OPEN - issue SEC-808: Switch namespace schema version to 2.0.1 and update spring.schemas

http://jira.springframework.org/browse/SEC-808. Replaced 2.0 text with that from the 2.0 release, rather than the website schema.

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

@@ -10,7 +10,6 @@
       </xs:annotation>
       <xs:simpleType>
         <xs:restriction base="xs:token">
-
           <xs:enumeration value="plaintext"/>
           <xs:enumeration value="sha"/>
           <xs:enumeration value="md5"/>
@@ -20,7 +19,6 @@
         </xs:restriction>
       </xs:simpleType>
     </xs:attribute>
-
   </xs:attributeGroup>
   <xs:attributeGroup name="base64">
     <xs:attribute name="base64" use="required">
@@ -29,7 +27,6 @@
       </xs:annotation>
       <xs:simpleType>
         <xs:restriction base="xs:token">
-
           <xs:enumeration value="true"/>
           <xs:enumeration value="false"/>
         </xs:restriction>
@@ -39,7 +36,6 @@
   <xs:attributeGroup name="path-type">
     <xs:attribute name="path-type" use="required">
       <xs:annotation>
-
         <xs:documentation>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.</xs:documentation>
@@ -50,7 +46,6 @@
           <xs:enumeration value="regex"/>
         </xs:restriction>
       </xs:simpleType>
-
     </xs:attribute>
   </xs:attributeGroup>
   <xs:attributeGroup name="port">
@@ -60,7 +55,6 @@
           for example.</xs:documentation>
       </xs:annotation>
     </xs:attribute>
-
   </xs:attributeGroup>
   <xs:attributeGroup name="url">
     <xs:attribute name="url" use="required" type="xs:string">
@@ -69,7 +63,6 @@
       </xs:annotation>
     </xs:attribute>
   </xs:attributeGroup>
-
   <xs:attributeGroup name="id">
     <xs:attribute name="id" use="required" type="xs:ID">
       <xs:annotation>
@@ -79,7 +72,6 @@
     </xs:attribute>
   </xs:attributeGroup>
   <xs:attributeGroup name="ref">
-
     <xs:attribute name="ref" use="required" type="xs:string">
       <xs:annotation>
         <xs:documentation>Defines a reference to a Spring bean Id.</xs:documentation>
@@ -88,7 +80,6 @@
   </xs:attributeGroup>
   <xs:attributeGroup name="cache-ref">
     <xs:attribute name="cache-ref" use="required" type="xs:string">
-
       <xs:annotation>
         <xs:documentation>Defines a reference to a cache for use with a
         UserDetailsService.</xs:documentation>
@@ -98,7 +89,6 @@
   <xs:attributeGroup name="user-service-ref">
     <xs:attribute name="user-service-ref" use="required" type="xs:string">
       <xs:annotation>
-
         <xs:documentation>A reference to a user-service (or UserDetailsService bean)
         Id</xs:documentation>
       </xs:annotation>
@@ -108,7 +98,6 @@
     <xs:attribute name="ref" type="xs:string">
       <xs:annotation>
         <xs:documentation>Defines a reference to a Spring bean Id.</xs:documentation>
-
       </xs:annotation>
     </xs:attribute>
     <xs:attribute name="hash">
@@ -118,7 +107,6 @@
       </xs:annotation>
       <xs:simpleType>
         <xs:restriction base="xs:token">
-
           <xs:enumeration value="plaintext"/>
           <xs:enumeration value="sha"/>
           <xs:enumeration value="md5"/>
@@ -128,7 +116,6 @@
         </xs:restriction>
       </xs:simpleType>
     </xs:attribute>
-
     <xs:attribute name="base64">
       <xs:annotation>
         <xs:documentation>Whether a string should be base64 encoded</xs:documentation>
@@ -137,7 +124,6 @@
         <xs:restriction base="xs:token">
           <xs:enumeration value="true"/>
           <xs:enumeration value="false"/>
-
         </xs:restriction>
       </xs:simpleType>
     </xs:attribute>
@@ -147,7 +133,6 @@
       <xs:annotation>
         <xs:documentation>A property of the UserDetails object which will be used as salt by a
           password encoder. Typically something like "username" might be used. </xs:documentation>
-
       </xs:annotation>
     </xs:attribute>
   </xs:attributeGroup>
@@ -157,7 +142,6 @@
         <xs:documentation>A single value that will be used as the salt for a password encoder.
         </xs:documentation>
       </xs:annotation>
-
     </xs:attribute>
   </xs:attributeGroup>
   <xs:simpleType name="boolean">
