From a65b5a9ed8e9588b0e663816fef5d4c6dfd8fb06 Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Thu, 20 Mar 2008 14:56:02 +0000
Subject: [PATCH] Corrected separators between http method strings in rnc file.

---
 .../security/config/spring-security-2.0.rnc      |  2 +-
 .../security/config/spring-security-2.0.xsd      | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 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 5935d23a94..b7932df546 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
@@ -200,7 +200,7 @@ intercept-url.attlist &=
     attribute access {xsd:string}?
 intercept-url.attlist &=
     ## The HTTP Method for which the access configuration attributes should apply. If not specified, the attributes will apply to any method.
-    attribute method {"GET", "DELETE", "HEAD", "OPTIONS", "POST", "PUT", "TRACE"}?
+    attribute method {"GET" | "DELETE" | "HEAD" | "OPTIONS" | "POST" | "PUT" | "TRACE"}?
 
 intercept-url.attlist &=
     ## The filter list for the path. Currently can be set to "none" to remove a path from having any filters applied. The full filter stack (consisting of all defined filters, will be applied to any other paths).
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 3e7fac7395..dc723cb9b6 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
@@ -260,7 +260,7 @@
             </xs:annotation>
         </xs:attribute>
     </xs:attributeGroup>
-    <xs:element name="ldap-user-service" substitutionGroup="security:any-user-service">
+    <xs:element name="ldap-user-service">
         <xs:complexType>
             <xs:attributeGroup ref="security:ldap-us.attlist"/>
         </xs:complexType>
@@ -924,7 +924,7 @@
         </xs:annotation>
         <xs:complexType>
             <xs:choice minOccurs="0" maxOccurs="unbounded">
-                <xs:element ref="security:any-user-service"/>
+                <xs:group ref="security:any-user-service"/>
                 <xs:element ref="security:password-encoder"/>
             </xs:choice>
             <xs:attributeGroup ref="security:ap.attlist"/>
@@ -940,7 +940,7 @@
     <xs:element name="custom-authentication-provider">
         <xs:complexType/>
     </xs:element>
-    <xs:element name="user-service" substitutionGroup="security:any-user-service">
+    <xs:element name="user-service">
         <xs:annotation>
             <xs:documentation>Creates an in-memory UserDetailsService from a properties file or a
                 list of "user" child elements.</xs:documentation>
@@ -1000,7 +1000,7 @@
             </xs:simpleType>
         </xs:attribute>
     </xs:attributeGroup>
-    <xs:element name="jdbc-user-service" substitutionGroup="security:any-user-service">
+    <xs:element name="jdbc-user-service">
         <xs:annotation>
             <xs:documentation>Causes creation of a JDBC-based UserDetailsService.</xs:documentation>
         </xs:annotation>
@@ -1021,7 +1021,13 @@
             </xs:annotation>
         </xs:attribute>
     </xs:attributeGroup>
-    <xs:element name="any-user-service" abstract="true"/>
+    <xs:group name="any-user-service">
+        <xs:choice>
+            <xs:element ref="security:user-service"/>
+            <xs:element ref="security:jdbc-user-service"/>
+            <xs:element ref="security:ldap-user-service"/>
+        </xs:choice>
+    </xs:group>
     <xs:group name="custom-filter">
         <xs:sequence>
             <xs:element minOccurs="0" ref="security:custom-filter"/>