From commits-return-25712-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Tue May 04 18:01:04 2010 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 81914 invoked from network); 4 May 2010 18:01:04 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 4 May 2010 18:01:04 -0000 Received: (qmail 15430 invoked by uid 500); 4 May 2010 18:01:04 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 15365 invoked by uid 500); 4 May 2010 18:01:03 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 15358 invoked by uid 99); 4 May 2010 18:01:03 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 May 2010 18:01:03 +0000 X-ASF-Spam-Status: No, hits=-1996.4 required=10.0 tests=ALL_TRUSTED,FS_REPLICA X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 May 2010 18:01:01 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0A818238899C; Tue, 4 May 2010 18:00:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r940986 - 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:00:09 -0000 To: commits@directory.apache.org From: kayyagari@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100504180010.0A818238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kayyagari Date: Tue May 4 18:00:09 2010 New Revision: 940986 URL: http://svn.apache.org/viewvc?rev=940986&view=rev Log: o added constants to support move,rename and moveAndRename operations o updated the integer parsing limits 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=940986&r1=940985&r2=940986&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:00:09 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.DELETE.getValue() ); + SyncStateTypeEnum.MOVEANDRENAME.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=940986&r1=940985&r2=940986&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:00:09 2010 @@ -30,7 +30,12 @@ import org.apache.directory.shared.i18n. * present (0), * add (1), * modify (2), - * delete (3) + * delete (3), + * + * #includes the below ApacheDS specific values + * move(4), + * rename(5), + * moveAndRename(6) * } * * @author Apache Directory Project @@ -38,7 +43,7 @@ import org.apache.directory.shared.i18n. */ public enum SyncStateTypeEnum { - PRESENT(0), ADD(1), MODIFY(2), DELETE(3); + PRESENT(0), ADD(1), MODIFY(2), DELETE(3), MOVE(4), RENAME(5), MOVEANDRENAME(6); /** the internal value */ private int value; @@ -89,7 +94,19 @@ public enum SyncStateTypeEnum { return DELETE; } - + else if ( value == MOVE.value ) + { + return MOVE; + } + else if ( value == RENAME.value ) + { + return RENAME; + } + else if ( value == MOVEANDRENAME.value ) + { + return MOVEANDRENAME; + } + throw new IllegalArgumentException( I18n.err( I18n.ERR_04163, value ) ); }