diff --git a/config/pom.xml b/config/pom.xml
new file mode 100644
index 0000000000..80c25662c0
--- /dev/null
+++ b/config/pom.xml
@@ -0,0 +1,92 @@
+
+ 4.0.0
+
+ org.springframework.security
+ spring-security-parent
+ 2.5.0-SNAPSHOT
+
+ jar
+ spring-security-config
+ Spring Security - Namespace Configuration Module
+
+
+
+ org.springframework.security
+ spring-security-core
+ ${project.version}
+
+
+ commons-logging
+ commons-logging
+
+
+ org.springframework.security
+ spring-security-core
+ ${project.version}
+ tests
+ test
+
+
+ org.springframework.security
+ spring-security-ldap
+ ${project.version}
+ test
+
+
+ org.springframework
+ org.springframework.jdbc
+ test
+
+
+ org.springframework
+ org.springframework.web
+ test
+
+
+ org.apache.directory.server
+ apacheds-core
+ 1.0.2
+
+
+ org.apache.directory.server
+ apacheds-server-jndi
+ 1.0.2
+
+
+ org.apache.mina
+ mina-core
+ 1.0.5
+
+
+ org.slf4j
+ slf4j-log4j12
+ 1.4.3
+ test
+
+
+ hsqldb
+ hsqldb
+ test
+
+
+ cglib
+ cglib-nodep
+ test
+
+
+ org.apache.tomcat
+ annotations-api
+ test
+
+
+ org.springframework
+ org.springframework.test
+ test
+
+
+ javax.servlet
+ servlet-api
+
+
+
+
diff --git a/core/src/main/java/org/springframework/security/config/AbstractUserDetailsServiceBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/AbstractUserDetailsServiceBeanDefinitionParser.java
similarity index 100%
rename from core/src/main/java/org/springframework/security/config/AbstractUserDetailsServiceBeanDefinitionParser.java
rename to config/src/main/java/org/springframework/security/config/AbstractUserDetailsServiceBeanDefinitionParser.java
diff --git a/core/src/main/java/org/springframework/security/config/AnonymousBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/AnonymousBeanDefinitionParser.java
similarity index 100%
rename from core/src/main/java/org/springframework/security/config/AnonymousBeanDefinitionParser.java
rename to config/src/main/java/org/springframework/security/config/AnonymousBeanDefinitionParser.java
diff --git a/core/src/main/java/org/springframework/security/config/AuthenticationManagerBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/AuthenticationManagerBeanDefinitionParser.java
similarity index 100%
rename from core/src/main/java/org/springframework/security/config/AuthenticationManagerBeanDefinitionParser.java
rename to config/src/main/java/org/springframework/security/config/AuthenticationManagerBeanDefinitionParser.java
diff --git a/core/src/main/java/org/springframework/security/config/AuthenticationProviderBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/AuthenticationProviderBeanDefinitionParser.java
similarity index 100%
rename from core/src/main/java/org/springframework/security/config/AuthenticationProviderBeanDefinitionParser.java
rename to config/src/main/java/org/springframework/security/config/AuthenticationProviderBeanDefinitionParser.java
diff --git a/core/src/main/java/org/springframework/security/config/BasicAuthenticationBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/BasicAuthenticationBeanDefinitionParser.java
similarity index 100%
rename from core/src/main/java/org/springframework/security/config/BasicAuthenticationBeanDefinitionParser.java
rename to config/src/main/java/org/springframework/security/config/BasicAuthenticationBeanDefinitionParser.java
diff --git a/core/src/main/java/org/springframework/security/config/BeanIds.java b/config/src/main/java/org/springframework/security/config/BeanIds.java
similarity index 100%
rename from core/src/main/java/org/springframework/security/config/BeanIds.java
rename to config/src/main/java/org/springframework/security/config/BeanIds.java
diff --git a/core/src/main/java/org/springframework/security/config/CachingUserDetailsService.java b/config/src/main/java/org/springframework/security/config/CachingUserDetailsService.java
similarity index 100%
rename from core/src/main/java/org/springframework/security/config/CachingUserDetailsService.java
rename to config/src/main/java/org/springframework/security/config/CachingUserDetailsService.java
diff --git a/core/src/main/java/org/springframework/security/config/ConcurrentSessionsBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/ConcurrentSessionsBeanDefinitionParser.java
similarity index 100%
rename from core/src/main/java/org/springframework/security/config/ConcurrentSessionsBeanDefinitionParser.java
rename to config/src/main/java/org/springframework/security/config/ConcurrentSessionsBeanDefinitionParser.java
diff --git a/core/src/main/java/org/springframework/security/config/ConfigUtils.java b/config/src/main/java/org/springframework/security/config/ConfigUtils.java
similarity index 100%
rename from core/src/main/java/org/springframework/security/config/ConfigUtils.java
rename to config/src/main/java/org/springframework/security/config/ConfigUtils.java
diff --git a/ldap/src/main/java/org/springframework/security/config/ldap/ContextSourceSettingPostProcessor.java b/config/src/main/java/org/springframework/security/config/ContextSourceSettingPostProcessor.java
similarity index 68%
rename from ldap/src/main/java/org/springframework/security/config/ldap/ContextSourceSettingPostProcessor.java
rename to config/src/main/java/org/springframework/security/config/ContextSourceSettingPostProcessor.java
index 9211b354a0..b9284bc00f 100644
--- a/ldap/src/main/java/org/springframework/security/config/ldap/ContextSourceSettingPostProcessor.java
+++ b/config/src/main/java/org/springframework/security/config/ContextSourceSettingPostProcessor.java
@@ -1,13 +1,10 @@
-package org.springframework.security.config.ldap;
+package org.springframework.security.config;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.core.Ordered;
-import org.springframework.ldap.core.support.BaseLdapPathContextSource;
-import org.springframework.security.config.BeanIds;
-import org.springframework.security.config.Elements;
-import org.springframework.security.config.SecurityConfigurationException;
+import org.springframework.util.ClassUtils;
/**
* Checks for the presence of a ContextSource instance. Also supplies the standard reference to any
@@ -19,12 +16,26 @@ import org.springframework.security.config.SecurityConfigurationException;
* @version $Id$
* @since 2.5
*/
-public class ContextSourceSettingPostProcessor implements BeanFactoryPostProcessor, Ordered {
+class ContextSourceSettingPostProcessor implements BeanFactoryPostProcessor, Ordered {
+ private static final String REQUIRED_CONTEXT_SOURCE_CLASS_NAME = "org.springframework.ldap.core.support.BaseLdapPathContextSource";
+
/** If set to true, a bean parser has indicated that the default context source name needs to be set */
private boolean defaultNameRequired;
+
public void postProcessBeanFactory(ConfigurableListableBeanFactory bf) throws BeansException {
- String[] sources = bf.getBeanNamesForType(BaseLdapPathContextSource.class);
+ Class> contextSourceClass;
+
+ try {
+ contextSourceClass = ClassUtils.forName(REQUIRED_CONTEXT_SOURCE_CLASS_NAME);
+ } catch (ClassNotFoundException e) {
+ throw new SecurityConfigurationException("Couldn't locate: " + REQUIRED_CONTEXT_SOURCE_CLASS_NAME + ". " +
+ " If you are using LDAP with Spring Security, please ensure that you include the spring-ldap " +
+ "jar file in your application", e);
+ }
+
+ String[] sources = bf.getBeanNamesForType(contextSourceClass);
+
if (sources.length == 0) {
throw new SecurityConfigurationException("No BaseLdapPathContextSource instances found. Have you " +
diff --git a/core/src/main/java/org/springframework/security/config/CustomAfterInvocationProviderBeanDefinitionDecorator.java b/config/src/main/java/org/springframework/security/config/CustomAfterInvocationProviderBeanDefinitionDecorator.java
similarity index 100%
rename from core/src/main/java/org/springframework/security/config/CustomAfterInvocationProviderBeanDefinitionDecorator.java
rename to config/src/main/java/org/springframework/security/config/CustomAfterInvocationProviderBeanDefinitionDecorator.java
diff --git a/core/src/main/java/org/springframework/security/config/CustomAuthenticationProviderBeanDefinitionDecorator.java b/config/src/main/java/org/springframework/security/config/CustomAuthenticationProviderBeanDefinitionDecorator.java
similarity index 100%
rename from core/src/main/java/org/springframework/security/config/CustomAuthenticationProviderBeanDefinitionDecorator.java
rename to config/src/main/java/org/springframework/security/config/CustomAuthenticationProviderBeanDefinitionDecorator.java
diff --git a/core/src/main/java/org/springframework/security/config/Elements.java b/config/src/main/java/org/springframework/security/config/Elements.java
similarity index 100%
rename from core/src/main/java/org/springframework/security/config/Elements.java
rename to config/src/main/java/org/springframework/security/config/Elements.java
diff --git a/core/src/main/java/org/springframework/security/config/EntryPointInjectionBeanPostProcessor.java b/config/src/main/java/org/springframework/security/config/EntryPointInjectionBeanPostProcessor.java
similarity index 100%
rename from core/src/main/java/org/springframework/security/config/EntryPointInjectionBeanPostProcessor.java
rename to config/src/main/java/org/springframework/security/config/EntryPointInjectionBeanPostProcessor.java
diff --git a/core/src/main/java/org/springframework/security/config/FilterChainMapBeanDefinitionDecorator.java b/config/src/main/java/org/springframework/security/config/FilterChainMapBeanDefinitionDecorator.java
similarity index 100%
rename from core/src/main/java/org/springframework/security/config/FilterChainMapBeanDefinitionDecorator.java
rename to config/src/main/java/org/springframework/security/config/FilterChainMapBeanDefinitionDecorator.java
diff --git a/core/src/main/java/org/springframework/security/config/FilterChainProxyPostProcessor.java b/config/src/main/java/org/springframework/security/config/FilterChainProxyPostProcessor.java
similarity index 100%
rename from core/src/main/java/org/springframework/security/config/FilterChainProxyPostProcessor.java
rename to config/src/main/java/org/springframework/security/config/FilterChainProxyPostProcessor.java
diff --git a/core/src/main/java/org/springframework/security/config/FilterInvocationSecurityMetadataSourceBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/FilterInvocationSecurityMetadataSourceBeanDefinitionParser.java
similarity index 100%
rename from core/src/main/java/org/springframework/security/config/FilterInvocationSecurityMetadataSourceBeanDefinitionParser.java
rename to config/src/main/java/org/springframework/security/config/FilterInvocationSecurityMetadataSourceBeanDefinitionParser.java
diff --git a/core/src/main/java/org/springframework/security/config/FormLoginBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/FormLoginBeanDefinitionParser.java
similarity index 100%
rename from core/src/main/java/org/springframework/security/config/FormLoginBeanDefinitionParser.java
rename to config/src/main/java/org/springframework/security/config/FormLoginBeanDefinitionParser.java
diff --git a/core/src/main/java/org/springframework/security/config/GlobalMethodSecurityBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/GlobalMethodSecurityBeanDefinitionParser.java
similarity index 100%
rename from core/src/main/java/org/springframework/security/config/GlobalMethodSecurityBeanDefinitionParser.java
rename to config/src/main/java/org/springframework/security/config/GlobalMethodSecurityBeanDefinitionParser.java
diff --git a/core/src/main/java/org/springframework/security/config/HttpSecurityBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/HttpSecurityBeanDefinitionParser.java
similarity index 100%
rename from core/src/main/java/org/springframework/security/config/HttpSecurityBeanDefinitionParser.java
rename to config/src/main/java/org/springframework/security/config/HttpSecurityBeanDefinitionParser.java
diff --git a/core/src/main/java/org/springframework/security/config/InterceptMethodsBeanDefinitionDecorator.java b/config/src/main/java/org/springframework/security/config/InterceptMethodsBeanDefinitionDecorator.java
similarity index 100%
rename from core/src/main/java/org/springframework/security/config/InterceptMethodsBeanDefinitionDecorator.java
rename to config/src/main/java/org/springframework/security/config/InterceptMethodsBeanDefinitionDecorator.java
diff --git a/core/src/main/java/org/springframework/security/config/JdbcUserServiceBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/JdbcUserServiceBeanDefinitionParser.java
similarity index 100%
rename from core/src/main/java/org/springframework/security/config/JdbcUserServiceBeanDefinitionParser.java
rename to config/src/main/java/org/springframework/security/config/JdbcUserServiceBeanDefinitionParser.java
diff --git a/core/src/main/java/org/springframework/security/config/LdapProviderBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/LdapProviderBeanDefinitionParser.java
similarity index 100%
rename from core/src/main/java/org/springframework/security/config/LdapProviderBeanDefinitionParser.java
rename to config/src/main/java/org/springframework/security/config/LdapProviderBeanDefinitionParser.java
diff --git a/core/src/main/java/org/springframework/security/config/LdapServerBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/LdapServerBeanDefinitionParser.java
similarity index 99%
rename from core/src/main/java/org/springframework/security/config/LdapServerBeanDefinitionParser.java
rename to config/src/main/java/org/springframework/security/config/LdapServerBeanDefinitionParser.java
index d043bff9e6..6f8c4572c0 100644
--- a/core/src/main/java/org/springframework/security/config/LdapServerBeanDefinitionParser.java
+++ b/config/src/main/java/org/springframework/security/config/LdapServerBeanDefinitionParser.java
@@ -148,7 +148,7 @@ public class LdapServerBeanDefinitionParser implements BeanDefinitionParser {
contextSource.addPropertyValue("userDn", "uid=admin,ou=system");
contextSource.addPropertyValue("password", "secret");
- RootBeanDefinition apacheContainer = new RootBeanDefinition("org.springframework.security.config.ldap.ApacheDSContainer", null, null);
+ RootBeanDefinition apacheContainer = new RootBeanDefinition("org.springframework.security.ldap.server.ApacheDSContainer", null, null);
apacheContainer.setSource(source);
apacheContainer.getConstructorArgumentValues().addGenericArgumentValue(configuration.getBeanDefinition());
apacheContainer.getConstructorArgumentValues().addGenericArgumentValue(contextSource.getBeanDefinition());
diff --git a/core/src/main/java/org/springframework/security/config/LdapUserServiceBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/LdapUserServiceBeanDefinitionParser.java
similarity index 98%
rename from core/src/main/java/org/springframework/security/config/LdapUserServiceBeanDefinitionParser.java
rename to config/src/main/java/org/springframework/security/config/LdapUserServiceBeanDefinitionParser.java
index 916af868f9..836ef87893 100644
--- a/core/src/main/java/org/springframework/security/config/LdapUserServiceBeanDefinitionParser.java
+++ b/config/src/main/java/org/springframework/security/config/LdapUserServiceBeanDefinitionParser.java
@@ -104,7 +104,7 @@ public class LdapUserServiceBeanDefinitionParser extends AbstractUserDetailsServ
return;
}
- BeanDefinitionBuilder bdb = BeanDefinitionBuilder.rootBeanDefinition("org.springframework.security.config.ldap.ContextSourceSettingPostProcessor");
+ BeanDefinitionBuilder bdb = BeanDefinitionBuilder.rootBeanDefinition("org.springframework.security.config.ContextSourceSettingPostProcessor");
bdb.addPropertyValue("defaultNameRequired", Boolean.valueOf(defaultNameRequired));
registry.registerBeanDefinition(BeanIds.CONTEXT_SOURCE_SETTING_POST_PROCESSOR, bdb.getBeanDefinition());
}
diff --git a/core/src/main/java/org/springframework/security/config/LogoutBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/LogoutBeanDefinitionParser.java
similarity index 100%
rename from core/src/main/java/org/springframework/security/config/LogoutBeanDefinitionParser.java
rename to config/src/main/java/org/springframework/security/config/LogoutBeanDefinitionParser.java
diff --git a/core/src/main/java/org/springframework/security/config/MethodSecurityInterceptorPostProcessor.java b/config/src/main/java/org/springframework/security/config/MethodSecurityInterceptorPostProcessor.java
similarity index 100%
rename from core/src/main/java/org/springframework/security/config/MethodSecurityInterceptorPostProcessor.java
rename to config/src/main/java/org/springframework/security/config/MethodSecurityInterceptorPostProcessor.java
diff --git a/core/src/main/java/org/springframework/security/config/NamespaceAuthenticationManager.java b/config/src/main/java/org/springframework/security/config/NamespaceAuthenticationManager.java
similarity index 100%
rename from core/src/main/java/org/springframework/security/config/NamespaceAuthenticationManager.java
rename to config/src/main/java/org/springframework/security/config/NamespaceAuthenticationManager.java
diff --git a/core/src/main/java/org/springframework/security/config/OrderedFilterBeanDefinitionDecorator.java b/config/src/main/java/org/springframework/security/config/OrderedFilterBeanDefinitionDecorator.java
similarity index 100%
rename from core/src/main/java/org/springframework/security/config/OrderedFilterBeanDefinitionDecorator.java
rename to config/src/main/java/org/springframework/security/config/OrderedFilterBeanDefinitionDecorator.java
diff --git a/core/src/main/java/org/springframework/security/config/PasswordEncoderParser.java b/config/src/main/java/org/springframework/security/config/PasswordEncoderParser.java
similarity index 100%
rename from core/src/main/java/org/springframework/security/config/PasswordEncoderParser.java
rename to config/src/main/java/org/springframework/security/config/PasswordEncoderParser.java
diff --git a/core/src/main/java/org/springframework/security/config/PortMappingsBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/PortMappingsBeanDefinitionParser.java
similarity index 100%
rename from core/src/main/java/org/springframework/security/config/PortMappingsBeanDefinitionParser.java
rename to config/src/main/java/org/springframework/security/config/PortMappingsBeanDefinitionParser.java
diff --git a/core/src/main/java/org/springframework/security/config/RememberMeBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/RememberMeBeanDefinitionParser.java
similarity index 100%
rename from core/src/main/java/org/springframework/security/config/RememberMeBeanDefinitionParser.java
rename to config/src/main/java/org/springframework/security/config/RememberMeBeanDefinitionParser.java
diff --git a/core/src/main/java/org/springframework/security/config/RememberMeServicesInjectionBeanPostProcessor.java b/config/src/main/java/org/springframework/security/config/RememberMeServicesInjectionBeanPostProcessor.java
similarity index 100%
rename from core/src/main/java/org/springframework/security/config/RememberMeServicesInjectionBeanPostProcessor.java
rename to config/src/main/java/org/springframework/security/config/RememberMeServicesInjectionBeanPostProcessor.java
diff --git a/core/src/main/java/org/springframework/security/config/SaltSourceBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/SaltSourceBeanDefinitionParser.java
similarity index 100%
rename from core/src/main/java/org/springframework/security/config/SaltSourceBeanDefinitionParser.java
rename to config/src/main/java/org/springframework/security/config/SaltSourceBeanDefinitionParser.java
diff --git a/core/src/main/java/org/springframework/security/config/SecurityConfigurationException.java b/config/src/main/java/org/springframework/security/config/SecurityConfigurationException.java
similarity index 100%
rename from core/src/main/java/org/springframework/security/config/SecurityConfigurationException.java
rename to config/src/main/java/org/springframework/security/config/SecurityConfigurationException.java
diff --git a/core/src/main/java/org/springframework/security/config/SecurityNamespaceHandler.java b/config/src/main/java/org/springframework/security/config/SecurityNamespaceHandler.java
similarity index 100%
rename from core/src/main/java/org/springframework/security/config/SecurityNamespaceHandler.java
rename to config/src/main/java/org/springframework/security/config/SecurityNamespaceHandler.java
diff --git a/core/src/main/java/org/springframework/security/config/SessionRegistryInjectionBeanPostProcessor.java b/config/src/main/java/org/springframework/security/config/SessionRegistryInjectionBeanPostProcessor.java
similarity index 100%
rename from core/src/main/java/org/springframework/security/config/SessionRegistryInjectionBeanPostProcessor.java
rename to config/src/main/java/org/springframework/security/config/SessionRegistryInjectionBeanPostProcessor.java
diff --git a/core/src/main/java/org/springframework/security/config/UserDetailsServiceInjectionBeanPostProcessor.java b/config/src/main/java/org/springframework/security/config/UserDetailsServiceInjectionBeanPostProcessor.java
similarity index 100%
rename from core/src/main/java/org/springframework/security/config/UserDetailsServiceInjectionBeanPostProcessor.java
rename to config/src/main/java/org/springframework/security/config/UserDetailsServiceInjectionBeanPostProcessor.java
diff --git a/core/src/main/java/org/springframework/security/config/UserServiceBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/UserServiceBeanDefinitionParser.java
similarity index 100%
rename from core/src/main/java/org/springframework/security/config/UserServiceBeanDefinitionParser.java
rename to config/src/main/java/org/springframework/security/config/UserServiceBeanDefinitionParser.java
diff --git a/core/src/main/java/org/springframework/security/config/X509BeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/X509BeanDefinitionParser.java
similarity index 100%
rename from core/src/main/java/org/springframework/security/config/X509BeanDefinitionParser.java
rename to config/src/main/java/org/springframework/security/config/X509BeanDefinitionParser.java
diff --git a/core/src/main/java/org/springframework/security/util/InMemoryXmlApplicationContext.java b/config/src/main/java/org/springframework/security/config/util/InMemoryXmlApplicationContext.java
similarity index 93%
rename from core/src/main/java/org/springframework/security/util/InMemoryXmlApplicationContext.java
rename to config/src/main/java/org/springframework/security/config/util/InMemoryXmlApplicationContext.java
index d9df879c7a..67e20db828 100644
--- a/core/src/main/java/org/springframework/security/util/InMemoryXmlApplicationContext.java
+++ b/config/src/main/java/org/springframework/security/config/util/InMemoryXmlApplicationContext.java
@@ -1,7 +1,8 @@
-package org.springframework.security.util;
+package org.springframework.security.config.util;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.core.io.Resource;
+import org.springframework.security.util.InMemoryResource;
/**
* @author Luke Taylor
diff --git a/core/src/main/resources/META-INF/spring.handlers b/config/src/main/resources/META-INF/spring.handlers
similarity index 100%
rename from core/src/main/resources/META-INF/spring.handlers
rename to config/src/main/resources/META-INF/spring.handlers
diff --git a/core/src/main/resources/META-INF/spring.schemas b/config/src/main/resources/META-INF/spring.schemas
similarity index 100%
rename from core/src/main/resources/META-INF/spring.schemas
rename to config/src/main/resources/META-INF/spring.schemas
diff --git a/core/src/main/resources/org/springframework/security/config/catalog.xml b/config/src/main/resources/org/springframework/security/config/catalog.xml
similarity index 100%
rename from core/src/main/resources/org/springframework/security/config/catalog.xml
rename to config/src/main/resources/org/springframework/security/config/catalog.xml
diff --git a/core/src/main/resources/org/springframework/security/config/spring-security-2.0.1.xsd b/config/src/main/resources/org/springframework/security/config/spring-security-2.0.1.xsd
similarity index 100%
rename from core/src/main/resources/org/springframework/security/config/spring-security-2.0.1.xsd
rename to config/src/main/resources/org/springframework/security/config/spring-security-2.0.1.xsd
diff --git a/core/src/main/resources/org/springframework/security/config/spring-security-2.0.2.xsd b/config/src/main/resources/org/springframework/security/config/spring-security-2.0.2.xsd
similarity index 100%
rename from core/src/main/resources/org/springframework/security/config/spring-security-2.0.2.xsd
rename to config/src/main/resources/org/springframework/security/config/spring-security-2.0.2.xsd
diff --git a/core/src/main/resources/org/springframework/security/config/spring-security-2.0.4.rnc b/config/src/main/resources/org/springframework/security/config/spring-security-2.0.4.rnc
similarity index 100%
rename from core/src/main/resources/org/springframework/security/config/spring-security-2.0.4.rnc
rename to config/src/main/resources/org/springframework/security/config/spring-security-2.0.4.rnc
diff --git a/core/src/main/resources/org/springframework/security/config/spring-security-2.0.4.xsd b/config/src/main/resources/org/springframework/security/config/spring-security-2.0.4.xsd
similarity index 100%
rename from core/src/main/resources/org/springframework/security/config/spring-security-2.0.4.xsd
rename to config/src/main/resources/org/springframework/security/config/spring-security-2.0.4.xsd
diff --git a/core/src/main/resources/org/springframework/security/config/spring-security-2.0.xsd b/config/src/main/resources/org/springframework/security/config/spring-security-2.0.xsd
similarity index 100%
rename from core/src/main/resources/org/springframework/security/config/spring-security-2.0.xsd
rename to config/src/main/resources/org/springframework/security/config/spring-security-2.0.xsd
diff --git a/core/src/main/resources/org/springframework/security/config/spring-security-2.5.rnc b/config/src/main/resources/org/springframework/security/config/spring-security-2.5.rnc
similarity index 100%
rename from core/src/main/resources/org/springframework/security/config/spring-security-2.5.rnc
rename to config/src/main/resources/org/springframework/security/config/spring-security-2.5.rnc
diff --git a/core/src/main/resources/org/springframework/security/config/spring-security-2.5.xsd b/config/src/main/resources/org/springframework/security/config/spring-security-2.5.xsd
similarity index 100%
rename from core/src/main/resources/org/springframework/security/config/spring-security-2.5.xsd
rename to config/src/main/resources/org/springframework/security/config/spring-security-2.5.xsd
diff --git a/core/src/main/resources/org/springframework/security/config/spring-security.xsl b/config/src/main/resources/org/springframework/security/config/spring-security.xsl
similarity index 100%
rename from core/src/main/resources/org/springframework/security/config/spring-security.xsl
rename to config/src/main/resources/org/springframework/security/config/spring-security.xsl
diff --git a/core/src/test/java/org/springframework/security/config/AuthenticationProviderBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/AuthenticationProviderBeanDefinitionParserTests.java
similarity index 98%
rename from core/src/test/java/org/springframework/security/config/AuthenticationProviderBeanDefinitionParserTests.java
rename to config/src/test/java/org/springframework/security/config/AuthenticationProviderBeanDefinitionParserTests.java
index 99219beff1..a263815e62 100644
--- a/core/src/test/java/org/springframework/security/config/AuthenticationProviderBeanDefinitionParserTests.java
+++ b/config/src/test/java/org/springframework/security/config/AuthenticationProviderBeanDefinitionParserTests.java
@@ -2,12 +2,12 @@ package org.springframework.security.config;
import static org.junit.Assert.*;
+import org.springframework.security.config.util.InMemoryXmlApplicationContext;
import org.springframework.security.providers.ProviderManager;
import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
import org.springframework.security.providers.AuthenticationProvider;
import org.springframework.security.providers.encoding.ShaPasswordEncoder;
import org.springframework.security.util.FieldUtils;
-import org.springframework.security.util.InMemoryXmlApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.junit.Test;
diff --git a/core/src/test/java/org/springframework/security/config/ConfigTestUtils.java b/config/src/test/java/org/springframework/security/config/ConfigTestUtils.java
similarity index 100%
rename from core/src/test/java/org/springframework/security/config/ConfigTestUtils.java
rename to config/src/test/java/org/springframework/security/config/ConfigTestUtils.java
diff --git a/core/src/test/java/org/springframework/security/config/CustomAfterInvocationProviderBeanDefinitionDecoratorTests.java b/config/src/test/java/org/springframework/security/config/CustomAfterInvocationProviderBeanDefinitionDecoratorTests.java
similarity index 95%
rename from core/src/test/java/org/springframework/security/config/CustomAfterInvocationProviderBeanDefinitionDecoratorTests.java
rename to config/src/test/java/org/springframework/security/config/CustomAfterInvocationProviderBeanDefinitionDecoratorTests.java
index 5a2ee94736..e1d495624a 100644
--- a/core/src/test/java/org/springframework/security/config/CustomAfterInvocationProviderBeanDefinitionDecoratorTests.java
+++ b/config/src/test/java/org/springframework/security/config/CustomAfterInvocationProviderBeanDefinitionDecoratorTests.java
@@ -6,8 +6,8 @@ import org.junit.After;
import org.junit.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.security.afterinvocation.AfterInvocationProviderManager;
+import org.springframework.security.config.util.InMemoryXmlApplicationContext;
import org.springframework.security.intercept.method.aopalliance.MethodSecurityInterceptor;
-import org.springframework.security.util.InMemoryXmlApplicationContext;
public class CustomAfterInvocationProviderBeanDefinitionDecoratorTests {
private AbstractXmlApplicationContext appContext;
diff --git a/core/src/test/java/org/springframework/security/config/CustomAuthenticationProviderBeanDefinitionDecoratorTests.java b/config/src/test/java/org/springframework/security/config/CustomAuthenticationProviderBeanDefinitionDecoratorTests.java
similarity index 95%
rename from core/src/test/java/org/springframework/security/config/CustomAuthenticationProviderBeanDefinitionDecoratorTests.java
rename to config/src/test/java/org/springframework/security/config/CustomAuthenticationProviderBeanDefinitionDecoratorTests.java
index e02aa7780f..bad7caba5c 100644
--- a/core/src/test/java/org/springframework/security/config/CustomAuthenticationProviderBeanDefinitionDecoratorTests.java
+++ b/config/src/test/java/org/springframework/security/config/CustomAuthenticationProviderBeanDefinitionDecoratorTests.java
@@ -3,8 +3,8 @@ package org.springframework.security.config;
import static org.junit.Assert.*;
import org.junit.Test;
+import org.springframework.security.config.util.InMemoryXmlApplicationContext;
import org.springframework.security.providers.ProviderManager;
-import org.springframework.security.util.InMemoryXmlApplicationContext;
public class CustomAuthenticationProviderBeanDefinitionDecoratorTests {
diff --git a/core/src/test/java/org/springframework/security/config/DataSourcePopulator.java b/config/src/test/java/org/springframework/security/config/DataSourcePopulator.java
similarity index 100%
rename from core/src/test/java/org/springframework/security/config/DataSourcePopulator.java
rename to config/src/test/java/org/springframework/security/config/DataSourcePopulator.java
diff --git a/core/src/test/java/org/springframework/security/config/FilterInvocationDefinitionSourceParserTests.java b/config/src/test/java/org/springframework/security/config/FilterInvocationDefinitionSourceParserTests.java
similarity index 97%
rename from core/src/test/java/org/springframework/security/config/FilterInvocationDefinitionSourceParserTests.java
rename to config/src/test/java/org/springframework/security/config/FilterInvocationDefinitionSourceParserTests.java
index 0b3ede12da..f8fcf8c349 100644
--- a/core/src/test/java/org/springframework/security/config/FilterInvocationDefinitionSourceParserTests.java
+++ b/config/src/test/java/org/springframework/security/config/FilterInvocationDefinitionSourceParserTests.java
@@ -12,9 +12,9 @@ import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.security.ConfigAttribute;
import org.springframework.security.SecurityConfig;
+import org.springframework.security.config.util.InMemoryXmlApplicationContext;
import org.springframework.security.intercept.web.DefaultFilterInvocationSecurityMetadataSource;
import org.springframework.security.intercept.web.FilterInvocation;
-import org.springframework.security.util.InMemoryXmlApplicationContext;
/**
*
diff --git a/core/src/test/java/org/springframework/security/config/GlobalMethodSecurityBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/GlobalMethodSecurityBeanDefinitionParserTests.java
similarity index 99%
rename from core/src/test/java/org/springframework/security/config/GlobalMethodSecurityBeanDefinitionParserTests.java
rename to config/src/test/java/org/springframework/security/config/GlobalMethodSecurityBeanDefinitionParserTests.java
index 9b80ab34a6..2650d68f1a 100644
--- a/core/src/test/java/org/springframework/security/config/GlobalMethodSecurityBeanDefinitionParserTests.java
+++ b/config/src/test/java/org/springframework/security/config/GlobalMethodSecurityBeanDefinitionParserTests.java
@@ -14,6 +14,7 @@ import org.springframework.security.AccessDeniedException;
import org.springframework.security.AuthenticationCredentialsNotFoundException;
import org.springframework.security.afterinvocation.AfterInvocationProviderManager;
import org.springframework.security.annotation.BusinessService;
+import org.springframework.security.config.util.InMemoryXmlApplicationContext;
import org.springframework.security.context.SecurityContextHolder;
import org.springframework.security.expression.method.MethodExpressionAfterInvocationProvider;
import org.springframework.security.expression.method.MethodExpressionVoter;
@@ -22,7 +23,6 @@ import org.springframework.security.providers.UsernamePasswordAuthenticationToke
import org.springframework.security.userdetails.UserDetailsService;
import org.springframework.security.util.AuthorityUtils;
import org.springframework.security.util.FieldUtils;
-import org.springframework.security.util.InMemoryXmlApplicationContext;
import org.springframework.security.vote.AffirmativeBased;
/**
diff --git a/core/src/test/java/org/springframework/security/config/HttpSecurityBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/HttpSecurityBeanDefinitionParserTests.java
similarity index 99%
rename from core/src/test/java/org/springframework/security/config/HttpSecurityBeanDefinitionParserTests.java
rename to config/src/test/java/org/springframework/security/config/HttpSecurityBeanDefinitionParserTests.java
index ccde91d744..a84d0d921c 100644
--- a/core/src/test/java/org/springframework/security/config/HttpSecurityBeanDefinitionParserTests.java
+++ b/config/src/test/java/org/springframework/security/config/HttpSecurityBeanDefinitionParserTests.java
@@ -25,6 +25,7 @@ import org.springframework.security.SecurityConfig;
import org.springframework.security.concurrent.ConcurrentLoginException;
import org.springframework.security.concurrent.ConcurrentSessionControllerImpl;
import org.springframework.security.concurrent.ConcurrentSessionFilter;
+import org.springframework.security.config.util.InMemoryXmlApplicationContext;
import org.springframework.security.context.HttpSessionSecurityContextRepository;
import org.springframework.security.context.SecurityContextHolder;
import org.springframework.security.context.SecurityContextPersistenceFilter;
@@ -49,7 +50,6 @@ import org.springframework.security.ui.webapp.AuthenticationProcessingFilter;
import org.springframework.security.ui.webapp.DefaultLoginPageGeneratingFilter;
import org.springframework.security.util.FieldUtils;
import org.springframework.security.util.FilterChainProxy;
-import org.springframework.security.util.InMemoryXmlApplicationContext;
import org.springframework.security.util.MockFilter;
import org.springframework.security.util.PortMapperImpl;
import org.springframework.security.wrapper.SecurityContextHolderAwareRequestFilter;
diff --git a/core/src/test/java/org/springframework/security/config/InterceptMethodsBeanDefinitionDecoratorTests.java b/config/src/test/java/org/springframework/security/config/InterceptMethodsBeanDefinitionDecoratorTests.java
similarity index 100%
rename from core/src/test/java/org/springframework/security/config/InterceptMethodsBeanDefinitionDecoratorTests.java
rename to config/src/test/java/org/springframework/security/config/InterceptMethodsBeanDefinitionDecoratorTests.java
diff --git a/core/src/test/java/org/springframework/security/config/InvalidConfigurationTests.java b/config/src/test/java/org/springframework/security/config/InvalidConfigurationTests.java
similarity index 93%
rename from core/src/test/java/org/springframework/security/config/InvalidConfigurationTests.java
rename to config/src/test/java/org/springframework/security/config/InvalidConfigurationTests.java
index f63d849dca..2c8144d318 100644
--- a/core/src/test/java/org/springframework/security/config/InvalidConfigurationTests.java
+++ b/config/src/test/java/org/springframework/security/config/InvalidConfigurationTests.java
@@ -3,7 +3,7 @@ package org.springframework.security.config;
import org.junit.After;
import org.junit.Test;
import org.springframework.beans.factory.xml.XmlBeanDefinitionStoreException;
-import org.springframework.security.util.InMemoryXmlApplicationContext;
+import org.springframework.security.config.util.InMemoryXmlApplicationContext;
/**
* Tests which make sure invalid configurations are rejected by the namespace. In particular invalid top-level
diff --git a/core/src/test/java/org/springframework/security/config/JdbcUserServiceBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/JdbcUserServiceBeanDefinitionParserTests.java
similarity index 98%
rename from core/src/test/java/org/springframework/security/config/JdbcUserServiceBeanDefinitionParserTests.java
rename to config/src/test/java/org/springframework/security/config/JdbcUserServiceBeanDefinitionParserTests.java
index bf16b1f30a..330fe16367 100644
--- a/core/src/test/java/org/springframework/security/config/JdbcUserServiceBeanDefinitionParserTests.java
+++ b/config/src/test/java/org/springframework/security/config/JdbcUserServiceBeanDefinitionParserTests.java
@@ -5,6 +5,7 @@ import static org.junit.Assert.*;
import org.junit.After;
import org.junit.Test;
import org.springframework.security.AuthenticationManager;
+import org.springframework.security.config.util.InMemoryXmlApplicationContext;
import org.springframework.security.providers.ProviderManager;
import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
import org.springframework.security.providers.dao.DaoAuthenticationProvider;
@@ -12,7 +13,6 @@ import org.springframework.security.userdetails.UserDetails;
import org.springframework.security.userdetails.jdbc.JdbcUserDetailsManager;
import org.springframework.security.util.AuthorityUtils;
import org.springframework.security.util.FieldUtils;
-import org.springframework.security.util.InMemoryXmlApplicationContext;
/**
* @author Ben Alex
diff --git a/core/src/test/java/org/springframework/security/config/Jsr250AnnotationDrivenBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/Jsr250AnnotationDrivenBeanDefinitionParserTests.java
similarity index 97%
rename from core/src/test/java/org/springframework/security/config/Jsr250AnnotationDrivenBeanDefinitionParserTests.java
rename to config/src/test/java/org/springframework/security/config/Jsr250AnnotationDrivenBeanDefinitionParserTests.java
index ceb002bfe0..95e5be7401 100644
--- a/core/src/test/java/org/springframework/security/config/Jsr250AnnotationDrivenBeanDefinitionParserTests.java
+++ b/config/src/test/java/org/springframework/security/config/Jsr250AnnotationDrivenBeanDefinitionParserTests.java
@@ -6,10 +6,10 @@ import org.junit.Test;
import org.springframework.security.AccessDeniedException;
import org.springframework.security.AuthenticationCredentialsNotFoundException;
import org.springframework.security.annotation.BusinessService;
+import org.springframework.security.config.util.InMemoryXmlApplicationContext;
import org.springframework.security.context.SecurityContextHolder;
import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
import org.springframework.security.util.AuthorityUtils;
-import org.springframework.security.util.InMemoryXmlApplicationContext;
/**
* @author Luke Taylor
diff --git a/ldap/src/test/java/org/springframework/security/LdapProviderBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/LdapProviderBeanDefinitionParserTests.java
similarity index 97%
rename from ldap/src/test/java/org/springframework/security/LdapProviderBeanDefinitionParserTests.java
rename to config/src/test/java/org/springframework/security/config/LdapProviderBeanDefinitionParserTests.java
index 4ab4c0d40d..6480b4411c 100644
--- a/ldap/src/test/java/org/springframework/security/LdapProviderBeanDefinitionParserTests.java
+++ b/config/src/test/java/org/springframework/security/config/LdapProviderBeanDefinitionParserTests.java
@@ -1,4 +1,4 @@
-package org.springframework.security;
+package org.springframework.security.config;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -8,13 +8,13 @@ import org.junit.Test;
import org.springframework.security.Authentication;
import org.springframework.security.config.BeanIds;
import org.springframework.security.config.SecurityConfigurationException;
+import org.springframework.security.config.util.InMemoryXmlApplicationContext;
import org.springframework.security.providers.ProviderManager;
import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
import org.springframework.security.providers.ldap.LdapAuthenticationProvider;
import org.springframework.security.userdetails.ldap.InetOrgPersonContextMapper;
import org.springframework.security.userdetails.ldap.LdapUserDetailsImpl;
import org.springframework.security.util.FieldUtils;
-import org.springframework.security.util.InMemoryXmlApplicationContext;
/**
diff --git a/ldap/src/test/java/org/springframework/security/LdapServerBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/LdapServerBeanDefinitionParserTests.java
similarity index 94%
rename from ldap/src/test/java/org/springframework/security/LdapServerBeanDefinitionParserTests.java
rename to config/src/test/java/org/springframework/security/config/LdapServerBeanDefinitionParserTests.java
index e64ca52885..7c0b32b2c3 100644
--- a/ldap/src/test/java/org/springframework/security/LdapServerBeanDefinitionParserTests.java
+++ b/config/src/test/java/org/springframework/security/config/LdapServerBeanDefinitionParserTests.java
@@ -1,11 +1,11 @@
-package org.springframework.security;
+package org.springframework.security.config;
import org.junit.After;
import org.junit.Test;
import org.springframework.ldap.core.LdapTemplate;
import org.springframework.security.config.BeanIds;
+import org.springframework.security.config.util.InMemoryXmlApplicationContext;
import org.springframework.security.ldap.DefaultSpringSecurityContextSource;
-import org.springframework.security.util.InMemoryXmlApplicationContext;
/**
* @author Luke Taylor
diff --git a/ldap/src/test/java/org/springframework/security/LdapUserServiceBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/LdapUserServiceBeanDefinitionParserTests.java
similarity index 97%
rename from ldap/src/test/java/org/springframework/security/LdapUserServiceBeanDefinitionParserTests.java
rename to config/src/test/java/org/springframework/security/config/LdapUserServiceBeanDefinitionParserTests.java
index 8f17a84fdf..b77be36349 100644
--- a/ldap/src/test/java/org/springframework/security/LdapUserServiceBeanDefinitionParserTests.java
+++ b/config/src/test/java/org/springframework/security/config/LdapUserServiceBeanDefinitionParserTests.java
@@ -1,10 +1,10 @@
-package org.springframework.security;
+package org.springframework.security.config;
import java.util.Set;
import org.springframework.security.GrantedAuthorityImpl;
+import org.springframework.security.config.util.InMemoryXmlApplicationContext;
import org.springframework.security.util.AuthorityUtils;
-import org.springframework.security.util.InMemoryXmlApplicationContext;
import org.springframework.security.userdetails.UserDetailsService;
import org.springframework.security.userdetails.UserDetails;
import org.springframework.security.userdetails.ldap.InetOrgPerson;
diff --git a/core/src/test/java/org/springframework/security/config/MockAfterInvocationProvider.java b/config/src/test/java/org/springframework/security/config/MockAfterInvocationProvider.java
similarity index 100%
rename from core/src/test/java/org/springframework/security/config/MockAfterInvocationProvider.java
rename to config/src/test/java/org/springframework/security/config/MockAfterInvocationProvider.java
diff --git a/core/src/test/java/org/springframework/security/config/MockUserServiceBeanPostProcessor.java b/config/src/test/java/org/springframework/security/config/MockUserServiceBeanPostProcessor.java
similarity index 100%
rename from core/src/test/java/org/springframework/security/config/MockUserServiceBeanPostProcessor.java
rename to config/src/test/java/org/springframework/security/config/MockUserServiceBeanPostProcessor.java
diff --git a/core/src/test/java/org/springframework/security/config/PostProcessedMockUserDetailsService.java b/config/src/test/java/org/springframework/security/config/PostProcessedMockUserDetailsService.java
similarity index 100%
rename from core/src/test/java/org/springframework/security/config/PostProcessedMockUserDetailsService.java
rename to config/src/test/java/org/springframework/security/config/PostProcessedMockUserDetailsService.java
diff --git a/core/src/test/java/org/springframework/security/config/SecuredAnnotationDrivenBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/SecuredAnnotationDrivenBeanDefinitionParserTests.java
similarity index 96%
rename from core/src/test/java/org/springframework/security/config/SecuredAnnotationDrivenBeanDefinitionParserTests.java
rename to config/src/test/java/org/springframework/security/config/SecuredAnnotationDrivenBeanDefinitionParserTests.java
index 5b3d9e5da9..43627ee34b 100644
--- a/core/src/test/java/org/springframework/security/config/SecuredAnnotationDrivenBeanDefinitionParserTests.java
+++ b/config/src/test/java/org/springframework/security/config/SecuredAnnotationDrivenBeanDefinitionParserTests.java
@@ -6,10 +6,10 @@ import org.junit.Test;
import org.springframework.security.AccessDeniedException;
import org.springframework.security.AuthenticationCredentialsNotFoundException;
import org.springframework.security.annotation.BusinessService;
+import org.springframework.security.config.util.InMemoryXmlApplicationContext;
import org.springframework.security.context.SecurityContextHolder;
import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
import org.springframework.security.util.AuthorityUtils;
-import org.springframework.security.util.InMemoryXmlApplicationContext;
/**
* @author Ben Alex
diff --git a/core/src/test/java/org/springframework/security/config/SessionRegistryInjectionBeanPostProcessorTests.java b/config/src/test/java/org/springframework/security/config/SessionRegistryInjectionBeanPostProcessorTests.java
similarity index 97%
rename from core/src/test/java/org/springframework/security/config/SessionRegistryInjectionBeanPostProcessorTests.java
rename to config/src/test/java/org/springframework/security/config/SessionRegistryInjectionBeanPostProcessorTests.java
index e6f327a63a..acf10e53f9 100644
--- a/core/src/test/java/org/springframework/security/config/SessionRegistryInjectionBeanPostProcessorTests.java
+++ b/config/src/test/java/org/springframework/security/config/SessionRegistryInjectionBeanPostProcessorTests.java
@@ -8,8 +8,8 @@ import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.security.Authentication;
import org.springframework.security.AuthenticationException;
import org.springframework.security.concurrent.ConcurrentSessionController;
+import org.springframework.security.config.util.InMemoryXmlApplicationContext;
import org.springframework.security.util.FieldUtils;
-import org.springframework.security.util.InMemoryXmlApplicationContext;
/**
*
diff --git a/core/src/test/java/org/springframework/security/config/TestBusinessBean.java b/config/src/test/java/org/springframework/security/config/TestBusinessBean.java
similarity index 100%
rename from core/src/test/java/org/springframework/security/config/TestBusinessBean.java
rename to config/src/test/java/org/springframework/security/config/TestBusinessBean.java
diff --git a/core/src/test/java/org/springframework/security/config/TestBusinessBeanImpl.java b/config/src/test/java/org/springframework/security/config/TestBusinessBeanImpl.java
similarity index 100%
rename from core/src/test/java/org/springframework/security/config/TestBusinessBeanImpl.java
rename to config/src/test/java/org/springframework/security/config/TestBusinessBeanImpl.java
diff --git a/core/src/test/java/org/springframework/security/config/UserServiceBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/UserServiceBeanDefinitionParserTests.java
similarity index 97%
rename from core/src/test/java/org/springframework/security/config/UserServiceBeanDefinitionParserTests.java
rename to config/src/test/java/org/springframework/security/config/UserServiceBeanDefinitionParserTests.java
index d7da239da3..d157933e3b 100644
--- a/core/src/test/java/org/springframework/security/config/UserServiceBeanDefinitionParserTests.java
+++ b/config/src/test/java/org/springframework/security/config/UserServiceBeanDefinitionParserTests.java
@@ -2,7 +2,7 @@ package org.springframework.security.config;
import static org.junit.Assert.*;
-import org.springframework.security.util.InMemoryXmlApplicationContext;
+import org.springframework.security.config.util.InMemoryXmlApplicationContext;
import org.springframework.security.userdetails.UserDetails;
import org.springframework.security.userdetails.UserDetailsService;
import org.springframework.context.support.AbstractXmlApplicationContext;
diff --git a/core/src/test/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityInterceptorWithAopConfigTests.java b/config/src/test/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityInterceptorWithAopConfigTests.java
similarity index 97%
rename from core/src/test/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityInterceptorWithAopConfigTests.java
rename to config/src/test/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityInterceptorWithAopConfigTests.java
index b5d325b24d..66720a92df 100644
--- a/core/src/test/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityInterceptorWithAopConfigTests.java
+++ b/config/src/test/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityInterceptorWithAopConfigTests.java
@@ -6,8 +6,8 @@ import org.junit.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.security.AuthenticationCredentialsNotFoundException;
import org.springframework.security.ITargetObject;
+import org.springframework.security.config.util.InMemoryXmlApplicationContext;
import org.springframework.security.context.SecurityContextHolder;
-import org.springframework.security.util.InMemoryXmlApplicationContext;
/**
* Tests for SEC-428.
diff --git a/core/src/test/java/org/springframework/security/util/FilterChainProxyTests.java b/config/src/test/java/org/springframework/security/util/FilterChainProxyConfigTests.java
similarity index 99%
rename from core/src/test/java/org/springframework/security/util/FilterChainProxyTests.java
rename to config/src/test/java/org/springframework/security/util/FilterChainProxyConfigTests.java
index c53e12793b..c9cef1913c 100644
--- a/core/src/test/java/org/springframework/security/util/FilterChainProxyTests.java
+++ b/config/src/test/java/org/springframework/security/util/FilterChainProxyConfigTests.java
@@ -39,7 +39,7 @@ import org.springframework.security.ui.webapp.AuthenticationProcessingFilter;
* @author Ben Alex
* @version $Id$
*/
-public class FilterChainProxyTests {
+public class FilterChainProxyConfigTests {
private ClassPathXmlApplicationContext appCtx;
//~ Methods ========================================================================================================
diff --git a/core/src/test/resources/org/springframework/security/util/filtertest-valid.xml b/config/src/test/resources/org/springframework/security/util/filtertest-valid.xml
similarity index 98%
rename from core/src/test/resources/org/springframework/security/util/filtertest-valid.xml
rename to config/src/test/resources/org/springframework/security/util/filtertest-valid.xml
index f7ab8a0f05..177a88c11f 100644
--- a/core/src/test/resources/org/springframework/security/util/filtertest-valid.xml
+++ b/config/src/test/resources/org/springframework/security/util/filtertest-valid.xml
@@ -16,7 +16,7 @@
* limitations under the License.
*
*
- * $Id$
+ * $Id: filtertest-valid.xml 3497 2008-12-20 00:16:49Z ltaylor $
-->
javax.servlet
servlet-api
- true
org.apache.tomcat
annotations-api
- 6.0.14
true
ldap
+ config
+ acl
cas
openid
- acl
ntlm
samples
taglibs
@@ -801,6 +803,11 @@
commons-collections
3.2
+
+ org.apache.tomcat
+ annotations-api
+ 6.0.14
+
hsqldb
hsqldb
diff --git a/samples/cas/client/pom.xml b/samples/cas/client/pom.xml
index f2964ba2e0..4fc8d79c2e 100644
--- a/samples/cas/client/pom.xml
+++ b/samples/cas/client/pom.xml
@@ -15,11 +15,16 @@
spring-security-core
${project.version}
+
+ org.springframework.security
+ spring-security-config
+ ${project.version}
+
org.springframework.security
spring-security-cas-client
${project.version}
-
+
org.springframework
org.springframework.web
@@ -38,7 +43,7 @@
org.springframework.aop
runtime
-
+
org.slf4j
slf4j-log4j12
@@ -78,19 +83,19 @@
password
-
-
- javax.net.ssl.trustStore
- ../../certificates/server.jks
-
-
- javax.net.ssl.trustStorePassword
- password
-
-
+
+
+ javax.net.ssl.trustStore
+ ../../certificates/server.jks
+
+
+ javax.net.ssl.trustStorePassword
+ password
+
+
-
\ No newline at end of file
+
diff --git a/samples/contacts/pom.xml b/samples/contacts/pom.xml
index 1212cf890f..8e18e18a54 100644
--- a/samples/contacts/pom.xml
+++ b/samples/contacts/pom.xml
@@ -15,6 +15,11 @@
spring-security-core
${project.version}
+
+ org.springframework.security
+ spring-security-config
+ ${project.version}
+
org.springframework.security
spring-security-acl
diff --git a/samples/ldap/pom.xml b/samples/ldap/pom.xml
index 42bfb85074..80a6ac2b9f 100644
--- a/samples/ldap/pom.xml
+++ b/samples/ldap/pom.xml
@@ -24,13 +24,6 @@
org.springframework.web.servlet
${spring.version}
-
org.springframework
org.springframework.aop
diff --git a/samples/tutorial/pom.xml b/samples/tutorial/pom.xml
index 3781b7a604..55bb4ccb52 100644
--- a/samples/tutorial/pom.xml
+++ b/samples/tutorial/pom.xml
@@ -15,6 +15,11 @@
spring-security-core
${project.version}
+
+ org.springframework.security
+ spring-security-config
+ ${project.version}
+
org.springframework.security
spring-security-taglibs