@@ -167,7 +151,6 @@
     </xs:restriction>
   </xs:simpleType>
   <xs:element name="ldap-server">
-
     <xs:annotation>
       <xs:documentation>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 @@
     </xs:complexType>
   </xs:element>
   <xs:attributeGroup name="ldap-server.attlist">
-
     <xs:attribute name="id" type="xs:ID">
       <xs:annotation>
         <xs:documentation>A bean identifier, used for referring to the bean elsewhere in the
@@ -190,7 +172,6 @@
     <xs:attribute name="url" type="xs:string">
       <xs:annotation>
         <xs:documentation>Specifies a URL.</xs:documentation>
-
       </xs:annotation>
     </xs:attribute>
     <xs:attribute name="port" type="xs:integer">
@@ -200,7 +181,6 @@
       </xs:annotation>
     </xs:attribute>
     <xs:attribute name="manager-dn" type="xs:string">
-
       <xs:annotation>
         <xs:documentation>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 @@
       <xs:annotation>
         <xs:documentation>Explicitly specifies an ldif file resource to load into an embedded LDAP
           server</xs:documentation>
-
       </xs:annotation>
     </xs:attribute>
     <xs:attribute name="root" type="xs:string">
@@ -222,7 +201,6 @@
       </xs:annotation>
     </xs:attribute>
   </xs:attributeGroup>
-
   <xs:attributeGroup name="ldap-server-ref-attribute">
     <xs:attribute name="server-ref" use="required" type="xs:string">
       <xs:annotation>
@@ -232,7 +210,6 @@
       </xs:annotation>
     </xs:attribute>
   </xs:attributeGroup>
-
   <xs:attributeGroup name="group-search-filter-attribute">
     <xs:attribute name="group-search-filter" use="required" type="xs:string">
       <xs:annotation>
@@ -242,7 +219,6 @@
     </xs:attribute>
   </xs:attributeGroup>
   <xs:attributeGroup name="group-search-base-attribute">
-
     <xs:attribute name="group-search-base" use="required" type="xs:string">
       <xs:annotation>
         <xs:documentation>Search base for group membership searches. Defaults to
@@ -252,7 +228,6 @@
   </xs:attributeGroup>
   <xs:attributeGroup name="user-search-filter-attribute">
     <xs:attribute name="user-search-filter" use="required" type="xs:string"/>
-
   </xs:attributeGroup>
   <xs:attributeGroup name="user-search-base-attribute">
     <xs:attribute name="user-search-base" type="xs:string">
@@ -261,7 +236,6 @@
       </xs:annotation>
     </xs:attribute>
   </xs:attributeGroup>
-
   <xs:attributeGroup name="group-role-attribute-attribute">
     <xs:attribute name="group-role-attribute" use="required" type="xs:string">
       <xs:annotation>
@@ -271,7 +245,6 @@
     </xs:attribute>
   </xs:attributeGroup>
   <xs:element name="ldap-user-service" substitutionGroup="security:any-user-service">
-
     <xs:complexType>
       <xs:attributeGroup ref="security:ldap-us.attlist"/>
     </xs:complexType>
@@ -281,7 +254,6 @@
       <xs:annotation>
         <xs:documentation>A bean identifier, used for referring to the bean elsewhere in the
           context.</xs:documentation>
-
       </xs:annotation>
     </xs:attribute>
     <xs:attribute name="server-ref" type="xs:string">
@@ -291,7 +263,6 @@
         </xs:documentation>
       </xs:annotation>
     </xs:attribute>
-
     <xs:attribute name="user-search-filter" type="xs:string"/>
     <xs:attributeGroup ref="security:user-search-base-attribute"/>
     <xs:attribute name="group-search-filter" type="xs:string">
@@ -301,7 +272,6 @@
       </xs:annotation>
     </xs:attribute>
     <xs:attribute name="group-search-base" type="xs:string">
-
       <xs:annotation>
         <xs:documentation>Search base for group membership searches. Defaults to
         "ou=groups".</xs:documentation>
@@ -312,7 +282,6 @@
         <xs:documentation>The LDAP attribute name which contains the role name which will be used
           within Spring Security. Defaults to "cn".</xs:documentation>
       </xs:annotation>
-
     </xs:attribute>
     <xs:attribute name="cache-ref" type="xs:string">
       <xs:annotation>
@@ -322,7 +291,6 @@
     </xs:attribute>
   </xs:attributeGroup>
   <xs:element name="ldap-authentication-provider">
-
     <xs:annotation>
       <xs:documentation>Sets up an ldap authentication provider</xs:documentation>
     </xs:annotation>
