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

Corrected separators between http method strings in rnc file.

This commit is contained in:
Luke Taylor 2008-03-20 14:56:02 +00:00
parent 8f379768a8
commit a65b5a9ed8
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -200,7 +200,7 @@ intercept-url.attlist &=
attribute access {xsd:string}? attribute access {xsd:string}?
intercept-url.attlist &= intercept-url.attlist &=
## The HTTP Method for which the access configuration attributes should apply. If not specified, the attributes will apply to any method. ## 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 &= 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). ## 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).

16
core/src/main/resources/org/springframework/security/config/spring-security-2.0.xsd
View File

@ -260,7 +260,7 @@
</xs:annotation> </xs:annotation>
</xs:attribute> </xs:attribute>
</xs:attributeGroup> </xs:attributeGroup>
<xs:element name="ldap-user-service" substitutionGroup="security:any-user-service"> <xs:element name="ldap-user-service">
<xs:complexType> <xs:complexType>
<xs:attributeGroup ref="security:ldap-us.attlist"/> <xs:attributeGroup ref="security:ldap-us.attlist"/>
</xs:complexType> </xs:complexType>
@ -924,7 +924,7 @@
</xs:annotation> </xs:annotation>
<xs:complexType> <xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded"> <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:element ref="security:password-encoder"/>
</xs:choice> </xs:choice>
<xs:attributeGroup ref="security:ap.attlist"/> <xs:attributeGroup ref="security:ap.attlist"/>
@ -940,7 +940,7 @@
<xs:element name="custom-authentication-provider"> <xs:element name="custom-authentication-provider">
<xs:complexType/> <xs:complexType/>
</xs:element> </xs:element>
<xs:element name="user-service" substitutionGroup="security:any-user-service"> <xs:element name="user-service">
<xs:annotation> <xs:annotation>
<xs:documentation>Creates an in-memory UserDetailsService from a properties file or a <xs:documentation>Creates an in-memory UserDetailsService from a properties file or a
list of "user" child elements.</xs:documentation> list of "user" child elements.</xs:documentation>
@ -1000,7 +1000,7 @@
</xs:simpleType> </xs:simpleType>
</xs:attribute> </xs:attribute>
</xs:attributeGroup> </xs:attributeGroup>
<xs:element name="jdbc-user-service" substitutionGroup="security:any-user-service"> <xs:element name="jdbc-user-service">
<xs:annotation> <xs:annotation>
<xs:documentation>Causes creation of a JDBC-based UserDetailsService.</xs:documentation> <xs:documentation>Causes creation of a JDBC-based UserDetailsService.</xs:documentation>
</xs:annotation> </xs:annotation>
@ -1021,7 +1021,13 @@
</xs:annotation> </xs:annotation>
</xs:attribute> </xs:attribute>
</xs:attributeGroup> </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:group name="custom-filter">
<xs:sequence> <xs:sequence>
<xs:element minOccurs="0" ref="security:custom-filter"/> <xs:element minOccurs="0" ref="security:custom-filter"/>