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/21 01:10:51 UTC
svn commit: r901452 [1/2] - in /directory:
apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/
apacheds/trunk/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/
apacheds/trunk/core-api/src...
Author: elecharny
Date: Thu Jan 21 00:10:47 2010
New Revision: 901452
URL: http://svn.apache.org/viewvc?rev=901452&view=rev
Log:
o Reflected the rename of Rdn to RDN in all apacheDS
o Added a AddFuture class
o Some refactoring in a pom
Added:
directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/shared/ldap/client/api/messages/future/AddFuture.java
Modified:
directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java
directory/apacheds/trunk/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/CoreSession.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AttributeTypeSynchronizer.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ComparatorSynchronizer.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/DitContentRuleSynchronizer.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/DitStructureRuleSynchronizer.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleSynchronizer.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleUseSynchronizer.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NameFormSynchronizer.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NormalizerSynchronizer.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ObjectClassSynchronizer.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizer.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxCheckerSynchronizer.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxSynchronizer.java
directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveAndRenameReferralIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/AbstractMetaSchemaObjectHandler.java
directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCoreSession.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyDNStoredProcedureParameterInjector.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java
directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
directory/apacheds/trunk/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java
directory/apacheds/trunk/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java
directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java
directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifStore.java
directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/LdifPartitionTest.java
directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java
directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Store.java
directory/shared/trunk/all/pom.xml
directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/shared/ldap/client/api/LdapConnection.java
directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/shared/ldap/client/api/messages/AbstractResponseWithResult.java
directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/shared/ldap/client/api/messages/future/BindFuture.java
directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/shared/ldap/client/api/messages/future/ResponseFuture.java
directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/shared/ldap/client/api/messages/future/SearchFuture.java
Modified: directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java?rev=901452&r1=901451&r2=901452&view=diff
==============================================================================
--- directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java (original)
+++ directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java Thu Jan 21 00:10:47 2010
@@ -54,7 +54,7 @@
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.AVA;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.MatchingRule;
import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -913,7 +913,7 @@
/*
* Calculate the DN for the child's new name by copying the parents
- * new name and adding the child's old upRdn to new name as its Rdn
+ * new name and adding the child's old upRdn to new name as its RDN
*/
LdapDN childUpdn = ( LdapDN ) updn.clone();
LdapDN oldUpdn = new LdapDN( getEntryUpdn( childId ) );
@@ -1252,7 +1252,7 @@
}
- public void move( LdapDN oldChildDn, LdapDN newParentDn, Rdn newRdn, boolean deleteOldRdn ) throws Exception
+ public void move( LdapDN oldChildDn, LdapDN newParentDn, RDN newRdn, boolean deleteOldRdn ) throws Exception
{
Long childId = getEntryId( oldChildDn.toString() );
rename( oldChildDn, newRdn, deleteOldRdn );
@@ -1335,22 +1335,22 @@
/**
* Changes the relative distinguished name of an entry specified by a
- * distinguished name with the optional removal of the old Rdn attribute
+ * distinguished name with the optional removal of the old RDN attribute
* value from the entry. Name changes propagate down as dn changes to the
- * descendants of the entry where the Rdn changed.
+ * descendants of the entry where the RDN changed.
*
- * An Rdn change operation does not change parent child relationships. It
- * merely propagates a name change at a point in the DIT where the Rdn is
+ * An RDN change operation does not change parent child relationships. It
+ * merely propagates a name change at a point in the DIT where the RDN is
* changed. The change propagates down the subtree rooted at the
* distinguished name specified.
*
* @param dn the normalized distinguished name of the entry to alter
- * @param newRdn the new Rdn to set
- * @param deleteOldRdn whether or not to remove the old Rdn attr/val
+ * @param newRdn the new RDN to set
+ * @param deleteOldRdn whether or not to remove the old RDN attr/val
* @throws Exception if there are any errors propagating the name changes
*/
@SuppressWarnings("unchecked")
- public void rename( LdapDN dn, Rdn newRdn, boolean deleteOldRdn ) throws Exception
+ public void rename( LdapDN dn, RDN newRdn, boolean deleteOldRdn ) throws Exception
{
Long id = getEntryId( dn.getNormName() );
ServerEntry entry = lookup( id );
@@ -1359,10 +1359,10 @@
/*
* H A N D L E N E W R D N
* ====================================================================
- * Add the new Rdn attribute to the entry. If an index exists on the
- * new Rdn attribute we add the index for this attribute value pair.
+ * Add the new RDN attribute to the entry. If an index exists on the
+ * new RDN attribute we add the index for this attribute value pair.
* Also we make sure that the existance index shows the existance of the
- * new Rdn attribute within this entry.
+ * new RDN attribute within this entry.
*/
for ( AVA newAtav : newRdn )
@@ -1389,26 +1389,26 @@
/*
* H A N D L E O L D R D N
* ====================================================================
- * If the old Rdn is to be removed we need to get the attribute and
- * value for it. Keep in mind the old Rdn need not be based on the
- * same attr as the new one. We remove the Rdn value from the entry
- * and remove the value/id tuple from the index on the old Rdn attr
- * if any. We also test if the delete of the old Rdn index tuple
- * removed all the attribute values of the old Rdn using a reverse
+ * If the old RDN is to be removed we need to get the attribute and
+ * value for it. Keep in mind the old RDN need not be based on the
+ * same attr as the new one. We remove the RDN value from the entry
+ * and remove the value/id tuple from the index on the old RDN attr
+ * if any. We also test if the delete of the old RDN index tuple
+ * removed all the attribute values of the old RDN using a reverse
* lookup. If so that means we blew away the last value of the old
- * Rdn attribute. In this case we need to remove the attrName/id
+ * RDN attribute. In this case we need to remove the attrName/id
* tuple from the existance index.
*
- * We only remove an ATAV of the old Rdn if it is not included in the
- * new Rdn.
+ * We only remove an ATAV of the old RDN if it is not included in the
+ * new RDN.
*/
if ( deleteOldRdn )
{
- Rdn oldRdn = updn.getRdn();
+ RDN oldRdn = updn.getRdn();
for ( AVA oldAtav : oldRdn )
{
- // check if the new ATAV is part of the old Rdn
+ // check if the new ATAV is part of the old RDN
// if that is the case we do not remove the ATAV
boolean mustRemove = true;
for ( AVA newAtav : newRdn )
Modified: directory/apacheds/trunk/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.java?rev=901452&r1=901451&r2=901452&view=diff
==============================================================================
--- directory/apacheds/trunk/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.java (original)
+++ directory/apacheds/trunk/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.java Thu Jan 21 00:10:47 2010
@@ -57,10 +57,9 @@
import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.SchemaManager;
-import org.apache.directory.shared.ldap.schema.SchemaUtils;
import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;
import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor;
import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader;
@@ -730,7 +729,7 @@
store.add( entry );
- Rdn rdn = new Rdn("sn=James");
+ RDN rdn = new RDN("sn=James");
store.rename( dn, rdn, true );
}
@@ -750,7 +749,7 @@
store.add( entry );
- Rdn rdn = new Rdn("sn=Ja\\+es");
+ RDN rdn = new RDN("sn=Ja\\+es");
store.rename( dn, rdn, true );
@@ -780,7 +779,7 @@
LdapDN parentDn = new LdapDN( "ou=Sales,o=Good Times Co." );
parentDn.normalize( schemaManager.getNormalizerMapping() );
- Rdn rdn = new Rdn("cn=Ryan");
+ RDN rdn = new RDN("cn=Ryan");
store.move( childDn, parentDn, rdn, true );
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/CoreSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/CoreSession.java?rev=901452&r1=901451&r2=901452&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/CoreSession.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/CoreSession.java Thu Jan 21 00:10:47 2010
@@ -28,7 +28,6 @@
import org.apache.directory.server.constants.ServerDNConstants;
import org.apache.directory.server.core.changelog.LogChange;
-import org.apache.directory.server.core.LdapPrincipal;
import org.apache.directory.server.core.entry.ClonedServerEntry;
import org.apache.directory.server.core.entry.ServerEntry;
import org.apache.directory.server.core.filtering.EntryFilteringCursor;
@@ -37,8 +36,8 @@
import org.apache.directory.shared.ldap.entry.Modification;
import org.apache.directory.shared.ldap.filter.ExprNode;
import org.apache.directory.shared.ldap.filter.SearchScope;
-import org.apache.directory.shared.ldap.message.InternalAddRequest;
import org.apache.directory.shared.ldap.message.AliasDerefMode;
+import org.apache.directory.shared.ldap.message.InternalAddRequest;
import org.apache.directory.shared.ldap.message.InternalCompareRequest;
import org.apache.directory.shared.ldap.message.InternalDeleteRequest;
import org.apache.directory.shared.ldap.message.InternalModifyDnRequest;
@@ -46,7 +45,7 @@
import org.apache.directory.shared.ldap.message.InternalSearchRequest;
import org.apache.directory.shared.ldap.message.InternalUnbindRequest;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.schema.AttributeTypeOptions;
@@ -514,7 +513,7 @@
* @exception if there are failures while moving and renaming the entry
* or branch
*/
- void moveAndRename( LdapDN dn, LdapDN newParent, Rdn newRdn, boolean deleteOldRdn ) throws Exception;
+ void moveAndRename( LdapDN dn, LdapDN newParent, RDN newRdn, boolean deleteOldRdn ) throws Exception;
/**
@@ -530,7 +529,7 @@
* @exception if there are failures while moving and renaming the entry
* or branch
*/
- void moveAndRename( LdapDN dn, LdapDN newParent, Rdn newRdn, boolean deleteOldRdn, LogChange log ) throws Exception;
+ void moveAndRename( LdapDN dn, LdapDN newParent, RDN newRdn, boolean deleteOldRdn, LogChange log ) throws Exception;
/**
@@ -546,7 +545,7 @@
* @exception if there are failures while moving and renaming the entry
* or branch
*/
- void moveAndRename( LdapDN dn, LdapDN newParent, Rdn newRdn, boolean deleteOldRdn, boolean ignoreReferral ) throws Exception;
+ void moveAndRename( LdapDN dn, LdapDN newParent, RDN newRdn, boolean deleteOldRdn, boolean ignoreReferral ) throws Exception;
/**
@@ -563,7 +562,7 @@
* @exception if there are failures while moving and renaming the entry
* or branch
*/
- void moveAndRename( LdapDN dn, LdapDN newParent, Rdn newRdn, boolean deleteOldRdn, boolean ignoreReferral, LogChange log ) throws Exception;
+ void moveAndRename( LdapDN dn, LdapDN newParent, RDN newRdn, boolean deleteOldRdn, boolean ignoreReferral, LogChange log ) throws Exception;
/**
@@ -599,7 +598,7 @@
* distinguished name is to be deleted from the entry
* @throws Exception if there are failures while renaming the entry
*/
- void rename( LdapDN dn, Rdn newRdn, boolean deleteOldRdn ) throws Exception;
+ void rename( LdapDN dn, RDN newRdn, boolean deleteOldRdn ) throws Exception;
/**
@@ -615,7 +614,7 @@
* @param log a flag set if the added entry should be stored in the changeLog
* @throws Exception if there are failures while renaming the entry
*/
- void rename( LdapDN dn, Rdn newRdn, boolean deleteOldRdn, LogChange log ) throws Exception;
+ void rename( LdapDN dn, RDN newRdn, boolean deleteOldRdn, LogChange log ) throws Exception;
/**
@@ -631,7 +630,7 @@
* @param ignoreReferral a flag to tell the server to ignore referrals
* @throws Exception if there are failures while renaming the entry
*/
- void rename( LdapDN dn, Rdn newRdn, boolean deleteOldRdn, boolean ignoreReferral ) throws Exception;
+ void rename( LdapDN dn, RDN newRdn, boolean deleteOldRdn, boolean ignoreReferral ) throws Exception;
/**
@@ -648,7 +647,7 @@
* @param log a flag set if the added entry should be stored in the changeLog
* @throws Exception if there are failures while renaming the entry
*/
- void rename( LdapDN dn, Rdn newRdn, boolean deleteOldRdn, boolean ignoreReferral, LogChange log ) throws Exception;
+ void rename( LdapDN dn, RDN newRdn, boolean deleteOldRdn, boolean ignoreReferral, LogChange log ) throws Exception;
/**
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java?rev=901452&r1=901451&r2=901452&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java Thu Jan 21 00:10:47 2010
@@ -24,7 +24,7 @@
import org.apache.directory.shared.ldap.message.InternalModifyDnRequest;
import org.apache.directory.shared.ldap.message.control.ManageDsaITControl;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
/**
@@ -59,7 +59,7 @@
* @param newRdn the new rdn to use for the target once renamed
* @param delOldRdn true if the old rdn value is deleted, false otherwise
*/
- public MoveAndRenameOperationContext( CoreSession session, LdapDN oldDn, LdapDN parent, Rdn newRdn, boolean delOldRdn )
+ public MoveAndRenameOperationContext( CoreSession session, LdapDN oldDn, LdapDN parent, RDN newRdn, boolean delOldRdn )
{
super( session, oldDn, newRdn, delOldRdn );
this.parent = parent;
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java?rev=901452&r1=901451&r2=901452&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java Thu Jan 21 00:10:47 2010
@@ -26,7 +26,7 @@
import org.apache.directory.shared.ldap.message.MessageTypeEnum;
import org.apache.directory.shared.ldap.message.control.ManageDsaITControl;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
/**
@@ -41,7 +41,7 @@
public class RenameOperationContext extends AbstractChangeOperationContext
{
/** The new RDN */
- private Rdn newRdn;
+ private RDN newRdn;
/** Cached copy of the new DN */
private LdapDN newDn;
@@ -69,7 +69,7 @@
* @param newRdn the new RDN to use for the target
* @param delOldDn true if we delete the old RDN value
*/
- public RenameOperationContext( CoreSession session, LdapDN oldDn, Rdn newRdn, boolean delOldDn )
+ public RenameOperationContext( CoreSession session, LdapDN oldDn, RDN newRdn, boolean delOldDn )
{
super( session, oldDn );
this.newRdn = newRdn;
@@ -132,7 +132,7 @@
/**
* @return The new RDN
*/
- public Rdn getNewRdn()
+ public RDN getNewRdn()
{
return newRdn;
}
@@ -142,7 +142,7 @@
* Set the new RDN
* @param newRdn The new RDN
*/
- public void setNewRdn( Rdn newRdn )
+ public void setNewRdn( RDN newRdn )
{
this.newRdn = newRdn;
}
@@ -169,7 +169,7 @@
/**
* Returns the entry after it has been renamed and potentially changed for
- * Rdn alterations.
+ * RDN alterations.
*
* @return the new renamed entry
*/
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java?rev=901452&r1=901451&r2=901452&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java Thu Jan 21 00:10:47 2010
@@ -55,7 +55,7 @@
import org.apache.directory.shared.ldap.filter.SimpleNode;
import org.apache.directory.shared.ldap.message.AliasDerefMode;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.AttributeTypeOptions;
import org.apache.directory.shared.ldap.schema.MatchingRule;
@@ -478,7 +478,8 @@
return null;
}
- Rdn rdn = dn.getRdn( 1 );
+ RDN rdn = dn.getRdn( 1 );
+
if ( !rdn.getNormType().equalsIgnoreCase( CN_OID ) )
{
throw new NamingException( "Attribute of second rdn in dn '" + dn.toNormName()
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java?rev=901452&r1=901451&r2=901452&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java Thu Jan 21 00:10:47 2010
@@ -38,7 +38,7 @@
import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.apache.directory.shared.ldap.schema.SchemaObject;
@@ -155,7 +155,7 @@
throw new NamingException( "At least two name components are expected for the dn" );
}
- Rdn rdn = dn.getRdn( 1 );
+ RDN rdn = dn.getRdn( 1 );
return ( String ) rdn.getNormValue();
}
@@ -204,7 +204,7 @@
ResultCodeEnum.NAMING_VIOLATION );
}
- Rdn rdn = newParent.getRdn();
+ RDN rdn = newParent.getRdn();
if ( ! schemaManager.getAttributeTypeRegistry().getOidByName( rdn.getNormType() ).equals( SchemaConstants.OU_AT_OID ) )
{
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AttributeTypeSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AttributeTypeSynchronizer.java?rev=901452&r1=901451&r2=901452&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AttributeTypeSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AttributeTypeSynchronizer.java Thu Jan 21 00:10:47 2010
@@ -27,7 +27,7 @@
import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.apache.directory.shared.ldap.schema.registries.Schema;
@@ -195,7 +195,7 @@
/**
* {@inheritDoc}
*/
- public void rename( ServerEntry entry, Rdn newRdn, boolean cascade ) throws Exception
+ public void rename( ServerEntry entry, RDN newRdn, boolean cascade ) throws Exception
{
String schemaName = getSchemaName( entry.getDn() );
AttributeType oldAt = factory
@@ -238,7 +238,7 @@
}
- public void moveAndRename( LdapDN oriChildName, LdapDN newParentName, Rdn newRn, boolean deleteOldRn,
+ public void moveAndRename( LdapDN oriChildName, LdapDN newParentName, RDN newRn, boolean deleteOldRn,
ServerEntry entry, boolean cascade ) throws Exception
{
checkParent( newParentName, schemaManager, SchemaConstants.ATTRIBUTE_TYPE );
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ComparatorSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ComparatorSynchronizer.java?rev=901452&r1=901451&r2=901452&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ComparatorSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ComparatorSynchronizer.java Thu Jan 21 00:10:47 2010
@@ -35,7 +35,7 @@
import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.schema.LdapComparator;
import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.apache.directory.shared.ldap.schema.registries.Schema;
@@ -227,7 +227,7 @@
/**
* {@inheritDoc}
*/
- public void rename( ServerEntry entry, Rdn newRdn, boolean cascade ) throws Exception
+ public void rename( ServerEntry entry, RDN newRdn, boolean cascade ) throws Exception
{
String oldOid = getOid( entry );
@@ -266,7 +266,7 @@
}
- public void moveAndRename( LdapDN oriChildName, LdapDN newParentName, Rdn newRdn, boolean deleteOldRn,
+ public void moveAndRename( LdapDN oriChildName, LdapDN newParentName, RDN newRdn, boolean deleteOldRn,
ServerEntry entry, boolean cascade ) throws Exception
{
checkNewParent( newParentName );
@@ -383,7 +383,7 @@
ResultCodeEnum.NAMING_VIOLATION );
}
- Rdn rdn = newParent.getRdn();
+ RDN rdn = newParent.getRdn();
if ( !schemaManager.getAttributeTypeRegistry().getOidByName( rdn.getNormType() ).equals(
SchemaConstants.OU_AT_OID ) )
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/DitContentRuleSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/DitContentRuleSynchronizer.java?rev=901452&r1=901451&r2=901452&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/DitContentRuleSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/DitContentRuleSynchronizer.java Thu Jan 21 00:10:47 2010
@@ -25,7 +25,7 @@
import org.apache.directory.server.core.entry.ServerEntry;
import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.schema.DITContentRule;
import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -85,7 +85,7 @@
/* (non-Javadoc)
* @see org.apache.directory.server.core.schema.SchemaChangeHandler#move(org.apache.directory.shared.ldap.name.LdapDN, org.apache.directory.shared.ldap.name.LdapDN, java.lang.String, boolean, javax.naming.directory.Attributes)
*/
- public void moveAndRename( LdapDN oriChildName, LdapDN newParentName, Rdn newRn, boolean deleteOldRn,
+ public void moveAndRename( LdapDN oriChildName, LdapDN newParentName, RDN newRn, boolean deleteOldRn,
ServerEntry entry, boolean cascade ) throws NamingException
{
// TODO Auto-generated method stub
@@ -105,7 +105,7 @@
/**
* {@inheritDoc}
*/
- public void rename( ServerEntry entry, Rdn newRdn, boolean cascade ) throws NamingException
+ public void rename( ServerEntry entry, RDN newRdn, boolean cascade ) throws NamingException
{
// TODO Auto-generated method stub
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/DitStructureRuleSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/DitStructureRuleSynchronizer.java?rev=901452&r1=901451&r2=901452&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/DitStructureRuleSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/DitStructureRuleSynchronizer.java Thu Jan 21 00:10:47 2010
@@ -25,7 +25,7 @@
import org.apache.directory.server.core.entry.ServerEntry;
import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.schema.DITStructureRule;
import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -87,7 +87,7 @@
* org.apache.directory.shared.ldap.name.LdapDN,
* java.lang.String, boolean, javax.naming.directory.Attributes)
*/
- public void moveAndRename( LdapDN oriChildName, LdapDN newParentName, Rdn newRn, boolean deleteOldRn,
+ public void moveAndRename( LdapDN oriChildName, LdapDN newParentName, RDN newRn, boolean deleteOldRn,
ServerEntry entry, boolean cascade ) throws NamingException
{
// TODO Auto-generated method stub
@@ -110,7 +110,7 @@
/**
* {@inheritDoc}
*/
- public void rename( ServerEntry entry, Rdn newRdn, boolean cascade ) throws NamingException
+ public void rename( ServerEntry entry, RDN newRdn, boolean cascade ) throws NamingException
{
// TODO Auto-generated method stub
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleSynchronizer.java?rev=901452&r1=901451&r2=901452&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleSynchronizer.java Thu Jan 21 00:10:47 2010
@@ -30,7 +30,7 @@
import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.schema.MatchingRule;
import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.apache.directory.shared.ldap.schema.registries.Schema;
@@ -198,7 +198,7 @@
/**
* {@inheritDoc}
*/
- public void rename( ServerEntry entry, Rdn newRdn, boolean cascade ) throws Exception
+ public void rename( ServerEntry entry, RDN newRdn, boolean cascade ) throws Exception
{
String schemaName = getSchemaName( entry.getDn() );
MatchingRule oldMr = factory.getMatchingRule( schemaManager, entry, schemaManager.getRegistries(), schemaName );
@@ -223,7 +223,7 @@
}
- public void moveAndRename( LdapDN oriChildName, LdapDN newParentName, Rdn newRdn, boolean deleteOldRn,
+ public void moveAndRename( LdapDN oriChildName, LdapDN newParentName, RDN newRdn, boolean deleteOldRn,
ServerEntry entry, boolean cascade ) throws Exception
{
checkNewParent( newParentName );
@@ -298,7 +298,8 @@
ResultCodeEnum.NAMING_VIOLATION );
}
- Rdn rdn = newParent.getRdn();
+ RDN rdn = newParent.getRdn();
+
if ( !schemaManager.getAttributeTypeRegistry().getOidByName( rdn.getNormType() ).equals(
SchemaConstants.OU_AT_OID ) )
{
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleUseSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleUseSynchronizer.java?rev=901452&r1=901451&r2=901452&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleUseSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleUseSynchronizer.java Thu Jan 21 00:10:47 2010
@@ -25,7 +25,7 @@
import org.apache.directory.server.core.entry.ServerEntry;
import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.schema.MatchingRuleUse;
import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -81,7 +81,7 @@
}
- public void moveAndRename( LdapDN oriChildName, LdapDN newParentName, Rdn newRn, boolean deleteOldRn,
+ public void moveAndRename( LdapDN oriChildName, LdapDN newParentName, RDN newRn, boolean deleteOldRn,
ServerEntry entry, boolean cascade ) throws NamingException
{
// TODO Auto-generated method stub
@@ -98,7 +98,7 @@
/**
* {@inheritDoc}
*/
- public void rename( ServerEntry entry, Rdn newRdn, boolean cascade ) throws NamingException
+ public void rename( ServerEntry entry, RDN newRdn, boolean cascade ) throws NamingException
{
// TODO Auto-generated method stub
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NameFormSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NameFormSynchronizer.java?rev=901452&r1=901451&r2=901452&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NameFormSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NameFormSynchronizer.java Thu Jan 21 00:10:47 2010
@@ -25,7 +25,7 @@
import org.apache.directory.server.core.entry.ServerEntry;
import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.schema.NameForm;
import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -82,9 +82,9 @@
/* (non-Javadoc)
* @see org.apache.directory.server.core.schema.SchemaChangeHandler#move(
* org.apache.directory.shared.ldap.name.LdapDN, org.apache.directory.shared.ldap.name.LdapDN,
- * Rdn, boolean, javax.naming.directory.Attributes)
+ * RDN, boolean, javax.naming.directory.Attributes)
*/
- public void moveAndRename( LdapDN oriChildName, LdapDN newParentName, Rdn newRn,
+ public void moveAndRename( LdapDN oriChildName, LdapDN newParentName, RDN newRn,
boolean deleteOldRn, ServerEntry entry, boolean cascade ) throws NamingException
{
// TODO Auto-generated method stub
@@ -106,7 +106,7 @@
/**
* {@inheritDoc}
*/
- public void rename( ServerEntry entry, Rdn newRdn, boolean cascade ) throws NamingException
+ public void rename( ServerEntry entry, RDN newRdn, boolean cascade ) throws NamingException
{
// TODO Auto-generated method stub
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NormalizerSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NormalizerSynchronizer.java?rev=901452&r1=901451&r2=901452&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NormalizerSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NormalizerSynchronizer.java Thu Jan 21 00:10:47 2010
@@ -34,7 +34,7 @@
import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.schema.Normalizer;
import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.apache.directory.shared.ldap.schema.registries.Schema;
@@ -200,7 +200,7 @@
/**
* {@inheritDoc}
*/
- public void rename( ServerEntry entry, Rdn newRdn, boolean cascade ) throws Exception
+ public void rename( ServerEntry entry, RDN newRdn, boolean cascade ) throws Exception
{
String oldOid = getOid( entry );
String schemaName = getSchemaName( entry.getDn() );
@@ -235,7 +235,7 @@
}
- public void moveAndRename( LdapDN oriChildName, LdapDN newParentName, Rdn newRdn, boolean deleteOldRn,
+ public void moveAndRename( LdapDN oriChildName, LdapDN newParentName, RDN newRdn, boolean deleteOldRn,
ServerEntry entry, boolean cascade ) throws Exception
{
checkNewParent( newParentName );
@@ -327,7 +327,7 @@
ResultCodeEnum.NAMING_VIOLATION );
}
- Rdn rdn = newParent.getRdn();
+ RDN rdn = newParent.getRdn();
if ( !schemaManager.getAttributeTypeRegistry().getOidByName( rdn.getNormType() ).equals(
SchemaConstants.OU_AT_OID ) )
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ObjectClassSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ObjectClassSynchronizer.java?rev=901452&r1=901451&r2=901452&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ObjectClassSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ObjectClassSynchronizer.java Thu Jan 21 00:10:47 2010
@@ -30,7 +30,7 @@
import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.schema.ObjectClass;
import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.apache.directory.shared.ldap.schema.registries.Schema;
@@ -194,7 +194,7 @@
/**
* {@inheritDoc}
*/
- public void rename( ServerEntry entry, Rdn newRdn, boolean cascade ) throws Exception
+ public void rename( ServerEntry entry, RDN newRdn, boolean cascade ) throws Exception
{
String schemaName = getSchemaName( entry.getDn() );
ObjectClass oldOc = factory.getObjectClass( schemaManager, entry, schemaManager.getRegistries(), schemaName );
@@ -245,7 +245,7 @@
}
- public void moveAndRename( LdapDN oriChildName, LdapDN newParentName, Rdn newRdn, boolean deleteOldRn,
+ public void moveAndRename( LdapDN oriChildName, LdapDN newParentName, RDN newRdn, boolean deleteOldRn,
ServerEntry entry, boolean cascade ) throws Exception
{
checkNewParent( newParentName );
@@ -340,7 +340,7 @@
ResultCodeEnum.NAMING_VIOLATION );
}
- Rdn rdn = newParent.getRdn();
+ RDN rdn = newParent.getRdn();
if ( !schemaManager.getAttributeTypeRegistry().getOidByName( rdn.getNormType() ).equals(
SchemaConstants.OU_AT_OID ) )
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizer.java?rev=901452&r1=901451&r2=901452&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizer.java Thu Jan 21 00:10:47 2010
@@ -23,7 +23,7 @@
import org.apache.directory.server.core.entry.ServerEntry;
import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
/**
@@ -69,7 +69,7 @@
* @param cascaded unused
* @throws Exception If the rename failed
*/
- void rename( ServerEntry entry, Rdn newRdn, boolean cascaded ) throws Exception;
+ void rename( ServerEntry entry, RDN newRdn, boolean cascaded ) throws Exception;
/**
@@ -84,7 +84,7 @@
boolean modify( ModifyOperationContext opContext, ServerEntry targetEntry, boolean cascaded )
throws Exception;
- void moveAndRename( LdapDN oriChildName, LdapDN newParentName, Rdn newRn, boolean deleteOldRn, ServerEntry entry,
+ void moveAndRename( LdapDN oriChildName, LdapDN newParentName, RDN newRn, boolean deleteOldRn, ServerEntry entry,
boolean cascaded ) throws Exception;
void move( LdapDN oriChildName, LdapDN newParentName, ServerEntry entry, boolean cascaded ) throws Exception;
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java?rev=901452&r1=901451&r2=901452&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java Thu Jan 21 00:10:47 2010
@@ -47,7 +47,7 @@
import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.apache.directory.shared.ldap.schema.SchemaObject;
@@ -167,7 +167,7 @@
}
- public void moveAndRename( LdapDN oriChildName, LdapDN newParentName, Rdn newRn, boolean deleteOldRn, ServerEntry entry, boolean cascaded ) throws NamingException
+ public void moveAndRename( LdapDN oriChildName, LdapDN newParentName, RDN newRn, boolean deleteOldRn, ServerEntry entry, boolean cascaded ) throws NamingException
{
}
@@ -283,7 +283,7 @@
* @param entry the entry of the metaSchema object before the rename
* @param newRdn the new commonName of the metaSchema object
*/
- public void rename( ServerEntry entry, Rdn newRdn, boolean cascade ) throws Exception
+ public void rename( ServerEntry entry, RDN newRdn, boolean cascade ) throws Exception
{
String rdnAttribute = newRdn.getUpType();
String rdnAttributeOid = registries.getAttributeTypeRegistry().getOidByName( rdnAttribute );
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxCheckerSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxCheckerSynchronizer.java?rev=901452&r1=901451&r2=901452&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxCheckerSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxCheckerSynchronizer.java Thu Jan 21 00:10:47 2010
@@ -32,7 +32,7 @@
import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
import org.apache.directory.shared.ldap.schema.registries.Registries;
@@ -223,7 +223,7 @@
/**
* {@inheritDoc}
*/
- public void rename( ServerEntry entry, Rdn newRdn, boolean cascade ) throws Exception
+ public void rename( ServerEntry entry, RDN newRdn, boolean cascade ) throws Exception
{
String oldOid = getOid( entry );
String schemaName = getSchemaName( entry.getDn() );
@@ -256,7 +256,7 @@
}
- public void moveAndRename( LdapDN oriChildName, LdapDN newParentName, Rdn newRdn, boolean deleteOldRn,
+ public void moveAndRename( LdapDN oriChildName, LdapDN newParentName, RDN newRdn, boolean deleteOldRn,
ServerEntry entry, boolean cascade ) throws Exception
{
checkNewParent( newParentName );
@@ -367,7 +367,7 @@
ResultCodeEnum.NAMING_VIOLATION );
}
- Rdn rdn = newParent.getRdn();
+ RDN rdn = newParent.getRdn();
if ( !schemaManager.getAttributeTypeRegistry().getOidByName( rdn.getNormType() ).equals(
SchemaConstants.OU_AT_OID ) )
{
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxSynchronizer.java?rev=901452&r1=901451&r2=901452&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxSynchronizer.java Thu Jan 21 00:10:47 2010
@@ -33,7 +33,7 @@
import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.LdapSyntax;
import org.apache.directory.shared.ldap.schema.MatchingRule;
@@ -253,7 +253,7 @@
/**
* {@inheritDoc}
*/
- public void rename( ServerEntry entry, Rdn newRdn, boolean cascade ) throws Exception
+ public void rename( ServerEntry entry, RDN newRdn, boolean cascade ) throws Exception
{
String oldOid = getOid( entry );
String schemaName = getSchemaName( entry.getDn() );
@@ -292,7 +292,7 @@
}
- public void moveAndRename( LdapDN oriChildName, LdapDN newParentName, Rdn newRn, boolean deleteOldRn,
+ public void moveAndRename( LdapDN oriChildName, LdapDN newParentName, RDN newRn, boolean deleteOldRn,
ServerEntry entry, boolean cascade ) throws Exception
{
checkNewParent( newParentName );
@@ -392,7 +392,7 @@
ResultCodeEnum.NAMING_VIOLATION );
}
- Rdn rdn = newParent.getRdn();
+ RDN rdn = newParent.getRdn();
if ( !schemaManager.getAttributeTypeRegistry().getOidByName( rdn.getNormType() ).equals(
SchemaConstants.OU_AT_OID ) )
{
Modified: directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java?rev=901452&r1=901451&r2=901452&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java (original)
+++ directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java Thu Jan 21 00:10:47 2010
@@ -46,7 +46,7 @@
import org.apache.directory.shared.ldap.ldif.LdifEntry;
import org.apache.directory.shared.ldap.ldif.LdifReader;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.schema.registries.Schema;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -216,13 +216,13 @@
case( ChangeType.MODDN_ORDINAL ):
case( ChangeType.MODRDN_ORDINAL ):
- Rdn newRdn = new Rdn( entry.getNewRdn() );
+ RDN newRdn = new RDN( entry.getNewRdn() );
if ( entry.getNewSuperior() != null )
{
// It's a move. The superior have changed
// Let's see if it's a rename too
- Rdn oldRdn = dn.getRdn();
+ RDN oldRdn = dn.getRdn();
LdapDN newSuperior = new LdapDN( entry.getNewSuperior() );
if ( dn.size() == 0 )
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java?rev=901452&r1=901451&r2=901452&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java Thu Jan 21 00:10:47 2010
@@ -50,7 +50,7 @@
import org.apache.directory.shared.ldap.ldif.LdifEntry;
import org.apache.directory.shared.ldap.message.AliasDerefMode;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -108,7 +108,7 @@
{
service.getAdminSession().rename(
new LdapDN( "uid=admin,ou=system" ),
- new Rdn( "uid=alex" ),
+ new RDN( "uid=alex" ),
false );
fail( "admin should not be able to rename his account" );
}
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveAndRenameReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveAndRenameReferralIT.java?rev=901452&r1=901451&r2=901452&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveAndRenameReferralIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveAndRenameReferralIT.java Thu Jan 21 00:10:47 2010
@@ -48,7 +48,7 @@
import org.apache.directory.shared.ldap.exception.LdapNamingException;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -239,7 +239,7 @@
CoreSession coreSession = service.getAdminSession();
LdapDN dn = new LdapDN( "cn=Emmanuel Lecharny,ou=apache,ou=Roles,o=MNN,c=WW,ou=system" );
LdapDN newParent = new LdapDN( "o=PNN,c=WW,ou=system" );
- Rdn newRdn = new Rdn( "cn=Alex" );
+ RDN newRdn = new RDN( "cn=Alex" );
try
{
@@ -276,7 +276,7 @@
CoreSession coreSession = service.getAdminSession();
LdapDN dn = new LdapDN( "cn=Emmanuel Lecharny,ou=apache,ou=Roles,o=MNN,c=WW,ou=system" );
LdapDN newParent = new LdapDN( "o=PNN,c=WW,ou=system" );
- Rdn newRdn = new Rdn( "cn=Alex" );
+ RDN newRdn = new RDN( "cn=Alex" );
try
{
@@ -427,7 +427,7 @@
CoreSession coreSession = service.getAdminSession();
LdapDN dn = new LdapDN( "cn=Emmanuel Lecharny,ou=Roles,o=MNN,c=WW,ou=system" );
LdapDN newParent = new LdapDN( "o=PNN,c=WW,ou=system" );
- Rdn newRdn = new Rdn( "cn=Alex" );
+ RDN newRdn = new RDN( "cn=Alex" );
try
{
@@ -464,7 +464,7 @@
CoreSession coreSession = service.getAdminSession();
LdapDN dn = new LdapDN( "cn=Emmanuel Lecharny,ou=apache,ou=Roles,o=MNN,c=WW,ou=system" );
LdapDN newParent = new LdapDN( "o=PNN,c=WW,ou=system" );
- Rdn newRdn = new Rdn( "cn=Alex" );
+ RDN newRdn = new RDN( "cn=Alex" );
try
{
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIT.java?rev=901452&r1=901451&r2=901452&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIT.java Thu Jan 21 00:10:47 2010
@@ -45,7 +45,7 @@
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -230,7 +230,7 @@
try
{
LdapDN dn = new LdapDN( "cn=Emmanuel Lecharny,ou=apache,ou=roles,o=MNN,c=WW,ou=system" );
- Rdn newRdn = new Rdn( "cn=Alex Karasulu" );
+ RDN newRdn = new RDN( "cn=Alex Karasulu" );
session.rename( dn, newRdn, false, false );
fail();
}
@@ -265,7 +265,7 @@
try
{
LdapDN dn = new LdapDN( "cn=Emmanuel Lecharny,ou=apache,ou=roles,o=MNN,c=WW,ou=system" );
- Rdn newRdn = new Rdn( "cn=Alex Karasulu" );
+ RDN newRdn = new RDN( "cn=Alex Karasulu" );
session.rename( dn, newRdn, false, true );
fail();
}
@@ -405,7 +405,7 @@
try
{
LdapDN dn = new LdapDN( "ou=roles,o=MNN,c=WW,ou=system" );
- Rdn newRdn = new Rdn( "cn=Alex Karasulu" );
+ RDN newRdn = new RDN( "cn=Alex Karasulu" );
session.rename( dn, newRdn, false, false );
fail();
}
@@ -439,7 +439,7 @@
CoreSession session = service.getAdminSession();
LdapDN dnRoles = new LdapDN( "ou=Roles,o=MNN,c=WW,ou=system" );
LdapDN dnGroups = new LdapDN( "ou=Groups,o=MNN,c=WW,ou=system" );
- Rdn newRdn = new Rdn( "ou=Groups" );
+ RDN newRdn = new RDN( "ou=Groups" );
// First check that the object exists
ServerEntry renamed = session.lookup( dnRoles );
@@ -556,7 +556,7 @@
{
CoreSession session = service.getAdminSession();
LdapDN dn = new LdapDN( "ou=Roles,o=MNN,c=WW,ou=system" );
- Rdn newRdn = new Rdn( "ou=People" );
+ RDN newRdn = new RDN( "ou=People" );
try
{
@@ -592,7 +592,7 @@
{
CoreSession session = service.getAdminSession();
LdapDN dn = new LdapDN( "ou=Roles,o=MNN,c=WW,ou=system" );
- Rdn newRdn = new Rdn( "ou=People" );
+ RDN newRdn = new RDN( "ou=People" );
try
{
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/AbstractMetaSchemaObjectHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/AbstractMetaSchemaObjectHandler.java?rev=901452&r1=901451&r2=901452&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/AbstractMetaSchemaObjectHandler.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/AbstractMetaSchemaObjectHandler.java Thu Jan 21 00:10:47 2010
@@ -24,7 +24,7 @@
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.util.StringTools;
import org.junit.Before;
@@ -56,7 +56,7 @@
sb.append( workingDir ).append( '/' ).append( service.getSchemaService().getSchemaPartition().getId() ).append( '/' ).append( "ou=schema" );
- Enumeration<Rdn> rdns = dn.getAllRdn();
+ Enumeration<RDN> rdns = dn.getAllRdn();
while ( rdns.hasMoreElements() )
{
Modified: directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?rev=901452&r1=901451&r2=901452&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java (original)
+++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java Thu Jan 21 00:10:47 2010
@@ -86,7 +86,7 @@
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.AVA;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.util.AttributeUtils;
import org.apache.directory.shared.ldap.util.StringTools;
@@ -484,11 +484,11 @@
/**
* Used to encapsulate [de]marshalling of controls before and after moveAndRename operations.
*/
- protected void doMoveAndRenameOperation( LdapDN oldDn, LdapDN parent, Rdn newRdn, boolean delOldDn )
+ protected void doMoveAndRenameOperation( LdapDN oldDn, LdapDN parent, RDN newRdn, boolean delOldDn )
throws Exception
{
// setup the op context and populate with request controls
- MoveAndRenameOperationContext opCtx = new MoveAndRenameOperationContext( session, oldDn, parent, new Rdn(
+ MoveAndRenameOperationContext opCtx = new MoveAndRenameOperationContext( session, oldDn, parent, new RDN(
newRdn ), delOldDn );
opCtx.addRequestControls( requestControls );
@@ -552,7 +552,7 @@
/**
* Used to encapsulate [de]marshalling of controls before and after rename operations.
*/
- protected void doRename( LdapDN oldDn, Rdn newRdn, boolean delOldRdn ) throws Exception
+ protected void doRename( LdapDN oldDn, RDN newRdn, boolean delOldRdn ) throws Exception
{
// setup the op context and populate with request controls
RenameOperationContext opCtx = new RenameOperationContext( session, oldDn, newRdn, delOldRdn );
@@ -704,7 +704,7 @@
serverEntry.add( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.TOP_OC, JavaLdapSupport.JCONTAINER_ATTR );
// Now add the CN attribute, which is mandatory
- Rdn rdn = target.getRdn();
+ RDN rdn = target.getRdn();
if ( rdn != null )
{
@@ -803,7 +803,7 @@
private void injectRdnAttributeValues( LdapDN target, ServerEntry serverEntry ) throws NamingException
{
// Add all the RDN attributes and their values to this entry
- Rdn rdn = target.getRdn( target.size() - 1 );
+ RDN rdn = target.getRdn( target.size() - 1 );
if ( rdn.size() == 1 )
{
@@ -954,8 +954,8 @@
LdapDN newParent = ( LdapDN ) newDn.clone();
newParent.remove( newDn.size() - 1 );
- Rdn oldRdn = oldDn.getRdn();
- Rdn newRdn = newDn.getRdn();
+ RDN oldRdn = oldDn.getRdn();
+ RDN newRdn = newDn.getRdn();
boolean delOldRdn = true;
/*
Modified: directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java?rev=901452&r1=901451&r2=901452&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java (original)
+++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java Thu Jan 21 00:10:47 2010
@@ -69,7 +69,7 @@
import org.apache.directory.shared.ldap.message.AliasDerefMode;
import org.apache.directory.shared.ldap.name.AVA;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.util.AttributeUtils;
import org.apache.directory.shared.ldap.util.StringTools;
@@ -487,7 +487,7 @@
}
LdapDN target = buildTarget( name );
- Rdn rdn = target.getRdn( target.size() - 1 );
+ RDN rdn = target.getRdn( target.size() - 1 );
attrs = AttributeUtils.toCaseInsensitive( attrs );
Attributes attributes = ( Attributes ) attrs.clone();
@@ -497,7 +497,7 @@
String rdnAttribute = rdn.getUpType();
String rdnValue = ( String ) rdn.getNormValue();
- // Add the Rdn attribute
+ // Add the RDN attribute
boolean doRdnPut = attributes.get( rdnAttribute ) == null;
doRdnPut = doRdnPut || attributes.get( rdnAttribute ).size() == 0;
@@ -515,7 +515,7 @@
{
AVA atav = ii.next();
- // Add the Rdn attribute
+ // Add the RDN attribute
boolean doRdnPut = attributes.get( atav.getNormType() ) == null;
doRdnPut = doRdnPut || attributes.get( atav.getNormType() ).size() == 0;
Modified: directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCoreSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCoreSession.java?rev=901452&r1=901451&r2=901452&view=diff
==============================================================================
--- directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCoreSession.java (original)
+++ directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCoreSession.java Thu Jan 21 00:10:47 2010
@@ -65,7 +65,7 @@
import org.apache.directory.shared.ldap.message.InternalSearchRequest;
import org.apache.directory.shared.ldap.message.InternalUnbindRequest;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.AttributeTypeOptions;
import org.apache.directory.shared.ldap.util.StringTools;
@@ -605,7 +605,7 @@
/**
* {@inheritDoc}
*/
- public void moveAndRename( LdapDN dn, LdapDN newParent, Rdn newRdn, boolean deleteOldRdn ) throws Exception
+ public void moveAndRename( LdapDN dn, LdapDN newParent, RDN newRdn, boolean deleteOldRdn ) throws Exception
{
moveAndRename( dn, newParent, newRdn, deleteOldRdn, LogChange.TRUE );
}
@@ -614,7 +614,7 @@
/**
* {@inheritDoc}
*/
- public void moveAndRename( LdapDN dn, LdapDN newParent, Rdn newRdn, boolean deleteOldRdn, LogChange log ) throws Exception
+ public void moveAndRename( LdapDN dn, LdapDN newParent, RDN newRdn, boolean deleteOldRdn, LogChange log ) throws Exception
{
MoveAndRenameOperationContext opContext =
new MoveAndRenameOperationContext( this, dn, newParent, newRdn, deleteOldRdn );
@@ -629,7 +629,7 @@
/**
* {@inheritDoc}
*/
- public void moveAndRename( LdapDN dn, LdapDN newParent, Rdn newRdn, boolean deleteOldRdn, boolean ignoreReferral ) throws Exception
+ public void moveAndRename( LdapDN dn, LdapDN newParent, RDN newRdn, boolean deleteOldRdn, boolean ignoreReferral ) throws Exception
{
moveAndRename( dn, newParent, newRdn, deleteOldRdn, ignoreReferral, LogChange.TRUE );
}
@@ -638,7 +638,7 @@
/**
* {@inheritDoc}
*/
- public void moveAndRename( LdapDN dn, LdapDN newParent, Rdn newRdn, boolean deleteOldRdn, boolean ignoreReferral, LogChange log ) throws Exception
+ public void moveAndRename( LdapDN dn, LdapDN newParent, RDN newRdn, boolean deleteOldRdn, boolean ignoreReferral, LogChange log ) throws Exception
{
OperationManager operationManager = directoryService.getOperationManager();
MoveAndRenameOperationContext opContext = new MoveAndRenameOperationContext( this, dn, newParent, newRdn, deleteOldRdn );
@@ -653,7 +653,7 @@
/**
* {@inheritDoc}
*/
- public void rename( LdapDN dn, Rdn newRdn, boolean deleteOldRdn ) throws Exception
+ public void rename( LdapDN dn, RDN newRdn, boolean deleteOldRdn ) throws Exception
{
rename( dn, newRdn, deleteOldRdn, LogChange.TRUE );
}
@@ -662,7 +662,7 @@
/**
* {@inheritDoc}
*/
- public void rename( LdapDN dn, Rdn newRdn, boolean deleteOldRdn, LogChange log ) throws Exception
+ public void rename( LdapDN dn, RDN newRdn, boolean deleteOldRdn, LogChange log ) throws Exception
{
RenameOperationContext opContext = new RenameOperationContext( this, dn, newRdn, deleteOldRdn );
@@ -676,7 +676,7 @@
/**
* {@inheritDoc}
*/
- public void rename( LdapDN dn, Rdn newRdn, boolean deleteOldRdn, boolean ignoreReferral ) throws Exception
+ public void rename( LdapDN dn, RDN newRdn, boolean deleteOldRdn, boolean ignoreReferral ) throws Exception
{
rename( dn, newRdn, deleteOldRdn, ignoreReferral, LogChange.TRUE );
}
@@ -685,7 +685,7 @@
/**
* {@inheritDoc}
*/
- public void rename( LdapDN dn, Rdn newRdn, boolean deleteOldRdn, boolean ignoreReferral, LogChange log ) throws Exception
+ public void rename( LdapDN dn, RDN newRdn, boolean deleteOldRdn, boolean ignoreReferral, LogChange log ) throws Exception
{
OperationManager operationManager = directoryService.getOperationManager();
RenameOperationContext opContext = new RenameOperationContext( this, dn, newRdn, deleteOldRdn );
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java?rev=901452&r1=901451&r2=901452&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java Thu Jan 21 00:10:47 2010
@@ -65,7 +65,7 @@
import org.apache.directory.shared.ldap.message.InternalSearchRequest;
import org.apache.directory.shared.ldap.message.InternalUnbindRequest;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.AttributeTypeOptions;
import org.apache.directory.shared.ldap.util.StringTools;
@@ -605,7 +605,7 @@
/**
* {@inheritDoc}
*/
- public void moveAndRename( LdapDN dn, LdapDN newParent, Rdn newRdn, boolean deleteOldRdn ) throws Exception
+ public void moveAndRename( LdapDN dn, LdapDN newParent, RDN newRdn, boolean deleteOldRdn ) throws Exception
{
moveAndRename( dn, newParent, newRdn, deleteOldRdn, LogChange.TRUE );
}
@@ -614,7 +614,7 @@
/**
* {@inheritDoc}
*/
- public void moveAndRename( LdapDN dn, LdapDN newParent, Rdn newRdn, boolean deleteOldRdn, LogChange log ) throws Exception
+ public void moveAndRename( LdapDN dn, LdapDN newParent, RDN newRdn, boolean deleteOldRdn, LogChange log ) throws Exception
{
MoveAndRenameOperationContext opContext =
new MoveAndRenameOperationContext( this, dn, newParent, newRdn, deleteOldRdn );
@@ -629,7 +629,7 @@
/**
* {@inheritDoc}
*/
- public void moveAndRename( LdapDN dn, LdapDN newParent, Rdn newRdn, boolean deleteOldRdn, boolean ignoreReferral ) throws Exception
+ public void moveAndRename( LdapDN dn, LdapDN newParent, RDN newRdn, boolean deleteOldRdn, boolean ignoreReferral ) throws Exception
{
moveAndRename( dn, newParent, newRdn, deleteOldRdn, ignoreReferral, LogChange.TRUE );
}
@@ -638,7 +638,7 @@
/**
* {@inheritDoc}
*/
- public void moveAndRename( LdapDN dn, LdapDN newParent, Rdn newRdn, boolean deleteOldRdn, boolean ignoreReferral, LogChange log ) throws Exception
+ public void moveAndRename( LdapDN dn, LdapDN newParent, RDN newRdn, boolean deleteOldRdn, boolean ignoreReferral, LogChange log ) throws Exception
{
OperationManager operationManager = directoryService.getOperationManager();
MoveAndRenameOperationContext opContext = new MoveAndRenameOperationContext( this, dn, newParent, newRdn, deleteOldRdn );
@@ -653,7 +653,7 @@
/**
* {@inheritDoc}
*/
- public void rename( LdapDN dn, Rdn newRdn, boolean deleteOldRdn ) throws Exception
+ public void rename( LdapDN dn, RDN newRdn, boolean deleteOldRdn ) throws Exception
{
rename( dn, newRdn, deleteOldRdn, LogChange.TRUE );
}
@@ -662,7 +662,7 @@
/**
* {@inheritDoc}
*/
- public void rename( LdapDN dn, Rdn newRdn, boolean deleteOldRdn, LogChange log ) throws Exception
+ public void rename( LdapDN dn, RDN newRdn, boolean deleteOldRdn, LogChange log ) throws Exception
{
RenameOperationContext opContext = new RenameOperationContext( this, dn, newRdn, deleteOldRdn );
@@ -677,7 +677,7 @@
/**
* {@inheritDoc}
*/
- public void rename( LdapDN dn, Rdn newRdn, boolean deleteOldRdn, boolean ignoreReferral ) throws Exception
+ public void rename( LdapDN dn, RDN newRdn, boolean deleteOldRdn, boolean ignoreReferral ) throws Exception
{
rename( dn, newRdn, deleteOldRdn, ignoreReferral, LogChange.TRUE );
}
@@ -686,7 +686,7 @@
/**
* {@inheritDoc}
*/
- public void rename( LdapDN dn, Rdn newRdn, boolean deleteOldRdn, boolean ignoreReferral, LogChange log ) throws Exception
+ public void rename( LdapDN dn, RDN newRdn, boolean deleteOldRdn, boolean ignoreReferral, LogChange log ) throws Exception
{
OperationManager operationManager = directoryService.getOperationManager();
RenameOperationContext opContext = new RenameOperationContext( this, dn, newRdn, deleteOldRdn );
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?rev=901452&r1=901451&r2=901452&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Thu Jan 21 00:10:47 2010
@@ -89,9 +89,8 @@
import org.apache.directory.shared.ldap.ldif.LdifEntry;
import org.apache.directory.shared.ldap.ldif.LdifReader;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.schema.SchemaManager;
-import org.apache.directory.shared.ldap.schema.SchemaUtils;
import org.apache.directory.shared.ldap.schema.normalizers.OidNormalizer;
import org.apache.directory.shared.ldap.util.AttributeUtils;
import org.apache.directory.shared.ldap.util.DateUtils;
@@ -738,8 +737,8 @@
newBase.remove( newDn.size() - 1 );
// Compute the RDN for each of the DN
- Rdn newRdn = newDn.getRdn( newDn.size() - 1 );
- Rdn oldRdn = oldDn.getRdn( oldDn.size() - 1 );
+ RDN newRdn = newDn.getRdn( newDn.size() - 1 );
+ RDN oldRdn = oldDn.getRdn( oldDn.size() - 1 );
/*
* We need to determine if this rename operation corresponds to a simple
@@ -764,7 +763,7 @@
}
else
{
- adminSession.moveAndRename( oldDn, target, new Rdn( newRdn ), delOldRdn );
+ adminSession.moveAndRename( oldDn, target, new RDN( newRdn ), delOldRdn );
}
}
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java?rev=901452&r1=901451&r2=901452&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java Thu Jan 21 00:10:47 2010
@@ -49,7 +49,7 @@
import org.apache.directory.shared.ldap.ldif.LdifEntry;
import org.apache.directory.shared.ldap.ldif.LdifRevertor;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -350,7 +350,7 @@
forward.setNewSuperior( opCtx.getParent().getName() );
List<LdifEntry> reverses = LdifRevertor.reverseMoveAndRename(
- serverEntry, opCtx.getParent(), new Rdn( opCtx.getNewRdn() ), false );
+ serverEntry, opCtx.getParent(), new RDN( opCtx.getNewRdn() ), false );
opCtx.setChangeLogEvent( changeLog.log( getPrincipal(), forward, reverses ) );
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java?rev=901452&r1=901451&r2=901452&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java Thu Jan 21 00:10:47 2010
@@ -51,7 +51,7 @@
import org.apache.directory.shared.ldap.name.AVA;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.name.NameComponentNormalizer;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.apache.directory.shared.ldap.schema.normalizers.ConcreteNameComponentNormalizer;
@@ -354,7 +354,7 @@
return;
}
- Rdn rdn = dn.getRdn();
+ RDN rdn = dn.getRdn();
// Loop on all the AVAs
for ( AVA ava : rdn )
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java?rev=901452&r1=901451&r2=901452&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java Thu Jan 21 00:10:47 2010
@@ -58,10 +58,9 @@
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.AVA;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.name.Rdn;
+import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.SchemaManager;
-import org.apache.directory.shared.ldap.schema.SchemaUtils;
import org.apache.directory.shared.ldap.schema.UsageEnum;
import org.apache.directory.shared.ldap.util.DateUtils;
import org.slf4j.Logger;
@@ -557,17 +556,17 @@
for ( int ii = 0; ii < dn.size(); ii++ )
{
- Rdn rdn = dn.getRdn( ii );
+ RDN rdn = dn.getRdn( ii );
if ( rdn.size() == 0 )
{
- newDn.add( new Rdn() );
+ newDn.add( new RDN() );
continue;
}
else if ( rdn.size() == 1 )
{
String name = schemaManager.lookupAttributeTypeRegistry( rdn.getNormType() ).getName();
String value = rdn.getAtav().getNormValue().getString();
- newDn.add( new Rdn( name, name, value, value ) );
+ newDn.add( new RDN( name, name, value, value ) );
continue;
}
@@ -586,7 +585,7 @@
}
}
- newDn.add( new Rdn(buf.toString()) );
+ newDn.add( new RDN(buf.toString()) );
}
return newDn;