@@ -332,7 +300,6 @@
           <xs:annotation>
             <xs:documentation>Specifies that an LDAP provider should use an LDAP compare operation
               of the user's password to authenticate the user</xs:documentation>
-
           </xs:annotation>
           <xs:complexType>
             <xs:sequence>
@@ -343,7 +310,6 @@
                     example.</xs:documentation>
                 </xs:annotation>
                 <xs:complexType>
-
                   <xs:sequence>
                     <xs:element minOccurs="0" name="salt-source">
                       <xs:complexType>
@@ -354,7 +320,6 @@
                               "username" might be used. </xs:documentation>
                           </xs:annotation>
                         </xs:attribute>
-
                         <xs:attribute name="system-wide" type="xs:string">
                           <xs:annotation>
                             <xs:documentation>A single value that will be used as the salt for a
@@ -364,7 +329,6 @@
                       </xs:complexType>
                     </xs:element>
                   </xs:sequence>
-
                   <xs:attributeGroup ref="security:password-encoder.attlist"/>
                 </xs:complexType>
               </xs:element>
@@ -374,7 +338,6 @@
         </xs:element>
       </xs:sequence>
       <xs:attributeGroup ref="security:ldap-ap.attlist"/>
-
     </xs:complexType>
   </xs:element>
   <xs:attributeGroup name="ldap-ap.attlist">
@@ -384,7 +347,6 @@
           registered (using &lt;ldap-server&gt; with no Id), that server will be used.
         </xs:documentation>
       </xs:annotation>
-
     </xs:attribute>
     <xs:attributeGroup ref="security:user-search-base-attribute"/>
     <xs:attribute name="user-search-filter" type="xs:string"/>
@@ -394,7 +356,6 @@
         "ou=groups".</xs:documentation>
       </xs:annotation>
     </xs:attribute>
-
     <xs:attribute name="group-search-filter" type="xs:string">
       <xs:annotation>
         <xs:documentation>Group search filter. Defaults to (uniqueMember={0}). The substituted
@@ -405,7 +366,6 @@
       <xs:annotation>
         <xs:documentation>The LDAP attribute name which contains the role name which will be used
           within Spring Security. Defaults to "cn".</xs:documentation>
-
       </xs:annotation>
     </xs:attribute>
     <xs:attribute name="user-dn-pattern" type="xs:string">
@@ -416,7 +376,6 @@
       </xs:annotation>
     </xs:attribute>
   </xs:attributeGroup>
-
   <xs:attributeGroup name="password-compare.attlist">
     <xs:attribute name="password-attribute" type="xs:string">
       <xs:annotation>
@@ -426,7 +385,6 @@
     </xs:attribute>
     <xs:attribute name="hash">
       <xs:annotation>
-
         <xs:documentation>Defines the hashing algorithm used on user passwords. We recommend
           strongly against using MD4, as it is a very weak hashing algorithm.</xs:documentation>
       </xs:annotation>
@@ -436,7 +394,6 @@
           <xs:enumeration value="sha"/>
           <xs:enumeration value="md5"/>
           <xs:enumeration value="md4"/>
-
           <xs:enumeration value="{sha}"/>
           <xs:enumeration value="{ssha}"/>
         </xs:restriction>
@@ -447,7 +404,6 @@
     <xs:annotation>
       <xs:documentation>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</xs:documentation>
-
     </xs:annotation>
     <xs:complexType>
       <xs:sequence>
@@ -457,7 +413,6 @@
     </xs:complexType>
   </xs:element>
   <xs:attributeGroup name="intercept-methods.attlist">
-
     <xs:attribute name="access-decision-manager-ref" type="xs:string">
       <xs:annotation>
         <xs:documentation>Optional AccessDecisionManager bean ID to be used by the created method
@@ -467,7 +422,6 @@
   </xs:attributeGroup>
   <xs:element name="protect">
     <xs:annotation>
-
       <xs:documentation>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".</xs:documentation>
@@ -478,7 +432,6 @@
   </xs:element>
   <xs:attributeGroup name="protect.attlist">
     <xs:attribute name="method" use="required" type="xs:string">
-
       <xs:annotation>
         <xs:documentation>A method name</xs:documentation>
       </xs:annotation>
@@ -488,7 +441,6 @@
         <xs:documentation>Access configuration attributes list that applies to the method, e.g.
           "ROLE_A,ROLE_B".</xs:documentation>
       </xs:annotation>
-
     </xs:attribute>
   </xs:attributeGroup>
   <xs:element name="global-method-security">
@@ -508,7 +460,6 @@
     </xs:annotation>
     <xs:complexType>
       <xs:sequence>
