From 56b967f935efb6885681c9b7b27779a377f6e6c0 Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Thu, 20 Mar 2008 15:10:21 +0000
Subject: [PATCH] Removed filer name duplication in rnc file.

---
 .../security/config/spring-security-2.0.rnc   |   6 +-
 .../security/config/spring-security-2.0.xsd   | 113 ++++--------------
 2 files changed, 28 insertions(+), 91 deletions(-)

diff --git a/core/src/main/resources/org/springframework/security/config/spring-security-2.0.rnc b/core/src/main/resources/org/springframework/security/config/spring-security-2.0.rnc
index b7932df546..08b7e00f90 100644
--- a/core/src/main/resources/org/springframework/security/config/spring-security-2.0.rnc
+++ b/core/src/main/resources/org/springframework/security/config/spring-security-2.0.rnc
@@ -376,11 +376,11 @@ custom-filter =
     element custom-filter {after | before}?
 after =
     ## The filter immediately after which the custom-filter should be placed in the chain. This feature will only be needed by advanced users who wish to mix their own filters into the security filter chain and have some knowledge of the standard Spring Security filters. The filter names map to specific Spring Security implementation filters. 
-    attribute after {"FIRST" | "CHANNEL_FILTER" | "CONCURRENT_SESSION_FILTER" | "SESSION_CONTEXT_INTEGRATION_FILTER" | "LOGOUT_FILTER" | "X509_FILTER" | "PRE_AUTH_FILTER" | "CAS_PROCESSING_FILTER" | "AUTHENTICATION_PROCESSING_FILTER" | "BASIC_PROCESSING_FILTER" | "SERVLET_API_SUPPORT_FILTER" | "REMEMBER_ME_FILTER" | "ANONYMOUS_FILTER" | "EXCEPTION_TRANSLATION_FILTER" | "NTLM_FILTER" | "FILTER_SECURITY_INTERCEPTOR" | "SWITCH_USER_FILTER"}
+    attribute after {named-security-filter}
 before =
     ## The filter immediately before which the custom-filter should be placed in the chain
-    attribute before {"FIRST" | "CHANNEL_FILTER" | "CONCURRENT_SESSION_FILTER" | "SESSION_CONTEXT_INTEGRATION_FILTER" | "LOGOUT_FILTER" | "X509_FILTER" | "PRE_AUTH_FILTER" | "CAS_PROCESSING_FILTER" | "AUTHENTICATION_PROCESSING_FILTER" | "BASIC_PROCESSING_FILTER" | "SERVLET_API_SUPPORT_FILTER" | "REMEMBER_ME_FILTER" | "ANONYMOUS_FILTER" | "EXCEPTION_TRANSLATION_FILTER" | "NTLM_FILTER" | "FILTER_SECURITY_INTERCEPTOR" | "SWITCH_USER_FILTER"}
-
+    attribute before {named-security-filter}
 
+named-security-filter = "FIRST" | "CHANNEL_FILTER" | "CONCURRENT_SESSION_FILTER" | "SESSION_CONTEXT_INTEGRATION_FILTER" | "LOGOUT_FILTER" | "X509_FILTER" | "PRE_AUTH_FILTER" | "CAS_PROCESSING_FILTER" | "AUTHENTICATION_PROCESSING_FILTER" | "BASIC_PROCESSING_FILTER" | "SERVLET_API_SUPPORT_FILTER" | "REMEMBER_ME_FILTER" | "ANONYMOUS_FILTER" | "EXCEPTION_TRANSLATION_FILTER" | "NTLM_FILTER" | "FILTER_SECURITY_INTERCEPTOR" | "SWITCH_USER_FILTER"
     
     
diff --git a/core/src/main/resources/org/springframework/security/config/spring-security-2.0.xsd b/core/src/main/resources/org/springframework/security/config/spring-security-2.0.xsd
index dc723cb9b6..adaf6f15a4 100644
--- a/core/src/main/resources/org/springframework/security/config/spring-security-2.0.xsd
+++ b/core/src/main/resources/org/springframework/security/config/spring-security-2.0.xsd
@@ -1040,7 +1040,7 @@
                 supplied, then the filter must implement the Ordered interface directly. </xs:documentation>
         </xs:annotation>
         <xs:complexType>
-            <xs:attribute name="after">
+            <xs:attribute name="after" type="security:named-security-filter">
                 <xs:annotation>
                     <xs:documentation>The filter immediately after which the custom-filter should be
                         placed in the chain. This feature will only be needed by advanced users who
