Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 20269 invoked from network); 26 Jun 2005 20:16:02 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 26 Jun 2005 20:16:02 -0000 Received: (qmail 91881 invoked by uid 500); 26 Jun 2005 20:16:02 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 91857 invoked by uid 500); 26 Jun 2005 20:16:02 -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 91844 invoked by uid 99); 26 Jun 2005 20:16:02 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 26 Jun 2005 13:16:02 -0700 X-ASF-Spam-Status: No, hits=1.1 required=10.0 tests=NO_REAL_NAME,UPPERCASE_50_75 X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Sun, 26 Jun 2005 13:16:01 -0700 Received: (qmail 20219 invoked by uid 65534); 26 Jun 2005 20:15:59 -0000 Message-ID: <20050626201559.20218.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r201900 - /directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/LdapStatesEnum.java Date: Sun, 26 Jun 2005 20:15:58 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.2 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: elecharny Date: Sun Jun 26 13:15:57 2005 New Revision: 201900 URL: http://svn.apache.org/viewcvs?rev=201900&view=rev Log: Added states for ModifyRequest Modified: directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/LdapStatesEnum.java Modified: directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/LdapStatesEnum.java URL: http://svn.apache.org/viewcvs/directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/LdapStatesEnum.java?rev=201900&r1=201899&r2=201900&view=diff ============================================================================== --- directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/LdapStatesEnum.java (original) +++ directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/LdapStatesEnum.java Sun Jun 26 13:15:57 2005 @@ -631,6 +631,54 @@ public static int LAST_SEARCH_RESULT_ENTRY_STATE = 15; //========================================================================= + // Modify Request grammar states + //========================================================================= + // Modify Request --------------------------------------------------------- + /** Modify Request Tag */ + public static int MODIFY_REQUEST_TAG = 0; + + /** Modify Request Value */ + public static int MODIFY_REQUEST_VALUE = 1; + + // object ------------------------------------------------------------------ + /** Object Tag */ + public static int MODIFY_REQUEST_OBJECT_TAG = 2; + + /** Object Value */ + public static int MODIFY_REQUEST_OBJECT_VALUE = 3; + + // Modifications ---------------------------------------------------------- + /** Modifications Tag */ + public static int MODIFY_REQUEST_MODIFICATIONS_TAG = 4; + + /** Modifications Value */ + public static int MODIFY_REQUEST_MODIFICATIONS_VALUE = 5; + + // Modification sequence -------------------------------------------------- + /** Modifications sequence Tag */ + public static int MODIFY_REQUEST_MODIFICATION_SEQUENCE_TAG = 6; + + /** Modifications sequence Value */ + public static int MODIFY_REQUEST_MODIFICATION_SEQUENCE_VALUE = 7; + + // Operation -------------------------------------------------------------- + /** Operation Tag */ + public static int MODIFY_REQUEST_OPERATION_TAG = 8; + + /** Operation Value */ + public static int MODIFY_REQUEST_OPERATION_VALUE = 9; + + // Modification ---------------------------------------------------------- + /** Modification Tag */ + public static int MODIFY_REQUEST_MODIFICATION_TAG = 10; + + /** Modification Value */ + public static int MODIFY_REQUEST_MODIFICATION_VALUE = 11; + + /** The last state */ + public static int LAST_MODIFY_REQUEST_STATE = 12; + + //========================================================================= // Filter substring grammar states //========================================================================= @@ -736,6 +784,12 @@ /** SearchResultEntry number */ public static final int SEARCH_RESULT_ENTRY_GRAMMAR = 15; + /** ModifyRequest Grammar */ + public static final int MODIFY_REQUEST_GRAMMAR_SWITCH = 0x1100; + + /** ModifyRequest number */ + public static final int MODIFY_REQUEST_GRAMMAR = 16; + /** The total number of grammars used */ public static final int NB_GRAMMARS = 20; @@ -761,7 +815,8 @@ "SEARCH_RESULT_DONE_GRAMMAR_SWITCH", "SEARCH_REQUEST_GRAMMAR_SWITCH", "FILTER_GRAMMAR_SWITCH", - "SEARCH_RESULT_ENTRY_GRAMMAR_SWITCH" + "SEARCH_RESULT_ENTRY_GRAMMAR_SWITCH", + "MODIFY_REQUEST_GRAMMAR_SWITCH", }; //========================================================================= @@ -948,7 +1003,7 @@ "FILTER_OR_VALUE", "FILTER_NOT_TAG", "FILTER_NOT_VALUE", - "FILTER_EQUALITY_MATCH_TAG", // 10 + "FILTER_EQUALITY_MATCH_TAG", "FILTER_EQUALITY_MATCH_VALUE", "FILTER_SUBSTRINGS_TAG", "FILTER_SUBSTRINGS_VALUE", @@ -961,28 +1016,28 @@ "FILTER_APPROX_MATCH_TAG", "FILTER_APPROX_MATCH_VALUE", "FILTER_EXTENSIBLE_MATCH_TAG", - "FILTER_EXTENSIBLE_MATCH_VALUE", // 30 + "FILTER_EXTENSIBLE_MATCH_VALUE", "FILTER_LOOP_TAG", "FILTER_ATTRIBUTE_DESC_TAG", "FILTER_ATTRIBUTE_DESC_VALUE", "FILTER_ASSERTION_VALUE_TAG", "FILTER_ASSERTION_VALUE_VALUE", "FILTER_SUBSTRINGS_TYPE_TAG", - "FILTER_SUBSTRINGS_TYPE_VALUE", // 40 + "FILTER_SUBSTRINGS_TYPE_VALUE", "FILTER_SUBSTRINGS_SUBSTRINGS_TAG", "FILTER_SUBSTRINGS_SUBSTRINGS_VALUE", "FILTER_SUBSTRINGS_SUBSTRINGS_CHOICE_TAG", "FILTER_SUBSTRINGS_SUBSTRINGS_INITIAL_TAG", "FILTER_SUBSTRINGS_SUBSTRINGS_INITIAL_VALUE", "FILTER_SUBSTRINGS_SUBSTRINGS_ANY_OR_FINAL_TAG", - "FILTER_SUBSTRINGS_SUBSTRINGS_ANY_VALUE", // 50 + "FILTER_SUBSTRINGS_SUBSTRINGS_ANY_VALUE", "FILTER_SUBSTRINGS_SUBSTRINGS_FINAL_TAG", "FILTER_SUBSTRINGS_SUBSTRINGS_FINAL_VALUE", "FILTER_MATCHING_RULE_ASSERTION_TAG", "FILTER_MATCHING_RULE_ASSERTION_VALUE", "FILTER_MATCHING_RULE_OR_TYPE_TAG", "FILTER_MATCHING_RULE_VALUE", - "FILTER_MATCHING_TYPE_OR_MATCH_VALUE_TAG", // 60 + "FILTER_MATCHING_TYPE_OR_MATCH_VALUE_TAG", "FILTER_MATCHING_TYPE_VALUE", "FILTER_MATCHING_MATCH_VALUE_TAG", "FILTER_MATCHING_MATCH_VALUE_VALUE", @@ -1013,6 +1068,27 @@ "LAST_SEARCH_RESULT_ENTRY_STATE" }; + /** A string representation of all the modify request states */ + private static String[] ModifyRequestString = + new String[] + { + "MODIFY_REQUEST_TAG", + "MODIFY_REQUEST_VALUE", + "MODIFY_REQUEST_OBJECT_TAG", + "MODIFY_REQUEST_OBJECT_VALUE", + "MODIFY_REQUEST_MODIFICATIONS_TAG", + "MODIFY_REQUEST_OPERATION_VALUE", + "MODIFY_REQUEST_MODIFICATION_TAG", + "MODIFY_REQUEST_MODIFICATIONS_VALUE", + "MODIFY_REQUEST_MODIFICATION_SEQUENCE_TAG", + "MODIFY_REQUEST_MODIFICATION_SEQUENCE_VALUE", + "MODIFY_REQUEST_OPERATION_TAG", + "MODIFY_REQUEST_OPERATION_VALUE", + "MODIFY_REQUEST_MODIFICATION_TAG", + "MODIFY_REQUEST_MODIFICATION_VALUE", + "LAST_MODIFY_REQUEST_STATE" + }; + /** The instance */ private static LdapStatesEnum instance = new LdapStatesEnum(); @@ -1062,6 +1138,7 @@ case SEARCH_REQUEST_GRAMMAR : return "SEARCH_REQUEST_GRAMMAR"; case FILTER_GRAMMAR : return "FILTER_GRAMMAR"; case SEARCH_RESULT_ENTRY_GRAMMAR: return "SEARCH_RESULT_ENTRY_GRAMMAR"; + case MODIFY_REQUEST_GRAMMAR : return "MODIFY_REQUEST_GRAMMAR"; default : return "UNKNOWN"; } } @@ -1137,6 +1214,10 @@ { return "SEARCH_RESULT_ENTRY_GRAMMAR"; } + else if (grammar instanceof ModifyRequestGrammar) + { + return "MODIFY_REQUEST_GRAMMAR"; + } else { return "UNKNOWN GRAMMAR"; @@ -1211,6 +1292,9 @@ case SEARCH_RESULT_ENTRY_GRAMMAR : return ( ( state == GRAMMAR_END ) ? "SEARCH_RESULT_ENTRY_END_STATE" : SearchResultEntryString[state] ); + + case MODIFY_REQUEST_GRAMMAR : + return ( ( state == GRAMMAR_END ) ? "MODIFY_REQUEST_END_STATE" : ModifyRequestString[state] ); default : return "UNKNOWN";