-
         <xs:element minOccurs="0" maxOccurs="unbounded" name="protect-pointcut">
           <xs:annotation>
             <xs:documentation>Defines a protected pointcut and the access control configuration
@@ -520,7 +471,6 @@
             <xs:attributeGroup ref="security:protect-pointcut.attlist"/>
           </xs:complexType>
         </xs:element>
-
       </xs:sequence>
       <xs:attributeGroup ref="security:global-method-security.attlist"/>
     </xs:complexType>
@@ -531,7 +481,6 @@
         <xs:documentation>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".</xs:documentation>
-
       </xs:annotation>
       <xs:simpleType>
         <xs:restriction base="xs:token">
@@ -541,7 +490,6 @@
       </xs:simpleType>
     </xs:attribute>
     <xs:attribute name="jsr250-annotations">
-
       <xs:annotation>
         <xs:documentation>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 @@
           <xs:enumeration value="disabled"/>
           <xs:enumeration value="enabled"/>
         </xs:restriction>
-
       </xs:simpleType>
     </xs:attribute>
     <xs:attribute name="access-decision-manager-ref" type="xs:string">
@@ -562,7 +509,6 @@
       </xs:annotation>
     </xs:attribute>
   </xs:attributeGroup>
-
   <xs:attributeGroup name="protect-pointcut.attlist">
     <xs:attribute name="expression" use="required" type="xs:string">
       <xs:annotation>
@@ -573,7 +519,6 @@
     </xs:attribute>
     <xs:attribute name="access" use="required" type="xs:string">
       <xs:annotation>
-
         <xs:documentation>Access configuration attributes list that applies to all methods matching
           the pointcut, e.g. "ROLE_A,ROLE_B"</xs:documentation>
       </xs:annotation>
@@ -583,7 +528,6 @@
     <xs:annotation>
       <xs:documentation>Container element for HTTP security configuration</xs:documentation>
     </xs:annotation>
-
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
         <xs:element name="intercept-url">
@@ -593,7 +537,6 @@
           </xs:annotation>
           <xs:complexType>
             <xs:attributeGroup ref="security:intercept-url.attlist"/>
-
           </xs:complexType>
         </xs:element>
         <xs:element name="form-login">
@@ -603,7 +546,6 @@
           </xs:annotation>
           <xs:complexType>
             <xs:attributeGroup ref="security:form-login.attlist"/>
-
           </xs:complexType>
         </xs:element>
         <xs:element ref="security:openid-login"/>
@@ -612,7 +554,6 @@
             <xs:documentation>Adds support for X.509 client authentication.</xs:documentation>
           </xs:annotation>
           <xs:complexType>
-
             <xs:attributeGroup ref="security:x509.attlist"/>
           </xs:complexType>
         </xs:element>
@@ -622,7 +563,6 @@
               future expansion, such as supporting an "ignoreFailure" attribute)</xs:documentation>
           </xs:annotation>
           <xs:complexType/>
-
         </xs:element>
         <xs:element name="logout">
           <xs:annotation>
@@ -633,7 +573,6 @@
           <xs:complexType>
             <xs:attributeGroup ref="security:logout.attlist"/>
           </xs:complexType>
-
         </xs:element>
         <xs:element name="concurrent-session-control">
           <xs:annotation>
@@ -643,7 +582,6 @@
           <xs:complexType>
             <xs:attributeGroup ref="security:concurrent-sessions.attlist"/>
           </xs:complexType>
-
         </xs:element>
         <xs:element name="remember-me">
           <xs:complexType>
@@ -655,7 +593,6 @@
             <xs:documentation>Adds support for automatically granting all anonymous web requests a
               particular principal identity and a corresponding granted
             authority.</xs:documentation>
-
           </xs:annotation>
           <xs:complexType>
             <xs:attributeGroup ref="security:anonymous.attlist"/>
@@ -665,7 +602,6 @@
           <xs:annotation>
             <xs:documentation>Defines the list of mappings between http and https ports for use in
               redirects</xs:documentation>
-
           </xs:annotation>
           <xs:complexType>
             <xs:sequence>
@@ -675,7 +611,6 @@
         </xs:element>
       </xs:choice>
       <xs:attributeGroup ref="security:http.attlist"/>
-
     </xs:complexType>
   </xs:element>
   <xs:attributeGroup name="http.attlist">
@@ -688,7 +623,6 @@
           "false".</xs:documentation>
       </xs:annotation>
     </xs:attribute>
-
     <xs:attribute name="create-session">
       <xs:annotation>
         <xs:documentation>Controls the eagerness with which an HTTP session is created. If not set,