@@ -1048,59 +1048,17 @@
                         knowledge of the standard Spring Security filters. The filter names map to
                         specific Spring Security implementation filters. </xs:documentation>
                 </xs:annotation>
-                <xs:simpleType>
-                    <xs:restriction base="xs:token">
-                        <xs:enumeration value="FIRST"/>
-                        <xs:enumeration value="CHANNEL_FILTER"/>
-                        <xs:enumeration value="CONCURRENT_SESSION_FILTER"/>
-                        <xs:enumeration value="SESSION_CONTEXT_INTEGRATION_FILTER"/>
-                        <xs:enumeration value="LOGOUT_FILTER"/>
-                        <xs:enumeration value="X509_FILTER"/>
-                        <xs:enumeration value="PRE_AUTH_FILTER"/>
-                        <xs:enumeration value="CAS_PROCESSING_FILTER"/>
-                        <xs:enumeration value="AUTHENTICATION_PROCESSING_FILTER"/>
-                        <xs:enumeration value="BASIC_PROCESSING_FILTER"/>
-                        <xs:enumeration value="SERVLET_API_SUPPORT_FILTER"/>
-                        <xs:enumeration value="REMEMBER_ME_FILTER"/>
-                        <xs:enumeration value="ANONYMOUS_FILTER"/>
-                        <xs:enumeration value="EXCEPTION_TRANSLATION_FILTER"/>
-                        <xs:enumeration value="NTLM_FILTER"/>
-                        <xs:enumeration value="FILTER_SECURITY_INTERCEPTOR"/>
-                        <xs:enumeration value="SWITCH_USER_FILTER"/>
-                    </xs:restriction>
-                </xs:simpleType>
             </xs:attribute>
-            <xs:attribute name="before">
+            <xs:attribute name="before" type="security:named-security-filter">
                 <xs:annotation>
                     <xs:documentation>The filter immediately before which the custom-filter should
                         be placed in the chain</xs:documentation>
                 </xs:annotation>
-                <xs:simpleType>
-                    <xs:restriction base="xs:token">
-                        <xs:enumeration value="FIRST"/>
-                        <xs:enumeration value="CHANNEL_FILTER"/>
-                        <xs:enumeration value="CONCURRENT_SESSION_FILTER"/>
-                        <xs:enumeration value="SESSION_CONTEXT_INTEGRATION_FILTER"/>
-                        <xs:enumeration value="LOGOUT_FILTER"/>
-                        <xs:enumeration value="X509_FILTER"/>
-                        <xs:enumeration value="PRE_AUTH_FILTER"/>
-                        <xs:enumeration value="CAS_PROCESSING_FILTER"/>
-                        <xs:enumeration value="AUTHENTICATION_PROCESSING_FILTER"/>
-                        <xs:enumeration value="BASIC_PROCESSING_FILTER"/>
-                        <xs:enumeration value="SERVLET_API_SUPPORT_FILTER"/>
-                        <xs:enumeration value="REMEMBER_ME_FILTER"/>
-                        <xs:enumeration value="ANONYMOUS_FILTER"/>
-                        <xs:enumeration value="EXCEPTION_TRANSLATION_FILTER"/>
-                        <xs:enumeration value="NTLM_FILTER"/>
-                        <xs:enumeration value="FILTER_SECURITY_INTERCEPTOR"/>
-                        <xs:enumeration value="SWITCH_USER_FILTER"/>
-                    </xs:restriction>
-                </xs:simpleType>
             </xs:attribute>
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="after">
-        <xs:attribute name="after" use="required">
+        <xs:attribute name="after" use="required" type="security:named-security-filter">
             <xs:annotation>
                 <xs:documentation>The filter immediately after which the custom-filter should be
                     placed in the chain. This feature will only be needed by advanced users who wish
@@ -1108,56 +1066,35 @@
                     of the standard Spring Security filters. The filter names map to specific Spring
                     Security implementation filters. </xs:documentation>
             </xs:annotation>
