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

SEC-1835: Changed xsd:ID to xsd:token.

This commit is contained in:
Luke Taylor 2011-10-21 18:35:06 +01:00
parent f1e63f3008
commit 58f7d3acc6
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/src/main/resources/org/springframework/security/config/spring-security-3.1.rnc
View File

@ -24,10 +24,10 @@ url =
attribute url { xsd:token } attribute url { xsd:token }
id = id =
## A bean identifier, used for referring to the bean elsewhere in the context. ## A bean identifier, used for referring to the bean elsewhere in the context.
attribute id {xsd:ID} attribute id {xsd:token}
name = name =
## A bean identifier, used for referring to the bean elsewhere in the context. ## A bean identifier, used for referring to the bean elsewhere in the context.
attribute name {xsd:ID} attribute name {xsd:token}
ref = ref =
## Defines a reference to a Spring bean Id. ## Defines a reference to a Spring bean Id.
attribute ref {xsd:token} attribute ref {xsd:token}
@ -617,7 +617,7 @@ authentication-manager =
element authentication-manager {authman.attlist & authentication-provider* & ldap-authentication-provider*} element authentication-manager {authman.attlist & authentication-provider* & ldap-authentication-provider*}
authman.attlist &= authman.attlist &=
## The alias you wish to use for the AuthenticationManager bean ## The alias you wish to use for the AuthenticationManager bean
attribute alias {xsd:ID}? attribute alias {xsd:token}?
authman.attlist &= authman.attlist &=
## If set to true, the AuthenticationManger will attempt to clear any credentials data in the returned Authentication object, once the user has been authenticated. ## If set to true, the AuthenticationManger will attempt to clear any credentials data in the returned Authentication object, once the user has been authenticated.
attribute erase-credentials {xsd:boolean}? attribute erase-credentials {xsd:boolean}?

20
config/src/main/resources/org/springframework/security/config/spring-security-3.1.xsd
View File

