SEC-733: Changed names of <global-method-security> attributes as discussed with Ben and updated sample to reflect the changes. Also changed explicit instantiation of Jsr250 and Secured annotation MethodDefinitionSource beans in GlobalMethodSecurityBDP into bean definitions to make more tooling friendly.

core-tiger/src/test/resources/org/springframework/security/config/jsr250-annotated-method-security.xml

@@ -8,7 +8,7 @@ http://www.springframework.org/schema/security http://www.springframework.org/sc
 
     <b:bean id="target" class="org.springframework.security.annotation.Jsr250BusinessServiceImpl"/>
 
-	<global-method-security jsr250="true"/>
+	<global-method-security jsr250-annotations="enabled"/>
 
     <authentication-provider>
         <user-service>

core-tiger/src/test/resources/org/springframework/security/config/secured-annotated-method-security.xml

@@ -8,7 +8,7 @@ http://www.springframework.org/schema/security http://www.springframework.org/sc
 
     <b:bean id="target" class="org.springframework.security.annotation.Jsr250BusinessServiceImpl"/>
 
-	<global-method-security secured="true"/>
+	<global-method-security secured-annotations="enabled"/>
 
     <authentication-provider>
         <user-service>

core/src/main/java/org/springframework/security/config/GlobalMethodSecurityBeanDefinitionParser.java

@@ -10,6 +10,8 @@ import org.springframework.aop.config.AopNamespaceUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.RuntimeBeanReference;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.ManagedList;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.factory.xml.BeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
@@ -28,7 +30,6 @@ import org.w3c.dom.Element;
 /**
  * Processes the top-level "global-method-security" element.
  * 
- *
  * @author Ben Alex
  * @version $Id$
  */