-            <xs:simpleType>
-                <xs:restriction base="xs:token">
-                    <xs:enumeration value="FIRST"/>
-                    <xs:enumeration value="CHANNEL_FILTER"/>
-                    <xs:enumeration value="CONCURRENT_SESSION_FILTER"/>
-                    <xs:enumeration value="SESSION_CONTEXT_INTEGRATION_FILTER"/>
-                    <xs:enumeration value="LOGOUT_FILTER"/>
-                    <xs:enumeration value="X509_FILTER"/>
-                    <xs:enumeration value="PRE_AUTH_FILTER"/>
-                    <xs:enumeration value="CAS_PROCESSING_FILTER"/>
-                    <xs:enumeration value="AUTHENTICATION_PROCESSING_FILTER"/>
-                    <xs:enumeration value="BASIC_PROCESSING_FILTER"/>
-                    <xs:enumeration value="SERVLET_API_SUPPORT_FILTER"/>
-                    <xs:enumeration value="REMEMBER_ME_FILTER"/>
-                    <xs:enumeration value="ANONYMOUS_FILTER"/>
-                    <xs:enumeration value="EXCEPTION_TRANSLATION_FILTER"/>
-                    <xs:enumeration value="NTLM_FILTER"/>
-                    <xs:enumeration value="FILTER_SECURITY_INTERCEPTOR"/>
-                    <xs:enumeration value="SWITCH_USER_FILTER"/>
-                </xs:restriction>
-            </xs:simpleType>
         </xs:attribute>
     </xs:attributeGroup>
     <xs:attributeGroup name="before">
-        <xs:attribute name="before" use="required">
+        <xs:attribute name="before" use="required" type="security:named-security-filter">
             <xs:annotation>
                 <xs:documentation>The filter immediately before which the custom-filter should be
                     placed in the chain</xs:documentation>
             </xs:annotation>
-            <xs:simpleType>
-                <xs:restriction base="xs:token">
-                    <xs:enumeration value="FIRST"/>
-                    <xs:enumeration value="CHANNEL_FILTER"/>
-                    <xs:enumeration value="CONCURRENT_SESSION_FILTER"/>
-                    <xs:enumeration value="SESSION_CONTEXT_INTEGRATION_FILTER"/>
-                    <xs:enumeration value="LOGOUT_FILTER"/>
-                    <xs:enumeration value="X509_FILTER"/>
-                    <xs:enumeration value="PRE_AUTH_FILTER"/>
-                    <xs:enumeration value="CAS_PROCESSING_FILTER"/>
-                    <xs:enumeration value="AUTHENTICATION_PROCESSING_FILTER"/>
-                    <xs:enumeration value="BASIC_PROCESSING_FILTER"/>
-                    <xs:enumeration value="SERVLET_API_SUPPORT_FILTER"/>
-                    <xs:enumeration value="REMEMBER_ME_FILTER"/>
-                    <xs:enumeration value="ANONYMOUS_FILTER"/>
-                    <xs:enumeration value="EXCEPTION_TRANSLATION_FILTER"/>
-                    <xs:enumeration value="NTLM_FILTER"/>
-                    <xs:enumeration value="FILTER_SECURITY_INTERCEPTOR"/>
-                    <xs:enumeration value="SWITCH_USER_FILTER"/>
-                </xs:restriction>
-            </xs:simpleType>
         </xs:attribute>
     </xs:attributeGroup>
+    <xs:simpleType name="named-security-filter">
+        <xs:restriction base="xs:token">
+            <xs:enumeration value="FIRST"/>
+            <xs:enumeration value="CHANNEL_FILTER"/>
+            <xs:enumeration value="CONCURRENT_SESSION_FILTER"/>
+            <xs:enumeration value="SESSION_CONTEXT_INTEGRATION_FILTER"/>
+            <xs:enumeration value="LOGOUT_FILTER"/>
+            <xs:enumeration value="X509_FILTER"/>
+            <xs:enumeration value="PRE_AUTH_FILTER"/>
+            <xs:enumeration value="CAS_PROCESSING_FILTER"/>
+            <xs:enumeration value="AUTHENTICATION_PROCESSING_FILTER"/>
+            <xs:enumeration value="BASIC_PROCESSING_FILTER"/>
+            <xs:enumeration value="SERVLET_API_SUPPORT_FILTER"/>
+            <xs:enumeration value="REMEMBER_ME_FILTER"/>
+            <xs:enumeration value="ANONYMOUS_FILTER"/>
+            <xs:enumeration value="EXCEPTION_TRANSLATION_FILTER"/>
+            <xs:enumeration value="NTLM_FILTER"/>
+            <xs:enumeration value="FILTER_SECURITY_INTERCEPTOR"/>
+            <xs:enumeration value="SWITCH_USER_FILTER"/>
+        </xs:restriction>
+    </xs:simpleType>
 </xs:schema>