SEC-1158: Decoupling of Pre/Post annotations implementation from Spring EL.

config/src/main/java/org/springframework/security/config/ConfigUtils.java

@@ -12,7 +12,6 @@ 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.ParserContext;
-import org.springframework.security.access.expression.method.MethodExpressionVoter;
 import org.springframework.security.access.intercept.AfterInvocationProviderManager;
 import org.springframework.security.access.vote.AccessDecisionVoter;
 import org.springframework.security.access.vote.AffirmativeBased;
@@ -35,7 +34,7 @@ abstract class ConfigUtils {
     static void registerDefaultMethodAccessManagerIfNecessary(ParserContext parserContext) {
         if (!parserContext.getRegistry().containsBeanDefinition(BeanIds.METHOD_ACCESS_MANAGER)) {
             parserContext.getRegistry().registerBeanDefinition(BeanIds.METHOD_ACCESS_MANAGER,
-                    createAccessManagerBean(MethodExpressionVoter.class, RoleVoter.class, AuthenticatedVoter.class));
+                    createAccessManagerBean(RoleVoter.class, AuthenticatedVoter.class));
         }
     }
 

config/src/main/java/org/springframework/security/config/ContextSourceSettingPostProcessor.java

@@ -14,7 +14,7 @@ import org.springframework.util.ClassUtils;
  *
  * @author Luke Taylor
  * @version $Id$