@@ -41,16 +42,16 @@ class GlobalMethodSecurityBeanDefinitionParser implements BeanDefinitionParser {
     private static final String ATT_ACCESS = "access";
     private static final String ATT_EXPRESSION = "expression";
     private static final String ATT_ACCESS_MGR = "access-decision-manager-ref";
-    private static final String ATT_USE_JSR250 = "jsr250";
-    private static final String ATT_USE_SECURED = "secured";
+    private static final String ATT_USE_JSR250 = "jsr250-annotations";
+    private static final String ATT_USE_SECURED = "secured-annotations";
 
     private void validatePresent(String className) {
     	Assert.isTrue(ClassUtils.isPresent(className), "Cannot locate '" + className + "'");
     }
     
     public BeanDefinition parse(Element element, ParserContext parserContext) {
-        boolean useJsr250 = "true".equals(element.getAttribute(ATT_USE_JSR250));
-        boolean useSecured = "true".equals(element.getAttribute(ATT_USE_SECURED));
+        boolean useJsr250 = "enabled".equals(element.getAttribute(ATT_USE_JSR250));
+        boolean useSecured = "enabled".equals(element.getAttribute(ATT_USE_SECURED));
 
         // Check the required classes are present
         if (useSecured) {
@@ -91,23 +92,15 @@ class GlobalMethodSecurityBeanDefinitionParser implements BeanDefinitionParser {
         }
         
         // Create our list of method metadata delegates
-        List delegates = new ArrayList();
+        ManagedList delegates = new ManagedList();
         delegates.add(mapBasedMethodDefinitionSource);
         
         if (useSecured) {
-        	try {
-            	delegates.add(BeanUtils.instantiateClass(ClassUtils.forName(SECURED_METHOD_DEFINITION_SOURCE_CLASS)));
-        	} catch (ClassNotFoundException shouldNotHappen) {
-        		throw new IllegalStateException(shouldNotHappen);
-        	}
+            delegates.add(BeanDefinitionBuilder.rootBeanDefinition(SECURED_METHOD_DEFINITION_SOURCE_CLASS).getBeanDefinition());
         }
         
         if (useJsr250) {
-        	try {
-        		delegates.add(BeanUtils.instantiateClass(ClassUtils.forName(JSR_250_SECURITY_METHOD_DEFINITION_SOURCE_CLASS)));
-        	} catch (ClassNotFoundException shouldNotHappen) {
-        		throw new IllegalStateException(shouldNotHappen);
-        	}
+            delegates.add(BeanDefinitionBuilder.rootBeanDefinition(JSR_250_SECURITY_METHOD_DEFINITION_SOURCE_CLASS).getBeanDefinition());            
         }
         
     	// Register our DelegatingMethodDefinitionSource

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

@@ -157,13 +157,13 @@ global-method-security =
     ## Provides method security for all beans registered in the Spring application context. Specifically, beans will be scanned for Spring Security annotations and/or matches with the ordered list of "protect-pointcut" sub-elements. Where there is a match, the beans will automatically be proxied and security authorization applied to the methods accordingly. If you use and enable all three sources of method security metadata (ie "protect-pointcut" declarations, @Secured and also JSR 250 security annotations), the metadata sources will be queried in that order. In practical terms, this enables you to use XML to override method security metadata expressed by way of @Secured annotations, with @Secured annotations overriding method security metadata expressed by JSR 250 annotations. It is perfectly acceptable to mix and match, with a given Java type using a combination of XML, @Secured and JSR 250 to express method security metadata (albeit on different methods).
 	element global-method-security {global-method-security.attlist, protect-pointcut*}
 global-method-security.attlist &=
-    ## Specifies that Spring Security's @Secured annotation should be used. Please ensure you have the spring-security-tiger-xxx.jar on the classpath. Defaults to false.
-    attribute secured {"false" | "true" }?
+    ## 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".
+    attribute secured-annotations {"disabled" | "enabled" }?
 global-method-security.attlist &=
-    ## Specifies that JSR-250 style attributes are to be used (for example "RolesAllowed"). This will require the javax.annotation.security classes on the classpath. Defaults to false.
-    attribute jsr250 {"false" | "true" }?
+    ## Specifies whether JSR-250 style attributes are to be used (for example "RolesAllowed"). This will require the javax.annotation.security classes on the classpath. Defaults to "disabled".
+    attribute jsr250-annotations {"disabled" | "enabled" }?
 global-method-security.attlist &=
-    ## Optional AccessDecisionManager bean ID to override the default.
+    ## Optional AccessDecisionManager bean ID to override the default used for method security.
     attribute access-decision-manager-ref {xsd:string}?
 
 
@@ -311,7 +311,7 @@ anonymous =
     ## Adds support for automatically granting all anonymous web requests a particular principal identity and a corresponding granted authority.
     element anonymous {anonymous.attlist}
 anonymous.attlist &=
-    ## The key used between the provider and filter. This generally does not need to be set. If unset, it will default to "doesNotMatter".
+    ## The key shared between the provider and filter. This generally does not need to be set. If unset, it will default to "doesNotMatter".
     attribute key {xsd:string}?
 anonymous.attlist &= 
     ## 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".

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

@@ -1,1920 +1,2058 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:security="http://www.springframework.org/schema/security" elementFormDefault="qualified" targetNamespace="http://www.springframework.org/schema/security">
-  
-   <xs:attributeGroup name="hash">
-    
-      <xs:attribute name="hash" use="required">
-      
-         <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>
-      
-         <xs:simpleType>
-        
-            <xs:restriction base="xs:token">
-          
-               <xs:enumeration value="plaintext"/>
-          
-               <xs:enumeration value="sha"/>
-          
-               <xs:enumeration value="md5"/>
-          
-               <xs:enumeration value="md4"/>
-          
-               <xs:enumeration value="{sha}"/>
-          
-               <xs:enumeration value="{ssha}"/>
-        
-            </xs:restriction>
-      
-         </xs:simpleType>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-   <xs:attributeGroup name="base64">
-    
-      <xs:attribute name="base64" use="required">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Whether a string should be base64 encoded</xs:documentation>
-      
-         </xs:annotation>
-      
-         <xs:simpleType>
-        
-            <xs:restriction base="xs:token">
-          
-               <xs:enumeration value="true"/>
-          
-               <xs:enumeration value="false"/>
-        
-            </xs:restriction>
-      
-         </xs:simpleType>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-   <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>
-      
-         </xs:annotation>
-      
-         <xs:simpleType>
-        
-            <xs:restriction base="xs:token">
-          
-               <xs:enumeration value="ant"/>
-          
-               <xs:enumeration value="regex"/>
-        
-            </xs:restriction>
-      
-         </xs:simpleType>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-   <xs:attributeGroup name="port">
-    
-      <xs:attribute name="port" use="required" type="xs:integer">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Specifies an IP port number. Used to configure an embedded LDAP server, for example.</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-   <xs:attributeGroup name="url">
-    
-      <xs:attribute name="url" use="required" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Specifies a URL.</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-   <xs:attributeGroup name="id">
-    
-      <xs:attribute name="id" use="required" type="xs:ID">
-      
-         <xs:annotation>
-        
-            <xs:documentation>A bean identifier, used for referring to the bean elsewhere in the context.</xs:documentation>
-      
-         </xs:annotation>
-    
-      </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>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-   <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>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-   <xs:element name="password-encoder">
-      <xs:annotation>
-      
-         <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>
-        
-            <xs:element minOccurs="0" name="salt-source">
-               <xs:complexType>
-      
-                  <xs:attribute name="user-property" type="xs:string">
-        
-                     <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:attribute name="system-wide" type="xs:string">
-        
-                     <xs:annotation>
-          
-                        <xs:documentation>A single value that will be used as the salt for a password encoder. </xs:documentation>
-        
-                     </xs:annotation>
-      
-                  </xs:attribute>
-    
-               </xs:complexType>
-            </xs:element>
-      
-         </xs:sequence>
-      
-         <xs:attributeGroup ref="security:password-encoder.attlist"/>
-    
-      </xs:complexType>
-   </xs:element>
-  
-   <xs:attributeGroup name="password-encoder.attlist">
-    
-      <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">
-      
-         <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>
-      
-         <xs:simpleType>
-        
-            <xs:restriction base="xs:token">
-          
-               <xs:enumeration value="plaintext"/>
-          
-               <xs:enumeration value="sha"/>
-          
-               <xs:enumeration value="md5"/>
-          
-               <xs:enumeration value="md4"/>
-          
-               <xs:enumeration value="{sha}"/>
-          
-               <xs:enumeration value="{ssha}"/>
-        
-            </xs:restriction>
-      
-         </xs:simpleType>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="base64">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Whether a string should be base64 encoded</xs:documentation>
-      
-         </xs:annotation>
-      
-         <xs:simpleType>
-        
-            <xs:restriction base="xs:token">
-          
-               <xs:enumeration value="true"/>
-          
-               <xs:enumeration value="false"/>
-        
-            </xs:restriction>
-      
-         </xs:simpleType>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-  
-   <xs:attributeGroup name="user-property">
-    
-      <xs:attribute name="user-property" use="required" type="xs:string">
-      
-         <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>
-  
-   <xs:attributeGroup name="system-wide">
-    
-      <xs:attribute name="system-wide" use="required" type="xs:string">
-      
-         <xs:annotation>
-        
-            <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: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 started, listening on the supplied port number. The port is optional and defaults to 33389. A Spring LDAP ContextSource bean will be registered for the server with the id supplied. </xs:documentation>
-    
-      </xs:annotation>
-      <xs:complexType>
-      
-         <xs:attributeGroup ref="security:ldap-server.attlist"/>
-    
-      </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 context.</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-    
-      <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">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Specifies an IP port number. Used to configure an embedded LDAP server, for example.</xs:documentation>
-      
-         </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. </xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="manager-password" type="xs:string"/>
-    
-      <xs:attribute name="ldif" type="xs:string">
-      
-         <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">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Optional root suffix for the embedded LDAP server. Default is "dc=springframework,dc=org"</xs:documentation>
-      
-         </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>
-        
-            <xs:documentation>The optional server to use. If omitted, and a default LDAP server is registered (using &lt;ldap-server&gt; with no Id), that server will be used. </xs:documentation>
-      
-         </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>
-        
-            <xs:documentation>Group search filter. Defaults to (uniqueMember={0}). The substituted parameter is the DN of the user.</xs:documentation>
-      
-         </xs:annotation>
-    
-      </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 "ou=groups".</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-  
-   </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">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Search base for user searches. Defaults to "".</xs:documentation>
-      
-         </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>
-        
-            <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:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  xmlns:security="http://www.springframework.org/schema/security" elementFormDefault="qualified"
+  targetNamespace="http://www.springframework.org/schema/security">
+
+  <xs:attributeGroup name="hash">
+
+    <xs:attribute name="hash" use="required">
+
+      <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>
+
+      <xs:simpleType>
+
+        <xs:restriction base="xs:token">
+
+          <xs:enumeration value="plaintext"/>
+
+          <xs:enumeration value="sha"/>
+
+          <xs:enumeration value="md5"/>
+
+          <xs:enumeration value="md4"/>
+
+          <xs:enumeration value="{sha}"/>
+
+          <xs:enumeration value="{ssha}"/>
+
+        </xs:restriction>
+
+      </xs:simpleType>
+
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:attributeGroup name="base64">
+
+    <xs:attribute name="base64" use="required">
+
+      <xs:annotation>
+
+        <xs:documentation>Whether a string should be base64 encoded</xs:documentation>
+
+      </xs:annotation>
+
+      <xs:simpleType>
+
+        <xs:restriction base="xs:token">
+
+          <xs:enumeration value="true"/>
+
+          <xs:enumeration value="false"/>
+
+        </xs:restriction>
+
+      </xs:simpleType>
+
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <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>
+
+      </xs:annotation>
+
+      <xs:simpleType>
+
+        <xs:restriction base="xs:token">
+
+          <xs:enumeration value="ant"/>
+
+          <xs:enumeration value="regex"/>
+
+        </xs:restriction>
+
+      </xs:simpleType>
+
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:attributeGroup name="port">
+
+    <xs:attribute name="port" use="required" type="xs:integer">
+
+      <xs:annotation>
+
+        <xs:documentation>Specifies an IP port number. Used to configure an embedded LDAP server,
+          for example.</xs:documentation>
+
+      </xs:annotation>
+
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:attributeGroup name="url">
+
+    <xs:attribute name="url" use="required" type="xs:string">
+
+      <xs:annotation>
+
+        <xs:documentation>Specifies a URL.</xs:documentation>
+
+      </xs:annotation>
+
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:attributeGroup name="id">
+
+    <xs:attribute name="id" use="required" type="xs:ID">
+
+      <xs:annotation>
+
+        <xs:documentation>A bean identifier, used for referring to the bean elsewhere in the
+          context.</xs:documentation>
+
+      </xs:annotation>
+
+    </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>
+
+      </xs:annotation>
+
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <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>
+
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="password-encoder">
+    <xs:annotation>
+
+      <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>
+
+        <xs:element minOccurs="0" name="salt-source">
+          <xs:complexType>
+
+            <xs:attribute name="user-property" type="xs:string">
+
+              <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:attribute name="system-wide" type="xs:string">
+
+              <xs:annotation>
+
+                <xs:documentation>A single value that will be used as the salt for a password
+                  encoder. </xs:documentation>
+
+              </xs:annotation>
+
+            </xs:attribute>
+
+          </xs:complexType>
+        </xs:element>
+
+      </xs:sequence>
+
+      <xs:attributeGroup ref="security:password-encoder.attlist"/>
+
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="password-encoder.attlist">
+
+    <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">
+
+      <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>
+
+      <xs:simpleType>
+
+        <xs:restriction base="xs:token">
+
+          <xs:enumeration value="plaintext"/>
+
+          <xs:enumeration value="sha"/>
+
+          <xs:enumeration value="md5"/>
+
+          <xs:enumeration value="md4"/>
+
+          <xs:enumeration value="{sha}"/>
+
+          <xs:enumeration value="{ssha}"/>
+
+        </xs:restriction>
+
+      </xs:simpleType>
+
+    </xs:attribute>
+
+    <xs:attribute name="base64">
+
+      <xs:annotation>
+
+        <xs:documentation>Whether a string should be base64 encoded</xs:documentation>
+
+      </xs:annotation>
+
+      <xs:simpleType>
+
+        <xs:restriction base="xs:token">
+
+          <xs:enumeration value="true"/>
+
+          <xs:enumeration value="false"/>
+
+        </xs:restriction>
+
+      </xs:simpleType>
+
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+
+  <xs:attributeGroup name="user-property">
+
+    <xs:attribute name="user-property" use="required" type="xs:string">
+
+      <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>
+
+  <xs:attributeGroup name="system-wide">
+
+    <xs:attribute name="system-wide" use="required" type="xs:string">
+
+      <xs:annotation>
+
+        <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: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
+        started, listening on the supplied port number. The port is optional and defaults to 33389.
+        A Spring LDAP ContextSource bean will be registered for the server with the id supplied. </xs:documentation>
+
+    </xs:annotation>
+    <xs:complexType>
+
+      <xs:attributeGroup ref="security:ldap-server.attlist"/>
+
+    </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
+          context.</xs:documentation>
+
+      </xs:annotation>
+
+    </xs:attribute>
+
+    <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">
+
+      <xs:annotation>
+
+        <xs:documentation>Specifies an IP port number. Used to configure an embedded LDAP server,
+          for example.</xs:documentation>
+
+      </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. </xs:documentation>
+
+      </xs:annotation>
+
+    </xs:attribute>
+
+    <xs:attribute name="manager-password" type="xs:string"/>
+
+    <xs:attribute name="ldif" type="xs:string">
+
+      <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">
+
+      <xs:annotation>
+
+        <xs:documentation>Optional root suffix for the embedded LDAP server. Default is
+          "dc=springframework,dc=org"</xs:documentation>
+
+      </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>
+
+        <xs:documentation>The optional server to use. If omitted, and a default LDAP server is
+          registered (using &lt;ldap-server&gt; with no Id), that server will be used. </xs:documentation>
+
+      </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>
+
+        <xs:documentation>Group search filter. Defaults to (uniqueMember={0}). The substituted
+          parameter is the DN of the user.</xs:documentation>
+
+      </xs:annotation>
+
+    </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 "ou=groups".</xs:documentation>
+
+      </xs:annotation>
+
+    </xs:attribute>
+
+  </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">
+
+      <xs:annotation>
+
+        <xs:documentation>Search base for user searches. Defaults to "".</xs:documentation>
+
+      </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>
+
+        <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:attributeGroup>
+
+  <xs:element name="ldap-user-service" substitutionGroup="security:any-user-service">
+    <xs:complexType>
+
+      <xs:attributeGroup ref="security:ldap-us.attlist"/>
+
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ldap-us.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>
+
+      </xs:annotation>
+
+    </xs:attribute>
+
+    <xs:attribute name="server-ref" type="xs:string">
+
+      <xs:annotation>
+
+        <xs:documentation>The optional server to use. If omitted, and a default LDAP server is
+          registered (using &lt;ldap-server&gt; with no Id), that server will be used. </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">
+
+      <xs:annotation>
+
+        <xs:documentation>Group search filter. Defaults to (uniqueMember={0}). The substituted
+          parameter is the DN of the user.</xs:documentation>
+
+      </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>
+
+      </xs:annotation>
+
+    </xs:attribute>
+
+    <xs:attribute name="group-role-attribute" type="xs:string">
+
+      <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:attributeGroup>
+
+  <xs:element name="ldap-authentication-provider">
+    <xs:annotation>
+
+      <xs:documentation>Sets up an ldap authentication provider</xs:documentation>
+
+    </xs:annotation>
+    <xs:complexType>
+
+      <xs:sequence>
+
+        <xs:element minOccurs="0" ref="security:password-compare"/>
+
+      </xs:sequence>
+
+      <xs:attributeGroup ref="security:ldap-ap.attlist"/>
+
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ldap-ap.attlist">
+
+    <xs:attribute name="server-ref" type="xs:string">
+
+      <xs:annotation>
+
+        <xs:documentation>The optional server to use. If omitted, and a default LDAP server is
+          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"/>
+
+    <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>
+
+      </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
+          parameter is the DN of the user.</xs:documentation>
+
+      </xs:annotation>
+
+    </xs:attribute>
+
+    <xs:attribute name="group-role-attribute" type="xs:string">
+
+      <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">
+
+      <xs:annotation>
+
+        <xs:documentation>A specific pattern used to build the user's DN, for example
+          "uid={0},ou=people". The key "{0}" must be present and will be substituted with the
+          username.</xs:documentation>
+
+      </xs:annotation>
+
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="password-compare">
+    <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>
+
+        <xs:element minOccurs="0" ref="security:password-encoder"/>
+
+      </xs:sequence>
+
+      <xs:attributeGroup ref="security:password-compare.attlist"/>
+
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="password-compare.attlist">
+
+    <xs:attribute name="password-attribute" type="xs:string">
+
+      <xs:annotation>
+
+        <xs:documentation>The attribute in the directory which contains the user password. Defaults
+          to "userPassword".</xs:documentation>
+
+      </xs:annotation>
+
+    </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>
+
+      <xs:simpleType>
+
+        <xs:restriction base="xs:token">
+
+          <xs:enumeration value="plaintext"/>
+
+          <xs:enumeration value="sha"/>
+
+          <xs:enumeration value="md5"/>
+
+          <xs:enumeration value="md4"/>
+
+          <xs:enumeration value="{sha}"/>
+
+          <xs:enumeration value="{ssha}"/>
+
+        </xs:restriction>
+
+      </xs:simpleType>
+
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="intercept-methods">
+    <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>
+
+        <xs:element maxOccurs="unbounded" ref="security:protect"/>
+
+      </xs:sequence>
+
+      <xs:attributeGroup ref="security:intercept-methods.attlist"/>
+
+    </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
+          security interceptor.</xs:documentation>
+
+      </xs:annotation>
+
+    </xs:attribute>
+
+  </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>
+
+    </xs:annotation>
+    <xs:complexType>
+
+      <xs:attributeGroup ref="security:protect.attlist"/>
+
+    </xs:complexType>
+  </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>
+
+    </xs:attribute>
+
+    <xs:attribute name="access" use="required" type="xs:string">
+
+      <xs:annotation>
+
+        <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">
+    <xs:annotation>
+
+      <xs:documentation>Provides method security for all beans registered in the Spring application
+        context. Specifically, beans will be scanned for Spring Security annotations and/or matches
+        with the ordered list of "protect-pointcut" sub-elements. Where there is a match, the beans
+        will automatically be proxied and security authorization applied to the methods accordingly.
+        If you use and enable all three sources of method security metadata (ie "protect-pointcut"
+        declarations, @Secured and also JSR 250 security annotations), the metadata sources will be
+        queried in that order. In practical terms, this enables you to use XML to override method
+        security metadata expressed by way of @Secured annotations, with @Secured annotations
+        overriding method security metadata expressed by JSR 250 annotations. It is perfectly
+        acceptable to mix and match, with a given Java type using a combination of XML, @Secured and
+        JSR 250 to express method security metadata (albeit on different methods).</xs:documentation>
+
+    </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
+              attributes that apply to it. Every bean registered in the Spring application context
+              that provides a method that matches the pointcut will receive security authorization.</xs:documentation>
+
+          </xs:annotation>
+          <xs:complexType>
+
+            <xs:attributeGroup ref="security:protect-pointcut.attlist"/>
+
+          </xs:complexType>
+        </xs:element>
+
+      </xs:sequence>
+
+      <xs:attributeGroup ref="security:global-method-security.attlist"/>
+
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="global-method-security.attlist">
+
+    <xs:attribute name="secured-annotations">
+
+      <xs:annotation>
+
+        <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">
+
+          <xs:enumeration value="disabled"/>
+
+          <xs:enumeration value="enabled"/>
+
+        </xs:restriction>
+
+      </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.
+          Defaults to "disabled".</xs:documentation>
+
+      </xs:annotation>
+
+      <xs:simpleType>
+
+        <xs:restriction base="xs:token">
+
+          <xs:enumeration value="disabled"/>
+
+          <xs:enumeration value="enabled"/>
+
+        </xs:restriction>
+
+      </xs:simpleType>
+
+    </xs:attribute>
+
+    <xs:attribute name="access-decision-manager-ref" type="xs:string">
+
+      <xs:annotation>
+
+        <xs:documentation>Optional AccessDecisionManager bean ID to override the default used for
+          method security.</xs:documentation>
+
+      </xs:annotation>
+
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+
+  <xs:attributeGroup name="protect-pointcut.attlist">
+
+    <xs:attribute name="expression" use="required" type="xs:string">
+
+      <xs:annotation>
+
+        <xs:documentation>An AspectJ expression, including the 'execution' keyword. For example,
+          'execution(int com.foo.TargetObject.countLength(String))' (without the quotes).</xs:documentation>
+
+      </xs:annotation>
+
+    </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>
+
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="http">
+    <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">
+          <xs:annotation>
+
+            <xs:documentation>Specifies the access attributes and/or filter list for a particular
+              set of URLs.</xs:documentation>
+
+          </xs:annotation>
+          <xs:complexType>
+
+            <xs:attributeGroup ref="security:intercept-url.attlist"/>
+
+          </xs:complexType>
+        </xs:element>
+
+        <xs:element name="form-login">
+          <xs:annotation>
+
+            <xs:documentation>Sets up a form login configuration for authentication with a username
+              and password</xs:documentation>
+
+          </xs:annotation>
+          <xs:complexType>
+
+            <xs:attributeGroup ref="security:form-login.attlist"/>
+
+          </xs:complexType>
+        </xs:element>
+
+        <xs:element ref="security:openid-login"/>
+
+        <xs:element name="x509">
+          <xs:annotation>
+
+            <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>
+
+        <xs:element name="http-basic">
+          <xs:annotation>
+
+            <xs:documentation>Adds support for basic authentication (this is an element to permit
+              future expansion, such as supporting an "ignoreFailure" attribute)</xs:documentation>
+
+          </xs:annotation>
+          <xs:complexType/>
+        </xs:element>
+
+        <xs:element name="logout">
+          <xs:annotation>
+
+            <xs:documentation>Incorporates a logout processing filter. Most web applications require
+              a logout filter, although you may not require one if you write a controller to
+              provider similar logic.</xs:documentation>
+
+          </xs:annotation>
+          <xs:complexType>
+
+            <xs:attributeGroup ref="security:logout.attlist"/>
+
+          </xs:complexType>
+        </xs:element>
+
+        <xs:element name="concurrent-session-control">
+          <xs:annotation>
+
+            <xs:documentation>Adds support for concurrent session control, allowing limits to be
+              placed on the number of sessions a user can have.</xs:documentation>
+
+          </xs:annotation>
+          <xs:complexType>
+
+            <xs:attributeGroup ref="security:concurrent-sessions.attlist"/>
+
+          </xs:complexType>
+        </xs:element>
+
+        <xs:element name="remember-me">
+          <xs:complexType>
+
+            <xs:attributeGroup ref="security:remember-me.attlist"/>
+
+          </xs:complexType>
+        </xs:element>
+
+        <xs:element name="anonymous">
+          <xs:annotation>
+
+            <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"/>
+
+          </xs:complexType>
+        </xs:element>
+
+        <xs:element name="port-mappings">
+          <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>
+
+              <xs:element maxOccurs="unbounded" ref="security:port-mapping"/>
+
+            </xs:sequence>
+
+          </xs:complexType>
+        </xs:element>
+
+      </xs:choice>
+
+      <xs:attributeGroup ref="security:http.attlist"/>
+
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="http.attlist">
+
+    <xs:attribute name="auto-config">
+
+      <xs:annotation>
+
+        <xs:documentation>Automatically registers a login form, BASIC authentication, anonymous
+          authentication, logout services, remember-me and servlet-api-integration. If set to
+          "true", all of these capabilities are added (although you can still customize the
+          configuration of each by providing the respective element). If unspecified, defaults to
+          "false".</xs:documentation>
+
+      </xs:annotation>
+
+      <xs:simpleType>
+
+        <xs:restriction base="xs:token">
+
+          <xs:enumeration value="true"/>
+
+          <xs:enumeration value="false"/>
+
+        </xs:restriction>
+
+      </xs:simpleType>
+
+    </xs:attribute>
+
+    <xs:attribute name="create-session">
+
+      <xs:annotation>
+
+        <xs:documentation>Controls the eagerness with which an HTTP session is created. If not set,
+          defaults to "ifRequired".</xs:documentation>
+
+      </xs:annotation>
+
+      <xs:simpleType>
+
+        <xs:restriction base="xs:token">
+
+          <xs:enumeration value="ifRequired"/>
+
+          <xs:enumeration value="always"/>
+
+          <xs:enumeration value="never"/>
+
+        </xs:restriction>
+
+      </xs:simpleType>
+
+    </xs:attribute>
+
+    <xs:attribute name="path-type">
+
+      <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>
+
+      </xs:annotation>
+
+      <xs:simpleType>
+
+        <xs:restriction base="xs:token">
+
+          <xs:enumeration value="ant"/>
+
+          <xs:enumeration value="regex"/>
+
+        </xs:restriction>
+
+      </xs:simpleType>
+
+    </xs:attribute>
+
+    <xs:attribute name="lowercase-comparisons">
+
+      <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>
+
+      <xs:simpleType>
+
+        <xs:restriction base="xs:token">
+
+          <xs:enumeration value="true"/>
+
+          <xs:enumeration value="false"/>
+
+        </xs:restriction>
+
+      </xs:simpleType>
+
+    </xs:attribute>
+
+    <xs:attribute name="servlet-api-provision">
+
+      <xs:annotation>
+
+        <xs:documentation>Provides versions of HttpServletRequest security methods such as
+          isUserInRole() and getPrincipal() which are implemented by accessing the Spring
+          SecurityContext. Defaults to "true".</xs:documentation>
+
+      </xs:annotation>
+
+      <xs:simpleType>
+
+        <xs:restriction base="xs:token">
+
+          <xs:enumeration value="true"/>
+
+          <xs:enumeration value="false"/>
+
+        </xs:restriction>
+
+      </xs:simpleType>
+
+    </xs:attribute>
+
+    <xs:attribute name="access-decision-manager-ref" type="xs:string">
+
+      <xs:annotation>
+
+        <xs:documentation>Optional attribute specifying the ID of the AccessDecisionManager
+          implementation which should be used for authorizing HTTP requests.</xs:documentation>
+
+      </xs:annotation>
+
+    </xs:attribute>
+
+    <xs:attribute name="realm" type="xs:string">
+
+      <xs:annotation>
+
+        <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">
+
+      <xs:annotation>
+
+        <xs:documentation>Indicates whether an existing session should be invalidated when a user
+          authenticates and a new session started. If set to "none" no change will be made.
+          "newSession" will create a new empty session. "migrateSession" will create a new session
+          and copy the session attributes to the new session. Defaults to "migrateSession".</xs:documentation>
+
+      </xs:annotation>
+
+      <xs:simpleType>
+
+        <xs:restriction base="xs:token">
+
+          <xs:enumeration value="none"/>
+
+          <xs:enumeration value="newSession"/>
+
+          <xs:enumeration value="migrateSession"/>
+
+        </xs:restriction>
+
+      </xs:simpleType>
+
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+
+  <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>
+
+      </xs:annotation>
+
+    </xs:attribute>
+
+    <xs:attribute name="access" type="xs:string">
+
+      <xs:annotation>
+
+        <xs:documentation>The access configuration attributes that apply for the configured 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
+          apply. If not specified, the attributes will apply to any method.</xs:documentation>
+
+      </xs:annotation>
+
+      <xs:simpleType>
+
+        <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"/>
+
+          <xs:enumeration value="PUT"/>
+
+          <xs:enumeration value="TRACE"/>
+
+        </xs:restriction>
+
+      </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
+          filters, will be applied to any other paths).</xs:documentation>
+
+      </xs:annotation>
+
+      <xs:simpleType>
+
+        <xs:restriction base="xs:token">
+
+          <xs:enumeration value="none"/>
+
+        </xs:restriction>
+
+      </xs:simpleType>
+
+    </xs:attribute>
+
+    <xs:attribute name="requires-channel">
+
+      <xs:annotation>
+
+        <xs:documentation>Used to specify that a URL must be accessed over http or https</xs:documentation>
+
+      </xs:annotation>
+
+      <xs:simpleType>
+
+        <xs:restriction base="xs:token">
+
+          <xs:enumeration value="http"/>
+
+          <xs:enumeration value="https"/>
+
+          <xs:enumeration value="any"/>
+
+        </xs:restriction>
+
+      </xs:simpleType>
+
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+
+  <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>
+
+      </xs:annotation>
+
+    </xs:attribute>
+
+    <xs:attribute name="logout-success-url" type="xs:string">
+
+      <xs:annotation>
+
+        <xs:documentation>Specifies the URL to display once the user has logged out. If not
+          specified, defaults to /.</xs:documentation>
+
+      </xs:annotation>
+
+    </xs:attribute>
+
+    <xs:attribute name="invalidate-session">
+
+      <xs:annotation>
+
+        <xs:documentation>Specifies whether a logout also causes HttpSession invalidation, which is
+          generally desirable. If unspecified, defaults to true.</xs:documentation>
+
+      </xs:annotation>
+
+      <xs:simpleType>
+
+        <xs:restriction base="xs:token">
+
+          <xs:enumeration value="true"/>
+
+          <xs:enumeration value="false"/>
+
+        </xs:restriction>
+
+      </xs:simpleType>
+
+    </xs:attribute>
+
+  </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>
+
+      </xs:annotation>
+
+    </xs:attribute>
+
+    <xs:attribute name="default-target-url" type="xs:string">
+
+      <xs:annotation>
+
+        <xs:documentation>The URL that will be redirected to after successful authentication, if the
+          user's previous action could not be resumed. This generally happens if the user visits a
+          login page without having first requested a secured operation that triggers
+          authentication. If unspecified, defaults to the root of the application.</xs:documentation>
+
+      </xs:annotation>
+
+    </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>
+
+      </xs:annotation>
+
+    </xs:attribute>
+
+    <xs:attribute name="authentication-failure-url" type="xs:string">
+
+      <xs:annotation>
+
+        <xs:documentation>The URL for the login failure page. If no login failure URL is specified,
+          Spring Security will automatically create a failure login URL at
+          /spring_security_login?login_error and a corresponding filter to render that login failure
+          URL when requested.</xs:documentation>
+
+      </xs:annotation>
+
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="openid-login">
+    <xs:annotation>
+
+      <xs:documentation>Sets up form login for authentication with an Open ID identity</xs:documentation>
+
+    </xs:annotation>
+    <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>
+
+        </xs:annotation>
+
       </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>
-   </xs:element>
-  
-   <xs:attributeGroup name="ldap-us.attlist">
-    
+
+    </xs:complexType>
+  </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>
+    <xs:complexType>
+
+      <xs:sequence>
+
+        <xs:element maxOccurs="unbounded" name="filter-chain">
+          <xs:annotation>
+
+            <xs:documentation>Used within filter-chain-map to define a specific URL pattern and the
+              list of filters which apply to the URLs matching that pattern. When multiple
+              filter-chain elements are used within a filter-chain-map element, the most specific
+              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>
+        </xs:element>
+
+      </xs:sequence>
+
+      <xs:attributeGroup ref="security:filter-chain-map.attlist"/>
+
+    </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">
+
+    <xs:attribute name="pattern" use="required" type="xs:string"/>
+
+    <xs:attribute name="filters" use="required" type="xs:string"/>
+
+  </xs:attributeGroup>
+
+  <xs:element name="filter-invocation-definition-source">
+    <xs:annotation>
+
+      <xs:documentation>Used to explicitly configure a FilterInvocationDefinitionSource bean for use
+        with a FilterSecurityInterceptor. Usually only needed if you are configuring a
+        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>
+
+        <xs:element maxOccurs="unbounded" name="intercept-url">
+          <xs:annotation>
+
+            <xs:documentation>Specifies the access attributes and/or filter list for a particular
+              set of URLs.</xs:documentation>
+
+          </xs:annotation>
+          <xs:complexType>
+
+            <xs:attributeGroup ref="security:intercept-url.attlist"/>
+
+          </xs:complexType>
+        </xs:element>
+
+      </xs:sequence>
+
+      <xs:attributeGroup ref="security:fids.attlist"/>
+
+    </xs:complexType>
+  </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>
+
+      </xs:annotation>
+
+    </xs:attribute>
+
+    <xs:attribute name="lowercase-comparisons">
+
+      <xs:annotation>
+
+        <xs:documentation>as for http element</xs:documentation>
+
+      </xs:annotation>
+
+      <xs:simpleType>
+
+        <xs:restriction base="xs:token">
+
+          <xs:enumeration value="true"/>
+
+          <xs:enumeration value="false"/>
+
+        </xs:restriction>
+
+      </xs:simpleType>
+
+    </xs:attribute>
+
+    <xs:attribute name="path-type">
+
+      <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>
+
+      </xs:annotation>
+
+      <xs:simpleType>
+
+        <xs:restriction base="xs:token">
+
+          <xs:enumeration value="ant"/>
+
+          <xs:enumeration value="regex"/>
+
+        </xs:restriction>
+
+      </xs:simpleType>
+
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+
+
+  <xs:attributeGroup name="concurrent-sessions.attlist">
+
+    <xs:attribute name="max-sessions" type="xs:positiveInteger"/>
+
+    <xs:attribute name="expired-url" type="xs:string"/>
+
+    <xs:attribute name="exception-if-maximum-exceeded">
+
+      <xs:simpleType>
+
+        <xs:restriction base="xs:token">
+
+          <xs:enumeration value="true"/>
+
+          <xs:enumeration value="false"/>
+
+        </xs:restriction>
+
+      </xs:simpleType>
+
+    </xs:attribute>
+
+  </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:attributeGroup>
+
+
+  <xs:attributeGroup name="anonymous.attlist">
+
+    <xs:attribute name="key" type="xs:string">
+
+      <xs:annotation>
+
+        <xs:documentation>The key shared between the provider and filter. This generally does not
+          need to be set. If unset, it will default to "doesNotMatter".</xs:documentation>
+
+      </xs:annotation>
+
+    </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>
+
+      </xs:annotation>
+
+    </xs:attribute>
+
+    <xs:attribute name="granted-authority" type="xs:string">
+
+      <xs:annotation>
+
+        <xs:documentation>The granted authority that should be assigned to the anonymous request.
+          Commonly this is used to assign the anonymous request particular roles, which can
+          subsequently be used in authorization decisions. If unset, defaults to "ROLE_ANONYMOUS".</xs:documentation>
+
+      </xs:annotation>
+
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+
+  <xs:element name="port-mapping">
+    <xs:complexType>
+
+      <xs:attributeGroup ref="security:http-port"/>
+
+      <xs:attributeGroup ref="security:https-port"/>
+
+    </xs:complexType>
+  </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"/>
+
+  </xs:attributeGroup>
+
+
+  <xs:attributeGroup name="x509.attlist">
+
+    <xs:attribute name="subject-principal-regex" type="xs:string">
+
+      <xs:annotation>
+
+        <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">
+
+      <xs:annotation>
+
+        <xs:documentation>A reference to a user-service (or UserDetailsService bean) Id</xs:documentation>
+
+      </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
+        AuthenticationManager will automatically be registered. This element simple allows you to
+        define an alias to allow you to reference the authentication-manager in your own beans. </xs:documentation>
+
+    </xs:annotation>
+    <xs:complexType>
+
+      <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 bean</xs:documentation>
+
+    </xs:annotation>
+
+    <xs:attribute name="alias" use="required" type="xs:ID"/>
+
+  </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>
+    <xs:complexType>
+
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+
+        <xs:element ref="security:any-user-service"/>
+
+        <xs:element ref="security:password-encoder"/>
+
+      </xs:choice>
+
+      <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>
+
+        <xs:documentation>A reference to a user-service (or UserDetailsService bean) Id</xs:documentation>
+
+      </xs:annotation>
+
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="custom-authentication-provider">
+    <xs:complexType/>
+  </xs:element>
+
+  <xs:element name="user-service" substitutionGroup="security:any-user-service">
+    <xs:annotation>
+
+      <xs:documentation>Creates an in-memory UserDetailsService from a properties file or a list of
+        "user" child elements.</xs:documentation>
+
+    </xs:annotation>
+    <xs:complexType>
+
+      <xs:sequence>
+
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="security:user"/>
+
+      </xs:sequence>
+
       <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>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="server-ref" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>The optional server to use. If omitted, and a default LDAP server is registered (using &lt;ldap-server&gt; with no Id), that server will be used. </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">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Group search filter. Defaults to (uniqueMember={0}). The substituted parameter is the DN of the user.</xs:documentation>
-      
-         </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>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="group-role-attribute" type="xs:string">
-      
-         <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:attributeGroup>
-  
-   <xs:element name="ldap-authentication-provider">
-      <xs:annotation>
-      
-         <xs:documentation>Sets up an ldap authentication provider</xs:documentation>
-    
-      </xs:annotation>
-      <xs:complexType>
-      
-         <xs:sequence>
-        
-            <xs:element minOccurs="0" ref="security:password-compare"/>
-      
-         </xs:sequence>
-      
-         <xs:attributeGroup ref="security:ldap-ap.attlist"/>
-    
-      </xs:complexType>
-   </xs:element>
-  
-   <xs:attributeGroup name="ldap-ap.attlist">
-    
-      <xs:attribute name="server-ref" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>The optional server to use. If omitted, and a default LDAP server is 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"/>
-    
-      <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>
-      
-         </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 parameter is the DN of the user.</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="group-role-attribute" type="xs:string">
-      
-         <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">
-      
-         <xs:annotation>
-        
-            <xs:documentation>A specific pattern used to build the user's DN, for example "uid={0},ou=people". The key "{0}" must be present and will be substituted with the username.</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-   <xs:element name="password-compare">
-      <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>
-        
-            <xs:element minOccurs="0" ref="security:password-encoder"/>
-      
-         </xs:sequence>
-      
-         <xs:attributeGroup ref="security:password-compare.attlist"/>
-    
-      </xs:complexType>
-   </xs:element>
-  
-   <xs:attributeGroup name="password-compare.attlist">
-    
-      <xs:attribute name="password-attribute" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>The attribute in the directory which contains the user password. Defaults to "userPassword".</xs:documentation>
-      
-         </xs:annotation>
-    
-      </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>
-      
-         <xs:simpleType>
-        
-            <xs:restriction base="xs:token">
-          
-               <xs:enumeration value="plaintext"/>
-          
-               <xs:enumeration value="sha"/>
-          
-               <xs:enumeration value="md5"/>
-          
-               <xs:enumeration value="md4"/>
-          
-               <xs:enumeration value="{sha}"/>
-          
-               <xs:enumeration value="{ssha}"/>
-        
-            </xs:restriction>
-      
-         </xs:simpleType>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-   <xs:element name="intercept-methods">
-      <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>
-        
-            <xs:element maxOccurs="unbounded" ref="security:protect"/>
-      
-         </xs:sequence>
-      
-         <xs:attributeGroup ref="security:intercept-methods.attlist"/>
-    
-      </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 security interceptor.</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-  
-   </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>
-    
-      </xs:annotation>
-      <xs:complexType>
-      
-         <xs:attributeGroup ref="security:protect.attlist"/>
-    
-      </xs:complexType>
-   </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>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="access" use="required" type="xs:string">
-      
-         <xs:annotation>
-        
-            <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">
-      <xs:annotation>
-      
-         <xs:documentation>Provides method security for all beans registered in the Spring application context. Specifically, beans will be scanned for Spring Security annotations and/or matches with the ordered list of "protect-pointcut" sub-elements. Where there is a match, the beans will automatically be proxied and security authorization applied to the methods accordingly. If you use and enable all three sources of method security metadata (ie "protect-pointcut" declarations, @Secured and also JSR 250 security annotations), the metadata sources will be queried in that order. In practical terms, this enables you to use XML to override method security metadata expressed by way of @Secured annotations, with @Secured annotations overriding method security metadata expressed by JSR 250 annotations. It is perfectly acceptable to mix and match, with a given Java type using a combination of XML, @Secured and JSR 250 to express method security metadata (albeit on different methods).</xs:documentation>
-    
-      </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 attributes that apply to it. Every bean registered in the Spring application context that provides a method that matches the pointcut will receive security authorization.</xs:documentation>
-    
-               </xs:annotation>
-               <xs:complexType>
-      
-                  <xs:attributeGroup ref="security:protect-pointcut.attlist"/>
-    
-               </xs:complexType>
-            </xs:element>
-      
-         </xs:sequence>
-      
-         <xs:attributeGroup ref="security:global-method-security.attlist"/>
-    
-      </xs:complexType>
-   </xs:element>
-  
-   <xs:attributeGroup name="global-method-security.attlist">
-    
-      <xs:attribute name="secured">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Specifies that Spring Security's @Secured annotation should be used. Please ensure you have the spring-security-tiger-xxx.jar on the classpath. Defaults to false.</xs:documentation>
-      
-         </xs:annotation>
-      
-         <xs:simpleType>
-        
-            <xs:restriction base="xs:token">
-          
-               <xs:enumeration value="false"/>
-          
-               <xs:enumeration value="true"/>
-        
-            </xs:restriction>
-      
-         </xs:simpleType>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="jsr250">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Specifies that JSR-250 style attributes are to be used (for example "RolesAllowed"). This will require the javax.annotation.security classes on the classpath. Defaults to false.</xs:documentation>
-      
-         </xs:annotation>
-      
-         <xs:simpleType>
-        
-            <xs:restriction base="xs:token">
-          
-               <xs:enumeration value="false"/>
-          
-               <xs:enumeration value="true"/>
-        
-            </xs:restriction>
-      
-         </xs:simpleType>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="access-decision-manager-ref" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Optional AccessDecisionManager bean ID to override the default.</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-  
-   <xs:attributeGroup name="protect-pointcut.attlist">
-    
-      <xs:attribute name="expression" use="required" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>An AspectJ expression, including the 'execution' keyword. For example, 'execution(int com.foo.TargetObject.countLength(String))' (without the quotes).</xs:documentation>
-      
-         </xs:annotation>
-    
-      </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>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-   <xs:element name="http">
-      <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">
-               <xs:annotation>
-      
-                  <xs:documentation>Specifies the access attributes and/or filter list for a particular set of URLs.</xs:documentation>
-    
-               </xs:annotation>
-               <xs:complexType>
-      
-                  <xs:attributeGroup ref="security:intercept-url.attlist"/>
-    
-               </xs:complexType>
-            </xs:element>
-        
-            <xs:element name="form-login">
-               <xs:annotation>
-      
-                  <xs:documentation>Sets up a form login configuration for authentication with a username and password</xs:documentation>
-    
-               </xs:annotation>
-               <xs:complexType>
-      
-                  <xs:attributeGroup ref="security:form-login.attlist"/>
-    
-               </xs:complexType>
-            </xs:element>
-        
-            <xs:element ref="security:openid-login"/>
-        
-            <xs:element name="x509">
-               <xs:annotation>
-      
-                  <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>
-        
-            <xs:element name="http-basic">
-               <xs:annotation>
-      
-                  <xs:documentation>Adds support for basic authentication (this is an element to permit future expansion, such as supporting an "ignoreFailure" attribute)</xs:documentation>
-    
-               </xs:annotation>
-               <xs:complexType/>
-            </xs:element>
-        
-            <xs:element name="logout">
-               <xs:annotation>
-      
-                  <xs:documentation>Incorporates a logout processing filter. Most web applications require a logout filter, although you may not require one if you write a controller to provider similar logic.</xs:documentation>
-    
-               </xs:annotation>
-               <xs:complexType>
-      
-                  <xs:attributeGroup ref="security:logout.attlist"/>
-    
-               </xs:complexType>
-            </xs:element>
-        
-            <xs:element name="concurrent-session-control">
-               <xs:annotation>
-      
-                  <xs:documentation>Adds support for concurrent session control, allowing limits to be placed on the number of sessions a user can have.</xs:documentation>
-    
-               </xs:annotation>
-               <xs:complexType>
-      
-                  <xs:attributeGroup ref="security:concurrent-sessions.attlist"/>
-    
-               </xs:complexType>
-            </xs:element>
-        
-            <xs:element name="remember-me">
-               <xs:complexType>
-      
-                  <xs:attributeGroup ref="security:remember-me.attlist"/>
-    
-               </xs:complexType>
-            </xs:element>
-        
-            <xs:element name="anonymous">
-               <xs:annotation>
-      
-                  <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"/>
-    
-               </xs:complexType>
-            </xs:element>
-        
-            <xs:element name="port-mappings">
-               <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>
-        
-                     <xs:element maxOccurs="unbounded" ref="security:port-mapping"/>
-      
-                  </xs:sequence>
-    
-               </xs:complexType>
-            </xs:element>
-      
-         </xs:choice>
-      
-         <xs:attributeGroup ref="security:http.attlist"/>
-    
-      </xs:complexType>
-   </xs:element>
-  
-   <xs:attributeGroup name="http.attlist">
-    
-      <xs:attribute name="auto-config">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Automatically registers a login form, BASIC authentication, anonymous authentication, logout services, remember-me and servlet-api-integration. If set to "true", all of these capabilities are added (although you can still customize the configuration of each by providing the respective element). If unspecified, defaults to "false".</xs:documentation>
-      
-         </xs:annotation>
-      
-         <xs:simpleType>
-        
-            <xs:restriction base="xs:token">
-          
-               <xs:enumeration value="true"/>
-          
-               <xs:enumeration value="false"/>
-        
-            </xs:restriction>
-      
-         </xs:simpleType>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="create-session">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Controls the eagerness with which an HTTP session is created. If not set, defaults to "ifRequired".</xs:documentation>
-      
-         </xs:annotation>
-      
-         <xs:simpleType>
-        
-            <xs:restriction base="xs:token">
-          
-               <xs:enumeration value="ifRequired"/>
-          
-               <xs:enumeration value="always"/>
-          
-               <xs:enumeration value="never"/>
-        
-            </xs:restriction>
-      
-         </xs:simpleType>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="path-type">
-      
-         <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>
-      
-         </xs:annotation>
-      
-         <xs:simpleType>
-        
-            <xs:restriction base="xs:token">
-          
-               <xs:enumeration value="ant"/>
-          
-               <xs:enumeration value="regex"/>
-        
-            </xs:restriction>
-      
-         </xs:simpleType>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="lowercase-comparisons">
-      
-         <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>
-      
-         <xs:simpleType>
-        
-            <xs:restriction base="xs:token">
-          
-               <xs:enumeration value="true"/>
-          
-               <xs:enumeration value="false"/>
-        
-            </xs:restriction>
-      
-         </xs:simpleType>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="servlet-api-provision">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Provides versions of HttpServletRequest security methods such as isUserInRole() and getPrincipal() which are implemented by accessing the Spring SecurityContext. Defaults to "true".</xs:documentation>
-      
-         </xs:annotation>
-      
-         <xs:simpleType>
-        
-            <xs:restriction base="xs:token">
-          
-               <xs:enumeration value="true"/>
-          
-               <xs:enumeration value="false"/>
-        
-            </xs:restriction>
-      
-         </xs:simpleType>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="access-decision-manager-ref" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Optional attribute specifying the ID of the AccessDecisionManager implementation which should be used for authorizing HTTP requests.</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="realm" type="xs:string">
-      
-         <xs:annotation>
-        
-            <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">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Indicates whether an existing session should be invalidated when a user authenticates and a new session started. If set to "none" no change will be made. "newSession" will create a new empty session. "migrateSession" will create a new session and copy the session attributes to the new session. Defaults to "migrateSession".</xs:documentation>
-      
-         </xs:annotation>
-      
-         <xs:simpleType>
-        
-            <xs:restriction base="xs:token">
-          
-               <xs:enumeration value="none"/>
-          
-               <xs:enumeration value="newSession"/>
-          
-               <xs:enumeration value="migrateSession"/>
-        
-            </xs:restriction>
-      
-         </xs:simpleType>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-  
-   <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>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="access" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>The access configuration attributes that apply for the configured 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 apply. If not specified, the attributes will apply to any method.</xs:documentation>
-      
-         </xs:annotation>
-      
-         <xs:simpleType>
-        
-            <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"/>
-          
-               <xs:enumeration value="PUT"/>
-          
-               <xs:enumeration value="TRACE"/>
-        
-            </xs:restriction>
-      
-         </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 filters, will be applied to any other paths).</xs:documentation>
-      
-         </xs:annotation>
-      
-         <xs:simpleType>
-        
-            <xs:restriction base="xs:token">
-          
-               <xs:enumeration value="none"/>
-        
-            </xs:restriction>
-      
-         </xs:simpleType>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="requires-channel">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Used to specify that a URL must be accessed over http or https</xs:documentation>
-      
-         </xs:annotation>
-      
-         <xs:simpleType>
-        
-            <xs:restriction base="xs:token">
-          
-               <xs:enumeration value="http"/>
-          
-               <xs:enumeration value="https"/>
-          
-               <xs:enumeration value="any"/>
-        
-            </xs:restriction>
-      
-         </xs:simpleType>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-  
-   <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>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="logout-success-url" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Specifies the URL to display once the user has logged out. If not specified, defaults to /.</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="invalidate-session">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Specifies whether a logout also causes HttpSession invalidation, which is generally desirable. If unspecified, defaults to true.</xs:documentation>
-      
-         </xs:annotation>
-      
-         <xs:simpleType>
-        
-            <xs:restriction base="xs:token">
-          
-               <xs:enumeration value="true"/>
-          
-               <xs:enumeration value="false"/>
-        
-            </xs:restriction>
-      
-         </xs:simpleType>
-    
-      </xs:attribute>
-  
-   </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>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="default-target-url" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>The URL that will be redirected to after successful authentication, if the user's previous action could not be resumed. This generally happens if the user visits a login page without having first requested a secured operation that triggers authentication. If unspecified, defaults to the root of the application.</xs:documentation>
-      
-         </xs:annotation>
-    
-      </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>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="authentication-failure-url" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>The URL for the login failure page. If no login failure URL is specified, Spring Security will automatically create a failure login URL at /spring_security_login?login_error and a corresponding filter to render that login failure URL when requested.</xs:documentation>
-      
-         </xs:annotation>
-    
+
+        <xs:annotation>
+
+          <xs:documentation>A bean identifier, used for referring to the bean elsewhere in the
+            context.</xs:documentation>
+
+        </xs:annotation>
+
       </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-   <xs:element name="openid-login">
-      <xs:annotation>
-      
-         <xs:documentation>Sets up form login for authentication with an Open ID identity</xs:documentation>
-    
-      </xs:annotation>
-      <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>
-        
-            </xs:annotation>
-      
-         </xs:attribute>
-    
-      </xs:complexType>
-   </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>
-      <xs:complexType>
-      
-         <xs:sequence>
-        
-            <xs:element maxOccurs="unbounded" name="filter-chain">
-               <xs:annotation>
-      
-                  <xs:documentation>Used within filter-chain-map to define a specific URL pattern and the list of filters which apply to the URLs matching that pattern. When multiple filter-chain elements are used within a filter-chain-map element, the most specific 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>
-            </xs:element>
-      
-         </xs:sequence>
-      
-         <xs:attributeGroup ref="security:filter-chain-map.attlist"/>
-    
-      </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">
-    
-      <xs:attribute name="pattern" use="required" type="xs:string"/>
-    
-      <xs:attribute name="filters" use="required" type="xs:string"/>
-  
-   </xs:attributeGroup>
-  
-   <xs:element name="filter-invocation-definition-source">
-      <xs:annotation>
-      
-         <xs:documentation>Used to explicitly configure a FilterInvocationDefinitionSource bean for use with a FilterSecurityInterceptor. Usually only needed if you are configuring a 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>
-        
-            <xs:element maxOccurs="unbounded" name="intercept-url">
-               <xs:annotation>
-      
-                  <xs:documentation>Specifies the access attributes and/or filter list for a particular set of URLs.</xs:documentation>
-    
-               </xs:annotation>
-               <xs:complexType>
-      
-                  <xs:attributeGroup ref="security:intercept-url.attlist"/>
-    
-               </xs:complexType>
-            </xs:element>
-      
-         </xs:sequence>
-      
-         <xs:attributeGroup ref="security:fids.attlist"/>
-    
-      </xs:complexType>
-   </xs:element>
-  
-   <xs:attributeGroup name="fids.attlist">
-    
+
+      <xs:attributeGroup ref="security:properties-file"/>
+
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="properties-file">
+
+    <xs:attribute name="properties" type="xs:string"/>
+
+  </xs:attributeGroup>
+
+  <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"/>
+
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="user.attlist">
+
+    <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">
+
+      <xs:annotation>
+
+        <xs:documentation>The password assigned to the user. This may be hashed if the corresponding
+          authentication provider supports hashing (remember to set the "hash" attribute of the
+          "user-service" element).</xs:documentation>
+
+      </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>
+
+      </xs:annotation>
+
+    </xs:attribute>
+
+    <xs:attribute name="locked">
+
+      <xs:annotation>
+
+        <xs:documentation>Can be set to "true" to mark an account as locked and unusable.</xs:documentation>
+
+      </xs:annotation>
+
+      <xs:simpleType>
+
+        <xs:restriction base="xs:token">
+
+          <xs:enumeration value="true"/>
+
+          <xs:enumeration value="false"/>
+
+        </xs:restriction>
+
+      </xs:simpleType>
+
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <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: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>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="lowercase-comparisons">
-      
-         <xs:annotation>
-        
-            <xs:documentation>as for http element</xs:documentation>
-      
-         </xs:annotation>
-      
-         <xs:simpleType>
-        
-            <xs:restriction base="xs:token">
-          
-               <xs:enumeration value="true"/>
-          
-               <xs:enumeration value="false"/>
-        
-            </xs:restriction>
-      
-         </xs:simpleType>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="path-type">
-      
-         <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>
-      
-         </xs:annotation>
-      
-         <xs:simpleType>
-        
-            <xs:restriction base="xs:token">
-          
-               <xs:enumeration value="ant"/>
-          
-               <xs:enumeration value="regex"/>
-        
-            </xs:restriction>
-      
-         </xs:simpleType>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-  
-  
-   <xs:attributeGroup name="concurrent-sessions.attlist">
-    
-      <xs:attribute name="max-sessions" type="xs:positiveInteger"/>
-    
-      <xs:attribute name="expired-url" type="xs:string"/>
-    
-      <xs:attribute name="exception-if-maximum-exceeded">
-      
-         <xs:simpleType>
-        
-            <xs:restriction base="xs:token">
-          
-               <xs:enumeration value="true"/>
-          
-               <xs:enumeration value="false"/>
-        
-            </xs:restriction>
-      
-         </xs:simpleType>
-    
-      </xs:attribute>
-  
-   </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:attributeGroup>
-  
-  
-   <xs:attributeGroup name="anonymous.attlist">
-    
-      <xs:attribute name="key" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>The key used between the provider and filter. This generally does not need to be set. If unset, it will default to "doesNotMatter".</xs:documentation>
-      
-         </xs:annotation>
-    
-      </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>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="granted-authority" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>The granted authority that should be assigned to the anonymous request. Commonly this is used to assign the anonymous request particular roles, which can subsequently be used in authorization decisions. If unset, defaults to "ROLE_ANONYMOUS".</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-  
-   <xs:element name="port-mapping">
-      <xs:complexType>
-      
-         <xs:attributeGroup ref="security:http-port"/>
-      
-         <xs:attributeGroup ref="security:https-port"/>
-    
-      </xs:complexType>
-   </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"/>
-  
-   </xs:attributeGroup>
-  
-  
-   <xs:attributeGroup name="x509.attlist">
-    
-      <xs:attribute name="subject-principal-regex" type="xs:string">
-      
-         <xs:annotation>
-        
-            <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">
-      
-         <xs:annotation>
-        
-            <xs:documentation>A reference to a user-service (or UserDetailsService bean) Id</xs:documentation>
-      
-         </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 AuthenticationManager will automatically be registered. This element simple allows you to define an alias to allow you to reference the authentication-manager in your own beans. </xs:documentation>
-    
-      </xs:annotation>
-      <xs:complexType>
-      
-         <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 bean</xs:documentation>
-    
-      </xs:annotation>
-    
-      <xs:attribute name="alias" use="required" type="xs:ID"/>
-  
-   </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>
-      <xs:complexType>
-      
-         <xs:choice minOccurs="0" maxOccurs="unbounded">
-        
-            <xs:element ref="security:any-user-service"/>
-        
-            <xs:element ref="security:password-encoder"/>
-      
-         </xs:choice>
-      
-         <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>
-        
-            <xs:documentation>A reference to a user-service (or UserDetailsService bean) Id</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-   <xs:element name="custom-authentication-provider">
-      <xs:complexType/>
-   </xs:element>
-  
-   <xs:element name="user-service" substitutionGroup="security:any-user-service">
-      <xs:annotation>
-      
-         <xs:documentation>Creates an in-memory UserDetailsService from a properties file or a list of "user" child elements.</xs:documentation>
-    
-      </xs:annotation>
-      <xs:complexType>
-      
-         <xs:sequence>
-        
-            <xs:element minOccurs="0" maxOccurs="unbounded" ref="security:user"/>
-      
-         </xs:sequence>
-      
-         <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>
-        
-            </xs:annotation>
-      
-         </xs:attribute>
-      
-         <xs:attributeGroup ref="security:properties-file"/>
-    
-      </xs:complexType>
-   </xs:element>
-  
-   <xs:attributeGroup name="properties-file">
-    
-      <xs:attribute name="properties" type="xs:string"/>
-  
-   </xs:attributeGroup>
-  
-   <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"/>
-    
-      </xs:complexType>
-   </xs:element>
-  
-   <xs:attributeGroup name="user.attlist">
-    
-      <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">
-      
-         <xs:annotation>
-        
-            <xs:documentation>The password assigned to the user. This may be hashed if the corresponding authentication provider supports hashing (remember to set the "hash" attribute of the "user-service" element).</xs:documentation>
-      
-         </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>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="locked">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Can be set to "true" to mark an account as locked and unusable.</xs:documentation>
-      
-         </xs:annotation>
-      
-         <xs:simpleType>
-        
-            <xs:restriction base="xs:token">
-          
-               <xs:enumeration value="true"/>
-          
-               <xs:enumeration value="false"/>
-        
-            </xs:restriction>
-      
-         </xs:simpleType>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-   <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: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>
-        
-            </xs:annotation>
-      
-         </xs:attribute>
-      
-         <xs:attributeGroup ref="security:jdbc-user-service.attlist"/>
-    
-      </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 tables.</xs:documentation>
-      
-         </xs:annotation>
-    
+
+        <xs:annotation>
+
+          <xs:documentation>A bean identifier, used for referring to the bean elsewhere in the
+            context.</xs:documentation>
+
+        </xs:annotation>
+
       </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-   <xs:element name="any-user-service" abstract="true"/>
-  
-   <xs:group name="custom-filter">
-    
-      <xs:sequence>
-      
-         <xs:element minOccurs="0" ref="security:custom-filter"/>
-    
-      </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 filter must implement the Ordered interface directly. </xs:documentation>
-    
-      </xs:annotation>
-      <xs:complexType>
-      
-         <xs:attribute name="after" 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 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>
-          
-               <xs:documentation>The filter immediately before which the custom-filter should be placed in the chain</xs:documentation>
-        
-            </xs:annotation>
-      
-         </xs:attribute>
-    
-      </xs:complexType>
-   </xs:element>
-  
-   <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 Security filters. The filter names map to specific Spring Security implementation filters. </xs:documentation>
-      
-         </xs:annotation>
-    
+
+      <xs:attributeGroup ref="security:jdbc-user-service.attlist"/>
+
+    </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 tables.</xs:documentation>
+
+      </xs:annotation>
+
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="any-user-service" abstract="true"/>
+
+  <xs:group name="custom-filter">
+
+    <xs:sequence>
+
+      <xs:element minOccurs="0" ref="security:custom-filter"/>
+
+    </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
+        filter must implement the Ordered interface directly. </xs:documentation>
+
+    </xs:annotation>
+    <xs:complexType>
+
+      <xs:attribute name="after" 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
+            Security filters. The filter names map to specific Spring Security implementation
+            filters. </xs:documentation>
+
+        </xs:annotation>
+
       </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-   <xs:attributeGroup name="before">
-    
-      <xs:attribute name="before" use="required" type="security:named-security-filter">
-      
-         <xs:annotation>
-        
-            <xs:documentation>The filter immediately before which the custom-filter should be placed in the chain</xs:documentation>
-      
-         </xs:annotation>
-    
+
+      <xs:attribute name="before" type="security:named-security-filter">
+
+        <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>
-  
-   <xs:simpleType name="named-security-filter">
-    
-      <xs:restriction base="xs:token">
-      
-         <xs:enumeration value="FIRST"/>
-      
-         <xs:enumeration value="CHANNEL_FILTER"/>
-      
-         <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"/>
-      
-         <xs:enumeration value="AUTHENTICATION_PROCESSING_FILTER"/>
-      
-         <xs:enumeration value="BASIC_PROCESSING_FILTER"/>
-      
-         <xs:enumeration value="SERVLET_API_SUPPORT_FILTER"/>
-      
-         <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"/>
-    
-      </xs:restriction>
-  
-   </xs:simpleType>
+
+    </xs:complexType>
+  </xs:element>
+
+  <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
+          Security filters. The filter names map to specific Spring Security implementation filters. </xs:documentation>
+
+      </xs:annotation>
+
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:attributeGroup name="before">
+
+    <xs:attribute name="before" use="required" type="security:named-security-filter">
+
+      <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>
+
+  <xs:simpleType name="named-security-filter">
+
+    <xs:restriction base="xs:token">
+
+      <xs:enumeration value="FIRST"/>
+
+      <xs:enumeration value="CHANNEL_FILTER"/>
+
+      <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"/>
+
+      <xs:enumeration value="AUTHENTICATION_PROCESSING_FILTER"/>
+
+      <xs:enumeration value="BASIC_PROCESSING_FILTER"/>
+
+      <xs:enumeration value="SERVLET_API_SUPPORT_FILTER"/>
+
+      <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"/>
+
+    </xs:restriction>
+
+  </xs:simpleType>
 
 </xs:schema>

samples/tutorial/src/main/webapp/WEB-INF/applicationContext-security-ns.xml

@@ -12,7 +12,7 @@
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
                         http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.xsd">
 
-	<global-method-security secured="true"/>
+	<global-method-security secured-annotations="enabled"/>
 
     <http>
         <intercept-url pattern="/secure/extreme/**" access="ROLE_SUPERVISOR"/>