directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r954517 - in /directory/apacheds/trunk: core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ core/src/main/java/org/apache/dire...
Date Mon, 14 Jun 2010 15:36:02 GMT
Author: elecharny
Date: Mon Jun 14 15:36:01 2010
New Revision: 954517

URL: http://svn.apache.org/viewvc?rev=954517&view=rev
Log:
rename the MoveAndRenameContext method getNewSuperior() to getNewSuperiorDn()

Modified:
    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/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.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/referral/ReferralInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/xdbm/AbstractXdbmPartition.java

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=954517&r1=954516&r2=954517&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java
(original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java
Mon Jun 14 15:36:01 2010
@@ -23,7 +23,6 @@ package org.apache.directory.server.core
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControl;
-import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.message.internal.InternalModifyDnRequest;
 import org.apache.directory.shared.ldap.name.DN;
@@ -106,7 +105,7 @@ public class MoveAndRenameOperationConte
     /**
      *  @return The new superior DN
      */
-    public DN getNewSuperior()
+    public DN getNewSuperiorDn()
     {
         return newSuperiorDn;
     }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java?rev=954517&r1=954516&r2=954517&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java
(original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java
Mon Jun 14 15:36:01 2010
@@ -385,7 +385,7 @@ public class RegistrySynchronizerAdaptor
             if ( objectClass2synchronizerMap.containsKey( oid ) )
             {
                 RegistrySynchronizer synchronizer = objectClass2synchronizerMap.get( oid
);
-                synchronizer.moveAndRename( opContext.getDn(), opContext.getNewSuperior(),
opContext.getNewRdn(), 
+                synchronizer.moveAndRename( opContext.getDn(), opContext.getNewSuperiorDn(),
opContext.getNewRdn(), 
                     opContext.getDeleteOldRdn(), entry, cascade );
                 return;
             }
@@ -393,7 +393,7 @@ public class RegistrySynchronizerAdaptor
 
         if ( oc.contains( MetaSchemaConstants.META_SCHEMA_OC ) )
         {
-            schemaSynchronizer.moveAndRename( opContext.getDn(), opContext.getNewSuperior(),
opContext.getNewRdn(), 
+            schemaSynchronizer.moveAndRename( opContext.getDn(), opContext.getNewSuperiorDn(),
opContext.getNewRdn(), 
                 opContext.getDeleteOldRdn(), entry, cascade );
             return;
         }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java?rev=954517&r1=954516&r2=954517&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
Mon Jun 14 15:36:01 2010
@@ -814,7 +814,7 @@ public class DefaultOperationManager imp
 
             // Now, check the destination
             // Normalize the opContext DN
-            DN newSuperiorDn = moveAndRenameContext.getNewSuperior();
+            DN newSuperiorDn = moveAndRenameContext.getNewSuperiorDn();
             newSuperiorDn.normalize( directoryService.getSchemaManager().getNormalizerMapping()
);
 
             // If he parent DN is a referral, or has a referral ancestor, we have to issue
a AffectMultipleDsas result

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java?rev=954517&r1=954516&r2=954517&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
Mon Jun 14 15:36:01 2010
@@ -832,7 +832,7 @@ public class AciAuthorizationInterceptor
         throws LdapException
     {
         DN oriChildName = moveAndRenameContext.getDn();
-        DN newParentName = moveAndRenameContext.getNewSuperior();
+        DN newParentName = moveAndRenameContext.getNewSuperiorDn();
 
         Entry entry = moveAndRenameContext.lookup( oriChildName, ByPassConstants.LOOKUP_BYPASS
);
 

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=954517&r1=954516&r2=954517&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
Mon Jun 14 15:36:01 2010
@@ -345,10 +345,10 @@ public class ChangeLogInterceptor extend
         forward.setDn( moveAndRenameContext.getDn() );
         forward.setDeleteOldRdn( moveAndRenameContext.getDeleteOldRdn() );
         forward.setNewRdn( moveAndRenameContext.getNewRdn().getName() );
-        forward.setNewSuperior( moveAndRenameContext.getNewSuperior().getName() );
+        forward.setNewSuperior( moveAndRenameContext.getNewSuperiorDn().getName() );
         
         List<LdifEntry> reverses = LdifRevertor.reverseMoveAndRename(  
-            serverEntry, moveAndRenameContext.getNewSuperior(), new RDN( moveAndRenameContext.getNewRdn()
), false );
+            serverEntry, moveAndRenameContext.getNewSuperiorDn(), new RDN( moveAndRenameContext.getNewRdn()
), false );
         
         if ( moveAndRenameContext.isReferralIgnored() )
         {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java?rev=954517&r1=954516&r2=954517&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
Mon Jun 14 15:36:01 2010
@@ -411,7 +411,7 @@ public class ExceptionInterceptor extend
         throws LdapException
     {
         DN oriChildName = moveAndRenameContext.getDn();
-        DN parent = moveAndRenameContext.getNewSuperior();
+        DN parent = moveAndRenameContext.getNewSuperiorDn();
 
         if ( oriChildName.getNormName().equalsIgnoreCase( subschemSubentryDn.getNormName()
) )
         {

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=954517&r1=954516&r2=954517&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
Mon Jun 14 15:36:01 2010
@@ -223,9 +223,9 @@ public class NormalizationInterceptor ex
             moveAndRenameContext.getDn().normalize( schemaManager.getNormalizerMapping()
);
         }
         
-        if ( !moveAndRenameContext.getNewSuperior().isNormalized() )
+        if ( !moveAndRenameContext.getNewSuperiorDn().isNormalized() )
         {
-            moveAndRenameContext.getNewSuperior().normalize( schemaManager.getNormalizerMapping()
);
+            moveAndRenameContext.getNewSuperiorDn().normalize( schemaManager.getNormalizerMapping()
);
         }
         
         nextInterceptor.moveAndRename( moveAndRenameContext );

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=954517&r1=954516&r2=954517&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
Mon Jun 14 15:36:01 2010
@@ -355,7 +355,7 @@ public class OperationalAttributeInterce
         List<Modification> items = ModifyOperationContext.createModItems( serverEntry,
             ModificationOperation.REPLACE_ATTRIBUTE );
 
-        ModifyOperationContext newModify = new ModifyOperationContext( moveAndRenameContext.getSession(),
moveAndRenameContext.getNewSuperior(),
+        ModifyOperationContext newModify = new ModifyOperationContext( moveAndRenameContext.getSession(),
moveAndRenameContext.getNewSuperiorDn(),
             items );
 
         service.getPartitionNexus().modify( newModify );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java?rev=954517&r1=954516&r2=954517&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
Mon Jun 14 15:36:01 2010
@@ -316,7 +316,7 @@ public class ReferralInterceptor extends
      **/
     public void moveAndRename( NextInterceptor next, MoveAndRenameOperationContext moveAndRenameContext
) throws LdapException
     {
-        DN newName = ( DN ) moveAndRenameContext.getNewSuperior().clone();
+        DN newName = ( DN ) moveAndRenameContext.getNewSuperiorDn().clone();
         newName.add( moveAndRenameContext.getNewRdn() );
 
         // Check if the entry is a referral itself

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java?rev=954517&r1=954516&r2=954517&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
Mon Jun 14 15:36:01 2010
@@ -875,7 +875,7 @@ public class SubentryInterceptor extends
     public void moveAndRename( NextInterceptor next, MoveAndRenameOperationContext moveAndRenameContext
) throws LdapException
     {
         DN oriChildName = moveAndRenameContext.getDn();
-        DN parent = moveAndRenameContext.getNewSuperior();
+        DN parent = moveAndRenameContext.getNewSuperiorDn();
 
         Entry entry = moveAndRenameContext.lookup( oriChildName, ByPassConstants.LOOKUP_BYPASS
);
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java?rev=954517&r1=954516&r2=954517&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java
Mon Jun 14 15:36:01 2010
@@ -407,7 +407,7 @@ public class TriggerInterceptor extends 
     public void moveAndRename( NextInterceptor next, MoveAndRenameOperationContext moveAndRenameContext
) throws LdapException
     {
         DN oriChildName = moveAndRenameContext.getDn();
-        DN parent = moveAndRenameContext.getNewSuperior();
+        DN parent = moveAndRenameContext.getNewSuperiorDn();
         RDN newRdn = moveAndRenameContext.getNewRdn();
         boolean deleteOldRn = moveAndRenameContext.getDeleteOldRdn();
 

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java?rev=954517&r1=954516&r2=954517&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java
(original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java
Mon Jun 14 15:36:01 2010
@@ -304,7 +304,7 @@ public class SyncReplSearchListener impl
 
         try
         {
-            if( ! opContext.getNewSuperior().isChildOf( clientMsgLog.getSearchCriteria().getBase()
) )
+            if( ! opContext.getNewSuperiorDn().isChildOf( clientMsgLog.getSearchCriteria().getBase()
) )
             {
                 sendDeletedEntry( opContext.getEntry() );
                 return;
@@ -312,7 +312,7 @@ public class SyncReplSearchListener impl
 
             SyncModifyDnControl modDnControl = new SyncModifyDnControl( SyncModifyDnType.MOVEANDRENAME
);
             modDnControl.setEntryDn( opContext.getDn().getNormName() );
-            modDnControl.setNewSuperiorDn( opContext.getNewSuperior().getNormName() );
+            modDnControl.setNewSuperiorDn( opContext.getNewSuperiorDn().getNormName() );
             modDnControl.setNewRdn( opContext.getNewRdn().getNormName() );
             modDnControl.setDeleteOldRdn( opContext.getDeleteOldRdn() );
 

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/xdbm/AbstractXdbmPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/xdbm/AbstractXdbmPartition.java?rev=954517&r1=954516&r2=954517&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/xdbm/AbstractXdbmPartition.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/xdbm/AbstractXdbmPartition.java
Mon Jun 14 15:36:01 2010
@@ -335,7 +335,7 @@ public abstract class AbstractXdbmPartit
 
     public final void moveAndRename( MoveAndRenameOperationContext moveAndRenameContext )
throws LdapException
     {
-        if ( moveAndRenameContext.getNewSuperior().isChildOf( moveAndRenameContext.getDn()
) )
+        if ( moveAndRenameContext.getNewSuperiorDn().isChildOf( moveAndRenameContext.getDn()
) )
         {
             throw new LdapUnwillingToPerformException( ResultCodeEnum.UNWILLING_TO_PERFORM,
                 "cannot place an entry below itself" );
@@ -343,7 +343,7 @@ public abstract class AbstractXdbmPartit
 
         try
         {
-            store.moveAndRename( moveAndRenameContext.getDn(), moveAndRenameContext.getNewSuperior(),
moveAndRenameContext.getNewRdn(),
+            store.moveAndRename( moveAndRenameContext.getDn(), moveAndRenameContext.getNewSuperiorDn(),
moveAndRenameContext.getNewRdn(),
                 null, moveAndRenameContext.getDeleteOldRdn() );
         }
         catch ( Exception e )



Mime
View raw message