@ -64,14 +64,14 @@
</xs:attribute> </xs:attribute>
</xs:attributeGroup> </xs:attributeGroup>
<xs:attributeGroup name="id"> <xs:attributeGroup name="id">
<xs:attribute name="id" use="required" type="xs:ID"> <xs:attribute name="id" use="required" type="xs:token">
<xs:annotation> <xs:annotation>
<xs:documentation>A bean identifier, used for referring to the bean elsewhere in the context.</xs:documentation> <xs:documentation>A bean identifier, used for referring to the bean elsewhere in the context.</xs:documentation>
</xs:annotation> </xs:annotation>
</xs:attribute> </xs:attribute>
</xs:attributeGroup> </xs:attributeGroup>
<xs:attributeGroup name="name"> <xs:attributeGroup name="name">
<xs:attribute name="name" use="required" type="xs:ID"> <xs:attribute name="name" use="required" type="xs:token">
<xs:annotation> <xs:annotation>
<xs:documentation>A bean identifier, used for referring to the bean elsewhere in the context.</xs:documentation> <xs:documentation>A bean identifier, used for referring to the bean elsewhere in the context.</xs:documentation>
</xs:annotation> </xs:annotation>
@ -172,7 +172,7 @@
<xs:attributeGroup ref="security:ldap-server.attlist"/> <xs:attributeGroup ref="security:ldap-server.attlist"/>
</xs:complexType></xs:element> </xs:complexType></xs:element>
<xs:attributeGroup name="ldap-server.attlist"> <xs:attributeGroup name="ldap-server.attlist">
<xs:attribute name="id" type="xs:ID"> <xs:attribute name="id" type="xs:token">
<xs:annotation> <xs:annotation>
<xs:documentation>A bean identifier, used for referring to the bean elsewhere in the context.</xs:documentation> <xs:documentation>A bean identifier, used for referring to the bean elsewhere in the context.</xs:documentation>
</xs:annotation> </xs:annotation>
@ -274,7 +274,7 @@
<xs:attributeGroup ref="security:ldap-us.attlist"/> <xs:attributeGroup ref="security:ldap-us.attlist"/>
</xs:complexType></xs:element> </xs:complexType></xs:element>
<xs:attributeGroup name="ldap-us.attlist"> <xs:attributeGroup name="ldap-us.attlist">
<xs:attribute name="id" type="xs:ID"> <xs:attribute name="id" type="xs:token">
<xs:annotation> <xs:annotation>
<xs:documentation>A bean identifier, used for referring to the bean elsewhere in the context.</xs:documentation> <xs:documentation>A bean identifier, used for referring to the bean elsewhere in the context.</xs:documentation>
</xs:annotation> </xs:annotation>
@ -464,7 +464,7 @@
<xs:attributeGroup ref="security:msmds.attlist"/> <xs:attributeGroup ref="security:msmds.attlist"/>
</xs:complexType></xs:element> </xs:complexType></xs:element>
<xs:attributeGroup name="msmds.attlist"> <xs:attributeGroup name="msmds.attlist">
<xs:attribute name="id" type="xs:ID"> <xs:attribute name="id" type="xs:token">
<xs:annotation> <xs:annotation>
<xs:documentation>A bean identifier, used for referring to the bean elsewhere in the context.</xs:documentation> <xs:documentation>A bean identifier, used for referring to the bean elsewhere in the context.</xs:documentation>
</xs:annotation> </xs:annotation>
@ -794,7 +794,7 @@
<xs:documentation>Prevents the jsessionid parameter from being added to rendered URLs.</xs:documentation> <xs:documentation>Prevents the jsessionid parameter from being added to rendered URLs.</xs:documentation>
</xs:annotation> </xs:annotation>
</xs:attribute> </xs:attribute>
<xs:attribute name="name" type="xs:ID"> <xs:attribute name="name" type="xs:token">
<xs:annotation> <xs:annotation>
<xs:documentation>A bean identifier, used for referring to the bean elsewhere in the context.</xs:documentation> <xs:documentation>A bean identifier, used for referring to the bean elsewhere in the context.</xs:documentation>
</xs:annotation> </xs:annotation>
@ -1033,7 +1033,7 @@
<xs:documentation>Enables the use of expressions in the 'access' attributes in &lt;intercept-url&gt; elements rather than the traditional list of configuration attributes. Defaults to 'false'. If enabled, each attribute should contain a single boolean expression. If the expression evaluates to 'true', access will be granted.</xs:documentation> <xs:documentation>Enables the use of expressions in the 'access' attributes in &lt;intercept-url&gt; elements rather than the traditional list of configuration attributes. Defaults to 'false'. If enabled, each attribute should contain a single boolean expression. If the expression evaluates to 'true', access will be granted.</xs:documentation>
</xs:annotation> </xs:annotation>
</xs:attribute> </xs:attribute>
<xs:attribute name="id" type="xs:ID"> <xs:attribute name="id" type="xs:token">
<xs:annotation> <xs:annotation>
<xs:documentation>A bean identifier, used for referring to the bean elsewhere in the context.</xs:documentation> <xs:documentation>A bean identifier, used for referring to the bean elsewhere in the context.</xs:documentation>
</xs:annotation> </xs:annotation>
@ -1352,7 +1352,7 @@
<xs:attributeGroup ref="security:authman.attlist"/> <xs:attributeGroup ref="security:authman.attlist"/>
</xs:complexType></xs:element> </xs:complexType></xs:element>
<xs:attributeGroup name="authman.attlist"> <xs:attributeGroup name="authman.attlist">
<xs:attribute name="alias" type="xs:ID"> <xs:attribute name="alias" type="xs:token">
<xs:annotation> <xs:annotation>
<xs:documentation>The alias you wish to use for the AuthenticationManager bean</xs:documentation> <xs:documentation>The alias you wish to use for the AuthenticationManager bean</xs:documentation>
</xs:annotation> </xs:annotation>
@ -1386,7 +1386,7 @@
<xs:attributeGroup ref="security:user.attlist"/> <xs:attributeGroup ref="security:user.attlist"/>
</xs:complexType></xs:element> </xs:complexType></xs:element>
</xs:sequence> </xs:sequence>
<xs:attribute name="id" type="xs:ID"> <xs:attribute name="id" type="xs:token">
<xs:annotation> <xs:annotation>
<xs:documentation>A bean identifier, used for referring to the bean elsewhere in the context.</xs:documentation> <xs:documentation>A bean identifier, used for referring to the bean elsewhere in the context.</xs:documentation>
</xs:annotation> </xs:annotation>
@ -1427,7 +1427,7 @@
<xs:element name="jdbc-user-service" substitutionGroup="security:any-user-service"><xs:annotation> <xs:element name="jdbc-user-service" substitutionGroup="security:any-user-service"><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:complexType> </xs:annotation><xs:complexType>
<xs:attribute name="id" type="xs:ID"> <xs:attribute name="id" type="xs:token">
<xs:annotation> <xs:annotation>
<xs:documentation>A bean identifier, used for referring to the bean elsewhere in the context.</xs:documentation> <xs:documentation>A bean identifier, used for referring to the bean elsewhere in the context.</xs:documentation>
</xs:annotation> </xs:annotation>