- * @since 2.5
+ * @since 3.0
  */
 class ContextSourceSettingPostProcessor implements BeanFactoryPostProcessor, Ordered {
     private static final String REQUIRED_CONTEXT_SOURCE_CLASS_NAME = "org.springframework.ldap.core.support.BaseLdapPathContextSource";
@@ -27,7 +27,7 @@ class ContextSourceSettingPostProcessor implements BeanFactoryPostProcessor, Ord
         Class<?> contextSourceClass;
 
         try {
-            contextSourceClass = ClassUtils.forName(REQUIRED_CONTEXT_SOURCE_CLASS_NAME);
+            contextSourceClass = ClassUtils.forName(REQUIRED_CONTEXT_SOURCE_CLASS_NAME, ClassUtils.getDefaultClassLoader());
         } catch (ClassNotFoundException e) {
             throw new SecurityConfigurationException("Couldn't locate: " + REQUIRED_CONTEXT_SOURCE_CLASS_NAME + ". " +
                     " If you are using LDAP with Spring Security, please ensure that you include the spring-ldap " +

config/src/main/java/org/springframework/security/config/Elements.java

@@ -22,6 +22,10 @@ public abstract class Elements {
     public static final String LDAP_USER_SERVICE = "ldap-user-service";
     public static final String PROTECT_POINTCUT = "protect-pointcut";
     public static final String EXPRESSION_HANDLER = "expression-handler";
+    public static final String INVOCATION_HANDLING = "pre-post-annotation-handling";
+    public static final String INVOCATION_ATTRIBUTE_FACTORY = "invocation-attribute-factory";
+    public static final String PRE_INVOCATION_ADVICE = "pre-invocation-advice";
+    public static final String POST_INVOCATION_ADVICE = "post-invocation-advice";
     public static final String PROTECT = "protect";
     public static final String CONCURRENT_SESSIONS = "concurrent-session-control";
     public static final String LOGOUT = "logout";

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

@@ -1,5 +1,7 @@
 package org.springframework.security.config;
 
+import static org.springframework.security.config.Elements.*;
+
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -18,14 +20,21 @@ import org.springframework.beans.factory.xml.BeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.access.SecurityConfig;
-import org.springframework.security.access.expression.method.MethodExpressionAfterInvocationProvider;
-import org.springframework.security.access.expression.method.MethodExpressionVoter;
-import org.springframework.security.access.expression.support.DefaultMethodSecurityExpressionHandler;
+import org.springframework.security.access.annotation.Jsr250MethodSecurityMetadataSource;
+import org.springframework.security.access.annotation.Jsr250Voter;
+import org.springframework.security.access.annotation.SecuredAnnotationSecurityMetadataSource;
+import org.springframework.security.access.expression.method.DefaultMethodSecurityExpressionHandler;
+import org.springframework.security.access.expression.method.ExpressionBasedAnnotationAttributeFactory;
+import org.springframework.security.access.expression.method.ExpressionBasedPostInvocationAdvice;
+import org.springframework.security.access.expression.method.ExpressionBasedPreInvocationAdvice;
 import org.springframework.security.access.intercept.method.DelegatingMethodSecurityMetadataSource;
 import org.springframework.security.access.intercept.method.MapBasedMethodSecurityMetadataSource;
 import org.springframework.security.access.intercept.method.ProtectPointcutPostProcessor;
 import org.springframework.security.access.intercept.method.aopalliance.MethodSecurityInterceptor;
 import org.springframework.security.access.intercept.method.aopalliance.MethodSecurityMetadataSourceAdvisor;
+import org.springframework.security.access.prepost.PostInvocationAdviceProvider;
+import org.springframework.security.access.prepost.PreInvocationAuthorizationAdviceVoter;
+import org.springframework.security.access.prepost.PrePostAnnotationSecurityMetadataSource;
 import org.springframework.security.access.vote.AffirmativeBased;
 import org.springframework.security.access.vote.AuthenticatedVoter;
 import org.springframework.security.access.vote.RoleVoter;
@@ -45,11 +54,6 @@ class GlobalMethodSecurityBeanDefinitionParser implements BeanDefinitionParser {
 
     private final Log logger = LogFactory.getLog(getClass());
 
-    static final String SECURED_METHOD_DEFINITION_SOURCE_CLASS = "org.springframework.security.access.annotation.SecuredMethodSecurityMetadataSource";
-    static final String EXPRESSION_METHOD_DEFINITION_SOURCE_CLASS = "org.springframework.security.access.expression.method.ExpressionAnnotationMethodSecurityMetadataSource";
-    static final String JSR_250_SECURITY_METHOD_DEFINITION_SOURCE_CLASS = "org.springframework.security.access.annotation.Jsr250MethodSecurityMetadataSource";
-    static final String JSR_250_VOTER_CLASS = "org.springframework.security.access.annotation.Jsr250Voter";
-
     /*
      * Internal Bean IDs which are only used within this class
      */
@@ -65,7 +69,7 @@ class GlobalMethodSecurityBeanDefinitionParser implements BeanDefinitionParser {
     private static final String ATT_RUN_AS_MGR = "run-as-manager-ref";
     private static final String ATT_USE_JSR250 = "jsr250-annotations";
     private static final String ATT_USE_SECURED = "secured-annotations";
-    private static final String ATT_USE_EXPRESSIONS = "expression-annotations";
+    private static final String ATT_USE_PREPOST = "pre-post-annotations";
 
     @SuppressWarnings("unchecked")
     public BeanDefinition parse(Element element, ParserContext parserContext) {
@@ -75,12 +79,12 @@ class GlobalMethodSecurityBeanDefinitionParser implements BeanDefinitionParser {
 
         boolean jsr250Enabled = "enabled".equals(element.getAttribute(ATT_USE_JSR250));
         boolean useSecured = "enabled".equals(element.getAttribute(ATT_USE_SECURED));
-        boolean expressionsEnabled = "enabled".equals(element.getAttribute(ATT_USE_EXPRESSIONS));
-        BeanDefinition expressionVoter = null;
+        boolean prePostAnnotationsEnabled = "enabled".equals(element.getAttribute(ATT_USE_PREPOST));
+        BeanDefinition preInvocationVoter = null;
 
         // Now create a Map<String, ConfigAttribute> for each <protect-pointcut> sub-element
         Map<String, List<ConfigAttribute>> pointcutMap = parseProtectPointcuts(parserContext,
-                DomUtils.getChildElementsByTagName(element, Elements.PROTECT_POINTCUT));
+                DomUtils.getChildElementsByTagName(element, PROTECT_POINTCUT));
 
         if (pointcutMap.size() > 0) {
             // SEC-1016: Put the pointcut MDS first, but only add it if there are actually any pointcuts defined.
@@ -89,39 +93,70 @@ class GlobalMethodSecurityBeanDefinitionParser implements BeanDefinitionParser {
             registerProtectPointcutPostProcessor(parserContext, pointcutMap, mapBasedMethodSecurityMetadataSource, source);
         }
 
-        if (expressionsEnabled) {
-            Element expressionHandlerElt = DomUtils.getChildElementByTagName(element, Elements.EXPRESSION_HANDLER);
-            String expressionHandlerRef = expressionHandlerElt == null ? null : expressionHandlerElt.getAttribute("ref");
+        if (prePostAnnotationsEnabled) {
+            Element prePostElt = DomUtils.getChildElementByTagName(element, INVOCATION_HANDLING);
+            Element expressionHandlerElt = DomUtils.getChildElementByTagName(element, EXPRESSION_HANDLER);
 
-            if (StringUtils.hasText(expressionHandlerRef)) {
-                logger.info("Using bean '" + expressionHandlerRef + "' as method SecurityExpressionHandler implementation");
-            } else {
-                parserContext.getRegistry().registerBeanDefinition(EXPRESSION_HANDLER_ID, new RootBeanDefinition(DefaultMethodSecurityExpressionHandler.class));
-                logger.warn("Expressions were enabled for method security but no SecurityExpressionHandler was configured. " +
-                        "All hasPermision() expressions will evaluate to false.");
-                expressionHandlerRef = EXPRESSION_HANDLER_ID;
+            if (prePostElt != null && expressionHandlerElt != null) {
+                parserContext.getReaderContext().error(INVOCATION_HANDLING + " and " +
+                        EXPRESSION_HANDLER + " cannot be used together ", source);
             }
-            BeanDefinitionBuilder expressionVoterBldr = BeanDefinitionBuilder.rootBeanDefinition(MethodExpressionVoter.class);
-            BeanDefinitionBuilder afterInvocationProvider = BeanDefinitionBuilder.rootBeanDefinition(MethodExpressionAfterInvocationProvider.class);
-            expressionVoterBldr.addPropertyReference("expressionHandler", expressionHandlerRef);
-            expressionVoter = expressionVoterBldr.getBeanDefinition();
+
+            BeanDefinitionBuilder preInvocationVoterBldr = BeanDefinitionBuilder.rootBeanDefinition(PreInvocationAuthorizationAdviceVoter.class);
             // After-invocation provider to handle post-invocation filtering and authorization expression annotations.
-            afterInvocationProvider.addPropertyReference("expressionHandler", expressionHandlerRef);
-            ConfigUtils.getRegisteredAfterInvocationProviders(parserContext).add(afterInvocationProvider.getBeanDefinition());
-            // Add the expression method definition source, which will obtain its parser from the registered expression
-            // handler
-            BeanDefinitionBuilder mds = BeanDefinitionBuilder.rootBeanDefinition(EXPRESSION_METHOD_DEFINITION_SOURCE_CLASS);
-            mds.addConstructorArgReference(expressionHandlerRef);
+            BeanDefinitionBuilder afterInvocationBldr = BeanDefinitionBuilder.rootBeanDefinition(PostInvocationAdviceProvider.class);
+            // The metadata source for the security interceptor
+            BeanDefinitionBuilder mds = BeanDefinitionBuilder.rootBeanDefinition(PrePostAnnotationSecurityMetadataSource.class);
+
+            if (prePostElt != null) {
+                // Customized override of expression handling system
+                String attributeFactoryRef =
+                    DomUtils.getChildElementByTagName(prePostElt, INVOCATION_ATTRIBUTE_FACTORY).getAttribute("ref");
+                String preAdviceRef =
+                    DomUtils.getChildElementByTagName(prePostElt, PRE_INVOCATION_ADVICE).getAttribute("ref");
+                String postAdviceRef =
+                    DomUtils.getChildElementByTagName(prePostElt, POST_INVOCATION_ADVICE).getAttribute("ref");
+
+                mds.addConstructorArgReference(attributeFactoryRef);
+                preInvocationVoterBldr.addConstructorArgReference(preAdviceRef);
+                afterInvocationBldr.addConstructorArgReference(postAdviceRef);
+            } else {
+                // The default expression-based system
+                String expressionHandlerRef = expressionHandlerElt == null ? null : expressionHandlerElt.getAttribute("ref");
+
+                if (StringUtils.hasText(expressionHandlerRef)) {
+                    logger.info("Using bean '" + expressionHandlerRef + "' as method ExpressionHandler implementation");
+                } else {
+                    parserContext.getRegistry().registerBeanDefinition(EXPRESSION_HANDLER_ID, new RootBeanDefinition(DefaultMethodSecurityExpressionHandler.class));
+                    logger.warn("Expressions were enabled for method security but no SecurityExpressionHandler was configured. " +
+                            "All hasPermision() expressions will evaluate to false.");
+                    expressionHandlerRef = EXPRESSION_HANDLER_ID;
+                }
+
+                BeanDefinitionBuilder expressionPreAdviceBldr = BeanDefinitionBuilder.rootBeanDefinition(ExpressionBasedPreInvocationAdvice.class);
+                expressionPreAdviceBldr.addPropertyReference("expressionHandler", expressionHandlerRef);
+                preInvocationVoterBldr.addConstructorArgValue(expressionPreAdviceBldr.getBeanDefinition());
+
+                BeanDefinitionBuilder expressionPostAdviceBldr = BeanDefinitionBuilder.rootBeanDefinition(ExpressionBasedPostInvocationAdvice.class);
+                expressionPostAdviceBldr.addConstructorArgReference(expressionHandlerRef);
+                afterInvocationBldr.addConstructorArgValue(expressionPostAdviceBldr.getBeanDefinition());
+
+                BeanDefinitionBuilder annotationInvocationFactory = BeanDefinitionBuilder.rootBeanDefinition(ExpressionBasedAnnotationAttributeFactory.class);
+                annotationInvocationFactory.addConstructorArgReference(expressionHandlerRef);
+                mds.addConstructorArgValue(annotationInvocationFactory.getBeanDefinition());
+            }
 
+            preInvocationVoter = preInvocationVoterBldr.getBeanDefinition();
+            ConfigUtils.getRegisteredAfterInvocationProviders(parserContext).add(afterInvocationBldr.getBeanDefinition());
             delegates.add(mds.getBeanDefinition());
         }
 
         if (useSecured) {
-            delegates.add(BeanDefinitionBuilder.rootBeanDefinition(SECURED_METHOD_DEFINITION_SOURCE_CLASS).getBeanDefinition());
+            delegates.add(BeanDefinitionBuilder.rootBeanDefinition(SecuredAnnotationSecurityMetadataSource.class).getBeanDefinition());
         }
 
         if (jsr250Enabled) {
-            delegates.add(BeanDefinitionBuilder.rootBeanDefinition(JSR_250_SECURITY_METHOD_DEFINITION_SOURCE_CLASS).getBeanDefinition());
+            delegates.add(BeanDefinitionBuilder.rootBeanDefinition(Jsr250MethodSecurityMetadataSource.class).getBeanDefinition());
         }
 
         registerDelegatingMethodSecurityMetadataSource(parserContext, delegates, source);
@@ -129,7 +164,7 @@ class GlobalMethodSecurityBeanDefinitionParser implements BeanDefinitionParser {
         String accessManagerId = element.getAttribute(ATT_ACCESS_MGR);
 
         if (!StringUtils.hasText(accessManagerId)) {
-            registerAccessManager(parserContext, jsr250Enabled, expressionVoter);
+            registerAccessManager(parserContext, jsr250Enabled, preInvocationVoter);
             accessManagerId = ACCESS_MANAGER_ID;
         }
 
@@ -161,7 +196,7 @@ class GlobalMethodSecurityBeanDefinitionParser implements BeanDefinitionParser {
         voters.add(new RootBeanDefinition(AuthenticatedVoter.class));
 
         if (jsr250Enabled) {
-            voters.add(new RootBeanDefinition(JSR_250_VOTER_CLASS, null, null));
+            voters.add(new RootBeanDefinition(Jsr250Voter.class));
         }
 
         accessMgrBuilder.addPropertyValue("decisionVoters", voters);

config/src/main/java/org/springframework/security/config/SaltSourceBeanDefinitionParser.java

@@ -5,8 +5,8 @@ import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.RuntimeBeanReference;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.security.authentication.dao.salt.ReflectionSaltSource;
-import org.springframework.security.authentication.dao.salt.SystemWideSaltSource;
+import org.springframework.security.authentication.dao.ReflectionSaltSource;
+import org.springframework.security.authentication.dao.SystemWideSaltSource;
 import org.springframework.util.StringUtils;
 import org.w3c.dom.Element;
 

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

@@ -184,10 +184,10 @@ protect.attlist &=
 
 global-method-security =
     ## Provides method security for all beans registered in the Spring application context. Specifically, beans will be scanned for matches with the ordered list of "protect-pointcut" sub-elements, Spring Security annotations and/or. 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 four sources of method security metadata (ie "protect-pointcut" declarations, expression annotations, @Secured and also JSR250 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 in annotations. If using annotations, the order of precedence is EL-based (@PreAuthorize etc.), @Secured and finally JSR-250.
-	element global-method-security {global-method-security.attlist, expression-handler?, protect-pointcut*}
+	element global-method-security {global-method-security.attlist, (pre-post-annotation-handling | expression-handler)?, protect-pointcut*}
 global-method-security.attlist &=
-    ## Specifies whether the use of Spring Security's expression-based annotations (@PreFilter, @PreAuthorize, @PostFilter, @PostAuthorize) should be enabled for this application context. Defaults to "disabled".
-    attribute expression-annotations {"disabled" | "enabled" }?
+    ## Specifies whether the use of Spring Security's pre and post invocation annotations (@PreFilter, @PreAuthorize, @PostFilter, @PostAuthorize) should be enabled for this application context. Defaults to "disabled".
+    attribute pre-post-annotations {"disabled" | "enabled" }?
 global-method-security.attlist &=
     ## Specifies whether the use of Spring Security's @Secured annotations should be enabled for this application context. Defaults to "disabled".
     attribute secured-annotations {"disabled" | "enabled" }?
@@ -201,6 +201,21 @@ global-method-security.attlist &=
     ## Optional RunAsmanager implementation which will be used by the configured MethodSecurityInterceptor
     attribute run-as-manager-ref {xsd:token}?
 
+pre-post-annotation-handling =
+    ## Allows the default expression-based mechanism for handling Spring Security's pre and post invocation annotations (@PreFilter, @PreAuthorize, @PostFilter, @PostAuthorize) to be replace entirely. Only applies if these annotations are enabled. 
+    element pre-post-annotation-handling {invocation-attribute-factory, pre-invocation-advice, post-invocation-advice}    
+    
+invocation-attribute-factory =
+    ## Defines the PrePostInvocationAttributeFactory instance which is used to generate pre and post invocation metadata from the annotated methods.  
+    element invocation-attribute-factory {ref}
+    
+pre-invocation-advice =
+    element pre-invocation-advice {ref}
+
+post-invocation-advice =
+    element post-invocation-advice {ref}
+
+    
 expression-handler =
     ## Defines the SecurityExpressionHandler instance which will be used if expression-based access-control is enabled. A default implementation (with no ACL support) will be used if not supplied.
     element expression-handler {ref}

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

@@ -1,1618 +1,1636 @@
 <?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="sha-256"/>
-               <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:positiveInteger">
-         <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:token">
-         <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:token">
-         <xs:annotation>
-            <xs:documentation>Defines a reference to a Spring bean Id.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-   </xs:attributeGroup>
-   <xs:attributeGroup name="cache-ref">
-      <xs:attribute name="cache-ref" use="required" type="xs:token">
-         <xs:annotation>
-            <xs:documentation>Defines a reference to a cache for use with a
-               UserDetailsService.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-   </xs:attributeGroup>
-   <xs:attributeGroup name="user-service-ref">
-      <xs:attribute name="user-service-ref" use="required" type="xs:token">
-         <xs:annotation>
-            <xs:documentation>A reference to a user-service (or UserDetailsService bean)
-               Id</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-   </xs:attributeGroup>
-   <xs:attributeGroup name="data-source-ref">
-      <xs:attribute name="data-source-ref" use="required" type="xs:token">
-         <xs:annotation>
-            <xs:documentation>A reference to a DataSource bean</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-   </xs:attributeGroup>
-   <xs:attributeGroup name="password-encoder.attlist">
-      <xs:attribute name="ref" type="xs:token">
-         <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="sha-256"/>
-               <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:token">
-         <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:token">
-         <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:simpleType name="boolean">
-      <xs:restriction base="xs:token">
-         <xs:enumeration value="true"/>
-         <xs:enumeration value="false"/>
-      </xs:restriction>
-   </xs:simpleType>
-   <xs:attributeGroup name="role-prefix">
-      <xs:attribute name="role-prefix" use="required" type="xs:token">
-         <xs:annotation>
-            <xs:documentation>A non-empty string prefix that will be added to role strings loaded
-               from persistent storage (e.g. "ROLE_"). Use the value "none" for no prefix in cases
-               where the default is non-empty.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-   </xs:attributeGroup>
-   <xs:attributeGroup name="use-expressions">
-      <xs:attribute name="use-expressions" use="required" type="security:boolean">
-         <xs:annotation>
-            <xs:documentation>Enables the use of expressions in the 'access' attributes in
-               &lt;intercept-url&gt; elements rather than the traditional list of
-               configuration attributes. Defaults to 'false'. If enabled, each attribute should
-               contain a single boolean expression. If the expression evaluates to 'true', access
-               will be granted. </xs:documentation>
-         </xs:annotation>
-      </xs: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:token">
-         <xs:annotation>
-            <xs:documentation>Specifies a URL.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="port" type="xs:positiveInteger">
-         <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:annotation>
-            <xs:documentation>The password for the manager DN.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <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:token">
-         <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:token">
-         <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:token">
-         <xs:annotation>
-            <xs:documentation>Search base for group membership searches. Defaults to "" (searching
-               from the root).</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:token">
-         <xs:annotation>
-            <xs:documentation>The LDAP filter used to search for users (optional). For example
-               "(uid={0})". The substituted parameter is the user's login name.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-   </xs:attributeGroup>
-   <xs:attributeGroup name="user-search-base-attribute">
-      <xs:attribute name="user-search-base" use="required" type="xs:token">
-         <xs:annotation>
-            <xs:documentation>Search base for user searches. Defaults to "". Only used with a
-               'user-search-filter'.</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:token">
-         <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:attributeGroup name="user-details-class-attribute">
-      <xs:attribute name="user-details-class" use="required">
-         <xs:annotation>
-            <xs:documentation>Allows the objectClass of the user entry to be specified. If set, the
-               framework will attempt to load standard attributes for the defined class into the
-               returned UserDetails object</xs:documentation>
-         </xs:annotation>
-         <xs:simpleType>
-            <xs:restriction base="xs:token">
-               <xs:enumeration value="person"/>
-               <xs:enumeration value="inetOrgPerson"/>
-            </xs:restriction>
-         </xs:simpleType>
-      </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:token">
-         <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:token">
-         <xs:annotation>
-            <xs:documentation>The LDAP filter used to search for users (optional). For example
-               "(uid={0})". The substituted parameter is the user's login name.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="user-search-base" type="xs:token">
-         <xs:annotation>
-            <xs:documentation>Search base for user searches. Defaults to "". Only used with a
-               'user-search-filter'.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="group-search-filter" type="xs:token">
-         <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:token">
-         <xs:annotation>
-            <xs:documentation>Search base for group membership searches. Defaults to "" (searching
-               from the root).</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="group-role-attribute" type="xs:token">
-         <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="cache-ref" type="xs:token">
-         <xs:annotation>
-            <xs:documentation>Defines a reference to a cache for use with a
-               UserDetailsService.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="role-prefix" type="xs:token">
-         <xs:annotation>
-            <xs:documentation>A non-empty string prefix that will be added to role strings loaded
-               from persistent storage (e.g. "ROLE_"). Use the value "none" for no prefix in cases
-               where the default is non-empty.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="user-details-class">
-         <xs:annotation>
-            <xs:documentation>Allows the objectClass of the user entry to be specified. If set, the
-               framework will attempt to load standard attributes for the defined class into the
-               returned UserDetails object</xs:documentation>
-         </xs:annotation>
-         <xs:simpleType>
-            <xs:restriction base="xs:token">
-               <xs:enumeration value="person"/>
-               <xs:enumeration value="inetOrgPerson"/>
-            </xs:restriction>
-         </xs:simpleType>
-      </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" 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" 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:annotation>
-                                    <xs:documentation>Password salting strategy. A system-wide
-                                       constant or a property from the UserDetails object can be
-                                       used.</xs:documentation>
-                                 </xs:annotation>
-                                 <xs:complexType>
-                                    <xs:attribute name="user-property" type="xs:token">
-                                       <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:token">
-                                       <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:attribute name="ref" type="xs:token">
-                                       <xs:annotation>
-                                          <xs:documentation>Defines a reference to a Spring bean
-                                             Id.</xs:documentation>
-                                       </xs:annotation>
-                                    </xs:attribute>
-                                 </xs:complexType>
-                              </xs:element>
-                           </xs:sequence>
-                           <xs:attributeGroup ref="security:password-encoder.attlist"/>
-                        </xs:complexType>
-                     </xs:element>
-                  </xs:sequence>
-                  <xs:attributeGroup ref="security:password-compare.attlist"/>
-               </xs:complexType>
-            </xs:element>
-         </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:token">
-         <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-base" type="xs:token">
-         <xs:annotation>
-            <xs:documentation>Search base for user searches. Defaults to "". Only used with a
-               'user-search-filter'.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="user-search-filter" type="xs:token">
-         <xs:annotation>
-            <xs:documentation>The LDAP filter used to search for users (optional). For example
-               "(uid={0})". The substituted parameter is the user's login name.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="group-search-base" type="xs:token">
-         <xs:annotation>
-            <xs:documentation>Search base for group membership searches. Defaults to "" (searching
-               from the root).</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="group-search-filter" type="xs:token">
-         <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:token">
-         <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:token">
-         <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:attribute name="role-prefix" type="xs:token">
-         <xs:annotation>
-            <xs:documentation>A non-empty string prefix that will be added to role strings loaded
-               from persistent storage (e.g. "ROLE_"). Use the value "none" for no prefix in cases
-               where the default is non-empty.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="user-details-class">
-         <xs:annotation>
-            <xs:documentation>Allows the objectClass of the user entry to be specified. If set, the
-               framework will attempt to load standard attributes for the defined class into the
-               returned UserDetails object</xs:documentation>
-         </xs:annotation>
-         <xs:simpleType>
-            <xs:restriction base="xs:token">
-               <xs:enumeration value="person"/>
-               <xs:enumeration value="inetOrgPerson"/>
-            </xs:restriction>
-         </xs:simpleType>
-      </xs:attribute>
-   </xs:attributeGroup>
-   <xs:attributeGroup name="password-compare.attlist">
-      <xs:attribute name="password-attribute" type="xs:token">
-         <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="sha-256"/>
-               <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" 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: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:token">
-         <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:attributeGroup name="protect.attlist">
-      <xs:attribute name="method" use="required" type="xs:token">
-         <xs:annotation>
-            <xs:documentation>A method name</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="access" use="required" type="xs:token">
-         <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 matches with the ordered
-            list of "protect-pointcut" sub-elements, Spring Security annotations and/or. 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 four sources of method security
-            metadata (ie "protect-pointcut" declarations, expression annotations, @Secured and also
-            JSR250 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 in annotations. If using annotations, the order of precedence is EL-based
-            (@PreAuthorize etc.), @Secured and finally JSR-250.</xs:documentation>
-      </xs:annotation>
-      <xs:complexType>
-         <xs:sequence>
-            <xs:element minOccurs="0" ref="security:expression-handler"/>
-            <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="expression-annotations">
-         <xs:annotation>
-            <xs:documentation>Specifies whether the use of Spring Security's expression-based
-               annotations (@PreFilter, @PreAuthorize, @PostFilter, @PostAuthorize) should be
-               enabled for this application context. 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="secured-annotations">
-         <xs:annotation>
-            <xs:documentation>Specifies whether the use of Spring Security's @Secured annotations
-               should be enabled for this application context. 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:token">
-         <xs:annotation>
-            <xs:documentation>Optional AccessDecisionManager bean ID to override the default used
-               for method security.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="run-as-manager-ref" type="xs:token">
-         <xs:annotation>
-            <xs:documentation>Optional RunAsmanager implementation which will be used by the
-               configured MethodSecurityInterceptor</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-   </xs:attributeGroup>
-   <xs:element name="expression-handler">
-      <xs:annotation>
-         <xs:documentation>Defines the SecurityExpressionHandler instance which will be used if
-            expression-based access-control is enabled. A default implementation (with no ACL
-            support) will be used if not supplied.</xs:documentation>
-      </xs:annotation>
-      <xs:complexType>
-         <xs:attributeGroup ref="security:ref"/>
-      </xs:complexType>
-   </xs:element>
-   <xs:element name="custom-after-invocation-provider">
-      <xs:annotation>
-         <xs:documentation>Used to decorate an AfterInvocationProvider to specify that it should be
-            used with method security.</xs:documentation>
-      </xs:annotation>
-      <xs:complexType/>
-   </xs:element>
-   <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:token">
-         <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="access-denied-handler">
-               <xs:annotation>
-                  <xs:documentation>Defines the access-denied strategy that should be used. An
-                     access denied page can be defined or a reference to an AccessDeniedHandler
-                     instance. </xs:documentation>
-               </xs:annotation>
-               <xs:complexType>
-                  <xs:attributeGroup ref="security:access-denied-handler.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:annotation>
-                  <xs:documentation>Sets up remember-me authentication. If used with the "key"
-                     attribute (or no attributes) the cookie-only implementation will be used.
-                     Specifying "token-repository-ref" or "remember-me-data-source-ref" will use the
-                     more secure, persisten token approach. </xs:documentation>
-               </xs:annotation>
-               <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" type="security:boolean">
-         <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:attribute>
-      <xs:attribute name="use-expressions" type="security:boolean">
-         <xs:annotation>
-            <xs:documentation>Enables the use of expressions in the 'access' attributes in
-               &lt;intercept-url&gt; elements rather than the traditional list of
-               configuration attributes. Defaults to 'false'. If enabled, each attribute should
-               contain a single boolean expression. If the expression evaluates to 'true', access
-               will be granted. </xs:documentation>
-         </xs:annotation>
-      </xs: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". Note that if a custom SecurityContextRepository is set
-               using security-context-repository-ref, then the only value which can be set is
-               "always". Otherwise the session creation behaviour will be determined by the
-               repository bean implementation.</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="security-context-repository-ref" type="xs:token">
-         <xs:annotation>
-            <xs:documentation>A reference to a SecurityContextRepository bean. This can be used to
-               customize how the SecurityContext is stored between requests.</xs:documentation>
-         </xs:annotation>
-      </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" type="security:boolean">
-         <xs:annotation>
-            <xs:documentation>Whether test URLs should be converted to lower case prior to comparing
-               with defined path patterns. If unspecified, defaults to "true".</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="servlet-api-provision" type="security:boolean">
-         <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:attribute>
-      <xs:attribute name="access-decision-manager-ref" type="xs:token">
-         <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:token">
-         <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:attribute name="entry-point-ref" type="xs:token">
-         <xs:annotation>
-            <xs:documentation>Allows a customized AuthenticationEntryPoint to be
-               used.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="once-per-request" type="security:boolean">
-         <xs:annotation>
-            <xs:documentation>Corresponds to the observeOncePerRequest property of
-               FilterSecurityInterceptor. Defaults to "true"</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="access-denied-page" type="xs:token">
-         <xs:annotation>
-            <xs:documentation>Deprecated in favour of the access-denied-handler
-               element.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="disable-url-rewriting" type="security:boolean">
-         <xs:annotation>
-            <xs:documentation> </xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-   </xs:attributeGroup>
-   <xs:attributeGroup name="access-denied-handler.attlist">
-      <xs:attribute name="ref" type="xs:token">
-         <xs:annotation>
-            <xs:documentation>Defines a reference to a Spring bean Id.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="error-page" type="xs:token">
-         <xs:annotation>
-            <xs:documentation>The access denied page that an authenticated user will be redirected
-               to if they request a page which they don't have the authority to access.
-            </xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-   </xs:attributeGroup>
-   <xs:attributeGroup name="access-denied-handler-page">
-      <xs:attribute name="error-page" use="required" type="xs:token">
-         <xs:annotation>
-            <xs:documentation>The access denied page that an authenticated user will be redirected
-               to if they request a page which they don't have the authority to access.
-            </xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-   </xs:attributeGroup>
-   <xs:attributeGroup name="intercept-url.attlist">
-      <xs:attribute name="pattern" use="required" type="xs:token">
-         <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:token">
-         <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
-               filters created by the namespace configuration, and any added using 'custom-filter'),
-               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, or
-               that there is no preference.</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:token">
-         <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:token">
-         <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" type="security:boolean">
-         <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:attribute>
-   </xs:attributeGroup>
-   <xs:attributeGroup name="form-login.attlist">
-      <xs:attribute name="login-processing-url" type="xs:token">
-         <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:token">
-         <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="always-use-default-target" type="security:boolean">
-         <xs:annotation>
-            <xs:documentation>Whether the user should always be redirected to the default-target-url
-               after login. </xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="login-page" type="xs:token">
-         <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:token">
-         <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:attribute name="authentication-success-handler-ref" type="xs:token">
-         <xs:annotation>
-            <xs:documentation>Reference to an AuthenticationSuccessHandler bean which should be used
-               to handle a successful authentication request. Should not be used in combination with
-               default-target-url (or always-use-default-target-url) as the implementation should
-               always deal with navigation to the subsequent destination</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="authentication-failure-handler-ref" type="xs:token">
-         <xs:annotation>
-            <xs:documentation>Reference to an AuthenticationFailureHandler bean which should be used
-               to handle a failed authentication request. Should not be used in combination with
-               authentication-failure-url as the implementation should always deal with navigation
-               to the subsequent destination</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-   </xs:attributeGroup>
-   <xs:element name="openid-login">
+  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>Sets up form login for authentication with an Open ID
-            identity</xs:documentation>
+        <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:complexType>
-         <xs:attributeGroup ref="security:form-login.attlist"/>
-         <xs:attribute name="user-service-ref" type="xs:token">
-            <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:token"/>
-      <xs:attribute name="filters" use="required" type="xs:token"/>
-   </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="use-expressions" type="security:boolean">
-         <xs:annotation>
-            <xs:documentation>Enables the use of expressions in the 'access' attributes in
-               &lt;intercept-url&gt; elements rather than the traditional list of
-               configuration attributes. Defaults to 'false'. If enabled, each attribute should
-               contain a single boolean expression. If the expression evaluates to 'true', access
-               will be granted. </xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <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" type="security:boolean">
-         <xs:annotation>
-            <xs:documentation>as for http element</xs:documentation>
-         </xs:annotation>
-      </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:annotation>
-            <xs:documentation>The maximum number of sessions a single user can have open at the same
-               time. Defaults to "1".</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="expired-url" type="xs:token">
-         <xs:annotation>
-            <xs:documentation>The URL a user will be redirected to if they attempt to use a session
-               which has been "expired" by the concurrent session controller because they have
-               logged in again.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="exception-if-maximum-exceeded" type="security:boolean">
-         <xs:annotation>
-            <xs:documentation>Specifies that an exception should be raised when a user attempts to
-               login when they already have the maximum configured sessions open. The default
-               behaviour is to expire the original session.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="session-registry-alias" type="xs:token">
-         <xs:annotation>
-            <xs:documentation>Allows you to define an alias for the SessionRegistry bean in order to
-               access it in your own configuration</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="session-registry-ref" type="xs:token">
-         <xs:annotation>
-            <xs:documentation>A reference to an external SessionRegistry implementation which will
-               be used in place of the standard one. </xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-   </xs:attributeGroup>
-   <xs:attributeGroup name="remember-me.attlist">
-      <xs:attribute name="key" type="xs:token">
-         <xs:annotation>
-            <xs:documentation>The "key" used to identify cookies from a specific token-based
-               remember-me application. You should set this to a unique value for your
-               application.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="token-repository-ref" type="xs:token">
-         <xs:annotation>
-            <xs:documentation>Reference to a PersistentTokenRepository bean for use with the
-               persistent token remember-me implementation. </xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="data-source-ref" type="xs:token">
-         <xs:annotation>
-            <xs:documentation>A reference to a DataSource bean</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attributeGroup ref="security:remember-me-services-ref"/>
-      <xs:attribute name="user-service-ref" type="xs:token">
-         <xs:annotation>
-            <xs:documentation>A reference to a user-service (or UserDetailsService bean)
-               Id</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="token-validity-seconds" type="xs:integer">
-         <xs:annotation>
-            <xs:documentation>The period (in seconds) for which the remember-me cookie should be
-               valid. If set to a negative value</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-   </xs:attributeGroup>
-   <xs:attributeGroup name="token-repository-ref">
-      <xs:attribute name="token-repository-ref" use="required" type="xs:token">
-         <xs:annotation>
-            <xs:documentation>Reference to a PersistentTokenRepository bean for use with the
-               persistent token remember-me implementation. </xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-   </xs:attributeGroup>
-   <xs:attributeGroup name="remember-me-services-ref">
-      <xs:attribute name="services-ref" type="xs:token">
-         <xs:annotation>
-            <xs:documentation>Allows a custom implementation of RememberMeServices to be used. Note
-               that this implementation should return RememberMeAuthenticationToken instances with
-               the same "key" value as specified in the remember-me element. Alternatively it should
-               register its own AuthenticationProvider. </xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-   </xs:attributeGroup>
-   <xs:attributeGroup name="remember-me-data-source-ref">
-      <xs:attributeGroup ref="security:data-source-ref"/>
-   </xs:attributeGroup>
-   <xs:attributeGroup name="anonymous.attlist">
-      <xs:attribute name="key" type="xs:token">
-         <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:token">
-         <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:token">
-         <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:attribute name="enabled" type="security:boolean">
-         <xs:annotation>
-            <xs:documentation>With the default namespace setup, the anonymous "authentication"
-               facility is automatically enabled. You can disable it using this property.
-            </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:token"/>
-   </xs:attributeGroup>
-   <xs:attributeGroup name="https-port">
-      <xs:attribute name="https" use="required" type="xs:token"/>
-   </xs:attributeGroup>
-   <xs:attributeGroup name="x509.attlist">
-      <xs:attribute name="subject-principal-regex" type="xs:token">
-         <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:token">
-         <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 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:attribute name="alias" use="required" type="xs:ID">
-         <xs:annotation>
-            <xs:documentation>The alias you wish to use for the AuthenticationManager
-               bean</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="session-controller-ref" type="xs:token">
-         <xs:annotation>
-            <xs:documentation>Allows the session controller to be set on the internal
-               AuthenticationManager. This should not be used with the
-               &lt;concurrent-session-control /&gt; element</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-   </xs:attributeGroup>
-   <xs:element name="authentication-provider">
+      <xs:simpleType>
+        <xs:restriction base="xs:token">
+          <xs:enumeration value="plaintext"/>
+          <xs:enumeration value="sha"/>
+          <xs:enumeration value="sha-256"/>
+          <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:positiveInteger">
+      <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:token">
+      <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:token">
+      <xs:annotation>
+        <xs:documentation>Defines a reference to a Spring bean Id.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:attributeGroup name="cache-ref">
+    <xs:attribute name="cache-ref" use="required" type="xs:token">
+      <xs:annotation>
+        <xs:documentation>Defines a reference to a cache for use with a
+          UserDetailsService.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:attributeGroup name="user-service-ref">
+    <xs:attribute name="user-service-ref" use="required" type="xs:token">
+      <xs:annotation>
+        <xs:documentation>A reference to a user-service (or UserDetailsService bean)
+          Id</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:attributeGroup name="data-source-ref">
+    <xs:attribute name="data-source-ref" use="required" type="xs:token">
+      <xs:annotation>
+        <xs:documentation>A reference to a DataSource bean</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:attributeGroup name="password-encoder.attlist">
+    <xs:attribute name="ref" type="xs:token">
+      <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="sha-256"/>
+          <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:token">
+      <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:token">
+      <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:simpleType name="boolean">
+    <xs:restriction base="xs:token">
+      <xs:enumeration value="true"/>
+      <xs:enumeration value="false"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:attributeGroup name="role-prefix">
+    <xs:attribute name="role-prefix" use="required" type="xs:token">
+      <xs:annotation>
+        <xs:documentation>A non-empty string prefix that will be added to role strings loaded from
+          persistent storage (e.g. "ROLE_"). Use the value "none" for no prefix in cases where the
+          default is non-empty.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:attributeGroup name="use-expressions">
+    <xs:attribute name="use-expressions" use="required" type="security:boolean">
+      <xs:annotation>
+        <xs:documentation>Enables the use of expressions in the 'access' attributes in
+          &lt;intercept-url&gt; elements rather than the traditional list of configuration
+          attributes. Defaults to 'false'. If enabled, each attribute should contain a single
+          boolean expression. If the expression evaluates to 'true', access will be granted.
+        </xs:documentation>
+      </xs:annotation>
+    </xs: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:token">
+      <xs:annotation>
+        <xs:documentation>Specifies a URL.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="port" type="xs:positiveInteger">
+      <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:annotation>
+        <xs:documentation>The password for the manager DN.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <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:token">
+      <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:token">
+      <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:token">
+      <xs:annotation>
+        <xs:documentation>Search base for group membership searches. Defaults to "" (searching from
+          the root).</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:token">
+      <xs:annotation>
+        <xs:documentation>The LDAP filter used to search for users (optional). For example
+          "(uid={0})". The substituted parameter is the user's login name.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:attributeGroup name="user-search-base-attribute">
+    <xs:attribute name="user-search-base" use="required" type="xs:token">
+      <xs:annotation>
+        <xs:documentation>Search base for user searches. Defaults to "". Only used with a
+          'user-search-filter'.</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:token">
+      <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:attributeGroup name="user-details-class-attribute">
+    <xs:attribute name="user-details-class" use="required">
+      <xs:annotation>
+        <xs:documentation>Allows the objectClass of the user entry to be specified. If set, the
+          framework will attempt to load standard attributes for the defined class into the returned
+          UserDetails object</xs:documentation>
+      </xs:annotation>
+      <xs:simpleType>
+        <xs:restriction base="xs:token">
+          <xs:enumeration value="person"/>
+          <xs:enumeration value="inetOrgPerson"/>
+        </xs:restriction>
+      </xs:simpleType>
+    </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:token">
+      <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:token">
+      <xs:annotation>
+        <xs:documentation>The LDAP filter used to search for users (optional). For example
+          "(uid={0})". The substituted parameter is the user's login name.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="user-search-base" type="xs:token">
+      <xs:annotation>
+        <xs:documentation>Search base for user searches. Defaults to "". Only used with a
+          'user-search-filter'.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="group-search-filter" type="xs:token">
+      <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:token">
+      <xs:annotation>
+        <xs:documentation>Search base for group membership searches. Defaults to "" (searching from
+          the root).</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="group-role-attribute" type="xs:token">
+      <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="cache-ref" type="xs:token">
+      <xs:annotation>
+        <xs:documentation>Defines a reference to a cache for use with a
+          UserDetailsService.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="role-prefix" type="xs:token">
+      <xs:annotation>
+        <xs:documentation>A non-empty string prefix that will be added to role strings loaded from
+          persistent storage (e.g. "ROLE_"). Use the value "none" for no prefix in cases where the
+          default is non-empty.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="user-details-class">
       <xs:annotation>
-         <xs:documentation>Indicates that the contained user-service should be used as an
-            authentication source. </xs:documentation>
+        <xs:documentation>Allows the objectClass of the user entry to be specified. If set, the
+          framework will attempt to load standard attributes for the defined class into the returned
+          UserDetails object</xs:documentation>
       </xs:annotation>
-      <xs:complexType>
-         <xs:choice minOccurs="0" maxOccurs="unbounded">
-            <xs:element ref="security:any-user-service"/>
-            <xs:element name="password-encoder">
-               <xs:annotation>
+      <xs:simpleType>
+        <xs:restriction base="xs:token">
+          <xs:enumeration value="person"/>
+          <xs:enumeration value="inetOrgPerson"/>
+        </xs:restriction>
+      </xs:simpleType>
+    </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" 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" 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>
+                    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:annotation>
-                           <xs:documentation>Password salting strategy. A system-wide constant or a
-                              property from the UserDetails object can be used.</xs:documentation>
-                        </xs:annotation>
-                        <xs:complexType>
-                           <xs:attribute name="user-property" type="xs:token">
-                              <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:token">
-                              <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:attribute name="ref" type="xs:token">
-                              <xs:annotation>
-                                 <xs:documentation>Defines a reference to a Spring bean
-                                    Id.</xs:documentation>
-                              </xs:annotation>
-                           </xs:attribute>
-                        </xs:complexType>
-                     </xs:element>
+                    <xs:element minOccurs="0" name="salt-source">
+                      <xs:annotation>
+                        <xs:documentation>Password salting strategy. A system-wide constant or a
+                          property from the UserDetails object can be used.</xs:documentation>
+                      </xs:annotation>
+                      <xs:complexType>
+                        <xs:attribute name="user-property" type="xs:token">
+                          <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:token">
+                          <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:attribute name="ref" type="xs:token">
+                          <xs:annotation>
+                            <xs:documentation>Defines a reference to a Spring bean
+                              Id.</xs:documentation>
+                          </xs:annotation>
+                        </xs:attribute>
+                      </xs:complexType>
+                    </xs:element>
                   </xs:sequence>
                   <xs:attributeGroup ref="security:password-encoder.attlist"/>
-               </xs:complexType>
-            </xs:element>
-         </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:token">
-         <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:sequence>
+            <xs:attributeGroup ref="security:password-compare.attlist"/>
+          </xs:complexType>
+        </xs:element>
+      </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:token">
       <xs:annotation>
-         <xs:documentation>Element used to decorate an AuthenticationProvider bean to add it to the
-            internal AuthenticationManager maintained by the namespace.</xs:documentation>
+        <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:complexType/>
-   </xs:element>
-   <xs:element name="user-service" substitutionGroup="security:any-user-service">
+    </xs:attribute>
+    <xs:attribute name="user-search-base" type="xs:token">
       <xs:annotation>
-         <xs:documentation>Creates an in-memory UserDetailsService from a properties file or a list
-            of "user" child elements.</xs:documentation>
+        <xs:documentation>Search base for user searches. Defaults to "". Only used with a
+          'user-search-filter'.</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:token"/>
-   </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:token">
-         <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:token">
-         <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" type="security:boolean">
-         <xs:annotation>
-            <xs:documentation>Can be set to "true" to mark an account as locked and
-               unusable.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="disabled" type="security:boolean">
-         <xs:annotation>
-            <xs:documentation>Can be set to "true" to mark an account as disabled and
-               unusable.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-   </xs:attributeGroup>
-   <xs:element name="jdbc-user-service" substitutionGroup="security:any-user-service">
+    </xs:attribute>
+    <xs:attribute name="user-search-filter" type="xs:token">
       <xs:annotation>
-         <xs:documentation>Causes creation of a JDBC-based UserDetailsService.</xs:documentation>
+        <xs:documentation>The LDAP filter used to search for users (optional). For example
+          "(uid={0})". The substituted parameter is the user's login name.</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:token">
-         <xs:annotation>
-            <xs:documentation>The bean ID of the DataSource which provides the required
-               tables.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="cache-ref" type="xs:token">
-         <xs:annotation>
-            <xs:documentation>Defines a reference to a cache for use with a
-               UserDetailsService.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="users-by-username-query" type="xs:token">
-         <xs:annotation>
-            <xs:documentation>An SQL statement to query a username, password, and enabled status
-               given a username</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="authorities-by-username-query" type="xs:token">
-         <xs:annotation>
-            <xs:documentation>An SQL statement to query for a user's granted authorities given a
-               username.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="group-authorities-by-username-query" type="xs:token">
-         <xs:annotation>
-            <xs:documentation>An SQL statement to query user's group authorities given a
-               username.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="role-prefix" type="xs:token">
-         <xs:annotation>
-            <xs:documentation>A non-empty string prefix that will be added to role strings loaded
-               from persistent storage (e.g. "ROLE_"). Use the value "none" for no prefix in cases
-               where the default is non-empty.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-   </xs:attributeGroup>
-   <xs:element name="any-user-service" abstract="true"/>
-   <xs:group name="custom-filter">
+    </xs:attribute>
+    <xs:attribute name="group-search-base" type="xs:token">
+      <xs:annotation>
+        <xs:documentation>Search base for group membership searches. Defaults to "" (searching from
+          the root).</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="group-search-filter" type="xs:token">
+      <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:token">
+      <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:token">
+      <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:attribute name="role-prefix" type="xs:token">
+      <xs:annotation>
+        <xs:documentation>A non-empty string prefix that will be added to role strings loaded from
+          persistent storage (e.g. "ROLE_"). Use the value "none" for no prefix in cases where the
+          default is non-empty.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="user-details-class">
+      <xs:annotation>
+        <xs:documentation>Allows the objectClass of the user entry to be specified. If set, the
+          framework will attempt to load standard attributes for the defined class into the returned
+          UserDetails object</xs:documentation>
+      </xs:annotation>
+      <xs:simpleType>
+        <xs:restriction base="xs:token">
+          <xs:enumeration value="person"/>
+          <xs:enumeration value="inetOrgPerson"/>
+        </xs:restriction>
+      </xs:simpleType>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:attributeGroup name="password-compare.attlist">
+    <xs:attribute name="password-attribute" type="xs:token">
+      <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="sha-256"/>
+          <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 minOccurs="0" ref="security:custom-filter"/>
+        <xs:element maxOccurs="unbounded" 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:sequence>
-   </xs:group>
-   <xs:element name="custom-filter">
+      <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:token">
       <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:documentation>Optional AccessDecisionManager bean ID to be used by the created method
+          security interceptor.</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:attribute name="position" type="security:named-security-filter">
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:attributeGroup name="protect.attlist">
+    <xs:attribute name="method" use="required" type="xs:token">
+      <xs:annotation>
+        <xs:documentation>A method name</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="access" use="required" type="xs:token">
+      <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 matches with the ordered list of
+        "protect-pointcut" sub-elements, Spring Security annotations and/or. 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 four sources of method security metadata (ie
+        "protect-pointcut" declarations, expression annotations, @Secured and also JSR250 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 in annotations. If
+        using annotations, the order of precedence is EL-based (@PreAuthorize etc.), @Secured and
+        finally JSR-250.</xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:choice minOccurs="0">
+          <xs:element name="pre-post-annotation-handling">
             <xs:annotation>
-               <xs:documentation>The explicit position at which the custom-filter should be placed
-                  in the chain. Use if you are replacing a standard filter.</xs:documentation>
+              <xs:documentation>Allows the default expression-based mechanism for handling Spring
+                Security's pre and post invocation annotations (@PreFilter, @PreAuthorize,
+                @PostFilter, @PostAuthorize) to be replace entirely. Only applies if these
+                annotations are enabled. </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: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:attributeGroup name="position">
-      <xs:attribute name="position" use="required" type="security:named-security-filter">
-         <xs:annotation>
-            <xs:documentation>The explicit position at which the custom-filter should be placed in
-               the chain. Use if you are replacing a standard filter.</xs:documentation>
-         </xs:annotation>
-      </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="OPENID_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:enumeration value="LAST"/>
-      </xs:restriction>
-   </xs:simpleType>
+            <xs:complexType>
+              <xs:sequence>
+                <xs:element name="invocation-attribute-factory">
+                  <xs:annotation>
+                    <xs:documentation>Defines the PrePostInvocationAttributeFactory instance which
+                      is used to generate pre and post invocation metadata from the annotated
+                      methods. </xs:documentation>
+                  </xs:annotation>
+                  <xs:complexType>
+                    <xs:attributeGroup ref="security:ref"/>
+                  </xs:complexType>
+                </xs:element>
+                <xs:element name="pre-invocation-advice">
+                  <xs:complexType>
+                    <xs:attributeGroup ref="security:ref"/>
+                  </xs:complexType>
+                </xs:element>
+                <xs:element name="post-invocation-advice">
+                  <xs:complexType>
+                    <xs:attributeGroup ref="security:ref"/>
+                  </xs:complexType>
+                </xs:element>
+              </xs:sequence>
+            </xs:complexType>
+          </xs:element>
+          <xs:element ref="security:expression-handler"/>
+        </xs:choice>
+        <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="pre-post-annotations">
+      <xs:annotation>
+        <xs:documentation>Specifies whether the use of Spring Security's pre and post invocation
+          annotations (@PreFilter, @PreAuthorize, @PostFilter, @PostAuthorize) should be enabled for
+          this application context. 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="secured-annotations">
+      <xs:annotation>
+        <xs:documentation>Specifies whether the use of Spring Security's @Secured annotations should
+          be enabled for this application context. 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:token">
+      <xs:annotation>
+        <xs:documentation>Optional AccessDecisionManager bean ID to override the default used for
+          method security.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="run-as-manager-ref" type="xs:token">
+      <xs:annotation>
+        <xs:documentation>Optional RunAsmanager implementation which will be used by the configured
+          MethodSecurityInterceptor</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:element name="expression-handler">
+    <xs:annotation>
+      <xs:documentation>Defines the SecurityExpressionHandler instance which will be used if
+        expression-based access-control is enabled. A default implementation (with no ACL support)
+        will be used if not supplied.</xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:attributeGroup ref="security:ref"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="custom-after-invocation-provider">
+    <xs:annotation>
+      <xs:documentation>Used to decorate an AfterInvocationProvider to specify that it should be
+        used with method security.</xs:documentation>
+    </xs:annotation>
+    <xs:complexType/>
+  </xs:element>
+  <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:token">
+      <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="access-denied-handler">
+          <xs:annotation>
+            <xs:documentation>Defines the access-denied strategy that should be used. An access
+              denied page can be defined or a reference to an AccessDeniedHandler instance.
+            </xs:documentation>
+          </xs:annotation>
+          <xs:complexType>
+            <xs:attributeGroup ref="security:access-denied-handler.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:annotation>
+            <xs:documentation>Sets up remember-me authentication. If used with the "key" attribute
+              (or no attributes) the cookie-only implementation will be used. Specifying
+              "token-repository-ref" or "remember-me-data-source-ref" will use the more secure,
+              persisten token approach. </xs:documentation>
+          </xs:annotation>
+          <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" type="security:boolean">
+      <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:attribute>
+    <xs:attribute name="use-expressions" type="security:boolean">
+      <xs:annotation>
+        <xs:documentation>Enables the use of expressions in the 'access' attributes in
+          &lt;intercept-url&gt; elements rather than the traditional list of configuration
+          attributes. Defaults to 'false'. If enabled, each attribute should contain a single
+          boolean expression. If the expression evaluates to 'true', access will be granted.
+        </xs:documentation>
+      </xs:annotation>
+    </xs: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". Note that if a custom SecurityContextRepository is set using
+          security-context-repository-ref, then the only value which can be set is "always".
+          Otherwise the session creation behaviour will be determined by the repository bean
+          implementation.</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="security-context-repository-ref" type="xs:token">
+      <xs:annotation>
+        <xs:documentation>A reference to a SecurityContextRepository bean. This can be used to
+          customize how the SecurityContext is stored between requests.</xs:documentation>
+      </xs:annotation>
+    </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" type="security:boolean">
+      <xs:annotation>
+        <xs:documentation>Whether test URLs should be converted to lower case prior to comparing
+          with defined path patterns. If unspecified, defaults to "true".</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="servlet-api-provision" type="security:boolean">
+      <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:attribute>
+    <xs:attribute name="access-decision-manager-ref" type="xs:token">
+      <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:token">
+      <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:attribute name="entry-point-ref" type="xs:token">
+      <xs:annotation>
+        <xs:documentation>Allows a customized AuthenticationEntryPoint to be
+          used.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="once-per-request" type="security:boolean">
+      <xs:annotation>
+        <xs:documentation>Corresponds to the observeOncePerRequest property of
+          FilterSecurityInterceptor. Defaults to "true"</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="access-denied-page" type="xs:token">
+      <xs:annotation>
+        <xs:documentation>Deprecated in favour of the access-denied-handler
+          element.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="disable-url-rewriting" type="security:boolean">
+      <xs:annotation>
+        <xs:documentation> </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:attributeGroup name="access-denied-handler.attlist">
+    <xs:attribute name="ref" type="xs:token">
+      <xs:annotation>
+        <xs:documentation>Defines a reference to a Spring bean Id.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="error-page" type="xs:token">
+      <xs:annotation>
+        <xs:documentation>The access denied page that an authenticated user will be redirected to if
+          they request a page which they don't have the authority to access. </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:attributeGroup name="access-denied-handler-page">
+    <xs:attribute name="error-page" use="required" type="xs:token">
+      <xs:annotation>
+        <xs:documentation>The access denied page that an authenticated user will be redirected to if
+          they request a page which they don't have the authority to access. </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:attributeGroup name="intercept-url.attlist">
+    <xs:attribute name="pattern" use="required" type="xs:token">
+      <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:token">
+      <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 filters
+          created by the namespace configuration, and any added using 'custom-filter'), 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, or that
+          there is no preference.</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:token">
+      <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:token">
+      <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" type="security:boolean">
+      <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:attribute>
+  </xs:attributeGroup>
+  <xs:attributeGroup name="form-login.attlist">
+    <xs:attribute name="login-processing-url" type="xs:token">
+      <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:token">
+      <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="always-use-default-target" type="security:boolean">
+      <xs:annotation>
+        <xs:documentation>Whether the user should always be redirected to the default-target-url
+          after login. </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="login-page" type="xs:token">
+      <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:token">
+      <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:attribute name="authentication-success-handler-ref" type="xs:token">
+      <xs:annotation>
+        <xs:documentation>Reference to an AuthenticationSuccessHandler bean which should be used to
+          handle a successful authentication request. Should not be used in combination with
+          default-target-url (or always-use-default-target-url) as the implementation should always
+          deal with navigation to the subsequent destination</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="authentication-failure-handler-ref" type="xs:token">
+      <xs:annotation>
+        <xs:documentation>Reference to an AuthenticationFailureHandler bean which should be used to
+          handle a failed authentication request. Should not be used in combination with
+          authentication-failure-url as the implementation should always deal with navigation to the
+          subsequent destination</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:token">
+        <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:token"/>
+    <xs:attribute name="filters" use="required" type="xs:token"/>
+  </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="use-expressions" type="security:boolean">
+      <xs:annotation>
+        <xs:documentation>Enables the use of expressions in the 'access' attributes in
+          &lt;intercept-url&gt; elements rather than the traditional list of configuration
+          attributes. Defaults to 'false'. If enabled, each attribute should contain a single
+          boolean expression. If the expression evaluates to 'true', access will be granted.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <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" type="security:boolean">
+      <xs:annotation>
+        <xs:documentation>as for http element</xs:documentation>
+      </xs:annotation>
+    </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:annotation>
+        <xs:documentation>The maximum number of sessions a single user can have open at the same
+          time. Defaults to "1".</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="expired-url" type="xs:token">
+      <xs:annotation>
+        <xs:documentation>The URL a user will be redirected to if they attempt to use a session
+          which has been "expired" by the concurrent session controller because they have logged in
+          again.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="exception-if-maximum-exceeded" type="security:boolean">
+      <xs:annotation>
+        <xs:documentation>Specifies that an exception should be raised when a user attempts to login
+          when they already have the maximum configured sessions open. The default behaviour is to
+          expire the original session.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="session-registry-alias" type="xs:token">
+      <xs:annotation>
+        <xs:documentation>Allows you to define an alias for the SessionRegistry bean in order to
+          access it in your own configuration</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="session-registry-ref" type="xs:token">
+      <xs:annotation>
+        <xs:documentation>A reference to an external SessionRegistry implementation which will be
+          used in place of the standard one. </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:attributeGroup name="remember-me.attlist">
+    <xs:attribute name="key" type="xs:token">
+      <xs:annotation>
+        <xs:documentation>The "key" used to identify cookies from a specific token-based remember-me
+          application. You should set this to a unique value for your
+          application.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="token-repository-ref" type="xs:token">
+      <xs:annotation>
+        <xs:documentation>Reference to a PersistentTokenRepository bean for use with the persistent
+          token remember-me implementation. </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="data-source-ref" type="xs:token">
+      <xs:annotation>
+        <xs:documentation>A reference to a DataSource bean</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attributeGroup ref="security:remember-me-services-ref"/>
+    <xs:attribute name="user-service-ref" type="xs:token">
+      <xs:annotation>
+        <xs:documentation>A reference to a user-service (or UserDetailsService bean)
+          Id</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="token-validity-seconds" type="xs:integer">
+      <xs:annotation>
+        <xs:documentation>The period (in seconds) for which the remember-me cookie should be valid.
+          If set to a negative value</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:attributeGroup name="token-repository-ref">
+    <xs:attribute name="token-repository-ref" use="required" type="xs:token">
+      <xs:annotation>
+        <xs:documentation>Reference to a PersistentTokenRepository bean for use with the persistent
+          token remember-me implementation. </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:attributeGroup name="remember-me-services-ref">
+    <xs:attribute name="services-ref" type="xs:token">
+      <xs:annotation>
+        <xs:documentation>Allows a custom implementation of RememberMeServices to be used. Note that
+          this implementation should return RememberMeAuthenticationToken instances with the same
+          "key" value as specified in the remember-me element. Alternatively it should register its
+          own AuthenticationProvider. </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:attributeGroup name="remember-me-data-source-ref">
+    <xs:attributeGroup ref="security:data-source-ref"/>
+  </xs:attributeGroup>
+  <xs:attributeGroup name="anonymous.attlist">
+    <xs:attribute name="key" type="xs:token">
+      <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:token">
+      <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:token">
+      <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:attribute name="enabled" type="security:boolean">
+      <xs:annotation>
+        <xs:documentation>With the default namespace setup, the anonymous "authentication" facility
+          is automatically enabled. You can disable it using this property. </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:token"/>
+  </xs:attributeGroup>
+  <xs:attributeGroup name="https-port">
+    <xs:attribute name="https" use="required" type="xs:token"/>
+  </xs:attributeGroup>
+  <xs:attributeGroup name="x509.attlist">
+    <xs:attribute name="subject-principal-regex" type="xs:token">
+      <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:token">
+      <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 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:attribute name="alias" use="required" type="xs:ID">
+      <xs:annotation>
+        <xs:documentation>The alias you wish to use for the AuthenticationManager
+          bean</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="session-controller-ref" type="xs:token">
+      <xs:annotation>
+        <xs:documentation>Allows the session controller to be set on the internal
+          AuthenticationManager. This should not be used with the &lt;concurrent-session-control
+          /&gt; element</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </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 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:annotation>
+                  <xs:documentation>Password salting strategy. A system-wide constant or a property
+                    from the UserDetails object can be used.</xs:documentation>
+                </xs:annotation>
+                <xs:complexType>
+                  <xs:attribute name="user-property" type="xs:token">
+                    <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:token">
+                    <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:attribute name="ref" type="xs:token">
+                    <xs:annotation>
+                      <xs:documentation>Defines a reference to a Spring bean Id.</xs:documentation>
+                    </xs:annotation>
+                  </xs:attribute>
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+            <xs:attributeGroup ref="security:password-encoder.attlist"/>
+          </xs:complexType>
+        </xs:element>
+      </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:token">
+      <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:annotation>
+      <xs:documentation>Element used to decorate an AuthenticationProvider bean to add it to the
+        internal AuthenticationManager maintained by the namespace.</xs:documentation>
+    </xs:annotation>
+    <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:token"/>
+  </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:token">
+      <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:token">
+      <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" type="security:boolean">
+      <xs:annotation>
+        <xs:documentation>Can be set to "true" to mark an account as locked and
+          unusable.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="disabled" type="security:boolean">
+      <xs:annotation>
+        <xs:documentation>Can be set to "true" to mark an account as disabled and
+          unusable.</xs:documentation>
+      </xs:annotation>
+    </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:token">
+      <xs:annotation>
+        <xs:documentation>The bean ID of the DataSource which provides the required
+          tables.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="cache-ref" type="xs:token">
+      <xs:annotation>
+        <xs:documentation>Defines a reference to a cache for use with a
+          UserDetailsService.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="users-by-username-query" type="xs:token">
+      <xs:annotation>
+        <xs:documentation>An SQL statement to query a username, password, and enabled status given a
+          username</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="authorities-by-username-query" type="xs:token">
+      <xs:annotation>
+        <xs:documentation>An SQL statement to query for a user's granted authorities given a
+          username.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="group-authorities-by-username-query" type="xs:token">
+      <xs:annotation>
+        <xs:documentation>An SQL statement to query user's group authorities given a
+          username.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="role-prefix" type="xs:token">
+      <xs:annotation>
+        <xs:documentation>A non-empty string prefix that will be added to role strings loaded from
+          persistent storage (e.g. "ROLE_"). Use the value "none" for no prefix in cases where the
+          default is non-empty.</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:attribute name="position" type="security:named-security-filter">
+        <xs:annotation>
+          <xs:documentation>The explicit position at which the custom-filter should be placed in the
+            chain. Use if you are replacing a standard filter.</xs:documentation>
+        </xs:annotation>
+      </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: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:attributeGroup name="position">
+    <xs:attribute name="position" use="required" type="security:named-security-filter">
+      <xs:annotation>
+        <xs:documentation>The explicit position at which the custom-filter should be placed in the
+          chain. Use if you are replacing a standard filter.</xs:documentation>
+      </xs:annotation>
+    </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="OPENID_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:enumeration value="LAST"/>
+    </xs:restriction>
+  </xs:simpleType>
 </xs:schema>

config/src/main/resources/org/springframework/security/config/spring-security.xsl

@@ -10,7 +10,7 @@
     <xsl:output method="xml" indent="yes"/>
 
     <xsl:variable name="elts-to-inline">
-        <xsl:text>,access-denied-handler,anonymous,concurrent-session-control,filter-chain,form-login,http-basic,intercept-url,logout,password-encoder,port-mappings,port-mapper,password-compare,protect,protect-pointcut,remember-me,salt-source,x509,</xsl:text>
+        <xsl:text>,access-denied-handler,anonymous,concurrent-session-control,filter-chain,form-login,http-basic,intercept-url,logout,password-encoder,port-mappings,port-mapper,password-compare,protect,protect-pointcut,pre-post-annotation-handling,pre-invocation-advice,post-invocation-advice,invocation-attribute-factory,remember-me,salt-source,x509,</xsl:text>
     </xsl:variable>
 
     <xsl:template match="xs:element">

config/src/test/java/org/springframework/security/config/AuthenticationProviderBeanDefinitionParserTests.java

@@ -5,6 +5,7 @@ import static org.junit.Assert.*;
 import org.springframework.security.authentication.AuthenticationProvider;
 import org.springframework.security.authentication.ProviderManager;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.authentication.dao.ReflectionSaltSource;
 import org.springframework.security.authentication.encoding.ShaPasswordEncoder;
 import org.springframework.security.config.util.InMemoryXmlApplicationContext;
 import org.springframework.security.util.FieldUtils;
@@ -111,7 +112,7 @@ public class AuthenticationProviderBeanDefinitionParserTests {
                 "    <b:bean id='customPasswordEncoder' " +
                             "class='org.springframework.security.authentication.encoding.Md5PasswordEncoder'/>" +
                 "    <b:bean id='saltSource' " +
-                "           class='org.springframework.security.authentication.dao.salt.ReflectionSaltSource'>" +
+                "           class='" + ReflectionSaltSource.class.getName() +"'>" +
                 "         <b:property name='userPropertyToUse' value='username'/>" +
                 "    </b:bean>" +
                 "    <b:bean id='customUserService' " +

config/src/test/java/org/springframework/security/config/GlobalMethodSecurityBeanDefinitionParserTests.java

@@ -2,7 +2,6 @@ package org.springframework.security.config;
 
 import static org.junit.Assert.*;
 import static org.springframework.security.config.ConfigTestUtils.AUTH_PROVIDER_XML;
-import static org.springframework.security.config.GlobalMethodSecurityBeanDefinitionParser.*;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -16,14 +15,10 @@ import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.StaticApplicationContext;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.access.annotation.BusinessService;
-import org.springframework.security.access.annotation.Jsr250MethodSecurityMetadataSource;
-import org.springframework.security.access.annotation.Jsr250Voter;
-import org.springframework.security.access.annotation.SecuredMethodSecurityMetadataSource;
-import org.springframework.security.access.expression.method.ExpressionAnnotationMethodSecurityMetadataSource;
-import org.springframework.security.access.expression.method.MethodExpressionAfterInvocationProvider;
-import org.springframework.security.access.expression.method.MethodExpressionVoter;
 import org.springframework.security.access.intercept.AfterInvocationProviderManager;
 import org.springframework.security.access.intercept.RunAsManagerImpl;
+import org.springframework.security.access.prepost.PostInvocationAdviceProvider;
+import org.springframework.security.access.prepost.PreInvocationAuthorizationAdviceVoter;
 import org.springframework.security.access.vote.AffirmativeBased;
 import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException;
 import org.springframework.security.authentication.TestingAuthenticationToken;
@@ -65,14 +60,6 @@ public class GlobalMethodSecurityBeanDefinitionParserTests {
         target = null;
     }
 
-    @Test
-    public void beanClassNamesAreCorrect() throws Exception {
-        assertEquals(SecuredMethodSecurityMetadataSource.class.getName(), SECURED_METHOD_DEFINITION_SOURCE_CLASS);
-        assertEquals(ExpressionAnnotationMethodSecurityMetadataSource.class.getName(), EXPRESSION_METHOD_DEFINITION_SOURCE_CLASS);
-        assertEquals(Jsr250MethodSecurityMetadataSource.class.getName(), JSR_250_SECURITY_METHOD_DEFINITION_SOURCE_CLASS);
-        assertEquals(Jsr250Voter.class.getName(), JSR_250_VOTER_CLASS);
-    }
-
     @Test(expected=AuthenticationCredentialsNotFoundException.class)
     public void targetShouldPreventProtectedMethodInvocationWithNoContext() {
         loadContext();
@@ -211,19 +198,19 @@ public class GlobalMethodSecurityBeanDefinitionParserTests {
     @SuppressWarnings("unchecked")
     @Test
     public void expressionVoterAndAfterInvocationProviderUseSameExpressionHandlerInstance() throws Exception {
-        setContext("<global-method-security expression-annotations='enabled'/>" + AUTH_PROVIDER_XML);
+        setContext("<global-method-security pre-post-annotations='enabled'/>" + AUTH_PROVIDER_XML);
         AffirmativeBased adm = (AffirmativeBased) appContext.getBean(GlobalMethodSecurityBeanDefinitionParser.ACCESS_MANAGER_ID);
         List voters = (List) FieldUtils.getFieldValue(adm, "decisionVoters");
-        MethodExpressionVoter mev = (MethodExpressionVoter) voters.get(0);
+        PreInvocationAuthorizationAdviceVoter mev = (PreInvocationAuthorizationAdviceVoter) voters.get(0);
         AfterInvocationProviderManager pm = (AfterInvocationProviderManager) appContext.getBean(BeanIds.AFTER_INVOCATION_MANAGER);
-        MethodExpressionAfterInvocationProvider aip = (MethodExpressionAfterInvocationProvider) pm.getProviders().get(0);
-        assertTrue(FieldUtils.getFieldValue(mev, "expressionHandler") == FieldUtils.getFieldValue(aip, "expressionHandler"));
+        PostInvocationAdviceProvider aip = (PostInvocationAdviceProvider) pm.getProviders().get(0);
+        assertTrue(FieldUtils.getFieldValue(mev, "preAdvice.expressionHandler") == FieldUtils.getFieldValue(aip, "postAdvice.expressionHandler"));
     }
 
     @Test(expected=AccessDeniedException.class)
     public void accessIsDeniedForHasRoleExpression() {
         setContext(
-                "<global-method-security expression-annotations='enabled'/>" +
+                "<global-method-security pre-post-annotations='enabled'/>" +
                 "<b:bean id='target' class='org.springframework.security.access.annotation.ExpressionProtectedBusinessServiceImpl'/>" +
                 AUTH_PROVIDER_XML);
         SecurityContextHolder.getContext().setAuthentication(new UsernamePasswordAuthenticationToken("bob","bobspassword"));
@@ -234,7 +221,7 @@ public class GlobalMethodSecurityBeanDefinitionParserTests {
     @Test
     public void preAndPostFilterAnnotationsWorkWithLists() {
         setContext(
-                "<global-method-security expression-annotations='enabled'/>" +
+                "<global-method-security pre-post-annotations='enabled'/>" +
                 "<b:bean id='target' class='org.springframework.security.access.annotation.ExpressionProtectedBusinessServiceImpl'/>" +
                 AUTH_PROVIDER_XML);
         SecurityContextHolder.getContext().setAuthentication(new UsernamePasswordAuthenticationToken("bob","bobspassword"));
@@ -253,7 +240,7 @@ public class GlobalMethodSecurityBeanDefinitionParserTests {
     @Test
     public void prePostFilterAnnotationWorksWithArrays() {
         setContext(
-                "<global-method-security expression-annotations='enabled'/>" +
+                "<global-method-security pre-post-annotations='enabled'/>" +
                 "<b:bean id='target' class='org.springframework.security.access.annotation.ExpressionProtectedBusinessServiceImpl'/>" +
                 AUTH_PROVIDER_XML);
         SecurityContextHolder.getContext().setAuthentication(new UsernamePasswordAuthenticationToken("bob","bobspassword"));

config/src/test/resources/namespace-usage.xml

@@ -13,9 +13,11 @@
                         http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
                         http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
                         http://www.springframework.org/schema/security ../../main/resources/org/springframework/security/config/spring-security-3.0.xsd">
-    
+
     <global-method-security run-as-manager-ref="myRunAsManager">
-        <expression-handler ref="myExpressionhandler"/>
+        <pre-post-annotation-handling>
+            <
+        </pre-post-annotation-handling>
     </global-method-security>
 
     <http>

core/src/main/java/org/springframework/security/access/expression/PermissionEvaluator.java → core/src/main/java/org/springframework/security/access/PermissionEvaluator.java

@@ -1,4 +1,4 @@
-package org.springframework.security.access.expression;
+package org.springframework.security.access;
 
 import java.io.Serializable;
 
@@ -11,7 +11,7 @@ import org.springframework.security.core.Authentication;
  *
  * @author Luke Taylor
  * @version $Id$
- * @since 2.5
+ * @since 3.0
  */
 public interface PermissionEvaluator {
     /**

core/src/main/java/org/springframework/security/access/annotation/Secured.java

@@ -47,9 +47,9 @@ import java.lang.annotation.Target;
 @Inherited
 @Documented
 public @interface Secured {
-/**
-     * Returns the list of security configuration attributes.
-     *   (i.e. ROLE_USER, ROLE_ADMIN etc.)
+    /**
+     * Returns the list of security configuration attributes (e.g. ROLE_USER, ROLE_ADMIN).
+     *
      * @return String[] The secure method attributes
      */
     public String[] value();

core/src/main/java/org/springframework/security/access/annotation/SecuredMethodSecurityMetadataSource.java → core/src/main/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataSource.java

@@ -33,7 +33,7 @@ import org.springframework.security.access.intercept.method.AbstractFallbackMeth
  * @author Ben Alex
  * @version $Id$
  */
-public class SecuredMethodSecurityMetadataSource extends AbstractFallbackMethodSecurityMetadataSource {
+public class SecuredAnnotationSecurityMetadataSource extends AbstractFallbackMethodSecurityMetadataSource {
 
     protected List<ConfigAttribute> findAttributes(Class<?> clazz) {
         return processAnnotation(clazz.getAnnotation(Secured.class));

core/src/main/java/org/springframework/security/access/expression/ExpressionUtils.java

@@ -4,7 +4,7 @@ import org.springframework.expression.EvaluationContext;
 import org.springframework.expression.EvaluationException;
 import org.springframework.expression.Expression;
 
-public class ExpressionUtils {
+public final class ExpressionUtils {
 
     public static boolean evaluateAsBoolean(Expression expr, EvaluationContext ctx) {
         try {

core/src/main/java/org/springframework/security/access/expression/support/SecurityExpressionRoot.java → core/src/main/java/org/springframework/security/access/expression/SecurityExpressionRoot.java

@@ -1,4 +1,4 @@
-package org.springframework.security.access.expression.support;
+package org.springframework.security.access.expression;
 
 import java.util.Set;
 
@@ -13,7 +13,7 @@ import org.springframework.security.core.authority.AuthorityUtils;
  *
  * @author Luke Taylor
  * @version $Id$
- * @since 2.5
+ * @since 3.0
  */
 public abstract class SecurityExpressionRoot {
     protected final Authentication authentication;

core/src/main/java/org/springframework/security/access/expression/method/AbstractExpressionBasedMethodConfigAttribute.java

@@ -15,7 +15,7 @@ import org.springframework.util.Assert;
  *
  * @author Luke Taylor
  * @version $Id$
- * @since 2.5
+ * @since 3.0
  */
 abstract class AbstractExpressionBasedMethodConfigAttribute implements ConfigAttribute {
     private final Expression filterExpression;

core/src/main/java/org/springframework/security/access/expression/support/DefaultMethodSecurityExpressionHandler.java → core/src/main/java/org/springframework/security/access/expression/method/DefaultMethodSecurityExpressionHandler.java

@@ -1,4 +1,4 @@
-package org.springframework.security.access.expression.support;
+package org.springframework.security.access.expression.method;
 
 import java.lang.reflect.Array;
 import java.util.ArrayList;
@@ -14,9 +14,9 @@ import org.springframework.expression.EvaluationContext;
 import org.springframework.expression.Expression;
 import org.springframework.expression.ExpressionParser;
 import org.springframework.expression.spel.antlr.SpelAntlrExpressionParser;
+import org.springframework.security.access.PermissionEvaluator;
 import org.springframework.security.access.expression.ExpressionUtils;
-import org.springframework.security.access.expression.MethodSecurityExpressionHandler;
-import org.springframework.security.access.expression.PermissionEvaluator;
+import org.springframework.security.access.expression.SecurityExpressionRoot;
 import org.springframework.security.authentication.AuthenticationTrustResolver;
 import org.springframework.security.authentication.AuthenticationTrustResolverImpl;
 import org.springframework.security.core.Authentication;
@@ -28,7 +28,7 @@ import org.springframework.security.core.Authentication;
  *
  * @author Luke Taylor
  * @version $Id$
- * @since 2.5
+ * @since 3.0
  */
 public class DefaultMethodSecurityExpressionHandler implements MethodSecurityExpressionHandler {
 

core/src/main/java/org/springframework/security/access/expression/support/DenyAllPermissionEvaluator.java → core/src/main/java/org/springframework/security/access/expression/method/DenyAllPermissionEvaluator.java

@@ -1,10 +1,10 @@
-package org.springframework.security.access.expression.support;
+package org.springframework.security.access.expression.method;
 
 import java.io.Serializable;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.security.access.expression.PermissionEvaluator;
+import org.springframework.security.access.PermissionEvaluator;
 import org.springframework.security.core.Authentication;
 
 /**
@@ -13,7 +13,7 @@ import org.springframework.security.core.Authentication;
  *
  * @author Luke Taylor
  * @version $Id$
- * @since 2.5
+ * @since 3.0
  */
 class DenyAllPermissionEvaluator implements PermissionEvaluator {
 

core/src/main/java/org/springframework/security/access/expression/method/ExpressionBasedAnnotationAttributeFactory.java

@@ -0,0 +1,58 @@
+/**
+ *
+ */
+package org.springframework.security.access.expression.method;
+
+import org.springframework.expression.Expression;
+import org.springframework.expression.ExpressionParser;
+import org.springframework.expression.ParseException;
+import org.springframework.security.access.prepost.PostAuthorize;
+import org.springframework.security.access.prepost.PostFilter;
+import org.springframework.security.access.prepost.PostInvocationAttribute;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.access.prepost.PreFilter;
+import org.springframework.security.access.prepost.PreInvocationAttribute;
+import org.springframework.security.access.prepost.PrePostInvocationAttributeFactory;
+
+/**
+ * {@link PrePostInvocationAttributeFactory} which interprets the annotation value as
+ * an expression to be evaluated at runtime.
+ *
+ * @author Luke Taylor
+ * @version $Id$
+ * @since 3.0
+ */
+public class ExpressionBasedAnnotationAttributeFactory implements PrePostInvocationAttributeFactory {
+    private ExpressionParser parser;
+
+    public ExpressionBasedAnnotationAttributeFactory(MethodSecurityExpressionHandler handler) {
+        parser = handler.getExpressionParser();
+    }
+
+    public PreInvocationAttribute createPreInvocationAttribute(PreFilter preFilter, PreAuthorize preAuthorize) {
+        try {
+         // TODO: Optimization of permitAll
+            Expression preAuthorizeExpression = preAuthorize == null ? parser.parseExpression("permitAll") : parser.parseExpression(preAuthorize.value());
+            Expression preFilterExpression = preFilter == null ? null : parser.parseExpression(preFilter.value());
+            String filterObject = preFilter == null ? null : preFilter.filterTarget();
+            return new PreInvocationExpressionAttribute(preFilterExpression, filterObject, preAuthorizeExpression);
+        } catch (ParseException e) {
+            throw new IllegalArgumentException("Failed to parse expression '" + e.getExpressionString() + "'", e);
+        }
+    }
+
+    public PostInvocationAttribute createPostInvocationAttribute(PostFilter postFilter, PostAuthorize postAuthorize) {
+        try {
+            Expression postAuthorizeExpression = postAuthorize == null ? null : parser.parseExpression(postAuthorize.value());
+            Expression postFilterExpression = postFilter == null ? null : parser.parseExpression(postFilter.value());
+
+            if (postFilterExpression != null || postAuthorizeExpression != null) {
+                return new PostInvocationExpressionAttribute(postFilterExpression, postAuthorizeExpression);
+            }
+        } catch (ParseException e) {
+            throw new IllegalArgumentException("Failed to parse expression '" + e.getExpressionString() + "'", e);
+        }
+
+        return null;
+    }
+}

core/src/main/java/org/springframework/security/access/expression/method/ExpressionBasedPostInvocationAdvice.java

@@ -0,0 +1,61 @@
+package org.springframework.security.access.expression.method;
+
+import org.aopalliance.intercept.MethodInvocation;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.expression.EvaluationContext;
+import org.springframework.expression.Expression;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.access.expression.ExpressionUtils;
+import org.springframework.security.access.prepost.PostInvocationAttribute;
+import org.springframework.security.access.prepost.PostInvocationAuthorizationAdvice;
+import org.springframework.security.core.Authentication;
+
+/**
+ *
+ * @author Luke Taylor
+ * @version $Id$
+ * @since 3.0
+ */
+public class ExpressionBasedPostInvocationAdvice implements PostInvocationAuthorizationAdvice{
+    protected final Log logger = LogFactory.getLog(getClass());
+
+    private MethodSecurityExpressionHandler expressionHandler;
+
+    public ExpressionBasedPostInvocationAdvice(MethodSecurityExpressionHandler expressionHandler) {
+        this.expressionHandler = expressionHandler;
+    }
+
+    public Object after(Authentication authentication, MethodInvocation mi,
+            PostInvocationAttribute postAttr, Object returnedObject) throws AccessDeniedException{
+        PostInvocationExpressionAttribute pia = (PostInvocationExpressionAttribute) postAttr;
+        EvaluationContext ctx = expressionHandler.createEvaluationContext(authentication, mi);
+        Expression postFilter = pia.getFilterExpression();
+        Expression postAuthorize = pia.getAuthorizeExpression();
+
+        if (postFilter != null) {
+            if (logger.isDebugEnabled()) {
+                logger.debug("Applying PostFilter expression " + postFilter);
+            }
+
+            if (returnedObject != null) {
+                returnedObject = expressionHandler.filter(returnedObject, postFilter, ctx);
+            } else {
+                if (logger.isDebugEnabled()) {
+                    logger.debug("Return object is null, filtering will be skipped");
+                }
+            }
+        }
+
+        expressionHandler.setReturnObject(returnedObject, ctx);
+
+        if (postAuthorize != null && !ExpressionUtils.evaluateAsBoolean(postAuthorize, ctx)) {
+            if (logger.isDebugEnabled()) {
+                logger.debug("PostAuthorize expression rejected access");
+            }
+            throw new AccessDeniedException("Access is denied");
+        }
+
+        return returnedObject;
+    }
+}

core/src/main/java/org/springframework/security/access/expression/method/MethodExpressionVoter.java → core/src/main/java/org/springframework/security/access/expression/method/ExpressionBasedPreInvocationAdvice.java

@@ -1,68 +1,47 @@
+/**
+ *
+ */
 package org.springframework.security.access.expression.method;
 
 import java.util.Collection;
-import java.util.List;
 
 import org.aopalliance.intercept.MethodInvocation;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.springframework.expression.EvaluationContext;
 import org.springframework.expression.Expression;
-import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.access.expression.ExpressionUtils;
-import org.springframework.security.access.expression.MethodSecurityExpressionHandler;
-import org.springframework.security.access.expression.support.DefaultMethodSecurityExpressionHandler;
-import org.springframework.security.access.vote.AccessDecisionVoter;
+import org.springframework.security.access.prepost.PreInvocationAttribute;
+import org.springframework.security.access.prepost.PreInvocationAuthorizationAdvice;
 import org.springframework.security.core.Authentication;
 
 /**
- * Voter which performs the actions for @PreFilter and @PostAuthorize annotations.
- * <p>
  * If only a @PreFilter condition is specified, it will vote to grant access, otherwise it will vote
- * to grant or deny access depending on whether the @PostAuthorize expression evaluates to 'true' or 'false',
+ * to grant or deny access depending on whether the @PreAuthorize expression evaluates to 'true' or 'false',
  * respectively.
- *
+
  * @author Luke Taylor
  * @version $Id$
- * @since 2.5
+ * @since
  */
-public class MethodExpressionVoter implements AccessDecisionVoter {
-    protected final Log logger = LogFactory.getLog(getClass());
-
+public class ExpressionBasedPreInvocationAdvice implements PreInvocationAuthorizationAdvice {
     private MethodSecurityExpressionHandler expressionHandler = new DefaultMethodSecurityExpressionHandler();
 
-    public boolean supports(ConfigAttribute attribute) {
-        return attribute instanceof AbstractExpressionBasedMethodConfigAttribute;
-    }
-
-    public boolean supports(Class<?> clazz) {
-        return clazz.isAssignableFrom(MethodInvocation.class);
-    }
-
-    public int vote(Authentication authentication, Object object, List<ConfigAttribute> attributes) {
-        PreInvocationExpressionAttribute mace = findMethodAccessControlExpression(attributes);
-
-        if (mace == null) {
-            // No expression based metadata, so abstain
-            return ACCESS_ABSTAIN;
-        }
-
-        MethodInvocation mi = (MethodInvocation)object;
+    public boolean before(Authentication authentication, MethodInvocation mi, PreInvocationAttribute attr) {
+        PreInvocationExpressionAttribute preAttr = (PreInvocationExpressionAttribute) attr;
         EvaluationContext ctx = expressionHandler.createEvaluationContext(authentication, mi);
-        Expression preFilter = mace.getFilterExpression();
-        Expression preAuthorize = mace.getAuthorizeExpression();
+        Expression preFilter = preAttr.getFilterExpression();
+        Expression preAuthorize = preAttr.getAuthorizeExpression();
 
         if (preFilter != null) {
-            Object filterTarget = findFilterTarget(mace.getFilterTarget(), ctx, mi);
+            Object filterTarget = findFilterTarget(preAttr.getFilterTarget(), ctx, mi);
 
             expressionHandler.filter(filterTarget, preFilter, ctx);
         }
 
         if (preAuthorize == null) {
-            return ACCESS_GRANTED;
+            return true;
         }
 
-        return ExpressionUtils.evaluateAsBoolean(preAuthorize, ctx) ? ACCESS_GRANTED : ACCESS_DENIED;
+        return ExpressionUtils.evaluateAsBoolean(preAuthorize, ctx);
     }
 
     private Object findFilterTarget(String filterTargetName, EvaluationContext ctx, MethodInvocation mi) {
@@ -94,16 +73,6 @@ public class MethodExpressionVoter implements AccessDecisionVoter {
         return filterTarget;
     }
 
-    private PreInvocationExpressionAttribute findMethodAccessControlExpression(List<ConfigAttribute> config) {
-        // Find the MethodAccessControlExpression attribute
-        for (ConfigAttribute attribute : config) {
-            if (attribute instanceof PreInvocationExpressionAttribute) {
-                return (PreInvocationExpressionAttribute)attribute;
-            }
-        }
-
-        return null;
-    }
 
     public void setExpressionHandler(MethodSecurityExpressionHandler expressionHandler) {
         this.expressionHandler = expressionHandler;

core/src/main/java/org/springframework/security/access/expression/method/MethodExpressionAfterInvocationProvider.java

@@ -1,96 +0,0 @@
-package org.springframework.security.access.expression.method;
-
-import java.util.List;
-
-import org.aopalliance.intercept.MethodInvocation;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.expression.EvaluationContext;
-import org.springframework.expression.Expression;
-import org.springframework.security.access.AccessDeniedException;
-import org.springframework.security.access.ConfigAttribute;
-import org.springframework.security.access.expression.ExpressionUtils;
-import org.springframework.security.access.expression.MethodSecurityExpressionHandler;
-import org.springframework.security.access.expression.support.DefaultMethodSecurityExpressionHandler;
-import org.springframework.security.access.intercept.AfterInvocationProvider;
-import org.springframework.security.core.Authentication;
-
-/**
- * AfterInvocationProvider which handles the @PostAuthorize and @PostFilter annotation expressions.
- *
- * @author Luke Taylor
- * @verson $Id$
- * @since 2.5
- */
-public class MethodExpressionAfterInvocationProvider implements AfterInvocationProvider {
-
-    protected final Log logger = LogFactory.getLog(getClass());
-
-    private MethodSecurityExpressionHandler expressionHandler = new DefaultMethodSecurityExpressionHandler();
-
-    public Object decide(Authentication authentication, Object object, List<ConfigAttribute> config, Object returnedObject)
-            throws AccessDeniedException {
-
-        PostInvocationExpressionAttribute mca = findMethodAccessControlExpression(config);
-
-        if (mca == null) {
-            return returnedObject;
-        }
-
-        EvaluationContext ctx =
-            expressionHandler.createEvaluationContext(authentication, (MethodInvocation)object);
-        //SecurityExpressionRoot expressionRoot = new SecurityExpressionRoot(authentication);
-        //ctx.setRootObject(expressionRoot);
-
-        Expression postFilter = mca.getFilterExpression();
-        Expression postAuthorize = mca.getAuthorizeExpression();
-
-        if (postFilter != null) {
-            if (logger.isDebugEnabled()) {
-                logger.debug("Applying PostFilter expression " + postFilter);
-            }
-
-            if (returnedObject != null) {
-                returnedObject = expressionHandler.filter(returnedObject, postFilter, ctx);
-            } else {
-                if (logger.isDebugEnabled()) {
-                    logger.debug("Return object is null, filtering will be skipped");
-                }
-            }
-        }
-
-        expressionHandler.setReturnObject(returnedObject, ctx);
-
-        if (postAuthorize != null && !ExpressionUtils.evaluateAsBoolean(postAuthorize, ctx)) {
-            if (logger.isDebugEnabled()) {
-                logger.debug("PostAuthorize expression rejected access");
-            }
-            throw new AccessDeniedException("Access is denied");
-        }
-
-        return returnedObject;
-    }
-
-    private PostInvocationExpressionAttribute findMethodAccessControlExpression(List<ConfigAttribute> config) {
-        // Find the MethodAccessControlExpression attribute
-        for (ConfigAttribute attribute : config) {
-            if (attribute instanceof PostInvocationExpressionAttribute) {
-                return (PostInvocationExpressionAttribute)attribute;
-            }
-        }
-
-        return null;
-    }
-
-    public boolean supports(ConfigAttribute attribute) {
-        return attribute instanceof PostInvocationExpressionAttribute;
-    }
-
-    public boolean supports(Class<?> clazz) {
-        return clazz.isAssignableFrom(MethodInvocation.class);
-    }
-
-    public void setExpressionHandler(MethodSecurityExpressionHandler expressionHandler) {
-        this.expressionHandler = expressionHandler;
-    }
-}

core/src/main/java/org/springframework/security/access/expression/support/MethodSecurityEvaluationContext.java → core/src/main/java/org/springframework/security/access/expression/method/MethodSecurityEvaluationContext.java

@@ -1,4 +1,4 @@
-package org.springframework.security.access.expression.support;
+package org.springframework.security.access.expression.method;
 
 import java.lang.reflect.Method;
 
@@ -15,7 +15,7 @@ import org.springframework.util.ClassUtils;
  * and when they are required.
  *
  * @author Luke Taylor
- * @since 2.5
+ * @since 3.0
  */
 class MethodSecurityEvaluationContext extends StandardEvaluationContext {
     private ParameterNameDiscoverer parameterNameDiscoverer;

core/src/main/java/org/springframework/security/access/expression/MethodSecurityExpressionHandler.java → core/src/main/java/org/springframework/security/access/expression/method/MethodSecurityExpressionHandler.java

@@ -1,4 +1,4 @@
-package org.springframework.security.access.expression;
+package org.springframework.security.access.expression.method;
 
 import org.aopalliance.intercept.MethodInvocation;
 import org.springframework.expression.EvaluationContext;
@@ -12,7 +12,7 @@ import org.springframework.security.core.Authentication;
  *
  * @author Luke Taylor
  * @version $Id$
- * @since 2.5
+ * @since 3.0
  */
 public interface MethodSecurityExpressionHandler {
     /**

core/src/main/java/org/springframework/security/access/expression/support/MethodSecurityExpressionRoot.java → core/src/main/java/org/springframework/security/access/expression/method/MethodSecurityExpressionRoot.java

@@ -1,8 +1,9 @@
-package org.springframework.security.access.expression.support;
+package org.springframework.security.access.expression.method;
 
 import java.io.Serializable;
 
-import org.springframework.security.access.expression.PermissionEvaluator;
+import org.springframework.security.access.PermissionEvaluator;
+import org.springframework.security.access.expression.SecurityExpressionRoot;
 import org.springframework.security.core.Authentication;
 
 
@@ -11,7 +12,7 @@ import org.springframework.security.core.Authentication;
  *
  * @author Luke Taylor
  * @version $Id$
- * @since 2.5
+ * @since 3.0
  */
 class MethodSecurityExpressionRoot extends SecurityExpressionRoot {
     private PermissionEvaluator permissionEvaluator;

core/src/main/java/org/springframework/security/access/expression/method/PostInvocationExpressionAttribute.java

@@ -2,8 +2,16 @@ package org.springframework.security.access.expression.method;
 
 import org.springframework.expression.Expression;
 import org.springframework.expression.ParseException;
+import org.springframework.security.access.prepost.PostInvocationAttribute;
 
-class PostInvocationExpressionAttribute extends AbstractExpressionBasedMethodConfigAttribute {
+/**
+ *
+ * @author Luke Taylor
+ * @version $Id$
+ * @since 3.0
+ */
+class PostInvocationExpressionAttribute extends AbstractExpressionBasedMethodConfigAttribute
+        implements PostInvocationAttribute {
 
     PostInvocationExpressionAttribute(String filterExpression, String authorizeExpression)
             throws ParseException {

core/src/main/java/org/springframework/security/access/expression/method/PreInvocationExpressionAttribute.java

@@ -2,8 +2,17 @@ package org.springframework.security.access.expression.method;
 
 import org.springframework.expression.Expression;
 import org.springframework.expression.ParseException;
+import org.springframework.security.access.prepost.PreInvocationAttribute;
+
+/**
+ *
+ * @author Luke Taylor
+ * @version $Id$
+ * @since 3.0
+ */
+class PreInvocationExpressionAttribute extends AbstractExpressionBasedMethodConfigAttribute
+        implements PreInvocationAttribute {
 
-class PreInvocationExpressionAttribute extends AbstractExpressionBasedMethodConfigAttribute {
     private final String filterTarget;
 
     PreInvocationExpressionAttribute(String filterExpression, String filterTarget, String authorizeExpression)

core/src/main/java/org/springframework/security/access/expression/package.html

@@ -0,0 +1,2 @@
+Expression handling code to support the use of Spring-EL based expressions in @PreAuthorize, @PreFilter,
+@PostAuthorizue and @PostFilter annotations. Mainly for internal framework use and liable to change.

core/src/main/java/org/springframework/security/access/expression/support/AbstractSecurityExpressionHandler.java

@@ -1,5 +0,0 @@
-package org.springframework.security.access.expression.support;
-
-public class AbstractSecurityExpressionHandler {
-
-}

core/src/main/java/org/springframework/security/access/expression/annotation/PostAuthorize.java → core/src/main/java/org/springframework/security/access/prepost/PostAuthorize.java

@@ -1,4 +1,4 @@
-package org.springframework.security.access.expression.annotation;
+package org.springframework.security.access.prepost;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -12,7 +12,7 @@ import java.lang.annotation.Target;
  *
  * @author Luke Taylor
  * @version $Id$
- * @since 2.5
+ * @since 3.0
  */
 @Target({ElementType.METHOD, ElementType.TYPE})
 @Retention(RetentionPolicy.RUNTIME)

core/src/main/java/org/springframework/security/access/expression/annotation/PostFilter.java → core/src/main/java/org/springframework/security/access/prepost/PostFilter.java

@@ -1,4 +1,4 @@
-package org.springframework.security.access.expression.annotation;
+package org.springframework.security.access.prepost;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -12,7 +12,7 @@ import java.lang.annotation.Target;
  *
  * @author Luke Taylor
  * @version $Id$
- * @since 2.5
+ * @since 3.0
  */
 @Target({ElementType.METHOD, ElementType.TYPE})
 @Retention(RetentionPolicy.RUNTIME)

core/src/main/java/org/springframework/security/access/prepost/PostInvocationAdviceProvider.java

@@ -0,0 +1,59 @@
+package org.springframework.security.access.prepost;
+
+import java.util.List;
+
+import org.aopalliance.intercept.MethodInvocation;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.access.intercept.AfterInvocationProvider;
+import org.springframework.security.core.Authentication;
+
+/**
+ * <tt>AfterInvocationProvider</tt> which delegates to a {@link PostInvocationAuthorizationAdvice} instance
+ * passing it the <tt>PostInvocationAttribute</tt> created from @PostAuthorize and @PostFilter annotations.
+ *
+ * @author Luke Taylor
+ * @version $Id$
+ * @since 3.0
+ */
+public class PostInvocationAdviceProvider implements AfterInvocationProvider {
+    protected final Log logger = LogFactory.getLog(getClass());
+
+    private PostInvocationAuthorizationAdvice postAdvice;
+
+    public PostInvocationAdviceProvider(PostInvocationAuthorizationAdvice postAdvice) {
+        this.postAdvice = postAdvice;
+    }
+
+    public Object decide(Authentication authentication, Object object, List<ConfigAttribute> config, Object returnedObject)
+            throws AccessDeniedException {
+
+        PostInvocationAttribute pia = findPostInvocationAttribute(config);
+
+        if (pia == null) {
+            return returnedObject;
+        }
+
+        return postAdvice.after(authentication, (MethodInvocation)object, pia, returnedObject);
+    }
+
+    private PostInvocationAttribute findPostInvocationAttribute(List<ConfigAttribute> config) {
+        for (ConfigAttribute attribute : config) {
+            if (attribute instanceof PostInvocationAttribute) {
+                return (PostInvocationAttribute)attribute;
+            }
+        }
+
+        return null;
+    }
+
+    public boolean supports(ConfigAttribute attribute) {
+        return attribute instanceof PostInvocationAttribute;
+    }
+
+    public boolean supports(Class<?> clazz) {
+        return clazz.isAssignableFrom(MethodInvocation.class);
+    }
+}

core/src/main/java/org/springframework/security/access/prepost/PostInvocationAttribute.java

@@ -0,0 +1,16 @@
+package org.springframework.security.access.prepost;
+
+import org.springframework.security.access.ConfigAttribute;
+
+/**
+ * Marker interface for attributes which are created from combined @PostFilter and @PostAuthorize annotations.
+ * <p>
+ * Consumed by a {@link PostInvocationAuthorizationAdvice}.
+ *
+ * @author Luke Taylor
+ * @version $Id$
+ * @since 3.0
+ */
+public interface PostInvocationAttribute extends ConfigAttribute{
+
+}

core/src/main/java/org/springframework/security/access/prepost/PostInvocationAuthorizationAdvice.java

@@ -0,0 +1,18 @@
+package org.springframework.security.access.prepost;
+
+import org.aopalliance.intercept.MethodInvocation;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.core.Authentication;
+
+/**
+ * Performs filtering and authorization logic after a method is invoked.
+ *
+ * @author Luke Taylor
+ * @version $Id$
+ * @since 3.0
+ */
+public interface PostInvocationAuthorizationAdvice {
+
+    Object after(Authentication authentication, MethodInvocation mi,
+            PostInvocationAttribute pia, Object returnedObject) throws AccessDeniedException;
+}

core/src/main/java/org/springframework/security/access/expression/annotation/PreAuthorize.java → core/src/main/java/org/springframework/security/access/prepost/PreAuthorize.java

@@ -1,4 +1,4 @@
-package org.springframework.security.access.expression.annotation;
+package org.springframework.security.access.prepost;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -13,7 +13,7 @@ import java.lang.annotation.Target;
  *
  * @author Luke Taylor
  * @version $Id$
- * @since 2.5
+ * @since 3.0
  */
 @Target({ElementType.METHOD, ElementType.TYPE})
 @Retention(RetentionPolicy.RUNTIME)

core/src/main/java/org/springframework/security/access/expression/annotation/PreFilter.java → core/src/main/java/org/springframework/security/access/prepost/PreFilter.java

@@ -1,4 +1,4 @@
-package org.springframework.security.access.expression.annotation;
+package org.springframework.security.access.prepost;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -23,7 +23,7 @@ import java.lang.annotation.Target;
  *
  * @author Luke Taylor
  * @version $Id$
- * @since 2.5
+ * @since 3.0
  */
 @Target({ElementType.METHOD, ElementType.TYPE})
 @Retention(RetentionPolicy.RUNTIME)

core/src/main/java/org/springframework/security/access/prepost/PreInvocationAttribute.java

@@ -0,0 +1,16 @@
+package org.springframework.security.access.prepost;
+
+import org.springframework.security.access.ConfigAttribute;
+
+/**
+ * Marker interface for attributes which are created from combined @PreFilter and @PreAuthorize annotations.
+ * <p>
+ * Consumed by a {@link PreInvocationAuthorizationAdvice}.
+ *
+ * @author Luke Taylor
+ * @version $Id$
+ * @since 3.0
+ */
+public interface PreInvocationAttribute extends ConfigAttribute{
+
+}

core/src/main/java/org/springframework/security/access/prepost/PreInvocationAuthorizationAdvice.java

@@ -0,0 +1,16 @@
+package org.springframework.security.access.prepost;
+
+import org.aopalliance.intercept.MethodInvocation;
+import org.springframework.security.core.Authentication;
+
+/**
+ * Performs argument filtering and authorization logic before a method is invoked.
+ *
+ * @author Luke Taylor
+ * @version $Id$
+ * @since 3.0
+ */
+public interface PreInvocationAuthorizationAdvice {
+
+    boolean before(Authentication authentication, MethodInvocation mi, PreInvocationAttribute preInvocationAttribute);
+}

core/src/main/java/org/springframework/security/access/prepost/PreInvocationAuthorizationAdviceVoter.java

@@ -0,0 +1,69 @@
+package org.springframework.security.access.prepost;
+
+import java.util.List;
+
+import org.aopalliance.intercept.MethodInvocation;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.access.vote.AccessDecisionVoter;
+import org.springframework.security.core.Authentication;
+
+/**
+ * Voter which performs the actions using a PreInvocationAuthorizationAdvice implementation
+ * generated from @PreFilter and @PreAuthorize annotations.
+ * <p>
+ * In practice, if these annotations are being used, they will normally contain all the necessary
+ * access control logic, so a voter-based system is not really necessary and a single <tt>AccessDecisionManager</tt>
+ * which contained the same logic would suffice. However, this class fits in readily with the traditional
+ * voter-based <tt>AccessDecisionManager</tt> implementations used by Spring Security.
+ *
+ * @author Luke Taylor
+ * @version $Id$
+ * @since 3.0
+ */
+public class PreInvocationAuthorizationAdviceVoter implements AccessDecisionVoter {
+    protected final Log logger = LogFactory.getLog(getClass());
+
+    private PreInvocationAuthorizationAdvice preAdvice;
+
+    public PreInvocationAuthorizationAdviceVoter(PreInvocationAuthorizationAdvice pre) {
+        this.preAdvice = pre;
+    }
+
+    public boolean supports(ConfigAttribute attribute) {
+        return attribute instanceof PreInvocationAuthorizationAdvice;
+    }
+
+    public boolean supports(Class<?> clazz) {
+        return clazz.isAssignableFrom(MethodInvocation.class);
+    }
+
+    public int vote(Authentication authentication, Object object, List<ConfigAttribute> attributes) {
+
+        // Find prefilter and preauth (or combined) attributes
+        // if both null, abstain
+        // else call advice with them
+
+        PreInvocationAttribute preAttr = findPreInvocationAttribute(attributes);
+
+        if (preAttr == null) {
+            // No expression based metadata, so abstain
+            return ACCESS_ABSTAIN;
+        }
+
+        boolean allowed = preAdvice.before(authentication, (MethodInvocation)object, preAttr);
+
+        return allowed ? ACCESS_GRANTED : ACCESS_DENIED;
+    }
+
+    private PreInvocationAttribute findPreInvocationAttribute(List<ConfigAttribute> config) {
+        for (ConfigAttribute attribute : config) {
+            if (attribute instanceof PreInvocationAttribute) {
+                return (PreInvocationAttribute)attribute;
+            }
+        }
+
+        return null;
+    }
+}

core/src/main/java/org/springframework/security/access/expression/method/ExpressionAnnotationMethodSecurityMetadataSource.java → core/src/main/java/org/springframework/security/access/prepost/PrePostAnnotationSecurityMetadataSource.java

@@ -1,4 +1,4 @@
-package org.springframework.security.access.expression.method;
+package org.springframework.security.access.prepost;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
@@ -7,22 +7,15 @@ import java.util.Collection;
 import java.util.List;
 
 import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.expression.Expression;
-import org.springframework.expression.ExpressionParser;
-import org.springframework.expression.ParseException;
-import org.springframework.expression.spel.antlr.SpelAntlrExpressionParser;
 import org.springframework.security.access.ConfigAttribute;
-import org.springframework.security.access.expression.MethodSecurityExpressionHandler;
-import org.springframework.security.access.expression.annotation.PostAuthorize;
-import org.springframework.security.access.expression.annotation.PostFilter;
-import org.springframework.security.access.expression.annotation.PreAuthorize;
-import org.springframework.security.access.expression.annotation.PreFilter;
 import org.springframework.security.access.intercept.method.AbstractMethodSecurityMetadataSource;
 import org.springframework.util.ClassUtils;
 
 /**
  * <tt>MethodSecurityMetadataSource</tt> which extracts metadata from the @PreFilter and @PreAuthorize annotations
- * placed on a method. The metadata is encapsulated in a {@link AbstractExpressionBasedMethodConfigAttribute} instance.
+ * placed on a method. This class is merely responsible for locating the relevant annotations (if any). It delegates
+ * the actual <tt>ConfigAttribute</tt> creation to its {@link PrePostInvocationAttributeFactory}, thus
+ * decoupling itself from the mechanism which will enforce the annotations' behaviour.
  * <p>
  * Annotations may be specified on classes or methods, and method-specific annotations will take precedence.
  * If you use any annotation and do not specify a pre-authorization condition, then the method will be
@@ -31,25 +24,18 @@ import org.springframework.util.ClassUtils;
  * Since we are handling multiple annotations here, it's possible that we may have to combine annotations defined in
  * multiple locations for a single method - they may be defined on the method itself, or at interface or class level.
  *
- * @see MethodExpressionVoter
+ * @see PreInvocationAuthorizationAdviceVoter
  *
  * @author Luke Taylor
- * @since 2.5
+ * @since 3.0
  * @version $Id$
  */
-public class ExpressionAnnotationMethodSecurityMetadataSource extends AbstractMethodSecurityMetadataSource {
-    private ExpressionParser parser;
+public class PrePostAnnotationSecurityMetadataSource extends AbstractMethodSecurityMetadataSource {
 
-    public ExpressionAnnotationMethodSecurityMetadataSource() {
-        parser = new SpelAntlrExpressionParser();
-    }
+    private final PrePostInvocationAttributeFactory attributeFactory;
 
-    /**
-     * Constructor which obtains the expression parser from the {@link MethodSecurityExpressionHandler#getExpressionParser() }
-     * method on the supplied <tt>SecurityExpressionHandler</tt>.
-     */
-    public ExpressionAnnotationMethodSecurityMetadataSource(MethodSecurityExpressionHandler handler) {
-        parser = handler.getExpressionParser();
+    public PrePostAnnotationSecurityMetadataSource(PrePostInvocationAttributeFactory attributeFactory) {
+        this.attributeFactory = attributeFactory;
     }
 
     public List<ConfigAttribute> getAttributes(Method method, Class<?> targetClass) {
@@ -57,7 +43,7 @@ public class ExpressionAnnotationMethodSecurityMetadataSource extends AbstractMe
             return null;
         }
 
-        logger.trace("Looking for expression annotations for method '" +
+        logger.trace("Looking for Pre/Post annotations for method '" +
                 method.getName() + "' on target class '" + targetClass + "'");
         PreFilter preFilter = findAnnotation(method, targetClass, PreFilter.class);
         PreAuthorize preAuthorize = findAnnotation(method, targetClass, PreAuthorize.class);
@@ -71,7 +57,27 @@ public class ExpressionAnnotationMethodSecurityMetadataSource extends AbstractMe
             return null;
         }
 
-        return createAttributeList(preFilter, preAuthorize, postFilter, postAuthorize);
+        ArrayList<ConfigAttribute> attrs = new ArrayList<ConfigAttribute>();
+
+        PreInvocationAttribute pre = attributeFactory.createPreInvocationAttribute(preFilter, preAuthorize);
+
+        if (pre != null) {
+            attrs.add(pre);
+        }
+
+        PostInvocationAttribute post = attributeFactory.createPostInvocationAttribute(postFilter, postAuthorize);
+
+        if (post != null) {
+            attrs.add(post);
+        }
+
+        attrs.trimToSize();
+
+        return attrs.isEmpty() ? null : attrs;
+    }
+
+    public Collection<ConfigAttribute> getAllConfigAttributes() {
+        return null;
     }
 
     /**
@@ -121,40 +127,4 @@ public class ExpressionAnnotationMethodSecurityMetadataSource extends AbstractMe
         return null;
     }
 
-    public Collection<ConfigAttribute> getAllConfigAttributes() {
-        return null;
-    }
-
-    private List<ConfigAttribute> createAttributeList(PreFilter preFilter, PreAuthorize preAuthorize,
-            PostFilter postFilter, PostAuthorize postAuthorize) {
-        ConfigAttribute pre = null;
-        ConfigAttribute post = null;
-
-        // TODO: Optimization of permitAll
-        try {
-            Expression preAuthorizeExpression = preAuthorize == null ? parser.parseExpression("permitAll") : parser.parseExpression(preAuthorize.value());
-            Expression preFilterExpression = preFilter == null ? null : parser.parseExpression(preFilter.value());
-            String filterObject = preFilter == null ? null : preFilter.filterTarget();
-            Expression postAuthorizeExpression = postAuthorize == null ? null : parser.parseExpression(postAuthorize.value());
-            Expression postFilterExpression = postFilter == null ? null : parser.parseExpression(postFilter.value());
-
-            pre = new PreInvocationExpressionAttribute(preFilterExpression, filterObject, preAuthorizeExpression);
-            if (postFilterExpression != null || postAuthorizeExpression != null) {
-                post = new PostInvocationExpressionAttribute(postFilterExpression, postAuthorizeExpression);
-            }
-        } catch (ParseException e) {
-            throw new IllegalArgumentException("Failed to parse expression '" + e.getExpressionString() + "'", e);
-        }
-
-        List<ConfigAttribute> attrs = new ArrayList<ConfigAttribute>(2);
-        if (pre != null) {
-            attrs.add(pre);
-        }
-
-        if (post != null) {
-            attrs.add(post);
-        }
-
-        return attrs;
-    }
 }

core/src/main/java/org/springframework/security/access/prepost/PrePostInvocationAttributeFactory.java

@@ -0,0 +1,14 @@
+package org.springframework.security.access.prepost;
+
+/**
+ *
+ * @author Luke Taylor
+ * @version $Id$
+ * @since 3.0
+ */
+public interface PrePostInvocationAttributeFactory {
+
+    PreInvocationAttribute createPreInvocationAttribute(PreFilter preFilter, PreAuthorize preAuthorize);
+
+    PostInvocationAttribute createPostInvocationAttribute(PostFilter postFilter, PostAuthorize postAuthorize);
+}

core/src/main/java/org/springframework/security/access/prepost/package.html

@@ -0,0 +1,6 @@
+<p>
+Contains the infrastructure classes for handling the @PreAuthorize, @PreFilter, @PostAuthorize and
+@PostFilter annotations.
+</p>
+Other than the annotations themselves, the classes should be regarded as for internal framework use and
+are liable to change without notice.

core/src/main/java/org/springframework/security/authentication/dao/salt/ReflectionSaltSource.java → core/src/main/java/org/springframework/security/authentication/dao/ReflectionSaltSource.java

@@ -13,11 +13,10 @@
  * limitations under the License.
  */
 
-package org.springframework.security.authentication.dao.salt;
+package org.springframework.security.authentication.dao;
 
 
 import org.springframework.security.authentication.AuthenticationServiceException;
-import org.springframework.security.authentication.dao.SaltSource;
 import org.springframework.security.core.userdetails.UserDetails;
 
 

core/src/main/java/org/springframework/security/authentication/dao/salt/SystemWideSaltSource.java → core/src/main/java/org/springframework/security/authentication/dao/SystemWideSaltSource.java

@@ -13,9 +13,8 @@
  * limitations under the License.
  */
 
-package org.springframework.security.authentication.dao.salt;
+package org.springframework.security.authentication.dao;
 
-import org.springframework.security.authentication.dao.SaltSource;
 import org.springframework.security.core.userdetails.UserDetails;
 
 

core/src/main/java/org/springframework/security/authentication/dao/salt/package.html

@@ -1,5 +0,0 @@
-<html>
-<body>
-Implementations that provide salts for more secure password encoding.
-</body>
-</html>

core/src/main/java/org/springframework/security/core/session/SessionCreationEvent.java

@@ -8,7 +8,7 @@ import org.springframework.context.ApplicationEvent;
  *
  * @author Luke Taylor
  * @version $Id$
- * @since 2.5
+ * @since 3.0
  */
 public abstract class SessionCreationEvent extends ApplicationEvent {
 

core/src/main/java/org/springframework/security/core/session/SessionDestroyedEvent.java

@@ -9,7 +9,7 @@ import org.springframework.security.core.context.SecurityContext;
  *
  * @author Luke Taylor
  * @version $Id$
- * @since 2.5
+ * @since 3.0
  */
 public abstract class SessionDestroyedEvent extends ApplicationEvent {
 

core/src/test/java/org/springframework/security/access/annotation/BusinessService.java

@@ -21,7 +21,7 @@ import javax.annotation.security.RolesAllowed;
 import javax.annotation.security.PermitAll;
 
 import org.springframework.security.access.annotation.Secured;
-import org.springframework.security.access.expression.annotation.PreAuthorize;
+import org.springframework.security.access.prepost.PreAuthorize;
 
 /**
  * @version $Id$

core/src/test/java/org/springframework/security/access/annotation/ExpressionProtectedBusinessServiceImpl.java

@@ -3,8 +3,9 @@ package org.springframework.security.access.annotation;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.springframework.security.access.expression.annotation.PostFilter;
-import org.springframework.security.access.expression.annotation.PreFilter;
+import org.springframework.security.access.prepost.PostFilter;
+import org.springframework.security.access.prepost.PreFilter;
+
 
 public class ExpressionProtectedBusinessServiceImpl implements BusinessService {
 

core/src/test/java/org/springframework/security/access/annotation/Jsr250BusinessServiceImpl.java

@@ -6,6 +6,7 @@ import java.util.List;
 import javax.annotation.security.RolesAllowed;
 import javax.annotation.security.PermitAll;
 
+
 /**
  *
  * @author Luke Taylor

core/src/test/java/org/springframework/security/access/annotation/SecuredMethodDefinitionSourceTests.java → core/src/test/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataDefinitionSourceTests.java

@@ -23,23 +23,23 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.access.SecurityConfig;
-import org.springframework.security.access.annotation.SecuredMethodSecurityMetadataSource;
+import org.springframework.security.access.annotation.SecuredAnnotationSecurityMetadataSource;
 import org.springframework.util.StringUtils;
 
 
 /**
- * Tests for {@link org.springframework.security.access.annotation.SecuredMethodSecurityMetadataSource}
+ * Tests for {@link org.springframework.security.access.annotation.SecuredAnnotationSecurityMetadataSource}
  *
  * @author Mark St.Godard
  * @author Joe Scalise
  * @author Ben Alex
  * @version $Id$
  */
-public class SecuredMethodDefinitionSourceTests extends TestCase {
+public class SecuredAnnotationSecurityMetadataDefinitionSourceTests extends TestCase {
     //~ Instance fields ================================================================================================
 
-    private SecuredMethodSecurityMetadataSource mds = new SecuredMethodSecurityMetadataSource();;
-    private Log logger = LogFactory.getLog(SecuredMethodDefinitionSourceTests.class);
+    private SecuredAnnotationSecurityMetadataSource mds = new SecuredAnnotationSecurityMetadataSource();;
+    private Log logger = LogFactory.getLog(SecuredAnnotationSecurityMetadataDefinitionSourceTests.class);
 
     //~ Methods ========================================================================================================
 

core/src/test/java/org/springframework/security/access/expression/method/MethodExpressionVoterTests.java

@@ -11,8 +11,8 @@ import java.util.List;
 import org.aopalliance.intercept.MethodInvocation;
 import org.junit.Test;
 import org.springframework.security.access.ConfigAttribute;
-import org.springframework.security.access.expression.method.MethodExpressionVoter;
 import org.springframework.security.access.expression.method.PreInvocationExpressionAttribute;
+import org.springframework.security.access.prepost.PreInvocationAuthorizationAdviceVoter;
 import org.springframework.security.access.vote.AccessDecisionVoter;
 import org.springframework.security.authentication.TestingAuthenticationToken;
 import org.springframework.security.util.SimpleMethodInvocation;
@@ -20,7 +20,8 @@ import org.springframework.security.util.SimpleMethodInvocation;
 @SuppressWarnings("unchecked")
 public class MethodExpressionVoterTests {
     private TestingAuthenticationToken joe = new TestingAuthenticationToken("joe", "joespass", "blah");
-    private MethodExpressionVoter am = new MethodExpressionVoter();
+    private PreInvocationAuthorizationAdviceVoter am =
+        new PreInvocationAuthorizationAdviceVoter(new ExpressionBasedPreInvocationAdvice());
 
     @Test
     public void hasRoleExpressionAllowsUserWithRole() throws Exception {

core/src/test/java/org/springframework/security/access/expression/support/MethodSecurityExpressionRootTests.java → core/src/test/java/org/springframework/security/access/expression/method/MethodSecurityExpressionRootTests.java

@@ -1,4 +1,4 @@
-package org.springframework.security.access.expression.support;
+package org.springframework.security.access.expression.method;
 
 import static org.junit.Assert.*;
 
@@ -9,9 +9,9 @@ import org.junit.Test;
 import org.springframework.expression.Expression;
 import org.springframework.expression.spel.antlr.SpelAntlrExpressionParser;
 import org.springframework.expression.spel.support.StandardEvaluationContext;
+import org.springframework.security.access.PermissionEvaluator;
 import org.springframework.security.access.expression.ExpressionUtils;
-import org.springframework.security.access.expression.PermissionEvaluator;
-import org.springframework.security.access.expression.support.MethodSecurityExpressionRoot;
+import org.springframework.security.access.expression.method.MethodSecurityExpressionRoot;
 import org.springframework.security.authentication.AuthenticationTrustResolver;
 import org.springframework.security.core.Authentication;
 

core/src/test/java/org/springframework/security/access/expression/method/ExpressionAnnotationMethodDefinitionSourceTests.java → core/src/test/java/org/springframework/security/access/expression/method/PrePostAnnotationSecurityMetadataSourceTests.java

@@ -7,18 +7,22 @@ import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.security.access.ConfigAttribute;
-import org.springframework.security.access.expression.annotation.PostAuthorize;
-import org.springframework.security.access.expression.annotation.PostFilter;
-import org.springframework.security.access.expression.annotation.PreAuthorize;
-import org.springframework.security.access.expression.annotation.PreFilter;
-import org.springframework.security.access.expression.method.ExpressionAnnotationMethodSecurityMetadataSource;
-import org.springframework.security.access.expression.method.PostInvocationExpressionAttribute;
-import org.springframework.security.access.expression.method.PreInvocationExpressionAttribute;
 import org.springframework.security.access.intercept.method.MockMethodInvocation;
-
-
-public class ExpressionAnnotationMethodDefinitionSourceTests {
-    private ExpressionAnnotationMethodSecurityMetadataSource mds = new ExpressionAnnotationMethodSecurityMetadataSource();
+import org.springframework.security.access.prepost.PostAuthorize;
+import org.springframework.security.access.prepost.PostFilter;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.access.prepost.PreFilter;
+import org.springframework.security.access.prepost.PrePostAnnotationSecurityMetadataSource;
+
+/**
+ *
+ * @author Luke Taylor
+ * @version $Id$
+ * @since 3.0
+ */
+public class PrePostAnnotationSecurityMetadataSourceTests {
+    private PrePostAnnotationSecurityMetadataSource mds =
+        new PrePostAnnotationSecurityMetadataSource(new ExpressionBasedAnnotationAttributeFactory(new DefaultMethodSecurityExpressionHandler()));
 
     private MockMethodInvocation voidImpl1;
     private MockMethodInvocation voidImpl2;

core/src/test/java/org/springframework/security/authentication/dao/DaoAuthenticationProviderTests.java

@@ -29,7 +29,6 @@ import org.springframework.security.authentication.LockedException;
 import org.springframework.security.authentication.TestingAuthenticationToken;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
-import org.springframework.security.authentication.dao.salt.SystemWideSaltSource;
 import org.springframework.security.authentication.encoding.ShaPasswordEncoder;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;

core/src/test/java/org/springframework/security/authentication/dao/salt/ReflectionSaltSourceTests.java

@@ -19,7 +19,7 @@ import static junit.framework.Assert.assertEquals;
 
 import org.junit.Test;
 import org.springframework.security.authentication.AuthenticationServiceException;
-import org.springframework.security.authentication.dao.salt.ReflectionSaltSource;
+import org.springframework.security.authentication.dao.ReflectionSaltSource;
 import org.springframework.security.core.authority.AuthorityUtils;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;

core/src/test/java/org/springframework/security/authentication/dao/salt/SystemWideSaltSourceTests.java

@@ -15,7 +15,7 @@
 
 package org.springframework.security.authentication.dao.salt;
 
-import org.springframework.security.authentication.dao.salt.SystemWideSaltSource;
+import org.springframework.security.authentication.dao.SystemWideSaltSource;
 
 import junit.framework.TestCase;
 

core/src/test/resources/someMethod.py

@@ -0,0 +1,9 @@
+    
+print authentication.name;
+
+for authority in authentication.authorities:
+    print authority
+
+print "Granting access"
+
+allow = 1

itest/context/pom.xml

@@ -17,5 +17,10 @@
             <version>2.4</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>jython</groupId>
+            <artifactId>jython</artifactId>
+            <version>2.1</version>
+        </dependency>
     </dependencies>
 </project>

itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPostInvocationAdvice.java

@@ -0,0 +1,15 @@
+package org.springframework.security.integration.python;
+
+import org.aopalliance.intercept.MethodInvocation;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.access.prepost.PostInvocationAttribute;
+import org.springframework.security.access.prepost.PostInvocationAuthorizationAdvice;
+import org.springframework.security.core.Authentication;
+
+public class PythonInterpreterPostInvocationAdvice implements PostInvocationAuthorizationAdvice{
+
+    public Object after(Authentication authentication, MethodInvocation mi, PostInvocationAttribute pia,
+            Object returnedObject) throws AccessDeniedException {
+        return returnedObject;
+    }
+}

itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPreInvocationAdvice.java

@@ -0,0 +1,62 @@
+package org.springframework.security.integration.python;
+
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.aopalliance.intercept.MethodInvocation;
+import org.python.core.Py;
+import org.python.core.PyObject;
+import org.python.util.PythonInterpreter;
+import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
+import org.springframework.core.ParameterNameDiscoverer;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.security.access.prepost.PreInvocationAttribute;
+import org.springframework.security.access.prepost.PreInvocationAuthorizationAdvice;
+import org.springframework.security.core.Authentication;
+import org.springframework.util.ClassUtils;
+
+public class PythonInterpreterPreInvocationAdvice implements PreInvocationAuthorizationAdvice{
+    private ParameterNameDiscoverer parameterNameDiscoverer = new LocalVariableTableParameterNameDiscoverer();
+
+    public boolean before(Authentication authentication, MethodInvocation mi, PreInvocationAttribute preAttr) {
+        PythonInterpreterPreInvocationAttribute pythonAttr = (PythonInterpreterPreInvocationAttribute) preAttr;
+        String script = pythonAttr.getScript();
+
+        PythonInterpreter python = new PythonInterpreter();
+        python.set("authentication", authentication);
+        python.set("args", createArgumentMap(mi));
+        python.set("method", mi.getMethod().getName());
+        Resource scriptResource = new PathMatchingResourcePatternResolver().getResource(script);
+
+        try {
+            python.execfile(scriptResource.getInputStream());
+        } catch (IOException e) {
+            throw new IllegalArgumentException("Couldn't run python script, " + script, e);
+        }
+
+        PyObject allowed = python.get("allow");
+
+        if (allowed == null) {
+            throw new IllegalStateException("Python script did not set the permit flag");
+        }
+
+        return Py.tojava(allowed, Boolean.class);
+    }
+
+    private Map<String,Object> createArgumentMap(MethodInvocation mi) {
+        Object[] args = mi.getArguments();
+        Object targetObject = mi.getThis();
+        Method method = ClassUtils.getMostSpecificMethod(mi.getMethod(), targetObject.getClass());
+        String[] paramNames = parameterNameDiscoverer.getParameterNames(method);
+
+        Map<String,Object> argMap = new HashMap<String,Object>();
+        for(int i=0; i < args.length; i++) {
+            argMap.put(paramNames[i], args[i]);
+        }
+
+        return argMap;
+    }
+}

itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPreInvocationAttribute.java

@@ -0,0 +1,19 @@
+package org.springframework.security.integration.python;
+
+import org.springframework.security.access.prepost.PreInvocationAttribute;
+
+public class PythonInterpreterPreInvocationAttribute implements PreInvocationAttribute {
+    private String script;
+
+    PythonInterpreterPreInvocationAttribute(String script) {
+        this.script = script;
+    }
+
+    public String getAttribute() {
+        return null;
+    }
+
+    public String getScript() {
+        return script;
+    }
+}

itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPrePostInvocationAttributeFactory.java

@@ -0,0 +1,26 @@
+package org.springframework.security.integration.python;
+
+import org.python.util.PythonInterpreter;
+import org.springframework.security.access.prepost.PostAuthorize;
+import org.springframework.security.access.prepost.PostFilter;
+import org.springframework.security.access.prepost.PostInvocationAttribute;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.access.prepost.PreFilter;
+import org.springframework.security.access.prepost.PreInvocationAttribute;
+import org.springframework.security.access.prepost.PrePostInvocationAttributeFactory;
+
+public class PythonInterpreterPrePostInvocationAttributeFactory implements PrePostInvocationAttributeFactory{
+
+    public PythonInterpreterPrePostInvocationAttributeFactory() {
+        PythonInterpreter.initialize(System.getProperties(), null, new String[] {});        
+    }
+    
+    
+    public PreInvocationAttribute createPreInvocationAttribute(PreFilter preFilter, PreAuthorize preAuthorize) {
+        return new PythonInterpreterPreInvocationAttribute(preAuthorize.value());
+    }
+
+    public PostInvocationAttribute createPostInvocationAttribute(PostFilter postFilter, PostAuthorize postAuthorize) {
+        return null;
+    }
+}

itest/context/src/main/java/org/springframework/security/integration/python/TestService.java

@@ -0,0 +1,10 @@
+package org.springframework.security.integration.python;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+
+public interface TestService {
+
+    @PreAuthorize("someMethod.py")
+    public void someMethod();
+
+}

itest/context/src/main/java/org/springframework/security/integration/python/TestServiceImpl.java

@@ -0,0 +1,9 @@
+package org.springframework.security.integration.python;
+
+public class TestServiceImpl implements TestService {
+
+    public void someMethod() {
+        System.out.print("Invoked someMethod()");
+    }
+
+}

itest/context/src/test/java/org/springframework/security/integration/python/PythonInterpreterBasedSecurityTests.java

@@ -0,0 +1,26 @@
+package org.springframework.security.integration.python;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@ContextConfiguration(locations={"/python-method-access-app-context.xml"})
+@RunWith(SpringJUnit4ClassRunner.class)
+public class PythonInterpreterBasedSecurityTests {
+
+    @Autowired
+    private TestService service;
+
+    @Test
+    public void serviceMethod() throws Exception {
+        SecurityContextHolder.getContext().setAuthentication(new UsernamePasswordAuthenticationToken("bob","bobspassword"));
+
+//        for (int i=0; i < 1000; i++) {
+            service.someMethod();
+//        }
+    }
+}

itest/context/src/test/resources/python-method-access-app-context.xml

@@ -0,0 +1,32 @@
+<b:beans xmlns="http://www.springframework.org/schema/security"
+    xmlns:b="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:aop="http://www.springframework.org/schema/aop"
+    xmlns:tx="http://www.springframework.org/schema/tx"
+    xmlns:security="http://www.springframework.org/schema/security"
+    xsi:schemaLocation="
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
+        http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd">
+
+    <global-method-security pre-post-annotations="enabled">
+        <pre-post-annotation-handling>
+            <invocation-attribute-factory ref="attributeFactory"/>
+            <pre-invocation-advice ref="preAdvice"/>
+            <post-invocation-advice ref="postAdvice"/>
+        </pre-post-annotation-handling>
+    </global-method-security>
+
+    <b:bean id="attributeFactory" class="org.springframework.security.integration.python.PythonInterpreterPrePostInvocationAttributeFactory"/>
+    <b:bean id="preAdvice" class="org.springframework.security.integration.python.PythonInterpreterPreInvocationAdvice"/>
+    <b:bean id="postAdvice" class="org.springframework.security.integration.python.PythonInterpreterPostInvocationAdvice"/>
+
+    <b:bean id="service" class="org.springframework.security.integration.python.TestServiceImpl"/>
+
+    <authentication-provider>
+        <user-service>
+            <user name="bob" password="bobspassword" authorities="ROLE_A,ROLE_B"/>
+        </user-service>
+    </authentication-provider>
+
+</b:beans>

itest/context/src/test/resources/sec-933-app-context.xml

@@ -1,30 +1,30 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:tx="http://www.springframework.org/schema/tx"
-	xmlns:security="http://www.springframework.org/schema/security"
-	xsi:schemaLocation="
-	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-	http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
-	http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
-	http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.2.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:aop="http://www.springframework.org/schema/aop"
+    xmlns:tx="http://www.springframework.org/schema/tx"
+    xmlns:security="http://www.springframework.org/schema/security"
+    xsi:schemaLocation="
+    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
+    http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
+    http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd">
 
 
-	<bean id="userRepository" class="org.springframework.security.integration.StubUserRepository"/>
+    <bean id="userRepository" class="org.springframework.security.integration.StubUserRepository"/>
 
-	<security:authentication-provider
-		user-service-ref="userDetailsService" />
-		
-	<bean id="userDetailsService" class="org.springframework.security.integration.UserDetailsServiceImpl">
-		<property name="userRepository" ref="userRepository"/>
-	</bean>
+    <security:authentication-provider
+        user-service-ref="userDetailsService" />
 
-	<security:global-method-security>
-		<security:protect-pointcut
-			expression="execution(* org.springframework.security.integration.*Repository+.*(..))"
-			access="ROLE_LOGGEDIN" />
-	</security:global-method-security>
-	
-	<aop:aspectj-autoproxy/>
-	
-</beans>
+    <bean id="userDetailsService" class="org.springframework.security.integration.UserDetailsServiceImpl">
+        <property name="userRepository" ref="userRepository"/>
+    </bean>
+
+    <security:global-method-security>
+        <security:protect-pointcut
+            expression="execution(* org.springframework.security.integration.*Repository+.*(..))"
+            access="ROLE_LOGGEDIN" />
+    </security:global-method-security>
+
+    <aop:aspectj-autoproxy/>
+
+</beans>

itest/context/src/test/resources/sec-936-app-context.xml

@@ -5,7 +5,7 @@
     xsi:schemaLocation="
     http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
     http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
-    http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.2.xsd">
+    http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd">
 
     <security:authentication-provider>
         <security:user-service>

samples/cas/client/src/main/webapp/WEB-INF/applicationContext-security.xml

@@ -4,7 +4,7 @@
     xmlns:sec="http://www.springframework.org/schema/security"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     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">
+                        http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.0.xsd">
     <sec:http entry-point-ref="casProcessingFilterEntryPoint">
         <sec:intercept-url pattern="/secure/extreme/**" access="ROLE_SUPERVISOR" requires-channel="https"/>
         <sec:intercept-url pattern="/secure/**" access="ROLE_USER" />

samples/contacts/src/main/java/sample/contact/AdminPermissionController.java

@@ -9,13 +9,13 @@ import org.springframework.context.MessageSource;
 import org.springframework.context.MessageSourceAware;
 import org.springframework.context.support.MessageSourceAccessor;
 import org.springframework.dao.DataAccessException;
-import org.springframework.security.acls.Acl;
-import org.springframework.security.acls.AclService;
-import org.springframework.security.acls.Permission;
 import org.springframework.security.acls.domain.BasePermission;
-import org.springframework.security.acls.objectidentity.ObjectIdentityImpl;
-import org.springframework.security.acls.sid.PrincipalSid;
-import org.springframework.security.acls.sid.Sid;
+import org.springframework.security.acls.domain.ObjectIdentityImpl;
+import org.springframework.security.acls.domain.PrincipalSid;
+import org.springframework.security.acls.model.Acl;
+import org.springframework.security.acls.model.AclService;
+import org.springframework.security.acls.model.Permission;
+import org.springframework.security.acls.model.Sid;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.validation.BindingResult;

samples/contacts/src/main/java/sample/contact/ContactManager.java

@@ -14,10 +14,10 @@
  */
 package sample.contact;
 
-import org.springframework.security.access.expression.annotation.PostFilter;
-import org.springframework.security.access.expression.annotation.PreAuthorize;
-import org.springframework.security.acls.Permission;
-import org.springframework.security.acls.sid.Sid;
+import org.springframework.security.access.prepost.PostFilter;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.acls.model.Permission;
+import org.springframework.security.acls.model.Sid;
 
 import java.util.List;
 

samples/contacts/src/main/java/sample/contact/ContactManagerBackend.java

@@ -15,16 +15,16 @@
 package sample.contact;
 
 
-import org.springframework.security.acls.AccessControlEntry;
-import org.springframework.security.acls.MutableAcl;
-import org.springframework.security.acls.MutableAclService;
-import org.springframework.security.acls.NotFoundException;
-import org.springframework.security.acls.Permission;
 import org.springframework.security.acls.domain.BasePermission;
-import org.springframework.security.acls.objectidentity.ObjectIdentity;
-import org.springframework.security.acls.objectidentity.ObjectIdentityImpl;
-import org.springframework.security.acls.sid.PrincipalSid;
-import org.springframework.security.acls.sid.Sid;
+import org.springframework.security.acls.domain.ObjectIdentityImpl;
+import org.springframework.security.acls.domain.PrincipalSid;
+import org.springframework.security.acls.model.AccessControlEntry;
+import org.springframework.security.acls.model.MutableAcl;
+import org.springframework.security.acls.model.MutableAclService;
+import org.springframework.security.acls.model.NotFoundException;
+import org.springframework.security.acls.model.ObjectIdentity;
+import org.springframework.security.acls.model.Permission;
+import org.springframework.security.acls.model.Sid;
 
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;

samples/contacts/src/main/java/sample/contact/DataSourcePopulator.java

@@ -20,14 +20,14 @@ import javax.sql.DataSource;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.security.acls.MutableAcl;
-import org.springframework.security.acls.MutableAclService;
-import org.springframework.security.acls.Permission;
 import org.springframework.security.acls.domain.AclImpl;
 import org.springframework.security.acls.domain.BasePermission;
-import org.springframework.security.acls.objectidentity.ObjectIdentity;
-import org.springframework.security.acls.objectidentity.ObjectIdentityImpl;
-import org.springframework.security.acls.sid.PrincipalSid;
+import org.springframework.security.acls.domain.ObjectIdentityImpl;
+import org.springframework.security.acls.domain.PrincipalSid;
+import org.springframework.security.acls.model.MutableAcl;
+import org.springframework.security.acls.model.MutableAclService;
+import org.springframework.security.acls.model.ObjectIdentity;
+import org.springframework.security.acls.model.Permission;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.authority.AuthorityUtils;

samples/contacts/src/main/java/sample/contact/IndexController.java

@@ -5,10 +5,10 @@ import java.util.List;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.expression.PermissionEvaluator;
-import org.springframework.security.acls.Permission;
+import org.springframework.security.access.PermissionEvaluator;
+import org.springframework.security.acls.AclPermissionEvaluator;
 import org.springframework.security.acls.domain.BasePermission;
-import org.springframework.security.acls.expression.AclPermissionEvaluator;
+import org.springframework.security.acls.model.Permission;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Controller;

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

@@ -12,9 +12,9 @@
     xmlns:b="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-                        http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.5.xsd">
+                        http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.0.xsd">
 
-    <global-method-security expression-annotations="enabled">
+    <global-method-security pre-post-annotations="enabled">
         <expression-handler ref="expressionHandler"/>
     </global-method-security>
 
@@ -48,12 +48,11 @@
        <b:property name="targetUrl" value="/secure/index.htm"/>
     </b:bean>
 
-    <b:bean id="expressionHandler" class="org.springframework.security.access.expression.support.DefaultMethodSecurityExpressionHandler">
-        <b:property name="permissionEvaluator" ref="permissionEvaluator" />
+    <b:bean id="expressionHandler" class="org.springframework.security.access.expression.method.DefaultMethodSecurityExpressionHandler">
+        <b:property name="permissionEvaluator">
+            <b:bean class="org.springframework.security.acls.AclPermissionEvaluator">
+                <b:constructor-arg ref="aclService"/>
+            </b:bean>
+        </b:property>
     </b:bean>
-
-    <b:bean id="permissionEvaluator" class="org.springframework.security.acls.expression.AclPermissionEvaluator">
-        <b:constructor-arg ref="aclService"/>
-    </b:bean>
-
 </b:beans>

samples/contacts/src/test/java/sample/contact/ContactManagerTests.java

@@ -24,7 +24,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.acls.domain.BasePermission;
-import org.springframework.security.acls.sid.PrincipalSid;
+import org.springframework.security.acls.domain.PrincipalSid;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;

samples/contacts/src/test/resources/applicationContext-contacts-test.xml

@@ -11,25 +11,23 @@
     xmlns:b="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-                        http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.5.xsd">
+                        http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.0.xsd">
 
-    <global-method-security expression-annotations="enabled">
+    <global-method-security pre-post-annotations="enabled">
         <expression-handler ref="expressionHandler"/>
     </global-method-security>
 
-   <!-- ======================== AUTHENTICATION ======================= -->
-
     <authentication-provider>
         <password-encoder hash="md5"/>
         <jdbc-user-service data-source-ref="dataSource"/>
     </authentication-provider>
 
-    <b:bean id="expressionHandler" class="org.springframework.security.access.expression.support.DefaultMethodSecurityExpressionHandler">
-        <b:property name="permissionEvaluator" ref="permissionEvaluator" />
-    </b:bean>
-
-    <b:bean id="permissionEvaluator" class="org.springframework.security.acls.expression.AclPermissionEvaluator">
-        <b:constructor-arg ref="aclService"/>
+    <b:bean id="expressionHandler" class="org.springframework.security.access.expression.method.DefaultMethodSecurityExpressionHandler">
+        <b:property name="permissionEvaluator">
+            <b:bean class="org.springframework.security.acls.AclPermissionEvaluator">
+                <b:constructor-arg ref="aclService"/>
+            </b:bean>
+        </b:property>
     </b:bean>
 
 </b:beans>

samples/dms/src/main/java/sample/dms/secured/SecureDataSourcePopulator.java

@@ -2,16 +2,16 @@ package sample.dms.secured;
 
 import javax.sql.DataSource;
 
-import org.springframework.security.acls.MutableAcl;
-import org.springframework.security.acls.MutableAclService;
-import org.springframework.security.acls.NotFoundException;
-import org.springframework.security.acls.Permission;
 import org.springframework.security.acls.domain.BasePermission;
-import org.springframework.security.acls.objectidentity.ObjectIdentity;
-import org.springframework.security.acls.objectidentity.ObjectIdentityImpl;
-import org.springframework.security.acls.sid.GrantedAuthoritySid;
-import org.springframework.security.acls.sid.PrincipalSid;
-import org.springframework.security.acls.sid.Sid;
+import org.springframework.security.acls.domain.GrantedAuthoritySid;
+import org.springframework.security.acls.domain.ObjectIdentityImpl;
+import org.springframework.security.acls.domain.PrincipalSid;
+import org.springframework.security.acls.model.MutableAcl;
+import org.springframework.security.acls.model.MutableAclService;
+import org.springframework.security.acls.model.NotFoundException;
+import org.springframework.security.acls.model.ObjectIdentity;
+import org.springframework.security.acls.model.Permission;
+import org.springframework.security.acls.model.Sid;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.util.Assert;

samples/dms/src/main/java/sample/dms/secured/SecureDocumentDaoImpl.java

@@ -4,12 +4,12 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 
 import org.springframework.jdbc.core.RowMapper;
-import org.springframework.security.acls.MutableAcl;
-import org.springframework.security.acls.MutableAclService;
 import org.springframework.security.acls.domain.BasePermission;
-import org.springframework.security.acls.objectidentity.ObjectIdentity;
-import org.springframework.security.acls.objectidentity.ObjectIdentityImpl;
-import org.springframework.security.acls.sid.PrincipalSid;
+import org.springframework.security.acls.domain.ObjectIdentityImpl;
+import org.springframework.security.acls.domain.PrincipalSid;
+import org.springframework.security.acls.model.MutableAcl;
+import org.springframework.security.acls.model.MutableAclService;
+import org.springframework.security.acls.model.ObjectIdentity;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.util.Assert;
 

samples/dms/src/main/resources/applicationContext-dms-secure.xml

@@ -24,8 +24,8 @@
             <value>
                 sample.dms.secured.SecureDocumentDao.*=PROPAGATION_REQUIRED
                 sample.dms.DocumentDao.*=PROPAGATION_REQUIRED
-                org.springframework.security.acls.AclService.*=PROPAGATION_REQUIRED
-                org.springframework.security.acls.MutableAclService.*=PROPAGATION_REQUIRED
+                org.springframework.security.acls.model.AclService.*=PROPAGATION_REQUIRED
+                org.springframework.security.acls.model.MutableAclService.*=PROPAGATION_REQUIRED
                 org.springframework.security.acls.jdbc.JdbcMutableAclService.*=PROPAGATION_REQUIRED
                 org.springframework.security.acls.jdbc.JdbcAclService.*=PROPAGATION_REQUIRED
             </value>
@@ -114,7 +114,7 @@
    <bean id="roleVoter" class="org.springframework.security.access.vote.RoleVoter"/>
 
    <!-- An access decision voter that reads ACL_ABSTRACT_ELEMENT_WRITE_PARENT configuration settings -->
-   <bean id="aclAbstractElementWriteParentVoter" class="org.springframework.security.acls.vote.AclEntryVoter">
+   <bean id="aclAbstractElementWriteParentVoter" class="org.springframework.security.acls.AclEntryVoter">
       <constructor-arg ref="aclService"/>
       <constructor-arg value="ACL_ABSTRACT_ELEMENT_WRITE_PARENT"/>
       <constructor-arg>
@@ -128,7 +128,7 @@
    </bean>
 
    <!-- An access decision voter that reads ACL_ABSTRACT_ELEMENT_WRITE configuration settings -->
-   <bean id="aclAbstractElementWriteVoter" class="org.springframework.security.acls.vote.AclEntryVoter">
+   <bean id="aclAbstractElementWriteVoter" class="org.springframework.security.acls.AclEntryVoter">
       <constructor-arg ref="aclService"/>
       <constructor-arg value="ACL_ABSTRACT_ELEMENT_WRITE"/>
       <constructor-arg>

samples/tutorial/src/main/java/bigbank/BankService.java

@@ -1,6 +1,6 @@
 package bigbank;
 
-import org.springframework.security.access.expression.annotation.PreAuthorize;
+import org.springframework.security.access.prepost.PreAuthorize;
 
 
 public interface BankService {

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

@@ -10,9 +10,9 @@
     xmlns:beans="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-                        http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.5.xsd">
+                        http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.0.xsd">
 
-    <global-method-security expression-annotations="enabled">
+    <global-method-security prepost-annotations="enabled">
         <!-- AspectJ pointcut expression that locates our "post" method and applies security that way
         <protect-pointcut expression="execution(* bigbank.*Service.post*(..))" access="ROLE_TELLER"/>
         -->