directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kayyag...@apache.org
Subject svn commit: r940996 - in /directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap: codec/controls/replication/syncStateValue/SyncStateValueControlGrammar.java message/control/replication/SyncStateTypeEnum.java
Date Tue, 04 May 2010 18:43:51 GMT
Author: kayyagari
Date: Tue May  4 18:43:51 2010
New Revision: 940996

URL: http://svn.apache.org/viewvc?rev=940996&view=rev
Log:
merged move,rename and moveAndRename oeration states to moddn state

Modified:
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControlGrammar.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncStateTypeEnum.java

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControlGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControlGrammar.java?rev=940996&r1=940995&r2=940996&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControlGrammar.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncStateValue/SyncStateValueControlGrammar.java
Tue May  4 18:43:51 2010
@@ -119,7 +119,7 @@ public class SyncStateValueControlGramma
                     {
                         // Check that the value is into the allowed interval
                         int syncStateType = IntegerDecoder.parse( value, SyncStateTypeEnum.PRESENT.getValue(),
-                            SyncStateTypeEnum.MOVEANDRENAME.getValue() );
+                            SyncStateTypeEnum.MODDN.getValue() );
 
                         SyncStateTypeEnum syncStateTypeEnum = SyncStateTypeEnum.getSyncStateType(
syncStateType );
 

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncStateTypeEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncStateTypeEnum.java?rev=940996&r1=940995&r2=940996&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncStateTypeEnum.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncStateTypeEnum.java
Tue May  4 18:43:51 2010
@@ -33,9 +33,7 @@ import org.apache.directory.shared.i18n.
  *            delete (3),
  *            
  *            #includes the below ApacheDS specific values
- *            move(4),
- *            rename(5),
- *            moveAndRename(6)
+ *            moddn(4),
  *   }
  *   
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
@@ -43,7 +41,7 @@ import org.apache.directory.shared.i18n.
  */
 public enum SyncStateTypeEnum
 {
-    PRESENT(0), ADD(1), MODIFY(2), DELETE(3), MOVE(4), RENAME(5), MOVEANDRENAME(6);
+    PRESENT(0), ADD(1), MODIFY(2), DELETE(3), MODDN(4);
 
     /** the internal value */
     private int value;
@@ -94,17 +92,9 @@ public enum SyncStateTypeEnum
         {
             return DELETE;
         }
-        else if ( value == MOVE.value )
+        else if ( value == MODDN.value )
         {
-            return MOVE;
-        }
-        else if ( value == RENAME.value )
-        {
-            return RENAME;
-        }
-        else if ( value == MOVEANDRENAME.value )
-        {
-            return MOVEANDRENAME;
+            return MODDN;
         }
         
         throw new IllegalArgumentException( I18n.err( I18n.ERR_04163, value ) );



Mime
View raw message