From 73df14c9120094c75b30af348c143a84ec3fde43 Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Sun, 11 Oct 2009 19:58:04 +0000
Subject: [PATCH] Allow any ordering of authentication-provider elements within
 authentication-manager

---
 .../security/config/spring-security-3.0.rnc               | 2 +-
 .../security/config/spring-security-3.0.xsd               | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/src/main/resources/org/springframework/security/config/spring-security-3.0.rnc b/config/src/main/resources/org/springframework/security/config/spring-security-3.0.rnc
index adf379f1ef..81a508a6fc 100644
--- a/config/src/main/resources/org/springframework/security/config/spring-security-3.0.rnc
+++ b/config/src/main/resources/org/springframework/security/config/spring-security-3.0.rnc
@@ -528,7 +528,7 @@ x509.attlist &=
 
 authentication-manager =
     ## Registers the AuthenticationManager instance and allows its list of AuthenticationProviders to be defined. should use. Also allows you to define an alias to allow you to reference the AuthenticationManager in your own beans. 
-    element authentication-manager {authman.attlist, authentication-provider*, ldap-authentication-provider*}
+    element authentication-manager {authman.attlist & authentication-provider* & ldap-authentication-provider*}
 authman.attlist &=
     ## The alias you wish to use for the AuthenticationManager bean
     attribute alias {xsd:ID}?
diff --git a/config/src/main/resources/org/springframework/security/config/spring-security-3.0.xsd b/config/src/main/resources/org/springframework/security/config/spring-security-3.0.xsd
index 75bb778cb7..4fdab65576 100644
--- a/config/src/main/resources/org/springframework/security/config/spring-security-3.0.xsd
+++ b/config/src/main/resources/org/springframework/security/config/spring-security-3.0.xsd
@@ -1092,8 +1092,8 @@
   <xs:element name="authentication-manager"><xs:annotation>
       <xs:documentation>Registers the AuthenticationManager instance and allows its list of AuthenticationProviders to be defined. should use. Also allows you to define an alias to allow you to reference the AuthenticationManager in your own beans. </xs:documentation>
     </xs:annotation><xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" name="authentication-provider"><xs:annotation>
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element name="authentication-provider"><xs:annotation>
       <xs:documentation>Indicates that the contained user-service should be used as an authentication source. </xs:documentation>
     </xs:annotation><xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
@@ -1127,7 +1127,7 @@
       </xs:choice>
       <xs:attributeGroup ref="security:ap.attlist"/>
     </xs:complexType></xs:element>
-        <xs:element minOccurs="0" maxOccurs="unbounded" name="ldap-authentication-provider"><xs:annotation>
+        <xs:element name="ldap-authentication-provider"><xs:annotation>
       <xs:documentation>Sets up an ldap authentication provider</xs:documentation>
     </xs:annotation><xs:complexType>
       <xs:sequence>
@@ -1167,7 +1167,7 @@
       </xs:sequence>
       <xs:attributeGroup ref="security:ldap-ap.attlist"/>
     </xs:complexType></xs:element>
-      </xs:sequence>
+      </xs:choice>
       <xs:attributeGroup ref="security:authman.attlist"/>
     </xs:complexType></xs:element>
   <xs:attributeGroup name="authman.attlist">