SEC-733: AspectJ Pointcut Expression Parsing support.

core-tiger/pom.xml

@@ -19,6 +19,11 @@
             <artifactId>aspectjrt</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjweaver</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
@@ -87,4 +92,4 @@
             </plugin>
         </plugins>
     </reporting>
-</project>
+</project>

core-tiger/src/test/java/org/springframework/security/config/AnnotationDrivenBeanDefinitionParserTests.java → core-tiger/src/test/java/org/springframework/security/config/GlobalMethodSecurityBeanDefinitionParserTests.java

@@ -16,14 +16,14 @@ import org.springframework.security.providers.UsernamePasswordAuthenticationToke
  * @author Ben Alex
  * @version $Id$
  */
-public class AnnotationDrivenBeanDefinitionParserTests {
+public class GlobalMethodSecurityBeanDefinitionParserTests {
     private ClassPathXmlApplicationContext appContext;
 
     private BusinessService target;
 
     @Before
     public void loadContext() {
-        appContext = new ClassPathXmlApplicationContext("org/springframework/security/config/annotated-method-security.xml");
+        appContext = new ClassPathXmlApplicationContext("org/springframework/security/config/global-method-security.xml");
         target = (BusinessService) appContext.getBean("target");
     }
 

core-tiger/src/test/java/org/springframework/security/config/SecuredAnnotationDrivenBeanDefinitionParserTests.java

@@ -0,0 +1,60 @@
+package org.springframework.security.config;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.security.AccessDeniedException;
+import org.springframework.security.AuthenticationCredentialsNotFoundException;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
+import org.springframework.security.annotation.BusinessService;
+import org.springframework.security.context.SecurityContextHolder;
+import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
+
+/**
+ * @author Ben Alex
+ * @version $Id$
+ */
+public class SecuredAnnotationDrivenBeanDefinitionParserTests {
+    private ClassPathXmlApplicationContext appContext;
+
+    private BusinessService target;
+
+    @Before
+    public void loadContext() {
+        appContext = new ClassPathXmlApplicationContext("org/springframework/security/config/secured-annotated-method-security.xml");
+        target = (BusinessService) appContext.getBean("target");
+    }
+
+    @After
+    public void closeAppContext() {
+        if (appContext != null) {
+            appContext.close();
+        }
+        SecurityContextHolder.clearContext();
+    }
+
+    @Test(expected=AuthenticationCredentialsNotFoundException.class)
+    public void targetShouldPreventProtectedMethodInvocationWithNoContext() {
+        target.someUserMethod1();
+    }
+
+    @Test
+    public void targetShouldAllowProtectedMethodInvocationWithCorrectRole() {
+        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("Test", "Password",
+                new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_USER")});
+        SecurityContextHolder.getContext().setAuthentication(token);
+
+        target.someUserMethod1();
+    }
+
+    @Test(expected=AccessDeniedException.class)
+    public void targetShouldPreventProtectedMethodInvocationWithIncorrectRole() {
+        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("Test", "Password",
+                new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_SOMEOTHERROLE")});
+        SecurityContextHolder.getContext().setAuthentication(token);
+
+        target.someAdminMethod();
+    }
+}

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

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<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"
+    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">
+
+    <b:bean id="target" class="org.springframework.security.annotation.BusinessServiceImpl"/>
+
+	<global-method-security>
+		<protect-pointcut expression="execution(* *.someUser*(..))" access="ROLE_USER"/>
+		<protect-pointcut expression="execution(* *.someAdmin*(..))" access="ROLE_ADMIN"/>
+	</global-method-security>
+
+    <authentication-provider>
+        <user-service>
+            <user name="bob" password="bobspassword" authorities="ROLE_A,ROLE_B" />
+            <user name="bill" password="billspassword" authorities="ROLE_A,ROLE_B,AUTH_OTHER" />
+        </user-service>
+    </authentication-provider>
+
+</b:beans>

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

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

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

@@ -6,9 +6,9 @@
     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">
 
-    <b:bean id="target" class="org.springframework.security.annotation.BusinessServiceImpl"/>
+    <b:bean id="target" class="org.springframework.security.annotation.Jsr250BusinessServiceImpl"/>
 
-	<annotation-driven/>
+	<global-method-security secured="true"/>
 
     <authentication-provider>
         <user-service>

core/pom.xml

@@ -49,14 +49,13 @@
         </dependency>
 	    <dependency>
 	        <groupId>aspectj</groupId>
-		    <artifactId>aspectjrt</artifactId>
-		    <optional>true</optional>
+		<artifactId>aspectjrt</artifactId>
+		<optional>true</optional>
 	    </dependency>
 	    <dependency>
 	        <groupId>org.aspectj</groupId>
-		    <artifactId>aspectjweaver</artifactId>
-		    <scope>test</scope>
-		    <optional>true</optional>
+		<artifactId>aspectjweaver</artifactId>
+		<optional>true</optional>
 	    </dependency>	    
         <dependency>
             <groupId>org.springframework.ldap</groupId>

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

@@ -1,91 +0,0 @@
-package org.springframework.security.config;
-
-import org.springframework.aop.config.AopNamespaceUtils;
-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.BeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.security.intercept.method.MethodDefinitionAttributes;
-import org.springframework.security.intercept.method.aopalliance.MethodDefinitionSourceAdvisor;
-import org.springframework.security.intercept.method.aopalliance.MethodSecurityInterceptor;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.ReflectionUtils;
-import org.springframework.util.StringUtils;
-
-import org.w3c.dom.Element;
-
-/**
- * Processes the top-level "annotation-driven" element.
- *
- * @author Ben Alex
- * @version $Id$
- */
-class AnnotationDrivenBeanDefinitionParser implements BeanDefinitionParser {
-    public static final String SECURED_METHOD_DEFINITION_SOURCE_CLASS = "org.springframework.security.annotation.SecuredMethodDefinitionSource";
-    public static final String JSR_250_SECURITY_METHOD_DEFINITION_SOURCE_CLASS = "org.springframework.security.annotation.Jsr250MethodDefinitionSource";
-    public static final String JSR_250_VOTER_CLASS = "org.springframework.security.annotation.Jsr250Voter";
-    private static final String ATT_ACCESS_MGR = "access-decision-manager-ref";
-    private static final String ATT_USE_JSR250 = "jsr250";
-
-    public BeanDefinition parse(Element element, ParserContext parserContext) {
-        boolean useJsr250 = "true".equals(element.getAttribute(ATT_USE_JSR250));
-        String className = useJsr250 ?
-                JSR_250_SECURITY_METHOD_DEFINITION_SOURCE_CLASS : SECURED_METHOD_DEFINITION_SOURCE_CLASS;
-
-        String beanId = useJsr250 ? BeanIds.JSR_250_METHOD_DEFINITION_SOURCE : BeanIds.SECURED_METHOD_DEFINITION_SOURCE;
-        
-        // Reflectively obtain the Annotation-based ObjectDefinitionSource.
-    	// Reflection is used to avoid a compile-time dependency on SECURED_METHOD_DEFINITION_SOURCE_CLASS, as this parser is in the Java 4 project whereas the dependency is in the Tiger project.
-    	Assert.isTrue(ClassUtils.isPresent(className), "Could not locate class '" + className + "' - please ensure the spring-security-tiger-xxx.jar is in your classpath and you are running Java 5 or above.");
-    	Class clazz = null;
-
-        try {
-    		clazz = ClassUtils.forName(className);
-    	} catch (Exception ex) {
-    		ReflectionUtils.handleReflectionException(ex);
-    	}
-
-        RootBeanDefinition securityAnnotations = new RootBeanDefinition(clazz);
-        securityAnnotations.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
-        parserContext.getRegistry().registerBeanDefinition(beanId, securityAnnotations);
-
-        String accessManagerId = element.getAttribute(ATT_ACCESS_MGR);
-
-        if (!StringUtils.hasText(accessManagerId)) {
-            ConfigUtils.registerDefaultAccessManagerIfNecessary(parserContext);
-
-            if (useJsr250) {
-                ConfigUtils.addVoter(new RootBeanDefinition(JSR_250_VOTER_CLASS, null, null), parserContext);                
-            }
-
-            accessManagerId = BeanIds.ACCESS_MANAGER;
-        }
-
-        // MethodSecurityInterceptor
-
-        RootBeanDefinition interceptor = new RootBeanDefinition(MethodSecurityInterceptor.class);
-        interceptor.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
-
-        interceptor.getPropertyValues().addPropertyValue("accessDecisionManager",
-                new RuntimeBeanReference(accessManagerId));
-
-        interceptor.getPropertyValues().addPropertyValue("authenticationManager",
-                new RuntimeBeanReference(BeanIds.AUTHENTICATION_MANAGER));
-
-        interceptor.getPropertyValues().addPropertyValue("objectDefinitionSource", new RuntimeBeanReference(beanId));
-        parserContext.getRegistry().registerBeanDefinition(BeanIds.METHOD_SECURITY_INTERCEPTOR, interceptor);
-
-        // MethodDefinitionSourceAdvisor
-        
-        RootBeanDefinition advisor = new RootBeanDefinition(MethodDefinitionSourceAdvisor.class);
-        advisor.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
-        advisor.getConstructorArgumentValues().addGenericArgumentValue(interceptor);
-        parserContext.getRegistry().registerBeanDefinition(BeanIds.METHOD_DEFINITION_SOURCE_ADVISOR, advisor);
-
-        AopNamespaceUtils.registerAutoProxyCreatorIfNecessary(parserContext, element);
-
-        return null;
-    }
-}

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

@@ -48,6 +48,8 @@ public abstract class BeanIds {
 	public static final String SECURITY_CONTEXT_HOLDER_AWARE_REQUEST_FILTER = "_securityContextHolderAwareRequestFilter";
 	public static final String METHOD_SECURITY_INTERCEPTOR = "_methodSecurityInterceptor";
 	public static final String METHOD_DEFINITION_SOURCE_ADVISOR = "_methodDefinitionSourceAdvisor";
+	public static final String PROTECT_POINTCUT_POST_PROCESSOR = "_protectPointcutPostProcessor";
+	public static final String DELEGATING_METHOD_DEFINITION_SOURCE = "_delegatingMethodDefinitionSource";
 	public static final String SECURED_METHOD_DEFINITION_SOURCE = "_securedMethodDefinitionSource";
 	public static final String JSR_250_METHOD_DEFINITION_SOURCE = "_jsr250MethodDefinitionSource";
     public static final String EMBEDDED_APACHE_DS = "_apacheDirectoryServerContainer";

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

@@ -51,8 +51,8 @@ public abstract class ConfigUtils {
 
         ManagedList voters = (ManagedList) accessMgr.getPropertyValues().getPropertyValue("decisionVoters").getValue();
         voters.add(voter);
-
-        accessMgr.getPropertyValues().addPropertyValue("decisionVoters", voter);
+        
+        accessMgr.getPropertyValues().addPropertyValue("decisionVoters", voters);
     }
 
     /**

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

@@ -18,6 +18,7 @@ abstract class Elements {
 	public static final String LDAP_PROVIDER = "ldap-authentication-provider";
 	public static final String LDAP_SERVER = "ldap-server";
     public static final String LDAP_USER_SERVICE = "ldap-user-service";
+    public static final String PROTECT_POINTCUT = "protect-pointcut";
     public static final String PROTECT = "protect";
 	public static final String CONCURRENT_SESSIONS = "concurrent-session-control";
 	public static final String LOGOUT = "logout";
@@ -27,7 +28,7 @@ abstract class Elements {
 	public static final String REMEMBER_ME = "remember-me";
 	public static final String ANONYMOUS = "anonymous";
 	public static final String FILTER_CHAIN = "filter-chain";
-	public static final String ANNOTATION_DRIVEN = "annotation-driven";
+	public static final String GLOBAL_METHOD_SECURITY = "global-method-security";
 	public static final String PASSWORD_ENCODER = "password-encoder";
 	public static final String SALT_SOURCE = "salt-source";
 	public static final String PORT_MAPPINGS = "port-mappings";

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

@@ -0,0 +1,151 @@
+package org.springframework.security.config;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.aop.config.AopNamespaceUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.config.RuntimeBeanReference;
+import org.springframework.beans.factory.support.RootBeanDefinition;
+import org.springframework.beans.factory.xml.BeanDefinitionParser;
+import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.security.ConfigAttributeDefinition;
+import org.springframework.security.intercept.method.DelegatingMethodDefinitionSource;
+import org.springframework.security.intercept.method.MapBasedMethodDefinitionSource;
+import org.springframework.security.intercept.method.ProtectPointcutPostProcessor;
+import org.springframework.security.intercept.method.aopalliance.MethodDefinitionSourceAdvisor;
+import org.springframework.security.intercept.method.aopalliance.MethodSecurityInterceptor;
+import org.springframework.util.Assert;
+import org.springframework.util.ClassUtils;
+import org.springframework.util.StringUtils;
+import org.springframework.util.xml.DomUtils;
+import org.w3c.dom.Element;
+
+/**
+ * Processes the top-level "global-method-security" element.
+ * 
+ *
+ * @author Ben Alex
+ * @version $Id$
+ */
+class GlobalMethodSecurityBeanDefinitionParser implements BeanDefinitionParser {
+    public static final String SECURED_DEPENDENCY_CLASS = "org.springframework.security.annotation.Secured";
+    public static final String SECURED_METHOD_DEFINITION_SOURCE_CLASS = "org.springframework.security.annotation.SecuredMethodDefinitionSource";
+    public static final String JSR_250_DEPENDENCY_CLASS = "javax.annotation.security.DenyAll";
+    public static final String JSR_250_SECURITY_METHOD_DEFINITION_SOURCE_CLASS = "org.springframework.security.annotation.Jsr250MethodDefinitionSource";
+    public static final String JSR_250_VOTER_CLASS = "org.springframework.security.annotation.Jsr250Voter";
+    private static final String ATT_ACCESS = "access";
+    private static final String ATT_EXPRESSION = "expression";
+    private static final String ATT_ACCESS_MGR = "access-decision-manager-ref";
+    private static final String ATT_USE_JSR250 = "jsr250";
+    private static final String ATT_USE_SECURED = "secured";
+
+    private void validatePresent(String className) {
+    	Assert.isTrue(ClassUtils.isPresent(className), "Cannot locate '" + className + "'");
+    }
+    
+    public BeanDefinition parse(Element element, ParserContext parserContext) {
+        boolean useJsr250 = "true".equals(element.getAttribute(ATT_USE_JSR250));
+        boolean useSecured = "true".equals(element.getAttribute(ATT_USE_SECURED));
+
+        // Check the required classes are present
+        if (useSecured) {
+        	validatePresent(SECURED_METHOD_DEFINITION_SOURCE_CLASS);
+        	validatePresent(SECURED_DEPENDENCY_CLASS);
+        }
+
+        if (useJsr250) {
+        	validatePresent(JSR_250_SECURITY_METHOD_DEFINITION_SOURCE_CLASS);
+        	validatePresent(JSR_250_VOTER_CLASS);
+        	validatePresent(JSR_250_DEPENDENCY_CLASS);
+        }
+        
+        // Now create a Map<String, ConfigAttribute> for each <protect-pointcut> sub-element
+        Map pointcutMap = new LinkedHashMap();
+        List protect = DomUtils.getChildElementsByTagName(element, Elements.PROTECT_POINTCUT);
+
+        for (Iterator i = protect.iterator(); i.hasNext();) {
+            Element childElt = (Element) i.next();
+            String accessConfig = childElt.getAttribute(ATT_ACCESS);
+            String expression = childElt.getAttribute(ATT_EXPRESSION);
+            Assert.hasText(accessConfig, "Access configuration required for '" + childElt + "'");
+            Assert.hasText(expression, "Expression required for '" + childElt + "'");
+            
+            ConfigAttributeDefinition def = new ConfigAttributeDefinition(StringUtils.commaDelimitedListToStringArray(accessConfig));
+            pointcutMap.put(expression, def);
+        }
+
+        MapBasedMethodDefinitionSource mapBasedMethodDefinitionSource = new MapBasedMethodDefinitionSource();
+        
+        // Now create and populate our ProtectPointcutBeanPostProcessor, if needed
+        if (pointcutMap.size() > 0) {
+            RootBeanDefinition ppbp = new RootBeanDefinition(ProtectPointcutPostProcessor.class);
+            ppbp.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
+            ppbp.getConstructorArgumentValues().addGenericArgumentValue(mapBasedMethodDefinitionSource);
+            ppbp.getPropertyValues().addPropertyValue("pointcutMap", pointcutMap);
+            parserContext.getRegistry().registerBeanDefinition(BeanIds.PROTECT_POINTCUT_POST_PROCESSOR, ppbp);
+        }
+        
+        // Create our list of method metadata delegates
+        List delegates = new ArrayList();
+        delegates.add(mapBasedMethodDefinitionSource);
+        
+        if (useSecured) {
+        	try {
+            	delegates.add(BeanUtils.instantiateClass(ClassUtils.forName(SECURED_METHOD_DEFINITION_SOURCE_CLASS)));
+        	} catch (ClassNotFoundException shouldNotHappen) {
+        		throw new IllegalStateException(shouldNotHappen);
+        	}
+        }
+        
+        if (useJsr250) {
+        	try {
+        		delegates.add(BeanUtils.instantiateClass(ClassUtils.forName(JSR_250_SECURITY_METHOD_DEFINITION_SOURCE_CLASS)));
+        	} catch (ClassNotFoundException shouldNotHappen) {
+        		throw new IllegalStateException(shouldNotHappen);
+        	}
+        }
+        
+    	// Register our DelegatingMethodDefinitionSource
+        RootBeanDefinition delegatingMethodDefinitionSource = new RootBeanDefinition(DelegatingMethodDefinitionSource.class);
+        delegatingMethodDefinitionSource.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
+        delegatingMethodDefinitionSource.getPropertyValues().addPropertyValue("methodDefinitionSources", delegates);
+        parserContext.getRegistry().registerBeanDefinition(BeanIds.DELEGATING_METHOD_DEFINITION_SOURCE, delegatingMethodDefinitionSource);
+
+        // Register the applicable AccessDecisionManager, handling the special JSR 250 voter if being used
+        String accessManagerId = element.getAttribute(ATT_ACCESS_MGR);
+
+        if (!StringUtils.hasText(accessManagerId)) {
+            ConfigUtils.registerDefaultAccessManagerIfNecessary(parserContext);
+
+            if (useJsr250) {
+                ConfigUtils.addVoter(new RootBeanDefinition(JSR_250_VOTER_CLASS, null, null), parserContext);                
+            }
+
+            accessManagerId = BeanIds.ACCESS_MANAGER;
+        }
+
+        // MethodSecurityInterceptor
+        RootBeanDefinition interceptor = new RootBeanDefinition(MethodSecurityInterceptor.class);
+        interceptor.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
+
+        interceptor.getPropertyValues().addPropertyValue("accessDecisionManager", new RuntimeBeanReference(accessManagerId));
+        interceptor.getPropertyValues().addPropertyValue("authenticationManager", new RuntimeBeanReference(BeanIds.AUTHENTICATION_MANAGER));
+        interceptor.getPropertyValues().addPropertyValue("objectDefinitionSource", new RuntimeBeanReference(BeanIds.DELEGATING_METHOD_DEFINITION_SOURCE));
+        parserContext.getRegistry().registerBeanDefinition(BeanIds.METHOD_SECURITY_INTERCEPTOR, interceptor);
+
+        // MethodDefinitionSourceAdvisor
+        RootBeanDefinition advisor = new RootBeanDefinition(MethodDefinitionSourceAdvisor.class);
+        advisor.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
+        advisor.getConstructorArgumentValues().addGenericArgumentValue(interceptor);
+        parserContext.getRegistry().registerBeanDefinition(BeanIds.METHOD_DEFINITION_SOURCE_ADVISOR, advisor);
+
+        AopNamespaceUtils.registerAutoProxyCreatorIfNecessary(parserContext, element);
+
+        return null;
+    }
+}

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

@@ -21,7 +21,7 @@ public class SecurityNamespaceHandler extends NamespaceHandlerSupport {
         registerBeanDefinitionParser(Elements.USER_SERVICE, new UserServiceBeanDefinitionParser());
         registerBeanDefinitionParser(Elements.JDBC_USER_SERVICE, new JdbcUserServiceBeanDefinitionParser());
         registerBeanDefinitionParser(Elements.AUTHENTICATION_PROVIDER, new AuthenticationProviderBeanDefinitionParser());
-        registerBeanDefinitionParser(Elements.ANNOTATION_DRIVEN, new AnnotationDrivenBeanDefinitionParser());
+        registerBeanDefinitionParser(Elements.GLOBAL_METHOD_SECURITY, new GlobalMethodSecurityBeanDefinitionParser());
         registerBeanDefinitionParser(Elements.AUTHENTICATION_MANAGER, new AuthenticationManagerBeanDefinitionParser());
         registerBeanDefinitionParser(Elements.FILTER_INVOCATION_DEFINITION_SOURCE, new FilterInvocationDefinitionSourceBeanDefinitionParser());
 

core/src/main/java/org/springframework/security/intercept/method/DelegatingMethodDefinitionSource.java

@@ -0,0 +1,80 @@
+package org.springframework.security.intercept.method;
+
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.security.ConfigAttributeDefinition;
+import org.springframework.util.Assert;
+
+/**
+ * Automatically tries a series of method definition sources, relying on the first source of metadata
+ * that provides a non-null response.
+ * 
+ * @author Ben Alex
+ * @version $Id$
+ */
+public final class DelegatingMethodDefinitionSource implements MethodDefinitionSource, InitializingBean {
+	private List methodDefinitionSources;
+	
+	public void afterPropertiesSet() throws Exception {
+		Assert.notEmpty(methodDefinitionSources, "A list of MethodDefinitionSources is required");
+	}
+
+	public ConfigAttributeDefinition getAttributes(Method method, Class targetClass) {
+		Iterator i = methodDefinitionSources.iterator();
+		while (i.hasNext()) {
+			MethodDefinitionSource s = (MethodDefinitionSource) i.next();
+			ConfigAttributeDefinition result = s.getAttributes(method, targetClass);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	public ConfigAttributeDefinition getAttributes(Object object) throws IllegalArgumentException {
+		Iterator i = methodDefinitionSources.iterator();
+		while (i.hasNext()) {
+			MethodDefinitionSource s = (MethodDefinitionSource) i.next();
+			ConfigAttributeDefinition result = s.getAttributes(object);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	public Collection getConfigAttributeDefinitions() {
+		Set set = new HashSet();
+		Iterator i = methodDefinitionSources.iterator();
+		while (i.hasNext()) {
+			MethodDefinitionSource s = (MethodDefinitionSource) i.next();
+			Collection attrs = s.getConfigAttributeDefinitions();
+			if (attrs != null) {
+				set.addAll(attrs);
+			}
+		}
+		return set;
+	}
+
+	public boolean supports(Class clazz) {
+		Iterator i = methodDefinitionSources.iterator();
+		while (i.hasNext()) {
+			MethodDefinitionSource s = (MethodDefinitionSource) i.next();
+			if (s.supports(clazz)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public void setMethodDefinitionSources(List methodDefinitionSources) {
+		Assert.notEmpty(methodDefinitionSources, "A list of MethodDefinitionSources is required");
+		this.methodDefinitionSources = methodDefinitionSources;
+	}
+}

core/src/main/java/org/springframework/security/intercept/method/ProtectPointcutPostProcessor.java

@@ -0,0 +1,153 @@
+package org.springframework.security.intercept.method;
+
+import java.lang.reflect.Method;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.aspectj.weaver.tools.PointcutExpression;
+import org.aspectj.weaver.tools.PointcutParser;
+import org.aspectj.weaver.tools.PointcutPrimitive;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.config.BeanPostProcessor;
+import org.springframework.security.ConfigAttributeDefinition;
+import org.springframework.security.intercept.method.aopalliance.MethodDefinitionSourceAdvisor;
+import org.springframework.util.Assert;
+
+/**
+ * Parses AspectJ pointcut expressions, registering methods that match the pointcut with a
+ * traditional {@link MapBasedMethodDefinitionSource}.
+ * 
+ * <p>
+ * This class provides a convenient way of declaring a list of pointcuts, and then
+ * having every method of every bean defined in the Spring application context compared with
+ * those pointcuts. Where a match is found, the matching method will be registered with the
+ * {@link MapBasedMethodDefinitionSource}.
+ * </p>
+ * 
+ * <p>
+ * It is very important to understand that only the <b>first</b> pointcut that matches a given
+ * method will be taken as authoritative for that method. This is why pointcuts should be provided
+ * as a <tt>LinkedHashMap</tt>, because their order is very important.
+ * </p>
+ * 
+ * <p>
+ * Note also that only beans defined in the Spring application context will be examined by this
+ * class. 
+ * </p>
+ * 
+ * <p>
+ * Because this class registers method security metadata with {@link MapBasedMethodDefinitionSource},
+ * normal Spring Security capabilities such as {@link MethodDefinitionSourceAdvisor} can be used.
+ * It does not matter the fact the method metadata was originally obtained from an AspectJ pointcut
+ * expression evaluation.
+ * </p>
+ *
+ * @author Ben Alex
+ * @verion $Id$
+ *
+ */
+public final class ProtectPointcutPostProcessor implements BeanPostProcessor {
+
+    private static final Log logger = LogFactory.getLog(ProtectPointcutPostProcessor.class);
+
+    private Map pointcutMap = new LinkedHashMap(); /** Key: string-based pointcut, value: ConfigAttributeDefinition */
+	private MapBasedMethodDefinitionSource mapBasedMethodDefinitionSource;
+	private PointcutParser parser;
+	
+	public ProtectPointcutPostProcessor(MapBasedMethodDefinitionSource mapBasedMethodDefinitionSource) {
+		Assert.notNull(mapBasedMethodDefinitionSource, "MapBasedMethodDefinitionSource to populate is required");
+		this.mapBasedMethodDefinitionSource = mapBasedMethodDefinitionSource;
+		
+		// Setup AspectJ pointcut expression parser
+		Set supportedPrimitives = new HashSet();
+		supportedPrimitives.add(PointcutPrimitive.EXECUTION);
+		supportedPrimitives.add(PointcutPrimitive.ARGS);
+		supportedPrimitives.add(PointcutPrimitive.REFERENCE);
+//		supportedPrimitives.add(PointcutPrimitive.THIS);
+//		supportedPrimitives.add(PointcutPrimitive.TARGET);
+//		supportedPrimitives.add(PointcutPrimitive.WITHIN);
+//		supportedPrimitives.add(PointcutPrimitive.AT_ANNOTATION);
+//		supportedPrimitives.add(PointcutPrimitive.AT_WITHIN);
+//		supportedPrimitives.add(PointcutPrimitive.AT_ARGS);
+//		supportedPrimitives.add(PointcutPrimitive.AT_TARGET);
+		parser = PointcutParser.getPointcutParserSupportingSpecifiedPrimitivesAndUsingContextClassloaderForResolution(supportedPrimitives);
+	}
+
+	public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
+		return bean;
+	}
+
+	public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
+		// Obtain methods for the present bean
+		Method[] methods;
+		try {
+			methods = bean.getClass().getMethods();
+		} catch (Exception e) {
+			throw new IllegalStateException(e);
+		}
+		
+		// Check to see if any of those methods are compatible with our pointcut expressions
+		for (int i = 0; i < methods.length; i++) {
+			Iterator iter = pointcutMap.keySet().iterator();
+			while (iter.hasNext()) {
+				String ex = iter.next().toString();
+				
+				// Parse the presented AspectJ pointcut expression
+				PointcutExpression expression = parser.parsePointcutExpression(ex);
+
+				// Try for the bean class directly
+				if (attemptMatch(bean.getClass(), methods[i], expression, beanName)) {
+					// We've found the first expression that matches this method, so move onto the next method now
+					break; // the "while" loop, not the "for" loop
+				}
+			}
+		}
+		
+		return bean;
+	}
+	
+	private boolean attemptMatch(Class targetClass, Method method, PointcutExpression expression, String beanName) {
+		// Determine if the presented AspectJ pointcut expression matches this method
+		boolean matches = expression.matchesMethodExecution(method).alwaysMatches();
+		
+		// Handle accordingly
+		if (matches) {
+			ConfigAttributeDefinition attr = (ConfigAttributeDefinition) pointcutMap.get(expression.getPointcutExpression());
+			
+			if (logger.isDebugEnabled()) {
+				logger.debug("AspectJ pointcut expression '" + expression.getPointcutExpression() + "' matches target class '" + targetClass.getName() + "' (bean ID '" + beanName + "') for method '" + method + "'; registering security configuration attribute '" + attr + "'");
+			}
+			
+			mapBasedMethodDefinitionSource.addSecureMethod(targetClass, method.getName(), attr);
+		}
+		
+		return matches;
+	}
+	
+	public void setPointcutMap(Map map) {
+		Assert.notEmpty(map);
+		Iterator i = map.keySet().iterator();
+		while (i.hasNext()) {
+			String expression = i.next().toString();
+			Object value = map.get(expression);
+			Assert.isInstanceOf(ConfigAttributeDefinition.class, value, "Map keys must be instances of ConfigAttributeDefinition");
+			addPointcut(expression, (ConfigAttributeDefinition) value);
+		}
+	}
+
+	public void addPointcut(String pointcutExpression, ConfigAttributeDefinition definition) {
+		Assert.hasText(pointcutExpression, "An AspecTJ pointcut expression is required");
+		Assert.notNull(definition, "ConfigAttributeDefinition required");
+		pointcutMap.put(pointcutExpression, definition);
+		
+		if (logger.isDebugEnabled()) {
+			logger.debug("AspectJ pointcut expression '" + pointcutExpression + "' registered for security configuration attribute '" + definition + "'");
+		}
+	}
+	
+}

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

@@ -143,26 +143,41 @@ intercept-methods.attlist &=
 
 
 protect =
-    ## Defines a protected method and the access control configuration attributes that apply to it
+    ## 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".
     element protect {protect.attlist, empty}
 protect.attlist &=
     ## A method name
     attribute method {xsd:string}
 protect.attlist &=
-    ## Access configuration attributes list that applies to the method, e.g. "ROLE_A,ROLE_B"
+    ## Access configuration attributes list that applies to the method, e.g. "ROLE_A,ROLE_B".
     attribute access {xsd:string}
 
 
-annotation-driven =
-    ## Activates security annotation scanning. All beans registered in the Spring application context will be scanned for Spring Security annotations. Where found, the beans will automatically be proxied and security authorization applied to the methods accordingly. Please ensure you have the spring-security-tiger-XXX.jar on your classpath.
-	element annotation-driven {annotation-driven.attlist}
-annotation-driven.attlist &=
-    ## Specifies that JSR-250 style attributes are to be used (for example "RolesAllowed" instead of "Secured"). This will require the javax.annotation.security classes on the classpath. Defaults to false.
-    attribute jsr250 {"true" | "false" }?
-annotation-driven.attlist &=
+global-method-security =
+    ## Provides method security for all beans registered in the Spring application context. Specifically, beans will be scanned for Spring Security annotations and/or matches with the ordered list of "protect-pointcut" sub-elements. Where there is a match, the beans will automatically be proxied and security authorization applied to the methods accordingly. If you use and enable all three sources of method security metadata (ie "protect-pointcut" declarations, @Secured and also JSR 250 security annotations), the metadata sources will be queried in that order. In practical terms, this enables you to use XML to override method security metadata expressed by way of @Secured annotations, with @Secured annotations overriding method security metadata expressed by JSR 250 annotations. It is perfectly acceptable to mix and match, with a given Java type using a combination of XML, @Secured and JSR 250 to express method security metadata (albeit on different methods).
+	element global-method-security {global-method-security.attlist, protect-pointcut*}
+global-method-security.attlist &=
+    ## Specifies that Spring Security's @Secured annotation should be used. Please ensure you have the spring-security-tiger-xxx.jar on the classpath. Defaults to false.
+    attribute secured {"false" | "true" }?
+global-method-security.attlist &=
+    ## Specifies that JSR-250 style attributes are to be used (for example "RolesAllowed"). This will require the javax.annotation.security classes on the classpath. Defaults to false.
+    attribute jsr250 {"false" | "true" }?
+global-method-security.attlist &=
     ## Optional AccessDecisionManager bean ID to override the default.
     attribute access-decision-manager-ref {xsd:string}?
 
+
+protect-pointcut =
+    ## 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.
+    element protect-pointcut {protect-pointcut.attlist, empty}
+protect-pointcut.attlist &=
+    ## An AspectJ expression, including the 'execution' keyword. For example, 'execution(int com.foo.TargetObject.countLength(String))' (without the quotes).
+    attribute expression {xsd:string}
+protect-pointcut.attlist &=
+    ## Access configuration attributes list that applies to all methods matching the pointcut, e.g. "ROLE_A,ROLE_B"
+    attribute access {xsd:string}
+
+
 http =
     ## Container element for HTTP security configuration
    element http {http.attlist, (intercept-url+ & form-login? & openid-login & x509? & http-basic? & logout? & concurrent-session-control? & remember-me? & anonymous? & port-mappings) }

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

@@ -1,1832 +1,995 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:security="http://www.springframework.org/schema/security" elementFormDefault="qualified" targetNamespace="http://www.springframework.org/schema/security">
-  
-   <xs:attributeGroup name="hash">
-    
-      <xs:attribute name="hash" use="required">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Defines the hashing algorithm used on user passwords. We recommend strongly against using MD4, as it is a very weak hashing algorithm.</xs:documentation>
-      
-         </xs:annotation>
-      
-         <xs:simpleType>
-        
-            <xs:restriction base="xs:token">
-          
-               <xs:enumeration value="plaintext"/>
-          
-               <xs:enumeration value="sha"/>
-          
-               <xs:enumeration value="md5"/>
-          
-               <xs:enumeration value="md4"/>
-          
-               <xs:enumeration value="{sha}"/>
-          
-               <xs:enumeration value="{ssha}"/>
-        
-            </xs:restriction>
-      
-         </xs:simpleType>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-   <xs:attributeGroup name="base64">
-    
-      <xs:attribute name="base64" use="required">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Whether a string should be base64 encoded</xs:documentation>
-      
-         </xs:annotation>
-      
-         <xs:simpleType>
-        
-            <xs:restriction base="xs:token">
-          
-               <xs:enumeration value="true"/>
-          
-               <xs:enumeration value="false"/>
-        
-            </xs:restriction>
-      
-         </xs:simpleType>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-   <xs:attributeGroup name="path-type">
-    
-      <xs:attribute name="path-type" use="required">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Defines the type of pattern used to specify URL paths (either JDK 1.4-compatible regular expressions, or Apache Ant expressions). Defaults to "ant" if unspecified.</xs:documentation>
-      
-         </xs:annotation>
-      
-         <xs:simpleType>
-        
-            <xs:restriction base="xs:token">
-          
-               <xs:enumeration value="ant"/>
-          
-               <xs:enumeration value="regex"/>
-        
-            </xs:restriction>
-      
-         </xs:simpleType>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-   <xs:attributeGroup name="port">
-    
-      <xs:attribute name="port" use="required" type="xs:integer">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Specifies an IP port number. Used to configure an embedded LDAP server, for example.</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-   <xs:attributeGroup name="url">
-    
-      <xs:attribute name="url" use="required" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Specifies a URL.</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-   <xs:attributeGroup name="id">
-    
-      <xs:attribute name="id" use="required" type="xs:ID">
-      
-         <xs:annotation>
-        
-            <xs:documentation>A bean identifier, used for referring to the bean elsewhere in the context.</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-   <xs:attributeGroup name="ref">
-    
-      <xs:attribute name="ref" use="required" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Defines a reference to a Spring bean Id.</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-   <xs:attributeGroup name="user-service-ref">
-    
-      <xs:attribute name="user-service-ref" use="required" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>A reference to a user-service (or UserDetailsService bean) Id</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-   <xs:element name="password-encoder">
-      <xs:annotation>
-      
-         <xs:documentation>element which defines a password encoding strategy. Used by an authentication provider to convert submitted passwords to hashed versions, for example.</xs:documentation>
-    
-      </xs:annotation>
-      <xs:complexType>
-      
-         <xs:sequence>
-        
-            <xs:element minOccurs="0" name="salt-source">
-               <xs:complexType>
-      
-                  <xs:attribute name="user-property" type="xs:string">
-        
-                     <xs:annotation>
-          
-                        <xs:documentation>A property of the UserDetails object which will be used as salt by a password encoder. Typically something like "username" might be used. </xs:documentation>
-        
-                     </xs:annotation>
-      
-                  </xs:attribute>
-      
-                  <xs:attribute name="system-wide" type="xs:string">
-        
-                     <xs:annotation>
-          
-                        <xs:documentation>A single value that will be used as the salt for a password encoder. </xs:documentation>
-        
-                     </xs:annotation>
-      
-                  </xs:attribute>
-    
-               </xs:complexType>
-            </xs:element>
-      
-         </xs:sequence>
-      
-         <xs:attributeGroup ref="security:password-encoder.attlist"/>
-    
-      </xs:complexType>
-   </xs:element>
-  
-   <xs:attributeGroup name="password-encoder.attlist">
-    
-      <xs:attribute name="ref" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Defines a reference to a Spring bean Id.</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="hash">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Defines the hashing algorithm used on user passwords. We recommend strongly against using MD4, as it is a very weak hashing algorithm.</xs:documentation>
-      
-         </xs:annotation>
-      
-         <xs:simpleType>
-        
-            <xs:restriction base="xs:token">
-          
-               <xs:enumeration value="plaintext"/>
-          
-               <xs:enumeration value="sha"/>
-          
-               <xs:enumeration value="md5"/>
-          
-               <xs:enumeration value="md4"/>
-          
-               <xs:enumeration value="{sha}"/>
-          
-               <xs:enumeration value="{ssha}"/>
-        
-            </xs:restriction>
-      
-         </xs:simpleType>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="base64">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Whether a string should be base64 encoded</xs:documentation>
-      
-         </xs:annotation>
-      
-         <xs:simpleType>
-        
-            <xs:restriction base="xs:token">
-          
-               <xs:enumeration value="true"/>
-          
-               <xs:enumeration value="false"/>
-        
-            </xs:restriction>
-      
-         </xs:simpleType>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-  
-   <xs:attributeGroup name="user-property">
-    
-      <xs:attribute name="user-property" use="required" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>A property of the UserDetails object which will be used as salt by a password encoder. Typically something like "username" might be used. </xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-   <xs:attributeGroup name="system-wide">
-    
-      <xs:attribute name="system-wide" use="required" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>A single value that will be used as the salt for a password encoder. </xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-   <xs:element name="ldap-server">
-      <xs:annotation>
-      
-         <xs:documentation>Defines an LDAP server location or starts an embedded server. The url indicates the location of a remote server. If no url is given, an embedded server will be started, listening on the supplied port number. The port is optional and defaults to 33389. A Spring LDAP ContextSource bean will be registered for the server with the id supplied. </xs:documentation>
-    
-      </xs:annotation>
-      <xs:complexType>
-      
-         <xs:attributeGroup ref="security:ldap-server.attlist"/>
-    
-      </xs:complexType>
-   </xs:element>
-  
-   <xs:attributeGroup name="ldap-server.attlist">
-    
-      <xs:attribute name="id" type="xs:ID">
-      
-         <xs:annotation>
-        
-            <xs:documentation>A bean identifier, used for referring to the bean elsewhere in the context.</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="url" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Specifies a URL.</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="port" type="xs:integer">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Specifies an IP port number. Used to configure an embedded LDAP server, for example.</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="manager-dn" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Username (DN) of the "manager" user identity which will be used to authenticate to a (non-embedded) LDAP server. If omitted, anonymous access will be used. </xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="manager-password" type="xs:string"/>
-    
-      <xs:attribute name="ldif" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Explicitly specifies an ldif file resource to load into an embedded LDAP server</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="root" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Optional root suffix for the embedded LDAP server. Default is "dc=springframework,dc=org"</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-   <xs:attributeGroup name="ldap-server-ref-attribute">
-    
-      <xs:attribute name="server-ref" use="required" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>The optional server to use. If omitted, and a default LDAP server is registered (using &lt;ldap-server&gt; with no Id), that server will be used. </xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-   <xs:attributeGroup name="group-search-filter-attribute">
-    
-      <xs:attribute name="group-search-filter" use="required" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Group search filter. Defaults to (uniqueMember={0}). The substituted parameter is the DN of the user.</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-   <xs:attributeGroup name="group-search-base-attribute">
-    
-      <xs:attribute name="group-search-base" use="required" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Search base for group membership searches. Defaults to "ou=groups".</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-   <xs:attributeGroup name="user-search-filter-attribute">
-    
-      <xs:attribute name="user-search-filter" use="required" type="xs:string"/>
-  
-   </xs:attributeGroup>
-  
-   <xs:attributeGroup name="user-search-base-attribute">
-    
-      <xs:attribute name="user-search-base" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Search base for user searches. Defaults to "".</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-   <xs:attributeGroup name="group-role-attribute-attribute">
-    
-      <xs:attribute name="group-role-attribute" use="required" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>The LDAP attribute name which contains the role name which will be used within Spring Security. Defaults to "cn".</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-   <xs:element name="ldap-user-service" substitutionGroup="security:any-user-service">
-      <xs:complexType>
-      
-         <xs:attributeGroup ref="security:ldap-us.attlist"/>
-    
-      </xs:complexType>
-   </xs:element>
-  
-   <xs:attributeGroup name="ldap-us.attlist">
-    
-      <xs:attribute name="id" type="xs:ID">
-      
-         <xs:annotation>
-        
-            <xs:documentation>A bean identifier, used for referring to the bean elsewhere in the context.</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="server-ref" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>The optional server to use. If omitted, and a default LDAP server is registered (using &lt;ldap-server&gt; with no Id), that server will be used. </xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="user-search-filter" type="xs:string"/>
-    
-      <xs:attributeGroup ref="security:user-search-base-attribute"/>
-    
-      <xs:attribute name="group-search-filter" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Group search filter. Defaults to (uniqueMember={0}). The substituted parameter is the DN of the user.</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="group-search-base" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Search base for group membership searches. Defaults to "ou=groups".</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="group-role-attribute" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>The LDAP attribute name which contains the role name which will be used within Spring Security. Defaults to "cn".</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-   <xs:element name="ldap-authentication-provider">
-      <xs:annotation>
-      
-         <xs:documentation>Sets up an ldap authentication provider</xs:documentation>
-    
-      </xs:annotation>
-      <xs:complexType>
-      
-         <xs:sequence>
-        
-            <xs:element minOccurs="0" ref="security:password-compare"/>
-      
-         </xs:sequence>
-      
-         <xs:attributeGroup ref="security:ldap-ap.attlist"/>
-    
-      </xs:complexType>
-   </xs:element>
-  
-   <xs:attributeGroup name="ldap-ap.attlist">
-    
-      <xs:attribute name="server-ref" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>The optional server to use. If omitted, and a default LDAP server is registered (using &lt;ldap-server&gt; with no Id), that server will be used. </xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-    
-      <xs:attributeGroup ref="security:user-search-base-attribute"/>
-    
-      <xs:attribute name="user-search-filter" type="xs:string"/>
-    
-      <xs:attribute name="group-search-base" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Search base for group membership searches. Defaults to "ou=groups".</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="group-search-filter" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Group search filter. Defaults to (uniqueMember={0}). The substituted parameter is the DN of the user.</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="group-role-attribute" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>The LDAP attribute name which contains the role name which will be used within Spring Security. Defaults to "cn".</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="user-dn-pattern" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>A specific pattern used to build the user's DN, for example "uid={0},ou=people". The key "{0}" must be present and will be substituted with the username.</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-   <xs:element name="password-compare">
-      <xs:annotation>
-      
-         <xs:documentation>Specifies that an LDAP provider should use an LDAP compare operation of the user's password to authenticate the user</xs:documentation>
-    
-      </xs:annotation>
-      <xs:complexType>
-      
-         <xs:sequence>
-        
-            <xs:element minOccurs="0" ref="security:password-encoder"/>
-      
-         </xs:sequence>
-      
-         <xs:attributeGroup ref="security:password-compare.attlist"/>
-    
-      </xs:complexType>
-   </xs:element>
-  
-   <xs:attributeGroup name="password-compare.attlist">
-    
-      <xs:attribute name="password-attribute" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>The attribute in the directory which contains the user password. Defaults to "userPassword".</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="hash">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Defines the hashing algorithm used on user passwords. We recommend strongly against using MD4, as it is a very weak hashing algorithm.</xs:documentation>
-      
-         </xs:annotation>
-      
-         <xs:simpleType>
-        
-            <xs:restriction base="xs:token">
-          
-               <xs:enumeration value="plaintext"/>
-          
-               <xs:enumeration value="sha"/>
-          
-               <xs:enumeration value="md5"/>
-          
-               <xs:enumeration value="md4"/>
-          
-               <xs:enumeration value="{sha}"/>
-          
-               <xs:enumeration value="{ssha}"/>
-        
-            </xs:restriction>
-      
-         </xs:simpleType>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-   <xs:element name="intercept-methods">
-      <xs:annotation>
-      
-         <xs:documentation>Can be used inside a bean definition to add a security interceptor to the bean and set up access configuration attributes for the bean's methods</xs:documentation>
-    
-      </xs:annotation>
-      <xs:complexType>
-      
-         <xs:sequence>
-        
-            <xs:element maxOccurs="unbounded" ref="security:protect"/>
-      
-         </xs:sequence>
-      
-         <xs:attributeGroup ref="security:intercept-methods.attlist"/>
-    
-      </xs:complexType>
-   </xs:element>
-  
-   <xs:attributeGroup name="intercept-methods.attlist">
-    
-      <xs:attribute name="access-decision-manager-ref" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Optional AccessDecisionManager bean ID to be used by the created method security interceptor.</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-   <xs:element name="protect">
-      <xs:annotation>
-      
-         <xs:documentation>Defines a protected method and the access control configuration attributes that apply to it</xs:documentation>
-    
-      </xs:annotation>
-      <xs:complexType>
-      
-         <xs:attributeGroup ref="security:protect.attlist"/>
-    
-      </xs:complexType>
-   </xs:element>
-  
-   <xs:attributeGroup name="protect.attlist">
-    
-      <xs:attribute name="method" use="required" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>A method name</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="access" use="required" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Access configuration attributes list that applies to the method, e.g. "ROLE_A,ROLE_B"</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-   <xs:element name="annotation-driven">
-      <xs:annotation>
-      
-         <xs:documentation>Activates security annotation scanning. All beans registered in the Spring application context will be scanned for Spring Security annotations. Where found, the beans will automatically be proxied and security authorization applied to the methods accordingly. Please ensure you have the spring-security-tiger-XXX.jar on your classpath.</xs:documentation>
-    
-      </xs:annotation>
-      <xs:complexType>
-      
-         <xs:attributeGroup ref="security:annotation-driven.attlist"/>
-    
-      </xs:complexType>
-   </xs:element>
-  
-   <xs:attributeGroup name="annotation-driven.attlist">
-    
-      <xs:attribute name="jsr250">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Specifies that JSR-250 style attributes are to be used (for example "RolesAllowed" instead of "Secured"). This will require the javax.annotation.security classes on the classpath. Defaults to false.</xs:documentation>
-      
-         </xs:annotation>
-      
-         <xs:simpleType>
-        
-            <xs:restriction base="xs:token">
-          
-               <xs:enumeration value="true"/>
-          
-               <xs:enumeration value="false"/>
-        
-            </xs:restriction>
-      
-         </xs:simpleType>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="access-decision-manager-ref" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Optional AccessDecisionManager bean ID to override the default.</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-   <xs:element name="http">
-      <xs:annotation>
-      
-         <xs:documentation>Container element for HTTP security configuration</xs:documentation>
-    
-      </xs:annotation>
-      <xs:complexType>
-      
-         <xs:choice minOccurs="0" maxOccurs="unbounded">
-        
-            <xs:element name="intercept-url">
-               <xs:annotation>
-      
-                  <xs:documentation>Specifies the access attributes and/or filter list for a particular set of URLs.</xs:documentation>
-    
-               </xs:annotation>
-               <xs:complexType>
-      
-                  <xs:attributeGroup ref="security:intercept-url.attlist"/>
-    
-               </xs:complexType>
-            </xs:element>
-        
-            <xs:element name="form-login">
-               <xs:annotation>
-      
-                  <xs:documentation>Sets up a form login configuration for authentication with a username and password</xs:documentation>
-    
-               </xs:annotation>
-               <xs:complexType>
-      
-                  <xs:attributeGroup ref="security:form-login.attlist"/>
-    
-               </xs:complexType>
-            </xs:element>
-        
-            <xs:element ref="security:openid-login"/>
-        
-            <xs:element name="x509">
-               <xs:annotation>
-      
-                  <xs:documentation>Adds support for X.509 client authentication.</xs:documentation>
-    
-               </xs:annotation>
-               <xs:complexType>
-      
-                  <xs:attributeGroup ref="security:x509.attlist"/>
-    
-               </xs:complexType>
-            </xs:element>
-        
-            <xs:element name="http-basic">
-               <xs:annotation>
-      
-                  <xs:documentation>Adds support for basic authentication (this is an element to permit future expansion, such as supporting an "ignoreFailure" attribute)</xs:documentation>
-    
-               </xs:annotation>
-               <xs:complexType/>
-            </xs:element>
-        
-            <xs:element name="logout">
-               <xs:annotation>
-      
-                  <xs:documentation>Incorporates a logout processing filter. Most web applications require a logout filter, although you may not require one if you write a controller to provider similar logic.</xs:documentation>
-    
-               </xs:annotation>
-               <xs:complexType>
-      
-                  <xs:attributeGroup ref="security:logout.attlist"/>
-    
-               </xs:complexType>
-            </xs:element>
-        
-            <xs:element name="concurrent-session-control">
-               <xs:annotation>
-      
-                  <xs:documentation>Adds support for concurrent session control, allowing limits to be placed on the number of sessions a user can have.</xs:documentation>
-    
-               </xs:annotation>
-               <xs:complexType>
-      
-                  <xs:attributeGroup ref="security:concurrent-sessions.attlist"/>
-    
-               </xs:complexType>
-            </xs:element>
-        
-            <xs:element name="remember-me">
-               <xs:complexType>
-      
-                  <xs:attributeGroup ref="security:remember-me.attlist"/>
-    
-               </xs:complexType>
-            </xs:element>
-        
-            <xs:element name="anonymous">
-               <xs:annotation>
-      
-                  <xs:documentation>Adds support for automatically granting all anonymous web requests a particular principal identity and a corresponding granted authority.</xs:documentation>
-    
-               </xs:annotation>
-               <xs:complexType>
-      
-                  <xs:attributeGroup ref="security:anonymous.attlist"/>
-    
-               </xs:complexType>
-            </xs:element>
-        
-            <xs:element name="port-mappings">
-               <xs:annotation>
-      
-                  <xs:documentation>Defines the list of mappings between http and https ports for use in redirects</xs:documentation>
-    
-               </xs:annotation>
-               <xs:complexType>
-      
-                  <xs:sequence>
-        
-                     <xs:element maxOccurs="unbounded" ref="security:port-mapping"/>
-      
-                  </xs:sequence>
-    
-               </xs:complexType>
-            </xs:element>
-      
-         </xs:choice>
-      
-         <xs:attributeGroup ref="security:http.attlist"/>
-    
-      </xs:complexType>
-   </xs:element>
-  
-   <xs:attributeGroup name="http.attlist">
-    
-      <xs:attribute name="auto-config">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Automatically registers a login form, BASIC authentication, anonymous authentication, logout services, remember-me and servlet-api-integration. If set to "true", all of these capabilities are added (although you can still customize the configuration of each by providing the respective element). If unspecified, defaults to "false".</xs:documentation>
-      
-         </xs:annotation>
-      
-         <xs:simpleType>
-        
-            <xs:restriction base="xs:token">
-          
-               <xs:enumeration value="true"/>
-          
-               <xs:enumeration value="false"/>
-        
-            </xs:restriction>
-      
-         </xs:simpleType>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="create-session">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Controls the eagerness with which an HTTP session is created. If not set, defaults to "ifRequired".</xs:documentation>
-      
-         </xs:annotation>
-      
-         <xs:simpleType>
-        
-            <xs:restriction base="xs:token">
-          
-               <xs:enumeration value="ifRequired"/>
-          
-               <xs:enumeration value="always"/>
-          
-               <xs:enumeration value="never"/>
-        
-            </xs:restriction>
-      
-         </xs:simpleType>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="path-type">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Defines the type of pattern used to specify URL paths (either JDK 1.4-compatible regular expressions, or Apache Ant expressions). Defaults to "ant" if unspecified.</xs:documentation>
-      
-         </xs:annotation>
-      
-         <xs:simpleType>
-        
-            <xs:restriction base="xs:token">
-          
-               <xs:enumeration value="ant"/>
-          
-               <xs:enumeration value="regex"/>
-        
-            </xs:restriction>
-      
-         </xs:simpleType>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="lowercase-comparisons">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Whether test URLs should be converted to lower case prior to comparing with defined path patterns. If unspecified, defaults to "true".</xs:documentation>
-      
-         </xs:annotation>
-      
-         <xs:simpleType>
-        
-            <xs:restriction base="xs:token">
-          
-               <xs:enumeration value="true"/>
-          
-               <xs:enumeration value="false"/>
-        
-            </xs:restriction>
-      
-         </xs:simpleType>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="servlet-api-provision">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Provides versions of HttpServletRequest security methods such as isUserInRole() and getPrincipal() which are implemented by accessing the Spring SecurityContext. Defaults to "true".</xs:documentation>
-      
-         </xs:annotation>
-      
-         <xs:simpleType>
-        
-            <xs:restriction base="xs:token">
-          
-               <xs:enumeration value="true"/>
-          
-               <xs:enumeration value="false"/>
-        
-            </xs:restriction>
-      
-         </xs:simpleType>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="access-decision-manager-ref" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Optional attribute specifying the ID of the AccessDecisionManager implementation which should be used for authorizing HTTP requests.</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="realm" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Optional attribute specifying the realm name that will be used for all authentication features that require a realm name (eg BASIC and Digest authentication). If unspecified, defaults to "Spring Security Application".</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-  
-   <xs:attributeGroup name="intercept-url.attlist">
-    
-      <xs:attribute name="pattern" use="required" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>The pattern which defines the URL path. The content will depend on the type set in the containing http element, so will default to ant path syntax.</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="access" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>The access configuration attributes that apply for the configured path.</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="method">
-      
-         <xs:annotation>
-        
-            <xs:documentation>The HTTP Method for which the access configuration attributes should apply. If not specified, the attributes will apply to any method.</xs:documentation>
-      
-         </xs:annotation>
-      
-         <xs:simpleType>
-        
-            <xs:restriction base="xs:token">
-          
-               <xs:enumeration value="GET"/>
-          
-               <xs:enumeration value="DELETE"/>
-          
-               <xs:enumeration value="HEAD"/>
-          
-               <xs:enumeration value="OPTIONS"/>
-          
-               <xs:enumeration value="POST"/>
-          
-               <xs:enumeration value="PUT"/>
-          
-               <xs:enumeration value="TRACE"/>
-        
-            </xs:restriction>
-      
-         </xs:simpleType>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="filters">
-      
-         <xs:annotation>
-        
-            <xs:documentation>The filter list for the path. Currently can be set to "none" to remove a path from having any filters applied. The full filter stack (consisting of all defined filters, will be applied to any other paths).</xs:documentation>
-      
-         </xs:annotation>
-      
-         <xs:simpleType>
-        
-            <xs:restriction base="xs:token">
-          
-               <xs:enumeration value="none"/>
-        
-            </xs:restriction>
-      
-         </xs:simpleType>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="requires-channel">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Used to specify that a URL must be accessed over http or https</xs:documentation>
-      
-         </xs:annotation>
-      
-         <xs:simpleType>
-        
-            <xs:restriction base="xs:token">
-          
-               <xs:enumeration value="http"/>
-          
-               <xs:enumeration value="https"/>
-          
-               <xs:enumeration value="any"/>
-        
-            </xs:restriction>
-      
-         </xs:simpleType>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-  
-   <xs:attributeGroup name="logout.attlist">
-    
-      <xs:attribute name="logout-url" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Specifies the URL that will cause a logout. Spring Security will initialize a filter that responds to this particular URL. Defaults to /j_spring_security_logout if unspecified.</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="logout-success-url" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Specifies the URL to display once the user has logged out. If not specified, defaults to /.</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="invalidate-session">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Specifies whether a logout also causes HttpSession invalidation, which is generally desirable. If unspecified, defaults to true.</xs:documentation>
-      
-         </xs:annotation>
-      
-         <xs:simpleType>
-        
-            <xs:restriction base="xs:token">
-          
-               <xs:enumeration value="true"/>
-          
-               <xs:enumeration value="false"/>
-        
-            </xs:restriction>
-      
-         </xs:simpleType>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-  
-   <xs:attributeGroup name="form-login.attlist">
-    
-      <xs:attribute name="login-processing-url" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>The URL that the login form is posted to. If unspecified, it defaults to /j_spring_security_check.</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="default-target-url" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>The URL that will be redirected to after successful authentication, if the user's previous action could not be resumed. This generally happens if the user visits a login page without having first requested a secured operation that triggers authentication. If unspecified, defaults to the root of the application.</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="login-page" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>The URL for the login page. If no login URL is specified, Spring Security will automatically create a login URL at /spring_security_login and a corresponding filter to render that login URL when requested.</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="authentication-failure-url" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>The URL for the login failure page. If no login failure URL is specified, Spring Security will automatically create a failure login URL at /spring_security_login?login_error and a corresponding filter to render that login failure URL when requested.</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-   <xs:element name="openid-login">
-      <xs:annotation>
-      
-         <xs:documentation>Sets up form login for authentication with an Open ID identity</xs:documentation>
-    
-      </xs:annotation>
-      <xs:complexType>
-      
-         <xs:attributeGroup ref="security:form-login.attlist"/>
-      
-         <xs:attribute name="user-service-ref" type="xs:string">
-        
-            <xs:annotation>
-          
-               <xs:documentation>A reference to a user-service (or UserDetailsService bean) Id</xs:documentation>
-        
-            </xs:annotation>
-      
-         </xs:attribute>
-    
-      </xs:complexType>
-   </xs:element>
-  
-   <xs:element name="filter-chain-map">
-      <xs:annotation>
-      
-         <xs:documentation>Used to explicitly configure a FilterChainProxy instance with a FilterChainMap</xs:documentation>
-    
-      </xs:annotation>
-      <xs:complexType>
-      
-         <xs:sequence>
-        
-            <xs:element maxOccurs="unbounded" name="filter-chain">
-               <xs:annotation>
-      
-                  <xs:documentation>Used within filter-chain-map to define a specific URL pattern and the list of filters which apply to the URLs matching that pattern. When multiple filter-chain elements are used within a filter-chain-map element, the most specific patterns must be placed at the top of the list, with  most general ones at the bottom.</xs:documentation>
-    
-               </xs:annotation>
-               <xs:complexType>
-      
-                  <xs:attributeGroup ref="security:filter-chain.attlist"/>
-    
-               </xs:complexType>
-            </xs:element>
-      
-         </xs:sequence>
-      
-         <xs:attributeGroup ref="security:filter-chain-map.attlist"/>
-    
-      </xs:complexType>
-   </xs:element>
-  
-   <xs:attributeGroup name="filter-chain-map.attlist">
-    
-      <xs:attributeGroup ref="security:path-type"/>
-  
-   </xs:attributeGroup>
-  
-  
-   <xs:attributeGroup name="filter-chain.attlist">
-    
-      <xs:attribute name="pattern" use="required" type="xs:string"/>
-    
-      <xs:attribute name="filters" use="required" type="xs:string"/>
-  
-   </xs:attributeGroup>
-  
-   <xs:element name="filter-invocation-definition-source">
-      <xs:annotation>
-      
-         <xs:documentation>Used to explicitly configure a FilterInvocationDefinitionSource bean for use with a FilterSecurityInterceptor. Usually only needed if you are configuring a FilterChainProxy explicitly, rather than using the &lt;http&gt; element. The intercept-url elements used should only contain pattern, method and access attributes. Any others will result in a configuration error. </xs:documentation>
-    
-      </xs:annotation>
-      <xs:complexType>
-      
-         <xs:sequence>
-        
-            <xs:element maxOccurs="unbounded" name="intercept-url">
-               <xs:annotation>
-      
-                  <xs:documentation>Specifies the access attributes and/or filter list for a particular set of URLs.</xs:documentation>
-    
-               </xs:annotation>
-               <xs:complexType>
-      
-                  <xs:attributeGroup ref="security:intercept-url.attlist"/>
-    
-               </xs:complexType>
-            </xs:element>
-      
-         </xs:sequence>
-      
-         <xs:attributeGroup ref="security:fids.attlist"/>
-    
-      </xs:complexType>
-   </xs:element>
-  
-   <xs:attributeGroup name="fids.attlist">
-    
-      <xs:attribute name="id" type="xs:ID">
-      
-         <xs:annotation>
-        
-            <xs:documentation>A bean identifier, used for referring to the bean elsewhere in the context.</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="lowercase-comparisons">
-      
-         <xs:annotation>
-        
-            <xs:documentation>as for http element</xs:documentation>
-      
-         </xs:annotation>
-      
-         <xs:simpleType>
-        
-            <xs:restriction base="xs:token">
-          
-               <xs:enumeration value="true"/>
-          
-               <xs:enumeration value="false"/>
-        
-            </xs:restriction>
-      
-         </xs:simpleType>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="path-type">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Defines the type of pattern used to specify URL paths (either JDK 1.4-compatible regular expressions, or Apache Ant expressions). Defaults to "ant" if unspecified.</xs:documentation>
-      
-         </xs:annotation>
-      
-         <xs:simpleType>
-        
-            <xs:restriction base="xs:token">
-          
-               <xs:enumeration value="ant"/>
-          
-               <xs:enumeration value="regex"/>
-        
-            </xs:restriction>
-      
-         </xs:simpleType>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-  
-  
-   <xs:attributeGroup name="concurrent-sessions.attlist">
-    
-      <xs:attribute name="max-sessions" type="xs:positiveInteger"/>
-    
-      <xs:attribute name="expired-url" type="xs:string"/>
-    
-      <xs:attribute name="exception-if-maximum-exceeded">
-      
-         <xs:simpleType>
-        
-            <xs:restriction base="xs:token">
-          
-               <xs:enumeration value="true"/>
-          
-               <xs:enumeration value="false"/>
-        
-            </xs:restriction>
-      
-         </xs:simpleType>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-  
-   <xs:attributeGroup name="remember-me.attlist">
-    
-      <xs:attribute name="key" type="xs:string"/>
-    
-      <xs:attribute name="token-repository-ref" type="xs:string"/>
-    
-      <xs:attribute name="data-source-ref" type="xs:string"/>
-  
-   </xs:attributeGroup>
-  
-  
-   <xs:attributeGroup name="anonymous.attlist">
-    
-      <xs:attribute name="key" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>The key used between the provider and filter. This generally does not need to be set. If unset, it will default to "doesNotMatter".</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="username" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>The username that should be assigned to the anonymous request. This allows the principal to be identified, which may be important for logging and auditing. if unset, defaults to "anonymousUser".</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="granted-authority" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>The granted authority that should be assigned to the anonymous request. Commonly this is used to assign the anonymous request particular roles, which can subsequently be used in authorization decisions. If unset, defaults to "ROLE_ANONYMOUS".</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-  
-   <xs:element name="port-mapping">
-      <xs:complexType>
-      
-         <xs:attributeGroup ref="security:http-port"/>
-      
-         <xs:attributeGroup ref="security:https-port"/>
-    
-      </xs:complexType>
-   </xs:element>
-  
-   <xs:attributeGroup name="http-port">
-    
-      <xs:attribute name="http" use="required" type="xs:integer"/>
-  
-   </xs:attributeGroup>
-  
-   <xs:attributeGroup name="https-port">
-    
-      <xs:attribute name="https" use="required" type="xs:integer"/>
-  
-   </xs:attributeGroup>
-  
-  
-   <xs:attributeGroup name="x509.attlist">
-    
-      <xs:attribute name="subject-principal-regex" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>The regular expression used to obtain the username from the certificate's subject. Defaults to matching on the common name using the pattern "CN=(.*?),".</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="user-service-ref" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>A reference to a user-service (or UserDetailsService bean) Id</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-   <xs:element name="authentication-manager">
-      <xs:annotation>
-      
-         <xs:documentation>If you are using namespace configuration with Spring Security, an AuthenticationManager will automatically be registered. This element simple allows you to define an alias to allow you to reference the authentication-manager in your own beans. </xs:documentation>
-    
-      </xs:annotation>
-      <xs:complexType>
-      
-         <xs:attributeGroup ref="security:authman.attlist"/>
-    
-      </xs:complexType>
-   </xs:element>
-  
-   <xs:attributeGroup name="authman.attlist">
-    
-      <xs:annotation>
-      
-         <xs:documentation>The alias you wish to use for the AuthenticationManager bean</xs:documentation>
-    
-      </xs:annotation>
-    
-      <xs:attribute name="alias" use="required" type="xs:ID"/>
-  
-   </xs:attributeGroup>
-  
-   <xs:element name="authentication-provider">
-      <xs:annotation>
-      
-         <xs:documentation>Indicates that the contained user-service should be used as an authentication source. </xs:documentation>
-    
-      </xs:annotation>
-      <xs:complexType>
-      
-         <xs:choice minOccurs="0" maxOccurs="unbounded">
-        
-            <xs:element ref="security:any-user-service"/>
-        
-            <xs:element ref="security:password-encoder"/>
-      
-         </xs:choice>
-      
-         <xs:attributeGroup ref="security:ap.attlist"/>
-    
-      </xs:complexType>
-   </xs:element>
-  
-   <xs:attributeGroup name="ap.attlist">
-    
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.springframework.org/schema/security" xmlns:security="http://www.springframework.org/schema/security">
+  <xs:attributeGroup name="hash">
+    <xs:attribute name="hash" use="required">
+      <xs:annotation>
+        <xs:documentation>Defines the hashing algorithm used on user passwords. We recommend strongly against using MD4, as it is a very weak hashing algorithm.</xs:documentation>
+      </xs:annotation>
+      <xs:simpleType>
+        <xs:restriction base="xs:token">
+          <xs:enumeration value="plaintext"/>
+          <xs:enumeration value="sha"/>
+          <xs:enumeration value="md5"/>
+          <xs:enumeration value="md4"/>
+          <xs:enumeration value="{sha}"/>
+          <xs:enumeration value="{ssha}"/>
+        </xs:restriction>
+      </xs:simpleType>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:attributeGroup name="base64">
+    <xs:attribute name="base64" use="required">
+      <xs:annotation>
+        <xs:documentation>Whether a string should be base64 encoded</xs:documentation>
+      </xs:annotation>
+      <xs:simpleType>
+        <xs:restriction base="xs:token">
+          <xs:enumeration value="true"/>
+          <xs:enumeration value="false"/>
+        </xs:restriction>
+      </xs:simpleType>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:attributeGroup name="path-type">
+    <xs:attribute name="path-type" use="required">
+      <xs:annotation>
+        <xs:documentation>Defines the type of pattern used to specify URL paths (either JDK 1.4-compatible regular expressions, or Apache Ant expressions). Defaults to "ant" if unspecified.</xs:documentation>
+      </xs:annotation>
+      <xs:simpleType>
+        <xs:restriction base="xs:token">
+          <xs:enumeration value="ant"/>
+          <xs:enumeration value="regex"/>
+        </xs:restriction>
+      </xs:simpleType>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:attributeGroup name="port">
+    <xs:attribute name="port" use="required" type="xs:integer">
+      <xs:annotation>
+        <xs:documentation>Specifies an IP port number. Used to configure an embedded LDAP server, for example.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:attributeGroup name="url">
+    <xs:attribute name="url" use="required" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Specifies a URL.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:attributeGroup name="id">
+    <xs:attribute name="id" use="required" type="xs:ID">
+      <xs:annotation>
+        <xs:documentation>A bean identifier, used for referring to the bean elsewhere in the context.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:attributeGroup name="ref">
+    <xs:attribute name="ref" use="required" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Defines a reference to a Spring bean Id.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:attributeGroup name="user-service-ref">
+    <xs:attribute name="user-service-ref" use="required" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>A reference to a user-service (or UserDetailsService bean) Id</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:element name="password-encoder">
+    <xs:annotation>
+      <xs:documentation>element which defines a password encoding strategy. Used by an authentication provider to convert submitted passwords to hashed versions, for example.</xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="security:salt-source"/>
+      </xs:sequence>
+      <xs:attributeGroup ref="security:password-encoder.attlist"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:attributeGroup name="password-encoder.attlist">
+    <xs:attribute name="ref" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Defines a reference to a Spring bean Id.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="hash">
+      <xs:annotation>
+        <xs:documentation>Defines the hashing algorithm used on user passwords. We recommend strongly against using MD4, as it is a very weak hashing algorithm.</xs:documentation>
+      </xs:annotation>
+      <xs:simpleType>
+        <xs:restriction base="xs:token">
+          <xs:enumeration value="plaintext"/>
+          <xs:enumeration value="sha"/>
+          <xs:enumeration value="md5"/>
+          <xs:enumeration value="md4"/>
+          <xs:enumeration value="{sha}"/>
+          <xs:enumeration value="{ssha}"/>
+        </xs:restriction>
+      </xs:simpleType>
+    </xs:attribute>
+    <xs:attribute name="base64">
+      <xs:annotation>
+        <xs:documentation>Whether a string should be base64 encoded</xs:documentation>
+      </xs:annotation>
+      <xs:simpleType>
+        <xs:restriction base="xs:token">
+          <xs:enumeration value="true"/>
+          <xs:enumeration value="false"/>
+        </xs:restriction>
+      </xs:simpleType>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:element name="salt-source">
+    <xs:complexType>
+      <xs:attribute name="user-property" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A property of the UserDetails object which will be used as salt by a password encoder. Typically something like "username" might be used. </xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="system-wide" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A single value that will be used as the salt for a password encoder. </xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:attributeGroup name="user-property">
+    <xs:attribute name="user-property" use="required" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>A property of the UserDetails object which will be used as salt by a password encoder. Typically something like "username" might be used. </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:attributeGroup name="system-wide">
+    <xs:attribute name="system-wide" use="required" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>A single value that will be used as the salt for a password encoder. </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:element name="ldap-server">
+    <xs:annotation>
+      <xs:documentation>Defines an LDAP server location or starts an embedded server. The url indicates the location of a remote server. If no url is given, an embedded server will be started, listening on the supplied port number. The port is optional and defaults to 33389. A Spring LDAP ContextSource bean will be registered for the server with the id supplied. </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:attributeGroup ref="security:ldap-server.attlist"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:attributeGroup name="ldap-server.attlist">
+    <xs:attribute name="id" type="xs:ID">
+      <xs:annotation>
+        <xs:documentation>A bean identifier, used for referring to the bean elsewhere in the context.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="url" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Specifies a URL.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="port" type="xs:integer">
+      <xs:annotation>
+        <xs:documentation>Specifies an IP port number. Used to configure an embedded LDAP server, for example.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="manager-dn" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Username (DN) of the "manager" user identity which will be used to authenticate to a (non-embedded) LDAP server. If omitted, anonymous access will be used. </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="manager-password" type="xs:string"/>
+    <xs:attribute name="ldif" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Explicitly specifies an ldif file resource to load into an embedded LDAP server</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="root" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Optional root suffix for the embedded LDAP server. Default is "dc=springframework,dc=org"</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:attributeGroup name="ldap-server-ref-attribute">
+    <xs:attribute name="server-ref" use="required" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>The optional server to use. If omitted, and a default LDAP server is registered (using &lt;ldap-server&gt; with no Id), that server will be used. </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:attributeGroup name="group-search-filter-attribute">
+    <xs:attribute name="group-search-filter" use="required" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Group search filter. Defaults to (uniqueMember={0}). The substituted parameter is the DN of the user.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:attributeGroup name="group-search-base-attribute">
+    <xs:attribute name="group-search-base" use="required" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Search base for group membership searches. Defaults to "ou=groups".</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:attributeGroup name="user-search-filter-attribute">
+    <xs:attribute name="user-search-filter" use="required" type="xs:string"/>
+  </xs:attributeGroup>
+  <xs:attributeGroup name="user-search-base-attribute">
+    <xs:attribute name="user-search-base" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Search base for user searches. Defaults to "".</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:attributeGroup name="group-role-attribute-attribute">
+    <xs:attribute name="group-role-attribute" use="required" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>The LDAP attribute name which contains the role name which will be used within Spring Security. Defaults to "cn".</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:element name="ldap-user-service" substitutionGroup="security:any-user-service">
+    <xs:complexType>
+      <xs:attributeGroup ref="security:ldap-us.attlist"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:attributeGroup name="ldap-us.attlist">
+    <xs:attribute name="id" type="xs:ID">
+      <xs:annotation>
+        <xs:documentation>A bean identifier, used for referring to the bean elsewhere in the context.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="server-ref" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>The optional server to use. If omitted, and a default LDAP server is registered (using &lt;ldap-server&gt; with no Id), that server will be used. </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="user-search-filter" type="xs:string"/>
+    <xs:attributeGroup ref="security:user-search-base-attribute"/>
+    <xs:attribute name="group-search-filter" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Group search filter. Defaults to (uniqueMember={0}). The substituted parameter is the DN of the user.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="group-search-base" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Search base for group membership searches. Defaults to "ou=groups".</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="group-role-attribute" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>The LDAP attribute name which contains the role name which will be used within Spring Security. Defaults to "cn".</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:element name="ldap-authentication-provider">
+    <xs:annotation>
+      <xs:documentation>Sets up an ldap authentication provider</xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="security:password-compare"/>
+      </xs:sequence>
+      <xs:attributeGroup ref="security:ldap-ap.attlist"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:attributeGroup name="ldap-ap.attlist">
+    <xs:attribute name="server-ref" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>The optional server to use. If omitted, and a default LDAP server is registered (using &lt;ldap-server&gt; with no Id), that server will be used. </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attributeGroup ref="security:user-search-base-attribute"/>
+    <xs:attribute name="user-search-filter" type="xs:string"/>
+    <xs:attribute name="group-search-base" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Search base for group membership searches. Defaults to "ou=groups".</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="group-search-filter" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Group search filter. Defaults to (uniqueMember={0}). The substituted parameter is the DN of the user.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="group-role-attribute" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>The LDAP attribute name which contains the role name which will be used within Spring Security. Defaults to "cn".</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="user-dn-pattern" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>A specific pattern used to build the user's DN, for example "uid={0},ou=people". The key "{0}" must be present and will be substituted with the username.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:element name="password-compare">
+    <xs:annotation>
+      <xs:documentation>Specifies that an LDAP provider should use an LDAP compare operation of the user's password to authenticate the user</xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="security:password-encoder"/>
+      </xs:sequence>
+      <xs:attributeGroup ref="security:password-compare.attlist"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:attributeGroup name="password-compare.attlist">
+    <xs:attribute name="password-attribute" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>The attribute in the directory which contains the user password. Defaults to "userPassword".</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="hash">
+      <xs:annotation>
+        <xs:documentation>Defines the hashing algorithm used on user passwords. We recommend strongly against using MD4, as it is a very weak hashing algorithm.</xs:documentation>
+      </xs:annotation>
+      <xs:simpleType>
+        <xs:restriction base="xs:token">
+          <xs:enumeration value="plaintext"/>
+          <xs:enumeration value="sha"/>
+          <xs:enumeration value="md5"/>
+          <xs:enumeration value="md4"/>
+          <xs:enumeration value="{sha}"/>
+          <xs:enumeration value="{ssha}"/>
+        </xs:restriction>
+      </xs:simpleType>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:element name="intercept-methods">
+    <xs:annotation>
+      <xs:documentation>Can be used inside a bean definition to add a security interceptor to the bean and set up access configuration attributes for the bean's methods</xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" ref="security:protect"/>
+      </xs:sequence>
+      <xs:attributeGroup ref="security:intercept-methods.attlist"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:attributeGroup name="intercept-methods.attlist">
+    <xs:attribute name="access-decision-manager-ref" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Optional AccessDecisionManager bean ID to be used by the created method security interceptor.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:element name="protect">
+    <xs:annotation>
+      <xs:documentation>Defines a protected method and the access control configuration attributes that apply to it. We strongly advise you NOT to mix "protect" declarations with any services provided "global-method-security".</xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:attributeGroup ref="security:protect.attlist"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:attributeGroup name="protect.attlist">
+    <xs:attribute name="method" use="required" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>A method name</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="access" use="required" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Access configuration attributes list that applies to the method, e.g. "ROLE_A,ROLE_B".</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:element name="global-method-security">
+    <xs:annotation>
+      <xs:documentation>Provides method security for all beans registered in the Spring application context. Specifically, beans will be scanned for Spring Security annotations and/or matches with the ordered list of "protect-pointcut" sub-elements. Where there is a match, the beans will automatically be proxied and security authorization applied to the methods accordingly. If you use and enable all three sources of method security metadata (ie "protect-pointcut" declarations, @Secured and also JSR 250 security annotations), the metadata sources will be queried in that order. In practical terms, this enables you to use XML to override method security metadata expressed by way of @Secured annotations, with @Secured annotations overriding method security metadata expressed by JSR 250 annotations. It is perfectly acceptable to mix and match, with a given Java type using a combination of XML, @Secured and JSR 250 to express method security metadata (albeit on different methods).</xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="security:protect-pointcut"/>
+      </xs:sequence>
+      <xs:attributeGroup ref="security:global-method-security.attlist"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:attributeGroup name="global-method-security.attlist">
+    <xs:attribute name="secured">
+      <xs:annotation>
+        <xs:documentation>Specifies that Spring Security's @Secured annotation should be used. Please ensure you have the spring-security-tiger-xxx.jar on the classpath. Defaults to false.</xs:documentation>
+      </xs:annotation>
+      <xs:simpleType>
+        <xs:restriction base="xs:token">
+          <xs:enumeration value="false"/>
+          <xs:enumeration value="true"/>
+        </xs:restriction>
+      </xs:simpleType>
+    </xs:attribute>
+    <xs:attribute name="jsr250">
+      <xs:annotation>
+        <xs:documentation>Specifies that JSR-250 style attributes are to be used (for example "RolesAllowed"). This will require the javax.annotation.security classes on the classpath. Defaults to false.</xs:documentation>
+      </xs:annotation>
+      <xs:simpleType>
+        <xs:restriction base="xs:token">
+          <xs:enumeration value="false"/>
+          <xs:enumeration value="true"/>
+        </xs:restriction>
+      </xs:simpleType>
+    </xs:attribute>
+    <xs:attribute name="access-decision-manager-ref" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Optional AccessDecisionManager bean ID to override the default.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:element 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:attributeGroup name="protect-pointcut.attlist">
+    <xs:attribute name="expression" use="required" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>An AspectJ expression, including the 'execution' keyword. For example, 'execution(int com.foo.TargetObject.countLength(String))' (without the quotes).</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="access" use="required" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Access configuration attributes list that applies to all methods matching the pointcut, e.g. "ROLE_A,ROLE_B"</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:element name="http">
+    <xs:annotation>
+      <xs:documentation>Container element for HTTP security configuration</xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="security:intercept-url"/>
+        <xs:element ref="security:form-login"/>
+        <xs:element ref="security:openid-login"/>
+        <xs:element ref="security:x509"/>
+        <xs:element ref="security:http-basic"/>
+        <xs:element ref="security:logout"/>
+        <xs:element ref="security:concurrent-session-control"/>
+        <xs:element ref="security:remember-me"/>
+        <xs:element ref="security:anonymous"/>
+        <xs:element ref="security:port-mappings"/>
+      </xs:choice>
+      <xs:attributeGroup ref="security:http.attlist"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:attributeGroup name="http.attlist">
+    <xs:attribute name="auto-config">
+      <xs:annotation>
+        <xs:documentation>Automatically registers a login form, BASIC authentication, anonymous authentication, logout services, remember-me and servlet-api-integration. If set to "true", all of these capabilities are added (although you can still customize the configuration of each by providing the respective element). If unspecified, defaults to "false".</xs:documentation>
+      </xs:annotation>
+      <xs:simpleType>
+        <xs:restriction base="xs:token">
+          <xs:enumeration value="true"/>
+          <xs:enumeration value="false"/>
+        </xs:restriction>
+      </xs:simpleType>
+    </xs:attribute>
+    <xs:attribute name="create-session">
+      <xs:annotation>
+        <xs:documentation>Controls the eagerness with which an HTTP session is created. If not set, defaults to "ifRequired".</xs:documentation>
+      </xs:annotation>
+      <xs:simpleType>
+        <xs:restriction base="xs:token">
+          <xs:enumeration value="ifRequired"/>
+          <xs:enumeration value="always"/>
+          <xs:enumeration value="never"/>
+        </xs:restriction>
+      </xs:simpleType>
+    </xs:attribute>
+    <xs:attribute name="path-type">
+      <xs:annotation>
+        <xs:documentation>Defines the type of pattern used to specify URL paths (either JDK 1.4-compatible regular expressions, or Apache Ant expressions). Defaults to "ant" if unspecified.</xs:documentation>
+      </xs:annotation>
+      <xs:simpleType>
+        <xs:restriction base="xs:token">
+          <xs:enumeration value="ant"/>
+          <xs:enumeration value="regex"/>
+        </xs:restriction>
+      </xs:simpleType>
+    </xs:attribute>
+    <xs:attribute name="lowercase-comparisons">
+      <xs:annotation>
+        <xs:documentation>Whether test URLs should be converted to lower case prior to comparing with defined path patterns. If unspecified, defaults to "true".</xs:documentation>
+      </xs:annotation>
+      <xs:simpleType>
+        <xs:restriction base="xs:token">
+          <xs:enumeration value="true"/>
+          <xs:enumeration value="false"/>
+        </xs:restriction>
+      </xs:simpleType>
+    </xs:attribute>
+    <xs:attribute name="servlet-api-provision">
+      <xs:annotation>
+        <xs:documentation>Provides versions of HttpServletRequest security methods such as isUserInRole() and getPrincipal() which are implemented by accessing the Spring SecurityContext. Defaults to "true".</xs:documentation>
+      </xs:annotation>
+      <xs:simpleType>
+        <xs:restriction base="xs:token">
+          <xs:enumeration value="true"/>
+          <xs:enumeration value="false"/>
+        </xs:restriction>
+      </xs:simpleType>
+    </xs:attribute>
+    <xs:attribute name="access-decision-manager-ref" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Optional attribute specifying the ID of the AccessDecisionManager implementation which should be used for authorizing HTTP requests.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="realm" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Optional attribute specifying the realm name that will be used for all authentication features that require a realm name (eg BASIC and Digest authentication). If unspecified, defaults to "Spring Security Application".</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <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:attributeGroup name="intercept-url.attlist">
+    <xs:attribute name="pattern" use="required" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>The pattern which defines the URL path. The content will depend on the type set in the containing http element, so will default to ant path syntax.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="access" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>The access configuration attributes that apply for the configured path.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="method">
+      <xs:annotation>
+        <xs:documentation>The HTTP Method for which the access configuration attributes should apply. If not specified, the attributes will apply to any method.</xs:documentation>
+      </xs:annotation>
+      <xs:simpleType>
+        <xs:restriction base="xs:token">
+          <xs:enumeration value="GET"/>
+          <xs:enumeration value="DELETE"/>
+          <xs:enumeration value="HEAD"/>
+          <xs:enumeration value="OPTIONS"/>
+          <xs:enumeration value="POST"/>
+          <xs:enumeration value="PUT"/>
+          <xs:enumeration value="TRACE"/>
+        </xs:restriction>
+      </xs:simpleType>
+    </xs:attribute>
+    <xs:attribute name="filters">
+      <xs:annotation>
+        <xs:documentation>The filter list for the path. Currently can be set to "none" to remove a path from having any filters applied. The full filter stack (consisting of all defined filters, will be applied to any other paths).</xs:documentation>
+      </xs:annotation>
+      <xs:simpleType>
+        <xs:restriction base="xs:token">
+          <xs:enumeration value="none"/>
+        </xs:restriction>
+      </xs:simpleType>
+    </xs:attribute>
+    <xs:attribute name="requires-channel">
+      <xs:annotation>
+        <xs:documentation>Used to specify that a URL must be accessed over http or https</xs:documentation>
+      </xs:annotation>
+      <xs:simpleType>
+        <xs:restriction base="xs:token">
+          <xs:enumeration value="http"/>
+          <xs:enumeration value="https"/>
+          <xs:enumeration value="any"/>
+        </xs:restriction>
+      </xs:simpleType>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs: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:attributeGroup name="logout.attlist">
+    <xs:attribute name="logout-url" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Specifies the URL that will cause a logout. Spring Security will initialize a filter that responds to this particular URL. Defaults to /j_spring_security_logout if unspecified.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="logout-success-url" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Specifies the URL to display once the user has logged out. If not specified, defaults to /.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="invalidate-session">
+      <xs:annotation>
+        <xs:documentation>Specifies whether a logout also causes HttpSession invalidation, which is generally desirable. If unspecified, defaults to true.</xs:documentation>
+      </xs:annotation>
+      <xs:simpleType>
+        <xs:restriction base="xs:token">
+          <xs:enumeration value="true"/>
+          <xs:enumeration value="false"/>
+        </xs:restriction>
+      </xs:simpleType>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs: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:attributeGroup name="form-login.attlist">
+    <xs:attribute name="login-processing-url" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>The URL that the login form is posted to. If unspecified, it defaults to /j_spring_security_check.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="default-target-url" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>The URL that will be redirected to after successful authentication, if the user's previous action could not be resumed. This generally happens if the user visits a login page without having first requested a secured operation that triggers authentication. If unspecified, defaults to the root of the application.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="login-page" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>The URL for the login page. If no login URL is specified, Spring Security will automatically create a login URL at /spring_security_login and a corresponding filter to render that login URL when requested.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="authentication-failure-url" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>The URL for the login failure page. If no login failure URL is specified, Spring Security will automatically create a failure login URL at /spring_security_login?login_error and a corresponding filter to render that login failure URL when requested.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:element name="openid-login">
+    <xs:annotation>
+      <xs:documentation>Sets up form login for authentication with an Open ID identity</xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:attributeGroup ref="security:form-login.attlist"/>
       <xs:attribute name="user-service-ref" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>A reference to a user-service (or UserDetailsService bean) Id</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-   <xs:element name="custom-authentication-provider">
-      <xs:complexType/>
-   </xs:element>
-  
-   <xs:element name="user-service" substitutionGroup="security:any-user-service">
-      <xs:annotation>
-      
-         <xs:documentation>Creates an in-memory UserDetailsService from a properties file or a list of "user" child elements.</xs:documentation>
-    
-      </xs:annotation>
-      <xs:complexType>
-      
-         <xs:sequence>
-        
-            <xs:element minOccurs="0" maxOccurs="unbounded" ref="security:user"/>
-      
-         </xs:sequence>
-      
-         <xs:attribute name="id" type="xs:ID">
-        
-            <xs:annotation>
-          
-               <xs:documentation>A bean identifier, used for referring to the bean elsewhere in the context.</xs:documentation>
-        
-            </xs:annotation>
-      
-         </xs:attribute>
-      
-         <xs:attributeGroup ref="security:properties-file"/>
-    
-      </xs:complexType>
-   </xs:element>
-  
-   <xs:attributeGroup name="properties-file">
-    
-      <xs:attribute name="properties" type="xs:string"/>
-  
-   </xs:attributeGroup>
-  
-   <xs:element name="user">
-      <xs:annotation>
-      
-         <xs:documentation>Represents a user in the application.</xs:documentation>
-    
-      </xs:annotation>
-      <xs:complexType>
-      
-         <xs:attributeGroup ref="security:user.attlist"/>
-    
-      </xs:complexType>
-   </xs:element>
-  
-   <xs:attributeGroup name="user.attlist">
-    
-      <xs:attribute name="name" use="required" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>The username assigned to the user.</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="password" use="required" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>The password assigned to the user. This may be hashed if the corresponding authentication provider supports hashing (remember to set the "hash" attribute of the "user-service" element).</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="authorities" use="required" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>One of more authorities granted to the user. Separate authorities with a comma (but no space). For example, "ROLE_USER,ROLE_ADMINISTRATOR"</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-    
-      <xs:attribute name="locked">
-      
-         <xs:annotation>
-        
-            <xs:documentation>Can be set to "true" to mark an account as locked and unusable.</xs:documentation>
-      
-         </xs:annotation>
-      
-         <xs:simpleType>
-        
-            <xs:restriction base="xs:token">
-          
-               <xs:enumeration value="true"/>
-          
-               <xs:enumeration value="false"/>
-        
-            </xs:restriction>
-      
-         </xs:simpleType>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-   <xs:element name="jdbc-user-service" substitutionGroup="security:any-user-service">
-      <xs:annotation>
-      
-         <xs:documentation>Causes creation of a JDBC-based UserDetailsService.</xs:documentation>
-    
-      </xs:annotation>
-      <xs:complexType>
-      
-         <xs:attribute name="id" type="xs:ID">
-        
-            <xs:annotation>
-          
-               <xs:documentation>A bean identifier, used for referring to the bean elsewhere in the context.</xs:documentation>
-        
-            </xs:annotation>
-      
-         </xs:attribute>
-      
-         <xs:attributeGroup ref="security:jdbc-user-service.attlist"/>
-    
-      </xs:complexType>
-   </xs:element>
-  
-   <xs:attributeGroup name="jdbc-user-service.attlist">
-    
-      <xs:attribute name="data-source-ref" use="required" type="xs:string">
-      
-         <xs:annotation>
-        
-            <xs:documentation>The bean ID of the DataSource which provides the required tables.</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-   <xs:element name="any-user-service" abstract="true"/>
-  
-   <xs:group name="custom-filter">
-    
+        <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 minOccurs="0" ref="security:custom-filter"/>
-    
+        <xs:element maxOccurs="unbounded" ref="security:filter-chain"/>
       </xs:sequence>
-  
-   </xs:group>
-  
-   <xs:element name="custom-filter">
-      <xs:annotation>
-      
-         <xs:documentation>Used to indicate that a filter bean declaration should be incorporated into the security filter chain. If neither the 'after' or 'before' options are supplied, then the filter must implement the Ordered interface directly. </xs:documentation>
-    
-      </xs:annotation>
-      <xs:complexType>
-      
-         <xs:attribute name="after" type="security:named-security-filter">
-        
-            <xs:annotation>
-          
-               <xs:documentation>The filter immediately after which the custom-filter should be placed in the chain. This feature will only be needed by advanced users who wish to mix their own filters into the security filter chain and have some knowledge of the standard Spring Security filters. The filter names map to specific Spring Security implementation filters. </xs:documentation>
-        
-            </xs:annotation>
-      
-         </xs:attribute>
-      
-         <xs:attribute name="before" type="security:named-security-filter">
-        
-            <xs:annotation>
-          
-               <xs:documentation>The filter immediately before which the custom-filter should be placed in the chain</xs:documentation>
-        
-            </xs:annotation>
-      
-         </xs:attribute>
-    
-      </xs:complexType>
-   </xs:element>
-  
-   <xs:attributeGroup name="after">
-    
-      <xs:attribute name="after" use="required" type="security:named-security-filter">
-      
-         <xs:annotation>
-        
-            <xs:documentation>The filter immediately after which the custom-filter should be placed in the chain. This feature will only be needed by advanced users who wish to mix their own filters into the security filter chain and have some knowledge of the standard Spring Security filters. The filter names map to specific Spring Security implementation filters. </xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-   <xs:attributeGroup name="before">
-    
-      <xs:attribute name="before" use="required" type="security:named-security-filter">
-      
-         <xs:annotation>
-        
-            <xs:documentation>The filter immediately before which the custom-filter should be placed in the chain</xs:documentation>
-      
-         </xs:annotation>
-    
-      </xs:attribute>
-  
-   </xs:attributeGroup>
-  
-   <xs:simpleType name="named-security-filter">
-    
-      <xs:restriction base="xs:token">
-      
-         <xs:enumeration value="FIRST"/>
-      
-         <xs:enumeration value="CHANNEL_FILTER"/>
-      
-         <xs:enumeration value="CONCURRENT_SESSION_FILTER"/>
-      
-         <xs:enumeration value="SESSION_CONTEXT_INTEGRATION_FILTER"/>
-      
-         <xs:enumeration value="LOGOUT_FILTER"/>
-      
-         <xs:enumeration value="X509_FILTER"/>
-      
-         <xs:enumeration value="PRE_AUTH_FILTER"/>
-      
-         <xs:enumeration value="CAS_PROCESSING_FILTER"/>
-      
-         <xs:enumeration value="AUTHENTICATION_PROCESSING_FILTER"/>
-      
-         <xs:enumeration value="BASIC_PROCESSING_FILTER"/>
-      
-         <xs:enumeration value="SERVLET_API_SUPPORT_FILTER"/>
-      
-         <xs:enumeration value="REMEMBER_ME_FILTER"/>
-      
-         <xs:enumeration value="ANONYMOUS_FILTER"/>
-      
-         <xs:enumeration value="EXCEPTION_TRANSLATION_FILTER"/>
-      
-         <xs:enumeration value="NTLM_FILTER"/>
-      
-         <xs:enumeration value="FILTER_SECURITY_INTERCEPTOR"/>
-      
-         <xs:enumeration value="SWITCH_USER_FILTER"/>
-    
-      </xs:restriction>
-  
-   </xs:simpleType>
-
+      <xs: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:element 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:attributeGroup name="filter-chain.attlist">
+    <xs:attribute name="pattern" use="required" type="xs:string"/>
+    <xs:attribute name="filters" use="required" type="xs:string"/>
+  </xs:attributeGroup>
+  <xs:element name="filter-invocation-definition-source">
+    <xs:annotation>
+      <xs:documentation>Used to explicitly configure a FilterInvocationDefinitionSource bean for use with a FilterSecurityInterceptor. Usually only needed if you are configuring a FilterChainProxy explicitly, rather than using the &lt;http&gt; element. The intercept-url elements used should only contain pattern, method and access attributes. Any others will result in a configuration error. </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" ref="security:intercept-url"/>
+      </xs:sequence>
+      <xs:attributeGroup ref="security:fids.attlist"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:attributeGroup name="fids.attlist">
+    <xs:attribute name="id" type="xs:ID">
+      <xs:annotation>
+        <xs:documentation>A bean identifier, used for referring to the bean elsewhere in the context.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="lowercase-comparisons">
+      <xs:annotation>
+        <xs:documentation>as for http element</xs:documentation>
+      </xs:annotation>
+      <xs:simpleType>
+        <xs:restriction base="xs:token">
+          <xs:enumeration value="true"/>
+          <xs:enumeration value="false"/>
+        </xs:restriction>
+      </xs:simpleType>
+    </xs:attribute>
+    <xs:attribute name="path-type">
+      <xs:annotation>
+        <xs:documentation>Defines the type of pattern used to specify URL paths (either JDK 1.4-compatible regular expressions, or Apache Ant expressions). Defaults to "ant" if unspecified.</xs:documentation>
+      </xs:annotation>
+      <xs:simpleType>
+        <xs:restriction base="xs:token">
+          <xs:enumeration value="ant"/>
+          <xs:enumeration value="regex"/>
+        </xs:restriction>
+      </xs:simpleType>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs: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="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:attributeGroup name="concurrent-sessions.attlist">
+    <xs:attribute name="max-sessions" type="xs:positiveInteger"/>
+    <xs:attribute name="expired-url" type="xs:string"/>
+    <xs:attribute name="exception-if-maximum-exceeded">
+      <xs:simpleType>
+        <xs:restriction base="xs:token">
+          <xs:enumeration value="true"/>
+          <xs:enumeration value="false"/>
+        </xs:restriction>
+      </xs:simpleType>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:element name="remember-me">
+    <xs:complexType>
+      <xs:attributeGroup ref="security:remember-me.attlist"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:attributeGroup name="remember-me.attlist">
+    <xs:attribute name="key" type="xs:string"/>
+    <xs:attribute name="token-repository-ref" type="xs:string"/>
+    <xs:attribute name="data-source-ref" type="xs:string"/>
+  </xs:attributeGroup>
+  <xs: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:attributeGroup name="anonymous.attlist">
+    <xs:attribute name="key" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>The key used between the provider and filter. This generally does not need to be set. If unset, it will default to "doesNotMatter".</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="username" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>The username that should be assigned to the anonymous request. This allows the principal to be identified, which may be important for logging and auditing. if unset, defaults to "anonymousUser".</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="granted-authority" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>The granted authority that should be assigned to the anonymous request. Commonly this is used to assign the anonymous request particular roles, which can subsequently be used in authorization decisions. If unset, defaults to "ROLE_ANONYMOUS".</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:element name="port-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:element name="port-mapping">
+    <xs:complexType>
+      <xs:attributeGroup ref="security:http-port"/>
+      <xs:attributeGroup ref="security:https-port"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:attributeGroup name="http-port">
+    <xs:attribute name="http" use="required" type="xs:integer"/>
+  </xs:attributeGroup>
+  <xs:attributeGroup name="https-port">
+    <xs:attribute name="https" use="required" type="xs:integer"/>
+  </xs:attributeGroup>
+  <xs: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:attributeGroup name="x509.attlist">
+    <xs:attribute name="subject-principal-regex" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>The regular expression used to obtain the username from the certificate's subject. Defaults to matching on the common name using the pattern "CN=(.*?),".</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="user-service-ref" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>A reference to a user-service (or UserDetailsService bean) Id</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:element name="authentication-manager">
+    <xs:annotation>
+      <xs:documentation>If you are using namespace configuration with Spring Security, an AuthenticationManager will automatically be registered. This element simple allows you to define an alias to allow you to reference the authentication-manager in your own beans. </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:attributeGroup ref="security:authman.attlist"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:attributeGroup name="authman.attlist">
+    <xs:annotation>
+      <xs:documentation>The alias you wish to use for the AuthenticationManager bean</xs:documentation>
+    </xs:annotation>
+    <xs:attribute name="alias" use="required" type="xs:ID"/>
+  </xs:attributeGroup>
+  <xs:element name="authentication-provider">
+    <xs:annotation>
+      <xs:documentation>Indicates that the contained user-service should be used as an authentication source. </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="security:any-user-service"/>
+        <xs:element ref="security:password-encoder"/>
+      </xs:choice>
+      <xs:attributeGroup ref="security:ap.attlist"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:attributeGroup name="ap.attlist">
+    <xs:attribute name="user-service-ref" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>A reference to a user-service (or UserDetailsService bean) Id</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:element name="custom-authentication-provider">
+    <xs:complexType/>
+  </xs:element>
+  <xs:element name="user-service" substitutionGroup="security:any-user-service">
+    <xs:annotation>
+      <xs:documentation>Creates an in-memory UserDetailsService from a properties file or a list of "user" child elements.</xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="security:user"/>
+      </xs:sequence>
+      <xs:attribute name="id" type="xs:ID">
+        <xs:annotation>
+          <xs:documentation>A bean identifier, used for referring to the bean elsewhere in the context.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attributeGroup ref="security:properties-file"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:attributeGroup name="properties-file">
+    <xs:attribute name="properties" type="xs:string"/>
+  </xs:attributeGroup>
+  <xs:element name="user">
+    <xs:annotation>
+      <xs:documentation>Represents a user in the application.</xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:attributeGroup ref="security:user.attlist"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:attributeGroup name="user.attlist">
+    <xs:attribute name="name" use="required" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>The username assigned to the user.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="password" use="required" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>The password assigned to the user. This may be hashed if the corresponding authentication provider supports hashing (remember to set the "hash" attribute of the "user-service" element).</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="authorities" use="required" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>One of more authorities granted to the user. Separate authorities with a comma (but no space). For example, "ROLE_USER,ROLE_ADMINISTRATOR"</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="locked">
+      <xs:annotation>
+        <xs:documentation>Can be set to "true" to mark an account as locked and unusable.</xs:documentation>
+      </xs:annotation>
+      <xs:simpleType>
+        <xs:restriction base="xs:token">
+          <xs:enumeration value="true"/>
+          <xs:enumeration value="false"/>
+        </xs:restriction>
+      </xs:simpleType>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:element name="jdbc-user-service" substitutionGroup="security:any-user-service">
+    <xs:annotation>
+      <xs:documentation>Causes creation of a JDBC-based UserDetailsService.</xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:attribute name="id" type="xs:ID">
+        <xs:annotation>
+          <xs:documentation>A bean identifier, used for referring to the bean elsewhere in the context.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attributeGroup ref="security:jdbc-user-service.attlist"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:attributeGroup name="jdbc-user-service.attlist">
+    <xs:attribute name="data-source-ref" use="required" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>The bean ID of the DataSource which provides the required tables.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:element name="any-user-service" abstract="true"/>
+  <xs:group name="custom-filter">
+    <xs:sequence>
+      <xs:element minOccurs="0" ref="security:custom-filter"/>
+    </xs:sequence>
+  </xs:group>
+  <xs:element name="custom-filter">
+    <xs:annotation>
+      <xs:documentation>Used to indicate that a filter bean declaration should be incorporated into the security filter chain. If neither the 'after' or 'before' options are supplied, then the filter must implement the Ordered interface directly. </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:attribute name="after" type="security:named-security-filter">
+        <xs:annotation>
+          <xs:documentation>The filter immediately after which the custom-filter should be placed in the chain. This feature will only be needed by advanced users who wish to mix their own filters into the security filter chain and have some knowledge of the standard Spring Security filters. The filter names map to specific Spring Security implementation filters. </xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="before" type="security:named-security-filter">
+        <xs:annotation>
+          <xs:documentation>The filter immediately before which the custom-filter should be placed in the chain</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:attributeGroup name="after">
+    <xs:attribute name="after" use="required" type="security:named-security-filter">
+      <xs:annotation>
+        <xs:documentation>The filter immediately after which the custom-filter should be placed in the chain. This feature will only be needed by advanced users who wish to mix their own filters into the security filter chain and have some knowledge of the standard Spring Security filters. The filter names map to specific Spring Security implementation filters. </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:attributeGroup name="before">
+    <xs:attribute name="before" use="required" type="security:named-security-filter">
+      <xs:annotation>
+        <xs:documentation>The filter immediately before which the custom-filter should be placed in the chain</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:simpleType name="named-security-filter">
+    <xs:restriction base="xs:token">
+      <xs:enumeration value="FIRST"/>
+      <xs:enumeration value="CHANNEL_FILTER"/>
+      <xs:enumeration value="CONCURRENT_SESSION_FILTER"/>
+      <xs:enumeration value="SESSION_CONTEXT_INTEGRATION_FILTER"/>
+      <xs:enumeration value="LOGOUT_FILTER"/>
+      <xs:enumeration value="X509_FILTER"/>
+      <xs:enumeration value="PRE_AUTH_FILTER"/>
+      <xs:enumeration value="CAS_PROCESSING_FILTER"/>
+      <xs:enumeration value="AUTHENTICATION_PROCESSING_FILTER"/>
+      <xs:enumeration value="BASIC_PROCESSING_FILTER"/>
+      <xs:enumeration value="SERVLET_API_SUPPORT_FILTER"/>
+      <xs:enumeration value="REMEMBER_ME_FILTER"/>
+      <xs:enumeration value="ANONYMOUS_FILTER"/>
+      <xs:enumeration value="EXCEPTION_TRANSLATION_FILTER"/>
+      <xs:enumeration value="NTLM_FILTER"/>
+      <xs:enumeration value="FILTER_SECURITY_INTERCEPTOR"/>
+      <xs:enumeration value="SWITCH_USER_FILTER"/>
+    </xs:restriction>
+  </xs:simpleType>
 </xs:schema>

core/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>,intercept-url,form-login,x509,http-basic,logout,concurrent-session-control,remember-me,anonymous,port-mappings,password-compare-element,salt-source,filter-chain,</xsl:text>
+        <xsl:text>,intercept-url,form-login,x509,http-basic,logout,concurrent-session-control,remember-me,anonymous,port-mappings,password-compare-element,salt-source,filter-chain,protect-pointcut,</xsl:text>
     </xsl:variable>
 
     <xsl:template match="xs:element">

pom.xml

@@ -662,7 +662,6 @@
 	    <dependency>
 	        <groupId>org.aspectj</groupId>
 		<artifactId>aspectjweaver</artifactId>
-		<scope>test</scope>
 		<optional>true</optional>
 		<version>1.5.4</version>
 	    </dependency>	    

samples/pom.xml

@@ -29,6 +29,11 @@
 	    <groupId>aspectj</groupId>
 	    <artifactId>aspectjrt</artifactId>
 	</dependency>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjweaver</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>jstl</groupId>
             <artifactId>jstl</artifactId>

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

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