directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r954514 - 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:24:19 GMT
Author: elecharny
Date: Mon Jun 14 15:24:19 2010
New Revision: 954514

URL: http://svn.apache.org/viewvc?rev=954514&view=rev
Log:
Renamed the getOldDn() method and parameter to getDeleteOldRdn

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/interceptor/context/RenameOperationContext.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/changelog/ChangeLogInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.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/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=954514&r1=954513&r2=954514&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:24:19 2010
@@ -129,7 +129,7 @@ public class MoveAndRenameOperationConte
      * @return the normalized new name after move and rename
      * @throws Exception if the name cannot be normalized
      */
-    public DN getNewDn() throws LdapException
+    public DN getNewDn()
     {
         return newDn;
     }

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=954514&r1=954513&r2=954514&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
Mon Jun 14 15:24:19 2010
@@ -47,8 +47,8 @@ public class RenameOperationContext exte
     /** Cached copy of the new DN */
     private DN newDn;
 
-    /** The flag to remove the old DN Attribute  */
-    private boolean delOldDn;
+    /** The flag to remove the old RDN Attribute  */
+    private boolean deleteOldRdn;
 
     /** The entry after being renamed and altered for rdn attributes */ 
     private ClonedServerEntry alteredEntry;
@@ -70,11 +70,11 @@ public class RenameOperationContext exte
      * @param newRdn the new RDN to use for the target
      * @param delOldDn true if we delete the old RDN value
      */
-    public RenameOperationContext( CoreSession session, DN oldDn, RDN newRdn, boolean delOldDn
)
+    public RenameOperationContext( CoreSession session, DN oldDn, RDN newRdn, boolean deleteOldRdn
)
     {
         super( session, oldDn );
         this.newRdn = newRdn;
-        this.delOldDn = delOldDn;
+        this.deleteOldRdn = deleteOldRdn;
     }
 
 
@@ -88,7 +88,7 @@ public class RenameOperationContext exte
             throw new IllegalStateException( I18n.err( I18n.ERR_328, modifyDnRequest ) );
         }
         
-        this.delOldDn = modifyDnRequest.getDeleteOldRdn();
+        this.deleteOldRdn = modifyDnRequest.getDeleteOldRdn();
         this.requestControls = modifyDnRequest.getControls();
         
         if ( requestControls.containsKey( ManageDsaITControl.CONTROL_OID ) )
@@ -103,28 +103,28 @@ public class RenameOperationContext exte
 
 
     /**
-     * @return The delete old DN flag
+     * @return The delete old RDN flag
      */
-    public boolean getDelOldDn() 
+    public boolean getDeleteOldRdn() 
     {
-        return delOldDn;
+        return deleteOldRdn;
     }
 
 
     /**
-     * Set the flag to delete the old DN
-     * @param delOldDn the flag to set
+     * Set the flag to delete the old RDN
+     * @param deleteOldRdn the flag to set
      */
-    public void setDelOldDn( boolean delOldDn ) 
+    public void setDelOldDn( boolean deleteOldRdn ) 
     {
-        this.delOldDn = delOldDn;
+        this.deleteOldRdn = deleteOldRdn;
     }
 
 
     /**
      * @return The new DN either computed if null or already computed
      */
-    public DN getNewDn() throws LdapException
+    public DN getNewDn()
     {
         return newDn;
     }
@@ -199,6 +199,6 @@ public class RenameOperationContext exte
     {
         return "RenameContext for old DN '" + getDn().getName() + "'" +
         ", new RDN '" + newRdn + "'" +
-        ( delOldDn ? ", delete old Dn" : "" ) ; 
+        ( deleteOldRdn ? ", delete old Rdn" : "" ) ; 
     }
 }

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=954514&r1=954513&r2=954514&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:24:19 2010
@@ -386,7 +386,7 @@ public class RegistrySynchronizerAdaptor
             {
                 RegistrySynchronizer synchronizer = objectClass2synchronizerMap.get( oid
);
                 synchronizer.moveAndRename( opContext.getDn(), opContext.getNewSuperior(),
opContext.getNewRdn(), 
-                    opContext.getDelOldDn(), entry, cascade );
+                    opContext.getDeleteOldRdn(), entry, cascade );
                 return;
             }
         }
@@ -394,7 +394,7 @@ public class RegistrySynchronizerAdaptor
         if ( oc.contains( MetaSchemaConstants.META_SCHEMA_OC ) )
         {
             schemaSynchronizer.moveAndRename( opContext.getDn(), opContext.getNewSuperior(),
opContext.getNewRdn(), 
-                opContext.getDelOldDn(), entry, cascade );
+                opContext.getDeleteOldRdn(), entry, cascade );
             return;
         }
         

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=954514&r1=954513&r2=954514&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:24:19 2010
@@ -313,10 +313,10 @@ public class ChangeLogInterceptor extend
         forward.setChangeType( ChangeType.ModRdn );
         forward.setDn( renameContext.getDn() );
         forward.setNewRdn( renameContext.getNewRdn().getName() );
-        forward.setDeleteOldRdn( renameContext.getDelOldDn() );
+        forward.setDeleteOldRdn( renameContext.getDeleteOldRdn() );
 
         List<LdifEntry> reverses = LdifRevertor.reverseRename( 
-            serverEntry, renameContext.getNewRdn(), renameContext.getDelOldDn() );
+            serverEntry, renameContext.getNewRdn(), renameContext.getDeleteOldRdn() );
         
         renameContext.setChangeLogEvent( changeLog.log( getPrincipal(), forward, reverses
) );
     }