@@ -698,7 +632,6 @@
         <xs:restriction base="xs:token">
           <xs:enumeration value="ifRequired"/>
           <xs:enumeration value="always"/>
-
           <xs:enumeration value="never"/>
         </xs:restriction>
       </xs:simpleType>
@@ -709,7 +642,6 @@
           1.4-compatible regular expressions, or Apache Ant expressions). Defaults to "ant" if
           unspecified.</xs:documentation>
       </xs:annotation>
-
       <xs:simpleType>
         <xs:restriction base="xs:token">
           <xs:enumeration value="ant"/>
@@ -719,7 +651,6 @@
     </xs:attribute>
     <xs:attribute name="lowercase-comparisons" type="security:boolean">
       <xs:annotation>
-
         <xs:documentation>Whether test URLs should be converted to lower case prior to comparing
           with defined path patterns. If unspecified, defaults to "true".</xs:documentation>
       </xs:annotation>
@@ -731,7 +662,6 @@
           SecurityContext. Defaults to "true".</xs:documentation>
       </xs:annotation>
     </xs:attribute>
-
     <xs:attribute name="access-decision-manager-ref" type="xs:string">
       <xs:annotation>
         <xs:documentation>Optional attribute specifying the ID of the AccessDecisionManager
@@ -743,7 +673,6 @@
         <xs:documentation>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".</xs:documentation>
-
       </xs:annotation>
     </xs:attribute>
     <xs:attribute name="session-fixation-protection">
@@ -756,7 +685,6 @@
       </xs:annotation>
       <xs:simpleType>
         <xs:restriction base="xs:token">
-
           <xs:enumeration value="none"/>
           <xs:enumeration value="newSession"/>
           <xs:enumeration value="migrateSession"/>
@@ -767,17 +695,15 @@
       <xs:annotation>
         <xs:documentation>Allows a customized AuthenticationEntryPoint to be
         used.</xs:documentation>
-
       </xs:annotation>
     </xs:attribute>
     <xs:attribute name="once-per-request" type="security:boolean">
       <xs:annotation>
         <xs:documentation>Corresponds to the observeOncePerRequest property of
-          FilterSecurityInterceptor. Defaults to "true"</xs:documentation>
+          FilterSecurityInterceptor. Defaults to "false"</xs:documentation>
       </xs:annotation>
     </xs:attribute>
     <xs:attribute name="access-denied-page" type="xs:string">
-
       <xs:annotation>
         <xs:documentation>Allows the access denied page to be set (the user will be redirected here
           if an AccessDeniedException is raised).</xs:documentation>
@@ -787,7 +713,6 @@
   <xs:attributeGroup name="intercept-url.attlist">
     <xs:attribute name="pattern" use="required" type="xs:string">
       <xs:annotation>
-
         <xs:documentation>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.</xs:documentation>
@@ -799,7 +724,6 @@
         path.</xs:documentation>
       </xs:annotation>
     </xs:attribute>
-
     <xs:attribute name="method">
       <xs:annotation>
         <xs:documentation>The HTTP Method for which the access configuration attributes should
@@ -809,7 +733,6 @@
         <xs:restriction base="xs:token">
           <xs:enumeration value="GET"/>
           <xs:enumeration value="DELETE"/>
-
           <xs:enumeration value="HEAD"/>
           <xs:enumeration value="OPTIONS"/>
           <xs:enumeration value="POST"/>
@@ -819,7 +742,6 @@
       </xs:simpleType>
     </xs:attribute>
     <xs:attribute name="filters">
-
       <xs:annotation>
         <xs:documentation>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 @@
           <xs:enumeration value="none"/>
         </xs:restriction>
       </xs:simpleType>
-
     </xs:attribute>
     <xs:attribute name="requires-channel">
       <xs:annotation>
@@ -840,7 +761,6 @@
       <xs:simpleType>
         <xs:restriction base="xs:token">
           <xs:enumeration value="http"/>
-
           <xs:enumeration value="https"/>
           <xs:enumeration value="any"/>
         </xs:restriction>
@@ -850,7 +770,6 @@
   <xs:attributeGroup name="logout.attlist">
     <xs:attribute name="logout-url" type="xs:string">
       <xs:annotation>
-
         <xs:documentation>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.</xs:documentation>
@@ -862,7 +781,6 @@
           specified, defaults to /.</xs:documentation>
       </xs:annotation>
     </xs:attribute>
-
     <xs:attribute name="invalidate-session" type="security:boolean">
       <xs:annotation>
         <xs:documentation>Specifies whether a logout also causes HttpSession invalidation, which is
