Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow any ordering of authentication-provider elements within authentication-manager

This commit is contained in:
Luke Taylor 2009-10-11 19:58:04 +00:00
parent 5d3aa1a144
commit 73df14c912
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/src/main/resources/org/springframework/security/config/spring-security-3.0.rnc
View File

@ -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}?

8
config/src/main/resources/org/springframework/security/config/spring-security-3.0.xsd
View File

@ -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">