Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-07-05 02:02:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

SEC-635: Convert xsd:IDREF types to xsd:string to allow references to beans outside the current file.

Browse Source
This commit is contained in:
Luke Taylor 2008-01-22 11:38:50 +00:00
parent b29bcfebe8
commit 35a7928cb9
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,7 @@ id =
attribute id {xsd:ID} attribute id {xsd:ID}
ref = ref =
## Defines a reference to a Spring bean id. ## Defines a reference to a Spring bean id.
attribute ref {xsd:IDREF} attribute ref {xsd:string}
password-encoder = password-encoder =
## element which defines a password encoding strategy. Used by an authentication provider to convert submitted passwords to hashed versions, for example. ## element which defines a password encoding strategy. Used by an authentication provider to convert submitted passwords to hashed versions, for example.
@ -68,7 +68,7 @@ ldap-authentication-provider =
element ldap-authentication-provider {ldap-ap.attlist, empty} element ldap-authentication-provider {ldap-ap.attlist, empty}
ldap-ap.attlist &= ldap-ap.attlist &=
## The server to authenticate against. ## The server to authenticate against.
attribute server-ref {xsd:IDREF}? attribute server-ref {xsd:string}?
intercept-methods = intercept-methods =
@ -115,7 +115,7 @@ http.attlist &=
attribute servlet-api-provision {"true" | "false"}? attribute servlet-api-provision {"true" | "false"}?
http.attlist &= http.attlist &=
## Optional attribute specifying the ID of the AccessDecisionManager implementation which should be used for authorizing HTTP requests. ## Optional attribute specifying the ID of the AccessDecisionManager implementation which should be used for authorizing HTTP requests.
attribute access-decision-manager {xsd:IDREF}? attribute access-decision-manager {xsd:string}?
http.attlist &= http.attlist &=
## Optional attribute specifying the realm name that will be used for all authentication features that require a realm name (eg BASIC and Digest authentication). If unspecified, defaults to "Spring Security Application". ## Optional attribute specifying the realm name that will be used for all authentication features that require a realm name (eg BASIC and Digest authentication). If unspecified, defaults to "Spring Security Application".
attribute realm {xsd:string}? attribute realm {xsd:string}?
@ -198,7 +198,7 @@ concurrent-sessions.attlist &=
remember-me = remember-me =
element remember-me {remember-me.attlist} element remember-me {remember-me.attlist}
remember-me.attlist &= remember-me.attlist &=
(attribute key {xsd:string} | (attribute token-repository {xsd:IDREF} | attribute data-source {xsd:string})) (attribute key {xsd:string} | (attribute token-repository {xsd:string} | attribute data-source {xsd:string}))
anonymous = anonymous =
## Adds support for automatically granting all anonymous web requests a particular principal identity and a corresponding granted authority. ## Adds support for automatically granting all anonymous web requests a particular principal identity and a corresponding granted authority.
@ -218,7 +218,7 @@ authentication-provider =
element authentication-provider {ap.attlist & (user-service | jdbc-user-service) & password-encoder} element authentication-provider {ap.attlist & (user-service | jdbc-user-service) & password-encoder}
ap.attlist &= ap.attlist &=
## Specifies a reference to a separately configured UserDetailsService from which to obtain authentication data. ## Specifies a reference to a separately configured UserDetailsService from which to obtain authentication data.
attribute user-service-ref {xsd:IDREF}? attribute user-service-ref {xsd:string}?
user-service = user-service =
## Creates an in-memory UserDetailsService from a properties file or a list of "user" child elements. ## Creates an in-memory UserDetailsService from a properties file or a list of "user" child elements.

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

@ -64,7 +64,7 @@
</xs:attribute> </xs:attribute>
</xs:attributeGroup> </xs:attributeGroup>
<xs:attributeGroup name="ref"> <xs:attributeGroup name="ref">
<xs:attribute name="ref" use="required" type="xs:IDREF"> <xs:attribute name="ref" use="required" type="xs:string">
<xs:annotation> <xs:annotation>
<xs:documentation>Defines a reference to a Spring bean id.</xs:documentation> <xs:documentation>Defines a reference to a Spring bean id.</xs:documentation>
</xs:annotation> </xs:annotation>
@ -78,7 +78,7 @@
<xs:sequence> <xs:sequence>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="security:salt-source"/> <xs:element minOccurs="0" maxOccurs="unbounded" ref="security:salt-source"/>
</xs:sequence> </xs:sequence>
<xs:attribute name="ref" type="xs:IDREF"> <xs:attribute name="ref" type="xs:string">
<xs:annotation> <xs:annotation>
<xs:documentation>Defines a reference to a Spring bean id.</xs:documentation> <xs:documentation>Defines a reference to a Spring bean id.</xs:documentation>
</xs:annotation> </xs:annotation>
@ -188,7 +188,7 @@
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:attributeGroup name="ldap-ap.attlist"> <xs:attributeGroup name="ldap-ap.attlist">
<xs:attribute name="server-ref" type="xs:IDREF"> <xs:attribute name="server-ref" type="xs:string">
<xs:annotation> <xs:annotation>
<xs:documentation>The server to authenticate against. </xs:documentation> <xs:documentation>The server to authenticate against. </xs:documentation>
</xs:annotation> </xs:annotation>
@ -320,7 +320,7 @@
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
</xs:attribute> </xs:attribute>
<xs:attribute name="access-decision-manager" type="xs:IDREF"> <xs:attribute name="access-decision-manager" type="xs:string">
<xs:annotation> <xs:annotation>
<xs:documentation>Optional attribute specifying the ID of the AccessDecisionManager implementation which should be used for authorizing HTTP requests.</xs:documentation> <xs:documentation>Optional attribute specifying the ID of the AccessDecisionManager implementation which should be used for authorizing HTTP requests.</xs:documentation>
</xs:annotation> </xs:annotation>
@ -493,7 +493,7 @@
</xs:element> </xs:element>
<xs:attributeGroup name="remember-me.attlist"> <xs:attributeGroup name="remember-me.attlist">
<xs:attribute name="key" type="xs:string"/> <xs:attribute name="key" type="xs:string"/>
<xs:attribute name="token-repository" type="xs:IDREF"/> <xs:attribute name="token-repository" type="xs:string"/>
<xs:attribute name="data-source" type="xs:string"/> <xs:attribute name="data-source" type="xs:string"/>
</xs:attributeGroup> </xs:attributeGroup>
<xs:element name="anonymous"> <xs:element name="anonymous">
@ -537,7 +537,7 @@
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:attributeGroup name="ap.attlist"> <xs:attributeGroup name="ap.attlist">
<xs:attribute name="user-service-ref" type="xs:IDREF"> <xs:attribute name="user-service-ref" type="xs:string">
<xs:annotation> <xs:annotation>
<xs:documentation>Specifies a reference to a separately configured UserDetailsService from which to obtain authentication data. </xs:documentation> <xs:documentation>Specifies a reference to a separately configured UserDetailsService from which to obtain authentication data. </xs:documentation>
</xs:annotation> </xs:annotation>