@@ -872,7 +790,6 @@
   </xs:attributeGroup>
   <xs:attributeGroup name="form-login.attlist">
     <xs:attribute name="login-processing-url" type="xs:string">
-
       <xs:annotation>
         <xs:documentation>The URL that the login form is posted to. If unspecified, it defaults to
           /j_spring_security_check.</xs:documentation>
@@ -886,7 +803,6 @@
           authentication. If unspecified, defaults to the root of the
         application.</xs:documentation>
       </xs:annotation>
-
     </xs:attribute>
     <xs:attribute name="always-use-default-target" type="security:boolean">
       <xs:annotation>
@@ -896,7 +812,6 @@
     </xs:attribute>
     <xs:attribute name="login-page" type="xs:string">
       <xs:annotation>
-
         <xs:documentation>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.</xs:documentation>
@@ -910,7 +825,6 @@
           URL when requested.</xs:documentation>
       </xs:annotation>
     </xs:attribute>
-
   </xs:attributeGroup>
   <xs:element name="openid-login">
     <xs:annotation>
@@ -920,7 +834,6 @@
     <xs:complexType>
       <xs:attributeGroup ref="security:form-login.attlist"/>
       <xs:attribute name="user-service-ref" type="xs:string">
-
         <xs:annotation>
           <xs:documentation>A reference to a user-service (or UserDetailsService bean)
           Id</xs:documentation>
@@ -930,7 +843,6 @@
   </xs:element>
   <xs:element name="filter-chain-map">
     <xs:annotation>
-
       <xs:documentation>Used to explicitly configure a FilterChainProxy instance with a
         FilterChainMap</xs:documentation>
     </xs:annotation>
@@ -944,7 +856,6 @@
               patterns must be placed at the top of the list, with most general ones at the
             bottom.</xs:documentation>
           </xs:annotation>
-
           <xs:complexType>
             <xs:attributeGroup ref="security:filter-chain.attlist"/>
           </xs:complexType>
@@ -954,7 +865,6 @@
     </xs:complexType>
   </xs:element>
   <xs:attributeGroup name="filter-chain-map.attlist">
-
     <xs:attributeGroup ref="security:path-type"/>
   </xs:attributeGroup>
   <xs:attributeGroup name="filter-chain.attlist">
@@ -968,7 +878,6 @@
         FilterChainProxy explicitly, rather than using the &lt;http&gt; element. The
         intercept-url elements used should only contain pattern, method and access attributes. Any
         others will result in a configuration error. </xs:documentation>
-
     </xs:annotation>
     <xs:complexType>
       <xs:sequence>
@@ -978,7 +887,6 @@
               set of URLs.</xs:documentation>
           </xs:annotation>
           <xs:complexType>
-
             <xs:attributeGroup ref="security:intercept-url.attlist"/>
           </xs:complexType>
         </xs:element>
@@ -988,7 +896,6 @@
   </xs:element>
   <xs:attributeGroup name="fids.attlist">
     <xs:attribute name="id" type="xs:ID">
-
       <xs:annotation>
         <xs:documentation>A bean identifier, used for referring to the bean elsewhere in the
           context.</xs:documentation>
@@ -998,7 +905,6 @@
       <xs:annotation>
         <xs:documentation>as for http element</xs:documentation>
       </xs:annotation>
-
     </xs:attribute>
     <xs:attribute name="path-type">
       <xs:annotation>
@@ -1009,7 +915,6 @@
       <xs:simpleType>
         <xs:restriction base="xs:token">
           <xs:enumeration value="ant"/>
-
           <xs:enumeration value="regex"/>
         </xs:restriction>
       </xs:simpleType>
@@ -1019,7 +924,6 @@
     <xs:attribute name="max-sessions" type="xs:positiveInteger"/>
     <xs:attribute name="expired-url" type="xs:string"/>
     <xs:attribute name="exception-if-maximum-exceeded" type="security:boolean"/>
-
     <xs:attribute name="session-registry-alias" type="xs:string">
       <xs:annotation>
         <xs:documentation>Allows you to define an alias for the SessionRegistry bean in order to
@@ -1029,7 +933,6 @@
   </xs:attributeGroup>
   <xs:attributeGroup name="remember-me.attlist">
     <xs:attribute name="key" type="xs:string"/>
-
     <xs:attribute name="token-repository-ref" type="xs:string"/>
     <xs:attribute name="data-source-ref" type="xs:string"/>
     <xs:attribute name="user-service-ref" type="xs:string">
@@ -1039,7 +942,6 @@
       </xs:annotation>
     </xs:attribute>
   </xs:attributeGroup>
