directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1034406 - in /directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody: KdcReqBodyGrammar.java KdcReqBodyStatesEnum.java
Date Fri, 12 Nov 2010 14:38:37 GMT
Author: elecharny
Date: Fri Nov 12 14:38:37 2010
New Revision: 1034406

URL: http://svn.apache.org/viewvc?rev=1034406&view=rev
Log:
Updated the tags

Modified:
    directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/KdcReqBodyGrammar.java
    directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/KdcReqBodyStatesEnum.java

Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/KdcReqBodyGrammar.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/KdcReqBodyGrammar.java?rev=1034406&r1=1034405&r2=1034406&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/KdcReqBodyGrammar.java
(original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/KdcReqBodyGrammar.java
Fri Nov 12 14:38:37 2010
@@ -92,7 +92,7 @@ public final class KdcReqBodyGrammar ext
         // KDC-REQ-BODY    ::= SEQUENCE {
         //         kdc-options             [0] KDCOptions
         super.transitions[KdcReqBodyStatesEnum.KDC_REQ_BODY_KDC_OPTIONS_STATE.ordinal()][UniversalTag.BIT_STRING.getValue()]
= new GrammarTransition(
-            KdcReqBodyStatesEnum.KDC_REQ_BODY_KDC_OPTIONS_STATE, KdcReqBodyStatesEnum.KDC_REQ_BODY_CNAME_TAG_STATE,
UniversalTag.BIT_STRING.getValue(),
+            KdcReqBodyStatesEnum.KDC_REQ_BODY_KDC_OPTIONS_STATE, KdcReqBodyStatesEnum.KDC_REQ_BODY_CNAME_OR_REALM_TAG_STATE,
UniversalTag.BIT_STRING.getValue(),
             new StoreKdcOptions() );
         
         // --------------------------------------------------------------------------------------------
@@ -101,8 +101,8 @@ public final class KdcReqBodyGrammar ext
         // KDC-REQ-BODY    ::= SEQUENCE {
         //         ...
         //         cname                   [1]
-        super.transitions[KdcReqBodyStatesEnum.KDC_REQ_BODY_CNAME_TAG_STATE.ordinal()][KerberosConstants.KDC_REQ_BODY_CNAME_TAG]
= new GrammarTransition(
-            KdcReqBodyStatesEnum.KDC_REQ_BODY_CNAME_TAG_STATE, KdcReqBodyStatesEnum.KDC_REQ_BODY_REALM_TAG_STATE,
KerberosConstants.KDC_REQ_BODY_CNAME_TAG,
+        super.transitions[KdcReqBodyStatesEnum.KDC_REQ_BODY_CNAME_OR_REALM_TAG_STATE.ordinal()][KerberosConstants.KDC_REQ_BODY_CNAME_TAG]
= new GrammarTransition(
+            KdcReqBodyStatesEnum.KDC_REQ_BODY_CNAME_OR_REALM_TAG_STATE, KdcReqBodyStatesEnum.KDC_REQ_BODY_CNAME_STATE,
KerberosConstants.KDC_REQ_BODY_CNAME_TAG,
             new StoreCName() );
         
         // --------------------------------------------------------------------------------------------
@@ -111,8 +111,8 @@ public final class KdcReqBodyGrammar ext
         // KDC-REQ-BODY    ::= SEQUENCE {
         //         ...
         //         realm                   [2]
-        super.transitions[KdcReqBodyStatesEnum.KDC_REQ_BODY_CNAME_TAG_STATE.ordinal()][KerberosConstants.KDC_REQ_BODY_REALM_TAG]
= new GrammarTransition(
-            KdcReqBodyStatesEnum.KDC_REQ_BODY_CNAME_TAG_STATE, KdcReqBodyStatesEnum.KDC_REQ_BODY_REALM_TAG_STATE,
KerberosConstants.KDC_REQ_BODY_REALM_TAG,
+        super.transitions[KdcReqBodyStatesEnum.KDC_REQ_BODY_CNAME_OR_REALM_TAG_STATE.ordinal()][KerberosConstants.KDC_REQ_BODY_REALM_TAG]
= new GrammarTransition(
+            KdcReqBodyStatesEnum.KDC_REQ_BODY_CNAME_OR_REALM_TAG_STATE, KdcReqBodyStatesEnum.KDC_REQ_BODY_REALM_TAG_STATE,
KerberosConstants.KDC_REQ_BODY_REALM_TAG,
             new CheckNotNullLength() );
         
         // --------------------------------------------------------------------------------------------
@@ -121,8 +121,8 @@ public final class KdcReqBodyGrammar ext
         // KDC-REQ-BODY    ::= SEQUENCE {
         //         ...
         //         realm                   [2]
-        super.transitions[KdcReqBodyStatesEnum.KDC_REQ_BODY_REALM_TAG_STATE.ordinal()][KerberosConstants.KDC_REQ_BODY_REALM_TAG]
= new GrammarTransition(
-            KdcReqBodyStatesEnum.KDC_REQ_BODY_REALM_TAG_STATE, KdcReqBodyStatesEnum.KDC_REQ_BODY_REALM_STATE,
KerberosConstants.KDC_REQ_BODY_REALM_TAG,
+        super.transitions[KdcReqBodyStatesEnum.KDC_REQ_BODY_CNAME_STATE.ordinal()][KerberosConstants.KDC_REQ_BODY_REALM_TAG]
= new GrammarTransition(
+            KdcReqBodyStatesEnum.KDC_REQ_BODY_CNAME_STATE, KdcReqBodyStatesEnum.KDC_REQ_BODY_REALM_TAG_STATE,
KerberosConstants.KDC_REQ_BODY_REALM_TAG,
             new CheckNotNullLength() );
         
         // --------------------------------------------------------------------------------------------
@@ -131,8 +131,8 @@ public final class KdcReqBodyGrammar ext
         // KDC-REQ-BODY    ::= SEQUENCE {
         //         ...
         //         realm                   [2] Realm
-        super.transitions[KdcReqBodyStatesEnum.KDC_REQ_BODY_REALM_STATE.ordinal()][UniversalTag.GENERAL_STRING.getValue()]
= new GrammarTransition(
-            KdcReqBodyStatesEnum.KDC_REQ_BODY_REALM_STATE, KdcReqBodyStatesEnum.KDC_REQ_BODY_SNAME_TAG_STATE,
UniversalTag.GENERAL_STRING.getValue(),
+        super.transitions[KdcReqBodyStatesEnum.KDC_REQ_BODY_REALM_TAG_STATE.ordinal()][UniversalTag.GENERAL_STRING.getValue()]
= new GrammarTransition(
+            KdcReqBodyStatesEnum.KDC_REQ_BODY_REALM_TAG_STATE, KdcReqBodyStatesEnum.KDC_REQ_BODY_SNAME_OR_FROM_OR_TILL_TAG_STATE,
UniversalTag.GENERAL_STRING.getValue(),
             new StoreRealm() );
         
         // --------------------------------------------------------------------------------------------
@@ -141,59 +141,59 @@ public final class KdcReqBodyGrammar ext
         // KDC-REQ-BODY    ::= SEQUENCE {
         //         ...
         //         sname                   [3]
-        super.transitions[KdcReqBodyStatesEnum.KDC_REQ_BODY_SNAME_TAG_STATE.ordinal()][KerberosConstants.KDC_REQ_BODY_SNAME_TAG]
= new GrammarTransition(
-            KdcReqBodyStatesEnum.KDC_REQ_BODY_SNAME_TAG_STATE, KdcReqBodyStatesEnum.KDC_REQ_BODY_FROM_TAG_STATE,
KerberosConstants.KDC_REQ_BODY_SNAME_TAG,
+        super.transitions[KdcReqBodyStatesEnum.KDC_REQ_BODY_SNAME_OR_FROM_OR_TILL_TAG_STATE.ordinal()][KerberosConstants.KDC_REQ_BODY_SNAME_TAG]
= new GrammarTransition(
+            KdcReqBodyStatesEnum.KDC_REQ_BODY_SNAME_OR_FROM_OR_TILL_TAG_STATE, KdcReqBodyStatesEnum.KDC_REQ_BODY_SNAME_STATE,
KerberosConstants.KDC_REQ_BODY_SNAME_TAG,
             new StoreSName() );
-
+        
         // --------------------------------------------------------------------------------------------
-        // Transition from sname tag to from tag
+        // Transition from realm value to from tag (sname is empty)
         // --------------------------------------------------------------------------------------------
         // KDC-REQ-BODY    ::= SEQUENCE {
         //         ...
         //         from                    [4]
-        super.transitions[KdcReqBodyStatesEnum.KDC_REQ_BODY_FROM_TAG_STATE.ordinal()][KerberosConstants.KDC_REQ_BODY_FROM_TAG]
= new GrammarTransition(
-            KdcReqBodyStatesEnum.KDC_REQ_BODY_FROM_TAG_STATE, KdcReqBodyStatesEnum.KDC_REQ_BODY_FROM_STATE,
KerberosConstants.KDC_REQ_BODY_FROM_TAG,
+        super.transitions[KdcReqBodyStatesEnum.KDC_REQ_BODY_SNAME_OR_FROM_OR_TILL_TAG_STATE.ordinal()][KerberosConstants.KDC_REQ_BODY_FROM_TAG]
= new GrammarTransition(
+            KdcReqBodyStatesEnum.KDC_REQ_BODY_SNAME_OR_FROM_OR_TILL_TAG_STATE, KdcReqBodyStatesEnum.KDC_REQ_BODY_FROM_STATE,
KerberosConstants.KDC_REQ_BODY_FROM_TAG,
             new CheckNotNullLength() );
-        
+
         // --------------------------------------------------------------------------------------------
-        // Transition from sname tag to till tag (from is empty)
+        // Transition from realm value to till tag (sname and from are empty)
         // --------------------------------------------------------------------------------------------
         // KDC-REQ-BODY    ::= SEQUENCE {
         //         ...
         //         till                    [5]
-        super.transitions[KdcReqBodyStatesEnum.KDC_REQ_BODY_FROM_TAG_STATE.ordinal()][KerberosConstants.KDC_REQ_BODY_TILL_TAG]
= new GrammarTransition(
-            KdcReqBodyStatesEnum.KDC_REQ_BODY_FROM_TAG_STATE, KdcReqBodyStatesEnum.KDC_REQ_BODY_TILL_STATE,
KerberosConstants.KDC_REQ_BODY_TILL_TAG,
+        super.transitions[KdcReqBodyStatesEnum.KDC_REQ_BODY_SNAME_OR_FROM_OR_TILL_TAG_STATE.ordinal()][KerberosConstants.KDC_REQ_BODY_TILL_TAG]
= new GrammarTransition(
+            KdcReqBodyStatesEnum.KDC_REQ_BODY_SNAME_OR_FROM_OR_TILL_TAG_STATE, KdcReqBodyStatesEnum.KDC_REQ_BODY_TILL_STATE,
KerberosConstants.KDC_REQ_BODY_TILL_TAG,
             new CheckNotNullLength() );
-        
+
         // --------------------------------------------------------------------------------------------
-        // Transition from realm value to from tag (sname is empty)
+        // Transition from sname tag to from tag
         // --------------------------------------------------------------------------------------------
         // KDC-REQ-BODY    ::= SEQUENCE {
         //         ...
         //         from                    [4]
-        super.transitions[KdcReqBodyStatesEnum.KDC_REQ_BODY_SNAME_TAG_STATE.ordinal()][KerberosConstants.KDC_REQ_BODY_FROM_TAG]
= new GrammarTransition(
-            KdcReqBodyStatesEnum.KDC_REQ_BODY_SNAME_TAG_STATE, KdcReqBodyStatesEnum.KDC_REQ_BODY_FROM_STATE,
KerberosConstants.KDC_REQ_BODY_FROM_TAG,
+       super.transitions[KdcReqBodyStatesEnum.KDC_REQ_BODY_SNAME_STATE.ordinal()][KerberosConstants.KDC_REQ_BODY_FROM_TAG]
= new GrammarTransition(
+            KdcReqBodyStatesEnum.KDC_REQ_BODY_SNAME_STATE, KdcReqBodyStatesEnum.KDC_REQ_BODY_FROM_STATE,
KerberosConstants.KDC_REQ_BODY_FROM_TAG,
             new CheckNotNullLength() );
-
+        
         // --------------------------------------------------------------------------------------------
-        // Transition from from tag to from value
+        // Transition from sname tag to till tag (from is empty)
         // --------------------------------------------------------------------------------------------
         // KDC-REQ-BODY    ::= SEQUENCE {
         //         ...
-        //         from                    [4] KerberosTime
-        super.transitions[KdcReqBodyStatesEnum.KDC_REQ_BODY_FROM_STATE.ordinal()][UniversalTag.GENERALIZED_TIME.getValue()]
= new GrammarTransition(
-            KdcReqBodyStatesEnum.KDC_REQ_BODY_FROM_STATE, KdcReqBodyStatesEnum.KDC_REQ_BODY_TILL_TAG_STATE,
UniversalTag.GENERALIZED_TIME.getValue(),
-            new StoreFrom() );
-
+        //         till                    [5]
+       super.transitions[KdcReqBodyStatesEnum.KDC_REQ_BODY_SNAME_STATE.ordinal()][KerberosConstants.KDC_REQ_BODY_TILL_TAG]
= new GrammarTransition(
+            KdcReqBodyStatesEnum.KDC_REQ_BODY_SNAME_STATE, KdcReqBodyStatesEnum.KDC_REQ_BODY_TILL_STATE,
KerberosConstants.KDC_REQ_BODY_TILL_TAG,
+            new CheckNotNullLength() );
+        
         // --------------------------------------------------------------------------------------------
-        // Transition from realm value to till tag (sname and from are empty)
+        // Transition from from tag to from value
         // --------------------------------------------------------------------------------------------
         // KDC-REQ-BODY    ::= SEQUENCE {
         //         ...
-        //         till                    [4]
-        super.transitions[KdcReqBodyStatesEnum.KDC_REQ_BODY_SNAME_TAG_STATE.ordinal()][KerberosConstants.KDC_REQ_BODY_TILL_TAG]
= new GrammarTransition(
-            KdcReqBodyStatesEnum.KDC_REQ_BODY_SNAME_TAG_STATE, KdcReqBodyStatesEnum.KDC_REQ_BODY_TILL_STATE,
KerberosConstants.KDC_REQ_BODY_TILL_TAG,
-            new CheckNotNullLength() );
+        //         from                    [4] KerberosTime
+       super.transitions[KdcReqBodyStatesEnum.KDC_REQ_BODY_FROM_STATE.ordinal()][UniversalTag.GENERALIZED_TIME.getValue()]
= new GrammarTransition(
+            KdcReqBodyStatesEnum.KDC_REQ_BODY_FROM_STATE, KdcReqBodyStatesEnum.KDC_REQ_BODY_TILL_TAG_STATE,
UniversalTag.GENERALIZED_TIME.getValue(),
+            new StoreFrom() );
 
         // --------------------------------------------------------------------------------------------
         // Transition from till tag to till value
@@ -201,7 +201,7 @@ public final class KdcReqBodyGrammar ext
         // KDC-REQ-BODY    ::= SEQUENCE {
         //         ...
         //         till                    [5]
-        super.transitions[KdcReqBodyStatesEnum.KDC_REQ_BODY_TILL_TAG_STATE.ordinal()][KerberosConstants.KDC_REQ_BODY_TILL_TAG]
= new GrammarTransition(
+       super.transitions[KdcReqBodyStatesEnum.KDC_REQ_BODY_TILL_TAG_STATE.ordinal()][KerberosConstants.KDC_REQ_BODY_TILL_TAG]
= new GrammarTransition(
             KdcReqBodyStatesEnum.KDC_REQ_BODY_TILL_TAG_STATE, KdcReqBodyStatesEnum.KDC_REQ_BODY_TILL_STATE,
KerberosConstants.KDC_REQ_BODY_TILL_TAG,
             new CheckNotNullLength() );
 
@@ -211,18 +211,8 @@ public final class KdcReqBodyGrammar ext
         // KDC-REQ-BODY    ::= SEQUENCE {
         //         ...
         //         till                    [5] KerberosTime
-        super.transitions[KdcReqBodyStatesEnum.KDC_REQ_BODY_TILL_TAG_STATE.ordinal()][UniversalTag.GENERALIZED_TIME.getValue()]
= new GrammarTransition(
-            KdcReqBodyStatesEnum.KDC_REQ_BODY_TILL_TAG_STATE, KdcReqBodyStatesEnum.KDC_REQ_BODY_TILL_STATE,
UniversalTag.GENERALIZED_TIME.getValue(),
-            new StoreTill() );
-
-        // --------------------------------------------------------------------------------------------
-        // Transition from till tag to till value
-        // --------------------------------------------------------------------------------------------
-        // KDC-REQ-BODY    ::= SEQUENCE {
-        //         ...
-        //         till                    [5] KerberosTime
-        super.transitions[KdcReqBodyStatesEnum.KDC_REQ_BODY_TILL_STATE.ordinal()][UniversalTag.GENERALIZED_TIME.getValue()]
= new GrammarTransition(
-            KdcReqBodyStatesEnum.KDC_REQ_BODY_TILL_STATE, KdcReqBodyStatesEnum.KDC_REQ_BODY_RTIME_STATE,
UniversalTag.GENERALIZED_TIME.getValue(),
+       super.transitions[KdcReqBodyStatesEnum.KDC_REQ_BODY_TILL_STATE.ordinal()][UniversalTag.GENERALIZED_TIME.getValue()]
= new GrammarTransition(
+            KdcReqBodyStatesEnum.KDC_REQ_BODY_TILL_STATE, KdcReqBodyStatesEnum.KDC_REQ_BODY_RTIME_OR_NONCE_TAG_STATE,
UniversalTag.GENERALIZED_TIME.getValue(),
             new StoreTill() );
 }
 

Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/KdcReqBodyStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/KdcReqBodyStatesEnum.java?rev=1034406&r1=1034405&r2=1034406&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/KdcReqBodyStatesEnum.java
(original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/KdcReqBodyStatesEnum.java
Fri Nov 12 14:38:37 2010
@@ -42,22 +42,20 @@ public enum KdcReqBodyStatesEnum impleme
     KDC_REQ_BODY_KDC_OPTIONS_TAG_STATE,         // 2
     KDC_REQ_BODY_KDC_OPTIONS_STATE,             // 3
     
-    KDC_REQ_BODY_CNAME_TAG_STATE,               // 4
+    KDC_REQ_BODY_CNAME_OR_REALM_TAG_STATE,      // 4
     KDC_REQ_BODY_CNAME_STATE,                   // 5
 
     KDC_REQ_BODY_REALM_TAG_STATE,               // 6
-    KDC_REQ_BODY_REALM_STATE,                   // 7
 
-    KDC_REQ_BODY_SNAME_TAG_STATE,               // 8
-    KDC_REQ_BODY_SNAME_STATE,                   // 9
+    KDC_REQ_BODY_SNAME_OR_FROM_OR_TILL_TAG_STATE,// 7
+    KDC_REQ_BODY_SNAME_STATE,                   // 8
 
-    KDC_REQ_BODY_FROM_TAG_STATE,                // 10
-    KDC_REQ_BODY_FROM_STATE,                    // 11
+    KDC_REQ_BODY_FROM_STATE,                    // 9
 
-    KDC_REQ_BODY_TILL_TAG_STATE,                // 12
-    KDC_REQ_BODY_TILL_STATE,                    // 13
+    KDC_REQ_BODY_TILL_TAG_STATE,                // 10
+    KDC_REQ_BODY_TILL_STATE,                    // 11
     
-    KDC_REQ_BODY_RTIME_TAG_STATE,               // 14
+    KDC_REQ_BODY_RTIME_OR_NONCE_TAG_STATE,      // 12
     KDC_REQ_BODY_RTIME_STATE,                   // 15
 
     KDC_REQ_BODY_NONCE_TAG_STATE,               // 16



Mime
View raw message