@@ -343,7 +343,7 @@ public class ChangeLogInterceptor extend
         LdifEntry forward = new LdifEntry();
         forward.setChangeType( ChangeType.ModDn );
         forward.setDn( moveAndRenameContext.getDn() );
-        forward.setDeleteOldRdn( moveAndRenameContext.getDelOldDn() );
+        forward.setDeleteOldRdn( moveAndRenameContext.getDeleteOldRdn() );
         forward.setNewRdn( moveAndRenameContext.getNewRdn().getName() );
         forward.setNewSuperior( moveAndRenameContext.getNewSuperior().getName() );
         

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java?rev=954514&r1=954513&r2=954514&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java
Mon Jun 14 15:24:19 2010
@@ -252,7 +252,7 @@ public class JournalInterceptor extends 
             ldif.setChangeType( ChangeType.ModRdn );
             ldif.setDn( opContext.getDn() );
             ldif.setNewRdn( opContext.getNewRdn().getNormName() );
-            ldif.setDeleteOldRdn( opContext.getDelOldDn() );
+            ldif.setDeleteOldRdn( opContext.getDeleteOldRdn() );
             
             journal.log( getPrincipal(), opRevision, ldif );
         }
@@ -297,7 +297,7 @@ public class JournalInterceptor extends 
             ldif.setChangeType( ChangeType.ModDn );
             ldif.setDn( moveAndRenameContext.getDn() );
             ldif.setNewRdn( moveAndRenameContext.getNewRdn().getNormName() );
-            ldif.setDeleteOldRdn( moveAndRenameContext.getDelOldDn() );
+            ldif.setDeleteOldRdn( moveAndRenameContext.getDeleteOldRdn() );
             ldif.setNewSuperior( moveAndRenameContext.getNewDn().getNormName() );
             
             journal.log( getPrincipal(), opRevision, ldif );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java?rev=954514&r1=954513&r2=954514&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
Mon Jun 14 15:24:19 2010
@@ -971,7 +971,7 @@ public class SchemaInterceptor extends B
     {
         DN oldDn = opContext.getDn();
         RDN newRdn = opContext.getNewRdn();
-        boolean deleteOldRn = opContext.getDelOldDn();
+        boolean deleteOldRn = opContext.getDeleteOldRdn();
         Entry entry = opContext.getEntry().getClonedEntry();
 
         /*

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=954514&r1=954513&r2=954514&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:24:19 2010
@@ -363,7 +363,7 @@ public class TriggerInterceptor extends 
     {
         DN name = renameContext.getDn();
         RDN newRdn = renameContext.getNewRdn();
-        boolean deleteOldRn = renameContext.getDelOldDn();
+        boolean deleteOldRn = renameContext.getDeleteOldRdn();
 
         // Bypass trigger handling if the service is disabled.
         if ( !enabled )
@@ -409,7 +409,7 @@ public class TriggerInterceptor extends 
         DN oriChildName = moveAndRenameContext.getDn();
         DN parent = moveAndRenameContext.getNewSuperior();
         RDN newRdn = moveAndRenameContext.getNewRdn();
-        boolean deleteOldRn = moveAndRenameContext.getDelOldDn();
+        boolean deleteOldRn = moveAndRenameContext.getDeleteOldRdn();
 
         // Bypass trigger handling if the service is disabled.
         if ( !enabled )

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=954514&r1=954513&r2=954514&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:24:19 2010
@@ -314,7 +314,7 @@ public class SyncReplSearchListener impl
             modDnControl.setEntryDn( opContext.getDn().getNormName() );
             modDnControl.setNewSuperiorDn( opContext.getNewSuperior().getNormName() );
             modDnControl.setNewRdn( opContext.getNewRdn().getNormName() );
-            modDnControl.setDeleteOldRdn( opContext.getDelOldDn() );
+            modDnControl.setDeleteOldRdn( opContext.getDeleteOldRdn() );
 
             if ( pushInRealTime )
             {
@@ -360,7 +360,7 @@ public class SyncReplSearchListener impl
             modDnControl.setModDnType( SyncModifyDnType.RENAME );
             modDnControl.setEntryDn( opContext.getDn().getName() );
             modDnControl.setNewRdn( opContext.getNewRdn().getName() );
-            modDnControl.setDeleteOldRdn( opContext.getDelOldDn() );
+            modDnControl.setDeleteOldRdn( opContext.getDeleteOldRdn() );
 
             if ( pushInRealTime )
             {

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=954514&r1=954513&r2=954514&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:24:19 2010
@@ -319,11 +319,11 @@ public abstract class AbstractXdbmPartit
         {
             if ( renameContext.getEntry() != null )
             {
-                store.rename( renameContext.getDn(), renameContext.getNewRdn(), renameContext.getDelOldDn(),
renameContext.getEntry().getClonedEntry() );
+                store.rename( renameContext.getDn(), renameContext.getNewRdn(), renameContext.getDeleteOldRdn(),
renameContext.getEntry().getClonedEntry() );
             }
             else
             {
-                store.rename( renameContext.getDn(), renameContext.getNewRdn(), renameContext.getDelOldDn()
);
+                store.rename( renameContext.getDn(), renameContext.getNewRdn(), renameContext.getDeleteOldRdn()
);
             }
         }
         catch ( Exception e )
@@ -344,7 +344,7 @@ public abstract class AbstractXdbmPartit
         try
         {
             store.moveAndRename( moveAndRenameContext.getDn(), moveAndRenameContext.getNewSuperior(),
moveAndRenameContext.getNewRdn(),
-                null, moveAndRenameContext.getDelOldDn() );
+                null, moveAndRenameContext.getDeleteOldRdn() );
         }
         catch ( Exception e )
         {



Mime
View raw message