-
   <xs:attributeGroup name="anonymous.attlist">
     <xs:attribute name="key" type="xs:string">
       <xs:annotation>
@@ -1049,7 +951,6 @@
     </xs:attribute>
     <xs:attribute name="username" type="xs:string">
       <xs:annotation>
-
         <xs:documentation>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".</xs:documentation>
@@ -1063,7 +964,6 @@
         "ROLE_ANONYMOUS".</xs:documentation>
       </xs:annotation>
     </xs:attribute>
-
   </xs:attributeGroup>
   <xs:element name="port-mapping">
     <xs:complexType>
@@ -1073,7 +973,6 @@
   </xs:element>
   <xs:attributeGroup name="http-port">
     <xs:attribute name="http" use="required" type="xs:integer"/>
-
   </xs:attributeGroup>
   <xs:attributeGroup name="https-port">
     <xs:attribute name="https" use="required" type="xs:integer"/>
@@ -1084,7 +983,6 @@
         <xs:documentation>The regular expression used to obtain the username from the certificate's
           subject. Defaults to matching on the common name using the pattern
         "CN=(.*?),".</xs:documentation>
-
       </xs:annotation>
     </xs:attribute>
     <xs:attribute name="user-service-ref" type="xs:string">
@@ -1094,7 +992,6 @@
       </xs:annotation>
     </xs:attribute>
   </xs:attributeGroup>
-
   <xs:element name="authentication-manager">
     <xs:annotation>
       <xs:documentation>If you are using namespace configuration with Spring Security, an
@@ -1106,7 +1003,6 @@
       <xs:attributeGroup ref="security:authman.attlist"/>
     </xs:complexType>
   </xs:element>
-
   <xs:attributeGroup name="authman.attlist">
     <xs:annotation>
       <xs:documentation>The alias you wish to use for the AuthenticationManager
@@ -1116,7 +1012,6 @@
   </xs:attributeGroup>
   <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>
@@ -1128,7 +1023,6 @@
             <xs:documentation>element which defines a password encoding strategy. Used by an
               authentication provider to convert submitted passwords to hashed versions, for
               example.</xs:documentation>
-
           </xs:annotation>
           <xs:complexType>
             <xs:sequence>
@@ -1139,7 +1033,6 @@
                       <xs:documentation>A property of the UserDetails object which will be used as
                         salt by a password encoder. Typically something like "username" might be
                         used. </xs:documentation>
-
                     </xs:annotation>
                   </xs:attribute>
                   <xs:attribute name="system-wide" type="xs:string">
@@ -1149,7 +1042,6 @@
                     </xs:annotation>
                   </xs:attribute>
                 </xs:complexType>
-
               </xs:element>
             </xs:sequence>
             <xs:attributeGroup ref="security:password-encoder.attlist"/>
@@ -1159,7 +1051,6 @@
       <xs:attributeGroup ref="security:ap.attlist"/>
     </xs:complexType>
   </xs:element>
-
   <xs:attributeGroup name="ap.attlist">
     <xs:attribute name="user-service-ref" type="xs:string">
       <xs:annotation>
@@ -1169,7 +1060,6 @@
     </xs:attribute>
   </xs:attributeGroup>
   <xs:element name="custom-authentication-provider">
-
     <xs:complexType/>
   </xs:element>
   <xs:element name="user-service" substitutionGroup="security:any-user-service">
@@ -1179,7 +1069,6 @@
     </xs:annotation>
     <xs:complexType>
       <xs:sequence>
-
         <xs:element minOccurs="0" maxOccurs="unbounded" ref="security:user"/>
       </xs:sequence>
       <xs:attribute name="id" type="xs:ID">
@@ -1189,7 +1078,6 @@
         </xs:annotation>
       </xs:attribute>
       <xs:attributeGroup ref="security:properties-file"/>
-
     </xs:complexType>
   </xs:element>
   <xs:attributeGroup name="properties-file">
@@ -1198,7 +1086,6 @@
   <xs:element name="user">
     <xs:annotation>
       <xs:documentation>Represents a user in the application.</xs:documentation>
-
     </xs:annotation>
     <xs:complexType>
       <xs:attributeGroup ref="security:user.attlist"/>
@@ -1208,7 +1095,6 @@
     <xs:attribute name="name" use="required" type="xs:string">
       <xs:annotation>
         <xs:documentation>The username assigned to the user.</xs:documentation>
-
       </xs:annotation>
     </xs:attribute>
     <xs:attribute name="password" use="required" type="xs:string">
