diff --git a/core/src/main/resources/org/springframework/security/config/spring-security-2.0.xsd b/core/src/main/resources/org/springframework/security/config/spring-security-2.0.xsd
index fd269bbd06..09cfb1b52f 100644
--- a/core/src/main/resources/org/springframework/security/config/spring-security-2.0.xsd
+++ b/core/src/main/resources/org/springframework/security/config/spring-security-2.0.xsd
@@ -10,7 +10,6 @@
-
@@ -20,7 +19,6 @@
-
@@ -29,7 +27,6 @@
-
@@ -39,7 +36,6 @@
-
Defines the type of pattern used to specify URL paths (either JDK
1.4-compatible regular expressions, or Apache Ant expressions). Defaults to "ant" if
unspecified.
@@ -50,7 +46,6 @@
-
@@ -60,7 +55,6 @@
for example.
-
@@ -69,7 +63,6 @@
-
@@ -79,7 +72,6 @@
-
Defines a reference to a Spring bean Id.
@@ -88,7 +80,6 @@
-
Defines a reference to a cache for use with a
UserDetailsService.
@@ -98,7 +89,6 @@
-
A reference to a user-service (or UserDetailsService bean)
Id
@@ -108,7 +98,6 @@
Defines a reference to a Spring bean Id.
-
@@ -118,7 +107,6 @@
-
@@ -128,7 +116,6 @@
-
Whether a string should be base64 encoded
@@ -137,7 +124,6 @@
-
@@ -147,7 +133,6 @@
A property of the UserDetails object which will be used as salt by a
password encoder. Typically something like "username" might be used.
-
@@ -157,7 +142,6 @@
A single value that will be used as the salt for a password encoder.
-
@@ -167,7 +151,6 @@
-
Defines an LDAP server location or starts an embedded server. The url
indicates the location of a remote server. If no url is given, an embedded server will be
@@ -180,7 +163,6 @@
-
A bean identifier, used for referring to the bean elsewhere in the
@@ -190,7 +172,6 @@
Specifies a URL.
-
@@ -200,7 +181,6 @@
-
Username (DN) of the "manager" user identity which will be used to
authenticate to a (non-embedded) LDAP server. If omitted, anonymous access will be used.
@@ -212,7 +192,6 @@
Explicitly specifies an ldif file resource to load into an embedded LDAP
server
-
@@ -222,7 +201,6 @@
-
@@ -232,7 +210,6 @@
-
@@ -242,7 +219,6 @@
-
Search base for group membership searches. Defaults to
@@ -252,7 +228,6 @@
-
@@ -261,7 +236,6 @@
-
@@ -271,7 +245,6 @@
-
@@ -281,7 +254,6 @@
A bean identifier, used for referring to the bean elsewhere in the
context.
-
@@ -291,7 +263,6 @@
-
@@ -301,7 +272,6 @@
-
Search base for group membership searches. Defaults to
"ou=groups".
@@ -312,7 +282,6 @@
The LDAP attribute name which contains the role name which will be used
within Spring Security. Defaults to "cn".
-
@@ -322,7 +291,6 @@
-
Sets up an ldap authentication provider
@@ -332,7 +300,6 @@
Specifies that an LDAP provider should use an LDAP compare operation
of the user's password to authenticate the user
-
@@ -343,7 +310,6 @@
example.
-
@@ -354,7 +320,6 @@
"username" might be used.
-
A single value that will be used as the salt for a
@@ -364,7 +329,6 @@
-
@@ -374,7 +338,6 @@
-
@@ -384,7 +347,6 @@
registered (using <ldap-server> with no Id), that server will be used.
-
@@ -394,7 +356,6 @@
"ou=groups".
-
Group search filter. Defaults to (uniqueMember={0}). The substituted
@@ -405,7 +366,6 @@
The LDAP attribute name which contains the role name which will be used
within Spring Security. Defaults to "cn".
-
@@ -416,7 +376,6 @@
-
@@ -426,7 +385,6 @@
-
Defines the hashing algorithm used on user passwords. We recommend
strongly against using MD4, as it is a very weak hashing algorithm.
@@ -436,7 +394,6 @@
-
@@ -447,7 +404,6 @@
Can be used inside a bean definition to add a security interceptor to the
bean and set up access configuration attributes for the bean's methods
-
@@ -457,7 +413,6 @@
-
Optional AccessDecisionManager bean ID to be used by the created method
@@ -467,7 +422,6 @@
-
Defines a protected method and the access control configuration attributes
that apply to it. We strongly advise you NOT to mix "protect" declarations with any services
provided "global-method-security".
@@ -478,7 +432,6 @@
-
A method name
@@ -488,7 +441,6 @@
Access configuration attributes list that applies to the method, e.g.
"ROLE_A,ROLE_B".
-
@@ -508,7 +460,6 @@
-
Defines a protected pointcut and the access control configuration
@@ -520,7 +471,6 @@
-
@@ -531,7 +481,6 @@
Specifies whether the use of Spring Security's @Secured annotations should
be enabled for this application context. Please ensure you have the
spring-security-tiger-xxx.jar on the classpath. Defaults to "disabled".
-
@@ -541,7 +490,6 @@
-
Specifies whether JSR-250 style attributes are to be used (for example
"RolesAllowed"). This will require the javax.annotation.security classes on the classpath.
@@ -552,7 +500,6 @@
-
@@ -562,7 +509,6 @@
-
@@ -573,7 +519,6 @@
-
Access configuration attributes list that applies to all methods matching
the pointcut, e.g. "ROLE_A,ROLE_B"
@@ -583,7 +528,6 @@
Container element for HTTP security configuration
-
@@ -593,7 +537,6 @@
-
@@ -603,7 +546,6 @@
-
@@ -612,7 +554,6 @@
Adds support for X.509 client authentication.
-
@@ -622,7 +563,6 @@
future expansion, such as supporting an "ignoreFailure" attribute)
-
@@ -633,7 +573,6 @@
-
@@ -643,7 +582,6 @@
-
@@ -655,7 +593,6 @@
Adds support for automatically granting all anonymous web requests a
particular principal identity and a corresponding granted
authority.
-
@@ -665,7 +602,6 @@
Defines the list of mappings between http and https ports for use in
redirects
-
@@ -675,7 +611,6 @@
-
@@ -688,7 +623,6 @@
"false".
-
Controls the eagerness with which an HTTP session is created. If not set,
@@ -698,7 +632,6 @@
-
@@ -709,7 +642,6 @@
1.4-compatible regular expressions, or Apache Ant expressions). Defaults to "ant" if
unspecified.
-
@@ -719,7 +651,6 @@
-
Whether test URLs should be converted to lower case prior to comparing
with defined path patterns. If unspecified, defaults to "true".
@@ -731,7 +662,6 @@
SecurityContext. Defaults to "true".
-
Optional attribute specifying the ID of the AccessDecisionManager
@@ -743,7 +673,6 @@
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".
-
@@ -756,7 +685,6 @@
-
@@ -767,17 +695,15 @@
Allows a customized AuthenticationEntryPoint to be
used.
-
Corresponds to the observeOncePerRequest property of
- FilterSecurityInterceptor. Defaults to "true"
+ FilterSecurityInterceptor. Defaults to "false"
-
Allows the access denied page to be set (the user will be redirected here
if an AccessDeniedException is raised).
@@ -787,7 +713,6 @@
-
The pattern which defines the URL path. The content will depend on the
type set in the containing http element, so will default to ant path
syntax.
@@ -799,7 +724,6 @@
path.
-
The HTTP Method for which the access configuration attributes should
@@ -809,7 +733,6 @@
-
@@ -819,7 +742,6 @@
-
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
@@ -830,7 +752,6 @@
-
@@ -840,7 +761,6 @@
-
@@ -850,7 +770,6 @@
-
Specifies the URL that will cause a logout. Spring Security will
initialize a filter that responds to this particular URL. Defaults to
/j_spring_security_logout if unspecified.
@@ -862,7 +781,6 @@
specified, defaults to /.
-
Specifies whether a logout also causes HttpSession invalidation, which is
@@ -872,7 +790,6 @@
-
The URL that the login form is posted to. If unspecified, it defaults to
/j_spring_security_check.
@@ -886,7 +803,6 @@
authentication. If unspecified, defaults to the root of the
application.
-
@@ -896,7 +812,6 @@
-
The URL for the login page. If no login URL is specified, Spring Security
will automatically create a login URL at /spring_security_login and a corresponding filter
to render that login URL when requested.
@@ -910,7 +825,6 @@
URL when requested.
-
@@ -920,7 +834,6 @@
-
A reference to a user-service (or UserDetailsService bean)
Id
@@ -930,7 +843,6 @@
-
Used to explicitly configure a FilterChainProxy instance with a
FilterChainMap
@@ -944,7 +856,6 @@
patterns must be placed at the top of the list, with most general ones at the
bottom.
-
@@ -954,7 +865,6 @@
-
@@ -968,7 +878,6 @@
FilterChainProxy explicitly, rather than using the <http> element. The
intercept-url elements used should only contain pattern, method and access attributes. Any
others will result in a configuration error.
-
@@ -978,7 +887,6 @@
set of URLs.
-
@@ -988,7 +896,6 @@
-
A bean identifier, used for referring to the bean elsewhere in the
context.
@@ -998,7 +905,6 @@
as for http element
-
@@ -1009,7 +915,6 @@
-
@@ -1019,7 +924,6 @@
-
Allows you to define an alias for the SessionRegistry bean in order to
@@ -1029,7 +933,6 @@
-
@@ -1039,7 +942,6 @@
-
@@ -1049,7 +951,6 @@
-
The username that should be assigned to the anonymous request. This allows
the principal to be identified, which may be important for logging and auditing. if unset,
defaults to "anonymousUser".
@@ -1063,7 +964,6 @@
"ROLE_ANONYMOUS".
-
@@ -1073,7 +973,6 @@
-
@@ -1084,7 +983,6 @@
The regular expression used to obtain the username from the certificate's
subject. Defaults to matching on the common name using the pattern
"CN=(.*?),".
-
@@ -1094,7 +992,6 @@
-
If you are using namespace configuration with Spring Security, an
@@ -1106,7 +1003,6 @@
-
The alias you wish to use for the AuthenticationManager
@@ -1116,7 +1012,6 @@
-
Indicates that the contained user-service should be used as an
authentication source.
@@ -1128,7 +1023,6 @@
element which defines a password encoding strategy. Used by an
authentication provider to convert submitted passwords to hashed versions, for
example.
-
@@ -1139,7 +1033,6 @@
A property of the UserDetails object which will be used as
salt by a password encoder. Typically something like "username" might be
used.
-
@@ -1149,7 +1042,6 @@
-
@@ -1159,7 +1051,6 @@
-
@@ -1169,7 +1060,6 @@
-
@@ -1179,7 +1069,6 @@
-
@@ -1189,7 +1078,6 @@
-
@@ -1198,7 +1086,6 @@
Represents a user in the application.
-
@@ -1208,7 +1095,6 @@
The username assigned to the user.
-
@@ -1219,7 +1105,6 @@
-
One of more authorities granted to the user. Separate authorities with a
comma (but no space). For example, "ROLE_USER,ROLE_ADMINISTRATOR"
@@ -1230,7 +1115,6 @@
Can be set to "true" to mark an account as locked and
unusable.
-
@@ -1239,7 +1123,6 @@
-
A bean identifier, used for referring to the bean elsewhere in the
context.
@@ -1249,7 +1132,6 @@
-
The bean ID of the DataSource which provides the required
@@ -1260,7 +1142,6 @@
Defines a reference to a cache for use with a
UserDetailsService.
-
@@ -1270,7 +1151,6 @@
-
An SQL statement to query for a user's granted authorities given a
username.
@@ -1281,7 +1161,6 @@
An SQL statement to query user's group authorities given a
username.
-
@@ -1291,7 +1170,6 @@
-
Used to indicate that a filter bean declaration should be incorporated into
the security filter chain. If neither the 'after' or 'before' options are supplied, then the
@@ -1306,7 +1184,6 @@
Security filters. The filter names map to specific Spring Security implementation
filters.
-
@@ -1316,7 +1193,6 @@
-
The explicit position at which the custom-filter should be placed in the
chain. Use if you are replacing a standard filter.
@@ -1326,7 +1202,6 @@
-
The filter immediately after which the custom-filter should be placed in
the chain. This feature will only be needed by advanced users who wish to mix their own
filters into the security filter chain and have some knowledge of the standard Spring
@@ -1340,7 +1215,6 @@
The filter immediately before which the custom-filter should be placed in
the chain
-
@@ -1350,7 +1224,6 @@
The explicit position at which the custom-filter should be placed in the
chain. Use if you are replacing a standard filter.
-
@@ -1360,7 +1233,6 @@
-
@@ -1370,7 +1242,6 @@
-