@@ -1219,7 +1105,6 @@
       </xs:annotation>
     </xs:attribute>
     <xs:attribute name="authorities" use="required" type="xs:string">
-
       <xs:annotation>
         <xs:documentation>One of more authorities granted to the user. Separate authorities with a
           comma (but no space). For example, "ROLE_USER,ROLE_ADMINISTRATOR"</xs:documentation>
@@ -1230,7 +1115,6 @@
         <xs:documentation>Can be set to "true" to mark an account as locked and
         unusable.</xs:documentation>
       </xs:annotation>
-
     </xs:attribute>
   </xs:attributeGroup>
   <xs:element name="jdbc-user-service" substitutionGroup="security:any-user-service">
@@ -1239,7 +1123,6 @@
     </xs:annotation>
     <xs:complexType>
       <xs:attribute name="id" type="xs:ID">
-
         <xs:annotation>
           <xs:documentation>A bean identifier, used for referring to the bean elsewhere in the
             context.</xs:documentation>
@@ -1249,7 +1132,6 @@
     </xs:complexType>
   </xs:element>
   <xs:attributeGroup name="jdbc-user-service.attlist">
-
     <xs:attribute name="data-source-ref" use="required" type="xs:string">
       <xs:annotation>
         <xs:documentation>The bean ID of the DataSource which provides the required
@@ -1260,7 +1142,6 @@
       <xs:annotation>
         <xs:documentation>Defines a reference to a cache for use with a
         UserDetailsService.</xs:documentation>
-
       </xs:annotation>
     </xs:attribute>
     <xs:attribute name="users-by-username-query" type="xs:string">
@@ -1270,7 +1151,6 @@
       </xs:annotation>
     </xs:attribute>
     <xs:attribute name="authorities-by-username-query" type="xs:string">
-
       <xs:annotation>
         <xs:documentation>An SQL statement to query for a user's granted authorities given a
           username.</xs:documentation>
@@ -1281,7 +1161,6 @@
         <xs:documentation>An SQL statement to query user's group authorities given a
         username.</xs:documentation>
       </xs:annotation>
-
     </xs:attribute>
   </xs:attributeGroup>
   <xs:element name="any-user-service" abstract="true"/>
@@ -1291,7 +1170,6 @@
     </xs:sequence>
   </xs:group>
   <xs:element name="custom-filter">
-
     <xs:annotation>
       <xs:documentation>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. </xs:documentation>
         </xs:annotation>
-
       </xs:attribute>
       <xs:attribute name="before" type="security:named-security-filter">
         <xs:annotation>
@@ -1316,7 +1193,6 @@
       </xs:attribute>
       <xs:attribute name="position" type="security:named-security-filter">
         <xs:annotation>
-
           <xs:documentation>The explicit position at which the custom-filter should be placed in the
             chain. Use if you are replacing a standard filter.</xs:documentation>
         </xs:annotation>
@@ -1326,7 +1202,6 @@
   <xs:attributeGroup name="after">
     <xs:attribute name="after" use="required" type="security:named-security-filter">
       <xs:annotation>
-
         <xs:documentation>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 @@
       <xs:annotation>
         <xs:documentation>The filter immediately before which the custom-filter should be placed in
           the chain</xs:documentation>
-
       </xs:annotation>
     </xs:attribute>
   </xs:attributeGroup>
@@ -1350,7 +1224,6 @@
         <xs:documentation>The explicit position at which the custom-filter should be placed in the
           chain. Use if you are replacing a standard filter.</xs:documentation>
       </xs:annotation>
-
     </xs:attribute>
   </xs:attributeGroup>
   <xs:simpleType name="named-security-filter">
@@ -1360,7 +1233,6 @@
       <xs:enumeration value="CONCURRENT_SESSION_FILTER"/>
       <xs:enumeration value="SESSION_CONTEXT_INTEGRATION_FILTER"/>
       <xs:enumeration value="LOGOUT_FILTER"/>
-
       <xs:enumeration value="X509_FILTER"/>
       <xs:enumeration value="PRE_AUTH_FILTER"/>
       <xs:enumeration value="CAS_PROCESSING_FILTER"/>
@@ -1370,7 +1242,6 @@
       <xs:enumeration value="REMEMBER_ME_FILTER"/>
       <xs:enumeration value="ANONYMOUS_FILTER"/>
       <xs:enumeration value="EXCEPTION_TRANSLATION_FILTER"/>
-
       <xs:enumeration value="NTLM_FILTER"/>
       <xs:enumeration value="FILTER_SECURITY_INTERCEPTOR"/>
       <xs:enumeration value="SWITCH_USER_FILTER"/>