diff --git a/build.gradle b/build.gradle index b78fefa33c6..aac8e39142f 100644 --- a/build.gradle +++ b/build.gradle @@ -97,8 +97,6 @@ configure(allprojects) { project -> options.compilerArgs += "-parameters" } - sourceSets.test.resources.srcDirs = ["src/test/resources", "src/test/java"] - test { systemProperty("java.awt.headless", "true") systemProperty("testGroups", project.properties.get("testGroups")) @@ -468,9 +466,6 @@ project("spring-context") { testCompile("org.apache.commons:commons-pool2:2.2") testCompile("org.slf4j:slf4j-api:${slf4jVersion}") } - - // pick up RmiInvocationWrapperRTD.xml in src/main - sourceSets.main.resources.srcDirs += "src/main/java" } project("spring-messaging") { @@ -639,9 +634,6 @@ project("spring-context-support") { testCompile("org.ehcache:jcache:${ehcacheJCacheVersion}") testRuntime("com.sun.mail:javax.mail:1.5.2") } - - // pick up **/mime.types files in src/main - sourceSets.main.resources.srcDirs += "src/main/java" } project("spring-web") { @@ -704,9 +696,6 @@ project("spring-web") { testCompile("com.fasterxml.jackson.datatype:jackson-datatype-joda:${jackson2Version}") testRuntime("com.sun.mail:javax.mail:1.5.2") } - - // pick up ContextLoader.properties in src/main - sourceSets.main.resources.srcDirs += "src/main/java" } project("spring-websocket") { @@ -891,9 +880,6 @@ project("spring-webmvc") { testCompile("joda-time:joda-time:${jodaVersion}") testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}") } - - // pick up DispatcherServlet.properties in src/main - sourceSets.main.resources.srcDirs += "src/main/java" } project("spring-webmvc-tiles2") { @@ -941,9 +927,6 @@ project("spring-webmvc-portlet") { provided("javax.portlet:portlet-api:2.0") optional("commons-fileupload:commons-fileupload:1.3.1") } - - // pick up DispatcherPortlet.properties in src/main - sourceSets.main.resources.srcDirs += "src/main/java" } project("spring-test") { diff --git a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-context.xml b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-context.xml similarity index 100% rename from spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-context.xml rename to spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-context.xml diff --git a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-directPointcutEvents.xml b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-directPointcutEvents.xml similarity index 100% rename from spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-directPointcutEvents.xml rename to spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-directPointcutEvents.xml diff --git a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutEvents.xml b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutEvents.xml similarity index 100% rename from spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutEvents.xml rename to spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutEvents.xml diff --git a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutRefEvents.xml b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutRefEvents.xml similarity index 100% rename from spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutRefEvents.xml rename to spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutRefEvents.xml diff --git a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutDuplication.xml b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutDuplication.xml similarity index 100% rename from spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutDuplication.xml rename to spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutDuplication.xml diff --git a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutMissing.xml b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutMissing.xml similarity index 100% rename from spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutMissing.xml rename to spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutMissing.xml diff --git a/spring-aop/src/test/java/org/springframework/aop/config/TopLevelAopTagTests-context.xml b/spring-aop/src/test/resources/org/springframework/aop/config/TopLevelAopTagTests-context.xml similarity index 100% rename from spring-aop/src/test/java/org/springframework/aop/config/TopLevelAopTagTests-context.xml rename to spring-aop/src/test/resources/org/springframework/aop/config/TopLevelAopTagTests-context.xml diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests-context.xml b/spring-aop/src/test/resources/org/springframework/aop/framework/PrototypeTargetTests-context.xml similarity index 100% rename from spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests-context.xml rename to spring-aop/src/test/resources/org/springframework/aop/framework/PrototypeTargetTests-context.xml diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests-context.xml b/spring-aop/src/test/resources/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests-context.xml similarity index 100% rename from spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests-context.xml rename to spring-aop/src/test/resources/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests-context.xml diff --git a/spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests-scopedAutowireFalse.xml b/spring-aop/src/test/resources/org/springframework/aop/scope/ScopedProxyAutowireTests-scopedAutowireFalse.xml similarity index 100% rename from spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests-scopedAutowireFalse.xml rename to spring-aop/src/test/resources/org/springframework/aop/scope/ScopedProxyAutowireTests-scopedAutowireFalse.xml diff --git a/spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests-scopedAutowireTrue.xml b/spring-aop/src/test/resources/org/springframework/aop/scope/ScopedProxyAutowireTests-scopedAutowireTrue.xml similarity index 100% rename from spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests-scopedAutowireTrue.xml rename to spring-aop/src/test/resources/org/springframework/aop/scope/ScopedProxyAutowireTests-scopedAutowireTrue.xml diff --git a/spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests-context.xml b/spring-aop/src/test/resources/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests-context.xml similarity index 100% rename from spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests-context.xml rename to spring-aop/src/test/resources/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests-context.xml diff --git a/spring-aop/src/test/java/org/springframework/aop/target/CommonsPool2TargetSourceProxyTests-context.xml b/spring-aop/src/test/resources/org/springframework/aop/target/CommonsPool2TargetSourceProxyTests-context.xml similarity index 100% rename from spring-aop/src/test/java/org/springframework/aop/target/CommonsPool2TargetSourceProxyTests-context.xml rename to spring-aop/src/test/resources/org/springframework/aop/target/CommonsPool2TargetSourceProxyTests-context.xml diff --git a/spring-aop/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceProxyTests-context.xml b/spring-aop/src/test/resources/org/springframework/aop/target/CommonsPoolTargetSourceProxyTests-context.xml similarity index 100% rename from spring-aop/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceProxyTests-context.xml rename to spring-aop/src/test/resources/org/springframework/aop/target/CommonsPoolTargetSourceProxyTests-context.xml diff --git a/spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests-context.xml b/spring-aop/src/test/resources/org/springframework/aop/target/HotSwappableTargetSourceTests-context.xml similarity index 100% rename from spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests-context.xml rename to spring-aop/src/test/resources/org/springframework/aop/target/HotSwappableTargetSourceTests-context.xml diff --git a/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests-customTarget.xml b/spring-aop/src/test/resources/org/springframework/aop/target/LazyInitTargetSourceTests-customTarget.xml similarity index 100% rename from spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests-customTarget.xml rename to spring-aop/src/test/resources/org/springframework/aop/target/LazyInitTargetSourceTests-customTarget.xml diff --git a/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests-factoryBean.xml b/spring-aop/src/test/resources/org/springframework/aop/target/LazyInitTargetSourceTests-factoryBean.xml similarity index 100% rename from spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests-factoryBean.xml rename to spring-aop/src/test/resources/org/springframework/aop/target/LazyInitTargetSourceTests-factoryBean.xml diff --git a/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests-singleton.xml b/spring-aop/src/test/resources/org/springframework/aop/target/LazyInitTargetSourceTests-singleton.xml similarity index 100% rename from spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests-singleton.xml rename to spring-aop/src/test/resources/org/springframework/aop/target/LazyInitTargetSourceTests-singleton.xml diff --git a/spring-aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests-context.xml b/spring-aop/src/test/resources/org/springframework/aop/target/PrototypeTargetSourceTests-context.xml similarity index 100% rename from spring-aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests-context.xml rename to spring-aop/src/test/resources/org/springframework/aop/target/PrototypeTargetSourceTests-context.xml diff --git a/spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests-context.xml b/spring-aop/src/test/resources/org/springframework/aop/target/ThreadLocalTargetSourceTests-context.xml similarity index 100% rename from spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests-context.xml rename to spring-aop/src/test/resources/org/springframework/aop/target/ThreadLocalTargetSourceTests-context.xml diff --git a/spring-aspects/src/test/java/org/springframework/aop/aspectj/autoproxy/ajcAutoproxyTests.xml b/spring-aspects/src/test/resources/org/springframework/aop/aspectj/autoproxy/ajcAutoproxyTests.xml similarity index 100% rename from spring-aspects/src/test/java/org/springframework/aop/aspectj/autoproxy/ajcAutoproxyTests.xml rename to spring-aspects/src/test/resources/org/springframework/aop/aspectj/autoproxy/ajcAutoproxyTests.xml diff --git a/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/beanConfigurerTests-beans.xml b/spring-aspects/src/test/resources/org/springframework/beans/factory/aspectj/beanConfigurerTests-beans.xml similarity index 100% rename from spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/beanConfigurerTests-beans.xml rename to spring-aspects/src/test/resources/org/springframework/beans/factory/aspectj/beanConfigurerTests-beans.xml diff --git a/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/beanConfigurerTests.xml b/spring-aspects/src/test/resources/org/springframework/beans/factory/aspectj/beanConfigurerTests.xml similarity index 100% rename from spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/beanConfigurerTests.xml rename to spring-aspects/src/test/resources/org/springframework/beans/factory/aspectj/beanConfigurerTests.xml diff --git a/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/springConfigured.xml b/spring-aspects/src/test/resources/org/springframework/beans/factory/aspectj/springConfigured.xml similarity index 100% rename from spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/springConfigured.xml rename to spring-aspects/src/test/resources/org/springframework/beans/factory/aspectj/springConfigured.xml diff --git a/spring-aspects/src/test/java/org/springframework/cache/config/annotation-cache-aspectj.xml b/spring-aspects/src/test/resources/org/springframework/cache/config/annotation-cache-aspectj.xml similarity index 100% rename from spring-aspects/src/test/java/org/springframework/cache/config/annotation-cache-aspectj.xml rename to spring-aspects/src/test/resources/org/springframework/cache/config/annotation-cache-aspectj.xml diff --git a/spring-aspects/src/test/java/org/springframework/cache/config/annotation-jcache-aspectj.xml b/spring-aspects/src/test/resources/org/springframework/cache/config/annotation-jcache-aspectj.xml similarity index 100% rename from spring-aspects/src/test/java/org/springframework/cache/config/annotation-jcache-aspectj.xml rename to spring-aspects/src/test/resources/org/springframework/cache/config/annotation-jcache-aspectj.xml diff --git a/spring-aspects/src/test/java/org/springframework/scheduling/aspectj/annotationDrivenContext.xml b/spring-aspects/src/test/resources/org/springframework/scheduling/aspectj/annotationDrivenContext.xml similarity index 100% rename from spring-aspects/src/test/java/org/springframework/scheduling/aspectj/annotationDrivenContext.xml rename to spring-aspects/src/test/resources/org/springframework/scheduling/aspectj/annotationDrivenContext.xml diff --git a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests-context.xml b/spring-aspects/src/test/resources/org/springframework/transaction/aspectj/TransactionAspectTests-context.xml similarity index 100% rename from spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests-context.xml rename to spring-aspects/src/test/resources/org/springframework/transaction/aspectj/TransactionAspectTests-context.xml diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-dependentBeans.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/BeanFactoryUtilsTests-dependentBeans.xml similarity index 100% rename from spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-dependentBeans.xml rename to spring-beans/src/test/resources/org/springframework/beans/factory/BeanFactoryUtilsTests-dependentBeans.xml diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-leaf.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/BeanFactoryUtilsTests-leaf.xml similarity index 100% rename from spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-leaf.xml rename to spring-beans/src/test/resources/org/springframework/beans/factory/BeanFactoryUtilsTests-leaf.xml diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-middle.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/BeanFactoryUtilsTests-middle.xml similarity index 100% rename from spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-middle.xml rename to spring-beans/src/test/resources/org/springframework/beans/factory/BeanFactoryUtilsTests-middle.xml diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-root.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/BeanFactoryUtilsTests-root.xml similarity index 100% rename from spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-root.xml rename to spring-beans/src/test/resources/org/springframework/beans/factory/BeanFactoryUtilsTests-root.xml diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests-context.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/ConcurrentBeanFactoryTests-context.xml similarity index 100% rename from spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests-context.xml rename to spring-beans/src/test/resources/org/springframework/beans/factory/ConcurrentBeanFactoryTests-context.xml diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanLookupTests-context.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/FactoryBeanLookupTests-context.xml similarity index 100% rename from spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanLookupTests-context.xml rename to spring-beans/src/test/resources/org/springframework/beans/factory/FactoryBeanLookupTests-context.xml diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests-abstract.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/FactoryBeanTests-abstract.xml similarity index 100% rename from spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests-abstract.xml rename to spring-beans/src/test/resources/org/springframework/beans/factory/FactoryBeanTests-abstract.xml diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests-circular.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/FactoryBeanTests-circular.xml similarity index 100% rename from spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests-circular.xml rename to spring-beans/src/test/resources/org/springframework/beans/factory/FactoryBeanTests-circular.xml diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests-returnsNull.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/FactoryBeanTests-returnsNull.xml similarity index 100% rename from spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests-returnsNull.xml rename to spring-beans/src/test/resources/org/springframework/beans/factory/FactoryBeanTests-returnsNull.xml diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests-withAutowiring.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/FactoryBeanTests-withAutowiring.xml similarity index 100% rename from spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests-withAutowiring.xml rename to spring-beans/src/test/resources/org/springframework/beans/factory/FactoryBeanTests-withAutowiring.xml diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-beans1.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-beans1.xml similarity index 100% rename from spring-beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-beans1.xml rename to spring-beans/src/test/resources/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-beans1.xml diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-beans2.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-beans2.xml similarity index 100% rename from spring-beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-beans2.xml rename to spring-beans/src/test/resources/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-beans2.xml diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-ref1.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-ref1.xml similarity index 100% rename from spring-beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-ref1.xml rename to spring-beans/src/test/resources/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-ref1.xml diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/access/beans1.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/access/beans1.xml similarity index 100% rename from spring-beans/src/test/java/org/springframework/beans/factory/access/beans1.xml rename to spring-beans/src/test/resources/org/springframework/beans/factory/access/beans1.xml diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/access/beans2.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/access/beans2.xml similarity index 100% rename from spring-beans/src/test/java/org/springframework/beans/factory/access/beans2.xml rename to spring-beans/src/test/resources/org/springframework/beans/factory/access/beans2.xml diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests-context.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests-context.xml similarity index 100% rename from spring-beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests-context.xml rename to spring-beans/src/test/resources/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests-context.xml diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests-context.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests-context.xml similarity index 100% rename from spring-beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests-context.xml rename to spring-beans/src/test/resources/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests-context.xml diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests-context.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests-context.xml similarity index 100% rename from spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests-context.xml rename to spring-beans/src/test/resources/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests-context.xml diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests-test.properties b/spring-beans/src/test/resources/org/springframework/beans/factory/config/PropertiesFactoryBeanTests-test.properties similarity index 100% rename from spring-beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests-test.properties rename to spring-beans/src/test/resources/org/springframework/beans/factory/config/PropertiesFactoryBeanTests-test.properties diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests-test.properties.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/config/PropertiesFactoryBeanTests-test.properties.xml similarity index 100% rename from spring-beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests-test.properties.xml rename to spring-beans/src/test/resources/org/springframework/beans/factory/config/PropertiesFactoryBeanTests-test.properties.xml diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests-context.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests-context.xml similarity index 100% rename from spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests-context.xml rename to spring-beans/src/test/resources/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests-context.xml diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurerTests.properties b/spring-beans/src/test/resources/org/springframework/beans/factory/config/PropertyPlaceholderConfigurerTests.properties similarity index 100% rename from spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurerTests.properties rename to spring-beans/src/test/resources/org/springframework/beans/factory/config/PropertyPlaceholderConfigurerTests.properties diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests-test.properties b/spring-beans/src/test/resources/org/springframework/beans/factory/config/PropertyResourceConfigurerTests-test.properties similarity index 100% rename from spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests-test.properties rename to spring-beans/src/test/resources/org/springframework/beans/factory/config/PropertyResourceConfigurerTests-test.properties diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests-test.properties.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/config/PropertyResourceConfigurerTests-test.properties.xml similarity index 100% rename from spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests-test.properties.xml rename to spring-beans/src/test/resources/org/springframework/beans/factory/config/PropertyResourceConfigurerTests-test.properties.xml diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests-context.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/config/SimpleScopeTests-context.xml similarity index 100% rename from spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests-context.xml rename to spring-beans/src/test/resources/org/springframework/beans/factory/config/SimpleScopeTests-context.xml diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests-context.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/parsing/CustomProblemReporterTests-context.xml similarity index 100% rename from spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests-context.xml rename to spring-beans/src/test/resources/org/springframework/beans/factory/parsing/CustomProblemReporterTests-context.xml diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/genericBeanTests.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/support/genericBeanTests.xml similarity index 100% rename from spring-beans/src/test/java/org/springframework/beans/factory/support/genericBeanTests.xml rename to spring-beans/src/test/resources/org/springframework/beans/factory/support/genericBeanTests.xml diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/lookupMethodTests.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/support/lookupMethodTests.xml similarity index 100% rename from spring-beans/src/test/java/org/springframework/beans/factory/support/lookupMethodTests.xml rename to spring-beans/src/test/resources/org/springframework/beans/factory/support/lookupMethodTests.xml diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/callbacks.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/support/security/callbacks.xml similarity index 100% rename from spring-beans/src/test/java/org/springframework/beans/factory/support/security/callbacks.xml rename to spring-beans/src/test/resources/org/springframework/beans/factory/support/security/callbacks.xml diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/policy.all b/spring-beans/src/test/resources/org/springframework/beans/factory/support/security/policy.all similarity index 100% rename from spring-beans/src/test/java/org/springframework/beans/factory/support/security/policy.all rename to spring-beans/src/test/resources/org/springframework/beans/factory/support/security/policy.all diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests-multiLevel-context.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/DuplicateBeanIdTests-multiLevel-context.xml similarity index 100% rename from spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests-multiLevel-context.xml rename to spring-beans/src/test/resources/org/springframework/beans/factory/xml/DuplicateBeanIdTests-multiLevel-context.xml diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests-sameLevel-context.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/DuplicateBeanIdTests-sameLevel-context.xml similarity index 100% rename from spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests-sameLevel-context.xml rename to spring-beans/src/test/resources/org/springframework/beans/factory/xml/DuplicateBeanIdTests-sameLevel-context.xml diff --git a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/ResourceBundleEditorTests.properties b/spring-beans/src/test/resources/org/springframework/beans/propertyeditors/ResourceBundleEditorTests.properties similarity index 100% rename from spring-beans/src/test/java/org/springframework/beans/propertyeditors/ResourceBundleEditorTests.properties rename to spring-beans/src/test/resources/org/springframework/beans/propertyeditors/ResourceBundleEditorTests.properties diff --git a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/ResourceBundleEditorTestsLangCountryDialect_en_GB_GLASGOW.properties b/spring-beans/src/test/resources/org/springframework/beans/propertyeditors/ResourceBundleEditorTestsLangCountryDialect_en_GB_GLASGOW.properties similarity index 100% rename from spring-beans/src/test/java/org/springframework/beans/propertyeditors/ResourceBundleEditorTestsLangCountryDialect_en_GB_GLASGOW.properties rename to spring-beans/src/test/resources/org/springframework/beans/propertyeditors/ResourceBundleEditorTestsLangCountryDialect_en_GB_GLASGOW.properties diff --git a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/ResourceBundleEditorTestsLangCountry_en_GB.properties b/spring-beans/src/test/resources/org/springframework/beans/propertyeditors/ResourceBundleEditorTestsLangCountry_en_GB.properties similarity index 100% rename from spring-beans/src/test/java/org/springframework/beans/propertyeditors/ResourceBundleEditorTestsLangCountry_en_GB.properties rename to spring-beans/src/test/resources/org/springframework/beans/propertyeditors/ResourceBundleEditorTestsLangCountry_en_GB.properties diff --git a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/ResourceBundleEditorTestsLang_en.properties b/spring-beans/src/test/resources/org/springframework/beans/propertyeditors/ResourceBundleEditorTestsLang_en.properties similarity index 100% rename from spring-beans/src/test/java/org/springframework/beans/propertyeditors/ResourceBundleEditorTestsLang_en.properties rename to spring-beans/src/test/resources/org/springframework/beans/propertyeditors/ResourceBundleEditorTestsLang_en.properties diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/mime.types b/spring-context-support/src/main/resources/org/springframework/mail/javamail/mime.types similarity index 100% rename from spring-context-support/src/main/java/org/springframework/mail/javamail/mime.types rename to spring-context-support/src/main/resources/org/springframework/mail/javamail/mime.types diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationWrapperRTD.xml b/spring-context/src/main/resources/org/springframework/remoting/rmi/RmiInvocationWrapperRTD.xml similarity index 100% rename from spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationWrapperRTD.xml rename to spring-context/src/main/resources/org/springframework/remoting/rmi/RmiInvocationWrapperRTD.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/AfterAdviceBindingTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/AfterAdviceBindingTests.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/AroundAdviceBindingTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/AroundAdviceBindingTests.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceCircularTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/AroundAdviceCircularTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceCircularTests.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/AroundAdviceCircularTests.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/BeanNamePointcutTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/BeanNamePointcutTests.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/BeforeAdviceBindingTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/BeforeAdviceBindingTests.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/DeclareParentsTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/DeclareParentsTests.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests-ambiguous.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/OverloadedAdviceTests-ambiguous.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests-ambiguous.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/OverloadedAdviceTests-ambiguous.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/OverloadedAdviceTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/OverloadedAdviceTests.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ProceedTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/ProceedTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/ProceedTests.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/ProceedTests.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-after.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/PropertyDependentAspectTests-after.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-after.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/PropertyDependentAspectTests-after.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-after.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-after.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-after.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-after.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-before.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-before.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-before.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-before.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-before.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/PropertyDependentAspectTests-before.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-before.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/PropertyDependentAspectTests-before.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/TargetPointcutSelectionTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/TargetPointcutSelectionTests.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationBindingTests-context.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AnnotationBindingTests-context.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationBindingTests-context.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AnnotationBindingTests-context.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests-context.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests-context.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests-context.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests-context.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests-context.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests-context.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests-context.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests-context.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorAndLazyInitTargetSourceTests-context.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorAndLazyInitTargetSourceTests-context.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorAndLazyInitTargetSourceTests-context.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorAndLazyInitTargetSourceTests-context.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspects.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspects.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspects.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspects.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsPlusAdvisor.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsPlusAdvisor.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsPlusAdvisor.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsPlusAdvisor.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithAbstractBean.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithAbstractBean.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithAbstractBean.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithAbstractBean.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithCGLIB.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithCGLIB.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithCGLIB.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithCGLIB.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithOrdering.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithOrdering.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithOrdering.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithOrdering.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-pertarget.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-pertarget.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-pertarget.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-pertarget.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-perthis.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-perthis.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-perthis.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-perthis.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-retryAspect.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-retryAspect.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-retryAspect.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-retryAspect.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-twoAdviceAspect.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-twoAdviceAspect.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-twoAdviceAspect.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-twoAdviceAspect.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-twoAdviceAspectPrototype.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-twoAdviceAspectPrototype.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-twoAdviceAspectPrototype.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-twoAdviceAspectPrototype.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-usesInclude.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-usesInclude.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-usesInclude.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-usesInclude.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-usesJoinPointAspect.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-usesJoinPointAspect.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-usesJoinPointAspect.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-usesJoinPointAspect.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAfterThrowingTests-context.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AtAspectJAfterThrowingTests-context.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAfterThrowingTests-context.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AtAspectJAfterThrowingTests-context.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests-context.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests-context.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests-context.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests-context.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests-aspectj.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests-aspectj.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests-aspectj.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests-aspectj.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests-springAop.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests-springAop.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests-springAop.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests-springAop.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/AfterReturningGenericTypeMatchingTests-context.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/generic/AfterReturningGenericTypeMatchingTests-context.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/generic/AfterReturningGenericTypeMatchingTests-context.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/generic/AfterReturningGenericTypeMatchingTests-context.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingClassProxyTests-context.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingClassProxyTests-context.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingClassProxyTests-context.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingClassProxyTests-context.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingTests-context.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingTests-context.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingTests-context.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingTests-context.xml diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests-context.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests-context.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests-context.xml rename to spring-context/src/test/resources/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests-context.xml diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests-error.xml b/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests-error.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests-error.xml rename to spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests-error.xml diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests-ok.xml b/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests-ok.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests-ok.xml rename to spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests-ok.xml diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-error.xml b/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-error.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-error.xml rename to spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-error.xml diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-ok.xml b/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-ok.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-ok.xml rename to spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-ok.xml diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerProxyTargetClassTests-context.xml b/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerProxyTargetClassTests-context.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerProxyTargetClassTests-context.xml rename to spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerProxyTargetClassTests-context.xml diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests-error.xml b/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerReturningTests-error.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests-error.xml rename to spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerReturningTests-error.xml diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests-ok.xml b/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerReturningTests-ok.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests-ok.xml rename to spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerReturningTests-ok.xml diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerTests-context.xml b/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerTests-context.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerTests-context.xml rename to spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerTests-context.xml diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests-error.xml b/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerThrowingTests-error.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests-error.xml rename to spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerThrowingTests-error.xml diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests-ok.xml b/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerThrowingTests-ok.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests-ok.xml rename to spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerThrowingTests-ok.xml diff --git a/spring-context/src/test/java/org/springframework/aop/config/PrototypeProxyTests-context.xml b/spring-context/src/test/resources/org/springframework/aop/config/PrototypeProxyTests-context.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/config/PrototypeProxyTests-context.xml rename to spring-context/src/test/resources/org/springframework/aop/config/PrototypeProxyTests-context.xml diff --git a/spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests-with-dependency-checking.xml b/spring-context/src/test/resources/org/springframework/aop/framework/CglibProxyTests-with-dependency-checking.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests-with-dependency-checking.xml rename to spring-context/src/test/resources/org/springframework/aop/framework/CglibProxyTests-with-dependency-checking.xml diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ObjenesisProxyTests-context.xml b/spring-context/src/test/resources/org/springframework/aop/framework/ObjenesisProxyTests-context.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/framework/ObjenesisProxyTests-context.xml rename to spring-context/src/test/resources/org/springframework/aop/framework/ObjenesisProxyTests-context.xml diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-autowiring.xml b/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-autowiring.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-autowiring.xml rename to spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-autowiring.xml diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-context.xml b/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-context.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-context.xml rename to spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-context.xml diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-double-targetsource.xml b/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-double-targetsource.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-double-targetsource.xml rename to spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-double-targetsource.xml diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-frozen.xml b/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-frozen.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-frozen.xml rename to spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-frozen.xml diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-inner-bean-target.xml b/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-inner-bean-target.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-inner-bean-target.xml rename to spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-inner-bean-target.xml diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-invalid.xml b/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-invalid.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-invalid.xml rename to spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-invalid.xml diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-notlast-targetsource.xml b/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-notlast-targetsource.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-notlast-targetsource.xml rename to spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-notlast-targetsource.xml diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-prototype.xml b/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-prototype.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-prototype.xml rename to spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-prototype.xml diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-serialization.xml b/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-serialization.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-serialization.xml rename to spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-serialization.xml diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-targetsource.xml b/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-targetsource.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-targetsource.xml rename to spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-targetsource.xml diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-throws-advice.xml b/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-throws-advice.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-throws-advice.xml rename to spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-throws-advice.xml diff --git a/spring-context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-with-bpp.xml b/spring-context/src/test/resources/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-with-bpp.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-with-bpp.xml rename to spring-context/src/test/resources/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-with-bpp.xml diff --git a/spring-context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-without-bpp.xml b/spring-context/src/test/resources/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-without-bpp.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-without-bpp.xml rename to spring-context/src/test/resources/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-without-bpp.xml diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-common-interceptors.xml b/spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-common-interceptors.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-common-interceptors.xml rename to spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-common-interceptors.xml diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-custom-targetsource.xml b/spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-custom-targetsource.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-custom-targetsource.xml rename to spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-custom-targetsource.xml diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-optimized.xml b/spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-optimized.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-optimized.xml rename to spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-optimized.xml diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-quick-targetsource.xml b/spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-quick-targetsource.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-quick-targetsource.xml rename to spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-quick-targetsource.xml diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests-context.xml b/spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests-context.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests-context.xml rename to spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests-context.xml diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests-context.xml b/spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests-context.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests-context.xml rename to spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests-context.xml diff --git a/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests-list.xml b/spring-context/src/test/resources/org/springframework/aop/scope/ScopedProxyTests-list.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests-list.xml rename to spring-context/src/test/resources/org/springframework/aop/scope/ScopedProxyTests-list.xml diff --git a/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests-map.xml b/spring-context/src/test/resources/org/springframework/aop/scope/ScopedProxyTests-map.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests-map.xml rename to spring-context/src/test/resources/org/springframework/aop/scope/ScopedProxyTests-map.xml diff --git a/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests-override.xml b/spring-context/src/test/resources/org/springframework/aop/scope/ScopedProxyTests-override.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests-override.xml rename to spring-context/src/test/resources/org/springframework/aop/scope/ScopedProxyTests-override.xml diff --git a/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests-testbean.xml b/spring-context/src/test/resources/org/springframework/aop/scope/ScopedProxyTests-testbean.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests-testbean.xml rename to spring-context/src/test/resources/org/springframework/aop/scope/ScopedProxyTests-testbean.xml diff --git a/spring-context/src/test/java/org/springframework/aop/target/CommonsPool2TargetSourceTests-context.xml b/spring-context/src/test/resources/org/springframework/aop/target/CommonsPool2TargetSourceTests-context.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/aop/target/CommonsPool2TargetSourceTests-context.xml rename to spring-context/src/test/resources/org/springframework/aop/target/CommonsPool2TargetSourceTests-context.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests-context.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests-context.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests-context.xml rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests-context.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests-context.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/QualifierAnnotationTests-context.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests-context.xml rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/QualifierAnnotationTests-context.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-autowire.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-autowire.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-autowire.xml rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-autowire.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-child.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-child.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-child.xml rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-child.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-classNotFound.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-classNotFound.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-classNotFound.xml rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-classNotFound.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-collections.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-collections.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-collections.xml rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-collections.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-complexFactoryCircle.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-complexFactoryCircle.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-complexFactoryCircle.xml rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-complexFactoryCircle.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorArg.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorArg.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorArg.xml rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorArg.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorOverrides.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorOverrides.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorOverrides.xml rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorOverrides.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultAutowire.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultAutowire.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultAutowire.xml rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultAutowire.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultLazyInit.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultLazyInit.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultLazyInit.xml rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultLazyInit.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-delegationOverrides.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-delegationOverrides.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-delegationOverrides.xml rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-delegationOverrides.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCarg.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCarg.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCarg.xml rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCarg.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCargAutowire.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCargAutowire.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCargAutowire.xml rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCargAutowire.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCargInner.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCargInner.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCargInner.xml rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCargInner.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depDependsOn.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depDependsOn.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depDependsOn.xml rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depDependsOn.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depDependsOnInner.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depDependsOnInner.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depDependsOnInner.xml rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depDependsOnInner.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depMaterializeThis.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depMaterializeThis.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depMaterializeThis.xml rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depMaterializeThis.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depProp.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depProp.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depProp.xml rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depProp.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropAutowireByName.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropAutowireByName.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropAutowireByName.xml rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropAutowireByName.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropAutowireByType.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropAutowireByType.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropAutowireByType.xml rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropAutowireByType.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropInTheMiddle.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropInTheMiddle.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropInTheMiddle.xml rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropInTheMiddle.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropInner.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropInner.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropInner.xml rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropInner.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-factoryCircle.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-factoryCircle.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-factoryCircle.xml rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-factoryCircle.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-initializers.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-initializers.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-initializers.xml rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-initializers.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalid.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalid.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalid.xml rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalid.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalidOverridesNoSuchMethod.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalidOverridesNoSuchMethod.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalidOverridesNoSuchMethod.xml rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalidOverridesNoSuchMethod.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-localCollectionsUsingXsd.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-localCollectionsUsingXsd.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-localCollectionsUsingXsd.xml rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-localCollectionsUsingXsd.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-noSuchFactoryMethod.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-noSuchFactoryMethod.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-noSuchFactoryMethod.xml rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-noSuchFactoryMethod.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-overrides.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-overrides.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-overrides.xml rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-overrides.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-parent.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-parent.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-parent.xml rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-parent.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-recursiveImport.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-recursiveImport.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-recursiveImport.xml rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-recursiveImport.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-reftypes.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-reftypes.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-reftypes.xml rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-reftypes.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resource.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resource.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resource.xml rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resource.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resourceImport.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resourceImport.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resourceImport.xml rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resourceImport.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedAllDepCheck.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedAllDepCheck.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedAllDepCheck.xml rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedAllDepCheck.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedObjectDepCheck.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedObjectDepCheck.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedObjectDepCheck.xml rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedObjectDepCheck.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedSimpleDepCheck.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedSimpleDepCheck.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedSimpleDepCheck.xml rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedSimpleDepCheck.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNameInAlias.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNameInAlias.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNameInAlias.xml rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNameInAlias.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNames.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNames.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNames.xml rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNames.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingObjects.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingObjects.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingObjects.xml rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingObjects.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingSimple.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingSimple.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingSimple.xml rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingSimple.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedObjectDepCheck.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedObjectDepCheck.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedObjectDepCheck.xml rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedObjectDepCheck.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedSimpleDepCheck.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedSimpleDepCheck.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedSimpleDepCheck.xml rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedSimpleDepCheck.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests-context.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests-context.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests-context.xml rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests-context.xml diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.properties b/spring-context/src/test/resources/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.properties similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.properties rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.properties diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.xsd b/spring-context/src/test/resources/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.xsd similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.xsd rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.xsd diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/test.properties b/spring-context/src/test/resources/org/springframework/beans/factory/xml/test.properties similarity index 100% rename from spring-context/src/test/java/org/springframework/beans/factory/xml/test.properties rename to spring-context/src/test/resources/org/springframework/beans/factory/xml/test.properties diff --git a/spring-context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-collections.xml b/spring-context/src/test/resources/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-collections.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-collections.xml rename to spring-context/src/test/resources/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-collections.xml diff --git a/spring-context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-parent.xml b/spring-context/src/test/resources/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-parent.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-parent.xml rename to spring-context/src/test/resources/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-parent.xml diff --git a/spring-context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests-context.xml b/spring-context/src/test/resources/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests-context.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests-context.xml rename to spring-context/src/test/resources/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests-context.xml diff --git a/spring-context/src/test/java/org/springframework/context/annotation/DestroyMethodInferenceTests-context.xml b/spring-context/src/test/resources/org/springframework/context/annotation/DestroyMethodInferenceTests-context.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/DestroyMethodInferenceTests-context.xml rename to spring-context/src/test/resources/org/springframework/context/annotation/DestroyMethodInferenceTests-context.xml diff --git a/spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests-context.xml b/spring-context/src/test/resources/org/springframework/context/annotation/EnableLoadTimeWeavingTests-context.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests-context.xml rename to spring-context/src/test/resources/org/springframework/context/annotation/EnableLoadTimeWeavingTests-context.xml diff --git a/spring-context/src/test/java/org/springframework/context/annotation/Spr6602Tests-context.xml b/spring-context/src/test/resources/org/springframework/context/annotation/Spr6602Tests-context.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/Spr6602Tests-context.xml rename to spring-context/src/test/resources/org/springframework/context/annotation/Spr6602Tests-context.xml diff --git a/spring-context/src/test/java/org/springframework/context/annotation/aspectjTypeFilterTests.xml b/spring-context/src/test/resources/org/springframework/context/annotation/aspectjTypeFilterTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/aspectjTypeFilterTests.xml rename to spring-context/src/test/resources/org/springframework/context/annotation/aspectjTypeFilterTests.xml diff --git a/spring-context/src/test/java/org/springframework/context/annotation/aspectjTypeFilterTestsWithPlaceholders.xml b/spring-context/src/test/resources/org/springframework/context/annotation/aspectjTypeFilterTestsWithPlaceholders.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/aspectjTypeFilterTestsWithPlaceholders.xml rename to spring-context/src/test/resources/org/springframework/context/annotation/aspectjTypeFilterTestsWithPlaceholders.xml diff --git a/spring-context/src/test/java/org/springframework/context/annotation/componentScanRespectsProfileAnnotationTests.xml b/spring-context/src/test/resources/org/springframework/context/annotation/componentScanRespectsProfileAnnotationTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/componentScanRespectsProfileAnnotationTests.xml rename to spring-context/src/test/resources/org/springframework/context/annotation/componentScanRespectsProfileAnnotationTests.xml diff --git a/spring-context/src/test/java/org/springframework/context/annotation/componentScanWithAutowiredQualifierTests.xml b/spring-context/src/test/resources/org/springframework/context/annotation/componentScanWithAutowiredQualifierTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/componentScanWithAutowiredQualifierTests.xml rename to spring-context/src/test/resources/org/springframework/context/annotation/componentScanWithAutowiredQualifierTests.xml diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests-custom.properties b/spring-context/src/test/resources/org/springframework/context/annotation/configuration/AutowiredConfigurationTests-custom.properties similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests-custom.properties rename to spring-context/src/test/resources/org/springframework/context/annotation/configuration/AutowiredConfigurationTests-custom.properties diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests-custom.xml b/spring-context/src/test/resources/org/springframework/context/annotation/configuration/AutowiredConfigurationTests-custom.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests-custom.xml rename to spring-context/src/test/resources/org/springframework/context/annotation/configuration/AutowiredConfigurationTests-custom.xml diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.xml b/spring-context/src/test/resources/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.xml rename to spring-context/src/test/resources/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.xml diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportNonXmlResourceConfig-context.properties b/spring-context/src/test/resources/org/springframework/context/annotation/configuration/ImportNonXmlResourceConfig-context.properties similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportNonXmlResourceConfig-context.properties rename to spring-context/src/test/resources/org/springframework/context/annotation/configuration/ImportNonXmlResourceConfig-context.properties diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportXmlConfig-context.xml b/spring-context/src/test/resources/org/springframework/context/annotation/configuration/ImportXmlConfig-context.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportXmlConfig-context.xml rename to spring-context/src/test/resources/org/springframework/context/annotation/configuration/ImportXmlConfig-context.xml diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportXmlWithAopNamespace-context.xml b/spring-context/src/test/resources/org/springframework/context/annotation/configuration/ImportXmlWithAopNamespace-context.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportXmlWithAopNamespace-context.xml rename to spring-context/src/test/resources/org/springframework/context/annotation/configuration/ImportXmlWithAopNamespace-context.xml diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportXmlWithConfigurationClass-context.xml b/spring-context/src/test/resources/org/springframework/context/annotation/configuration/ImportXmlWithConfigurationClass-context.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportXmlWithConfigurationClass-context.xml rename to spring-context/src/test/resources/org/springframework/context/annotation/configuration/ImportXmlWithConfigurationClass-context.xml diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/SecondLevelSubConfig-context.xml b/spring-context/src/test/resources/org/springframework/context/annotation/configuration/SecondLevelSubConfig-context.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/configuration/SecondLevelSubConfig-context.xml rename to spring-context/src/test/resources/org/springframework/context/annotation/configuration/SecondLevelSubConfig-context.xml diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ValueInjectionTests.xml b/spring-context/src/test/resources/org/springframework/context/annotation/configuration/ValueInjectionTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/configuration/ValueInjectionTests.xml rename to spring-context/src/test/resources/org/springframework/context/annotation/configuration/ValueInjectionTests.xml diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/annotation-config.xml b/spring-context/src/test/resources/org/springframework/context/annotation/configuration/annotation-config.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/configuration/annotation-config.xml rename to spring-context/src/test/resources/org/springframework/context/annotation/configuration/annotation-config.xml diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/aspectj-autoproxy-config.xml b/spring-context/src/test/resources/org/springframework/context/annotation/configuration/aspectj-autoproxy-config.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/configuration/aspectj-autoproxy-config.xml rename to spring-context/src/test/resources/org/springframework/context/annotation/configuration/aspectj-autoproxy-config.xml diff --git a/spring-context/src/test/java/org/springframework/context/annotation/customAnnotationUsedForBothComponentScanAndQualifierTests.xml b/spring-context/src/test/resources/org/springframework/context/annotation/customAnnotationUsedForBothComponentScanAndQualifierTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/customAnnotationUsedForBothComponentScanAndQualifierTests.xml rename to spring-context/src/test/resources/org/springframework/context/annotation/customAnnotationUsedForBothComponentScanAndQualifierTests.xml diff --git a/spring-context/src/test/java/org/springframework/context/annotation/customNameGeneratorTests.xml b/spring-context/src/test/resources/org/springframework/context/annotation/customNameGeneratorTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/customNameGeneratorTests.xml rename to spring-context/src/test/resources/org/springframework/context/annotation/customNameGeneratorTests.xml diff --git a/spring-context/src/test/java/org/springframework/context/annotation/customScopeResolverTests.xml b/spring-context/src/test/resources/org/springframework/context/annotation/customScopeResolverTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/customScopeResolverTests.xml rename to spring-context/src/test/resources/org/springframework/context/annotation/customScopeResolverTests.xml diff --git a/spring-context/src/test/java/org/springframework/context/annotation/customTypeFilterTests.xml b/spring-context/src/test/resources/org/springframework/context/annotation/customTypeFilterTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/customTypeFilterTests.xml rename to spring-context/src/test/resources/org/springframework/context/annotation/customTypeFilterTests.xml diff --git a/spring-context/src/test/java/org/springframework/context/annotation/defaultAutowireByNameTests.xml b/spring-context/src/test/resources/org/springframework/context/annotation/defaultAutowireByNameTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/defaultAutowireByNameTests.xml rename to spring-context/src/test/resources/org/springframework/context/annotation/defaultAutowireByNameTests.xml diff --git a/spring-context/src/test/java/org/springframework/context/annotation/defaultAutowireByTypeTests.xml b/spring-context/src/test/resources/org/springframework/context/annotation/defaultAutowireByTypeTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/defaultAutowireByTypeTests.xml rename to spring-context/src/test/resources/org/springframework/context/annotation/defaultAutowireByTypeTests.xml diff --git a/spring-context/src/test/java/org/springframework/context/annotation/defaultAutowireConstructorTests.xml b/spring-context/src/test/resources/org/springframework/context/annotation/defaultAutowireConstructorTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/defaultAutowireConstructorTests.xml rename to spring-context/src/test/resources/org/springframework/context/annotation/defaultAutowireConstructorTests.xml diff --git a/spring-context/src/test/java/org/springframework/context/annotation/defaultAutowireNoTests.xml b/spring-context/src/test/resources/org/springframework/context/annotation/defaultAutowireNoTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/defaultAutowireNoTests.xml rename to spring-context/src/test/resources/org/springframework/context/annotation/defaultAutowireNoTests.xml diff --git a/spring-context/src/test/java/org/springframework/context/annotation/defaultDependencyCheckAllTests.xml b/spring-context/src/test/resources/org/springframework/context/annotation/defaultDependencyCheckAllTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/defaultDependencyCheckAllTests.xml rename to spring-context/src/test/resources/org/springframework/context/annotation/defaultDependencyCheckAllTests.xml diff --git a/spring-context/src/test/java/org/springframework/context/annotation/defaultDependencyCheckObjectsWithAutowireByNameTests.xml b/spring-context/src/test/resources/org/springframework/context/annotation/defaultDependencyCheckObjectsWithAutowireByNameTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/defaultDependencyCheckObjectsWithAutowireByNameTests.xml rename to spring-context/src/test/resources/org/springframework/context/annotation/defaultDependencyCheckObjectsWithAutowireByNameTests.xml diff --git a/spring-context/src/test/java/org/springframework/context/annotation/defaultInitAndDestroyMethodsTests.xml b/spring-context/src/test/resources/org/springframework/context/annotation/defaultInitAndDestroyMethodsTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/defaultInitAndDestroyMethodsTests.xml rename to spring-context/src/test/resources/org/springframework/context/annotation/defaultInitAndDestroyMethodsTests.xml diff --git a/spring-context/src/test/java/org/springframework/context/annotation/defaultLazyInitFalseTests.xml b/spring-context/src/test/resources/org/springframework/context/annotation/defaultLazyInitFalseTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/defaultLazyInitFalseTests.xml rename to spring-context/src/test/resources/org/springframework/context/annotation/defaultLazyInitFalseTests.xml diff --git a/spring-context/src/test/java/org/springframework/context/annotation/defaultLazyInitTrueTests.xml b/spring-context/src/test/resources/org/springframework/context/annotation/defaultLazyInitTrueTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/defaultLazyInitTrueTests.xml rename to spring-context/src/test/resources/org/springframework/context/annotation/defaultLazyInitTrueTests.xml diff --git a/spring-context/src/test/java/org/springframework/context/annotation/defaultNonExistingInitAndDestroyMethodsTests.xml b/spring-context/src/test/resources/org/springframework/context/annotation/defaultNonExistingInitAndDestroyMethodsTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/defaultNonExistingInitAndDestroyMethodsTests.xml rename to spring-context/src/test/resources/org/springframework/context/annotation/defaultNonExistingInitAndDestroyMethodsTests.xml diff --git a/spring-context/src/test/java/org/springframework/context/annotation/defaultWithNoOverridesTests.xml b/spring-context/src/test/resources/org/springframework/context/annotation/defaultWithNoOverridesTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/defaultWithNoOverridesTests.xml rename to spring-context/src/test/resources/org/springframework/context/annotation/defaultWithNoOverridesTests.xml diff --git a/spring-context/src/test/java/org/springframework/context/annotation/doubleScanTests.xml b/spring-context/src/test/resources/org/springframework/context/annotation/doubleScanTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/doubleScanTests.xml rename to spring-context/src/test/resources/org/springframework/context/annotation/doubleScanTests.xml diff --git a/spring-context/src/test/java/org/springframework/context/annotation/invalidClassNameScopeResolverTests.xml b/spring-context/src/test/resources/org/springframework/context/annotation/invalidClassNameScopeResolverTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/invalidClassNameScopeResolverTests.xml rename to spring-context/src/test/resources/org/springframework/context/annotation/invalidClassNameScopeResolverTests.xml diff --git a/spring-context/src/test/java/org/springframework/context/annotation/invalidConstructorNameGeneratorTests.xml b/spring-context/src/test/resources/org/springframework/context/annotation/invalidConstructorNameGeneratorTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/invalidConstructorNameGeneratorTests.xml rename to spring-context/src/test/resources/org/springframework/context/annotation/invalidConstructorNameGeneratorTests.xml diff --git a/spring-context/src/test/java/org/springframework/context/annotation/matchingResourcePatternTests.xml b/spring-context/src/test/resources/org/springframework/context/annotation/matchingResourcePatternTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/matchingResourcePatternTests.xml rename to spring-context/src/test/resources/org/springframework/context/annotation/matchingResourcePatternTests.xml diff --git a/spring-context/src/test/java/org/springframework/context/annotation/nonMatchingResourcePatternTests.xml b/spring-context/src/test/resources/org/springframework/context/annotation/nonMatchingResourcePatternTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/nonMatchingResourcePatternTests.xml rename to spring-context/src/test/resources/org/springframework/context/annotation/nonMatchingResourcePatternTests.xml diff --git a/spring-context/src/test/java/org/springframework/context/annotation/p1.properties b/spring-context/src/test/resources/org/springframework/context/annotation/p1.properties similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/p1.properties rename to spring-context/src/test/resources/org/springframework/context/annotation/p1.properties diff --git a/spring-context/src/test/java/org/springframework/context/annotation/p2.properties b/spring-context/src/test/resources/org/springframework/context/annotation/p2.properties similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/p2.properties rename to spring-context/src/test/resources/org/springframework/context/annotation/p2.properties diff --git a/spring-context/src/test/java/org/springframework/context/annotation/p3.properties b/spring-context/src/test/resources/org/springframework/context/annotation/p3.properties similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/p3.properties rename to spring-context/src/test/resources/org/springframework/context/annotation/p3.properties diff --git a/spring-context/src/test/java/org/springframework/context/annotation/p4.properties b/spring-context/src/test/resources/org/springframework/context/annotation/p4.properties similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/p4.properties rename to spring-context/src/test/resources/org/springframework/context/annotation/p4.properties diff --git a/spring-context/src/test/java/org/springframework/context/annotation/scopedProxyDefaultTests.xml b/spring-context/src/test/resources/org/springframework/context/annotation/scopedProxyDefaultTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/scopedProxyDefaultTests.xml rename to spring-context/src/test/resources/org/springframework/context/annotation/scopedProxyDefaultTests.xml diff --git a/spring-context/src/test/java/org/springframework/context/annotation/scopedProxyInterfacesTests.xml b/spring-context/src/test/resources/org/springframework/context/annotation/scopedProxyInterfacesTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/scopedProxyInterfacesTests.xml rename to spring-context/src/test/resources/org/springframework/context/annotation/scopedProxyInterfacesTests.xml diff --git a/spring-context/src/test/java/org/springframework/context/annotation/scopedProxyInvalidConfigTests.xml b/spring-context/src/test/resources/org/springframework/context/annotation/scopedProxyInvalidConfigTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/scopedProxyInvalidConfigTests.xml rename to spring-context/src/test/resources/org/springframework/context/annotation/scopedProxyInvalidConfigTests.xml diff --git a/spring-context/src/test/java/org/springframework/context/annotation/scopedProxyNoTests.xml b/spring-context/src/test/resources/org/springframework/context/annotation/scopedProxyNoTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/scopedProxyNoTests.xml rename to spring-context/src/test/resources/org/springframework/context/annotation/scopedProxyNoTests.xml diff --git a/spring-context/src/test/java/org/springframework/context/annotation/scopedProxyTargetClassTests.xml b/spring-context/src/test/resources/org/springframework/context/annotation/scopedProxyTargetClassTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/scopedProxyTargetClassTests.xml rename to spring-context/src/test/resources/org/springframework/context/annotation/scopedProxyTargetClassTests.xml diff --git a/spring-context/src/test/java/org/springframework/context/annotation/simpleConfigTests.xml b/spring-context/src/test/resources/org/springframework/context/annotation/simpleConfigTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/simpleConfigTests.xml rename to spring-context/src/test/resources/org/springframework/context/annotation/simpleConfigTests.xml diff --git a/spring-context/src/test/java/org/springframework/context/annotation/simpleScanTests.xml b/spring-context/src/test/resources/org/springframework/context/annotation/simpleScanTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/simpleScanTests.xml rename to spring-context/src/test/resources/org/springframework/context/annotation/simpleScanTests.xml diff --git a/spring-context/src/test/java/org/springframework/context/annotation/spr10546/importedResource.xml b/spring-context/src/test/resources/org/springframework/context/annotation/spr10546/importedResource.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/annotation/spr10546/importedResource.xml rename to spring-context/src/test/resources/org/springframework/context/annotation/spr10546/importedResource.xml diff --git a/spring-context/src/test/java/org/springframework/context/groovy/applicationContext-error.groovy b/spring-context/src/test/resources/org/springframework/context/groovy/applicationContext-error.groovy similarity index 100% rename from spring-context/src/test/java/org/springframework/context/groovy/applicationContext-error.groovy rename to spring-context/src/test/resources/org/springframework/context/groovy/applicationContext-error.groovy diff --git a/spring-context/src/test/java/org/springframework/context/groovy/applicationContext.groovy b/spring-context/src/test/resources/org/springframework/context/groovy/applicationContext.groovy similarity index 100% rename from spring-context/src/test/java/org/springframework/context/groovy/applicationContext.groovy rename to spring-context/src/test/resources/org/springframework/context/groovy/applicationContext.groovy diff --git a/spring-context/src/test/java/org/springframework/context/groovy/applicationContext2.groovy b/spring-context/src/test/resources/org/springframework/context/groovy/applicationContext2.groovy similarity index 100% rename from spring-context/src/test/java/org/springframework/context/groovy/applicationContext2.groovy rename to spring-context/src/test/resources/org/springframework/context/groovy/applicationContext2.groovy diff --git a/spring-context/src/test/java/org/springframework/context/groovy/test.xml b/spring-context/src/test/resources/org/springframework/context/groovy/test.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/groovy/test.xml rename to spring-context/src/test/resources/org/springframework/context/groovy/test.xml diff --git a/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests-resource.xml b/spring-context/src/test/resources/org/springframework/context/support/ClassPathXmlApplicationContextTests-resource.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests-resource.xml rename to spring-context/src/test/resources/org/springframework/context/support/ClassPathXmlApplicationContextTests-resource.xml diff --git a/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests-resourceImport.xml b/spring-context/src/test/resources/org/springframework/context/support/ClassPathXmlApplicationContextTests-resourceImport.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests-resourceImport.xml rename to spring-context/src/test/resources/org/springframework/context/support/ClassPathXmlApplicationContextTests-resourceImport.xml diff --git a/spring-context/src/test/java/org/springframework/context/support/GenericXmlApplicationContextTests-context.xml b/spring-context/src/test/resources/org/springframework/context/support/GenericXmlApplicationContextTests-context.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/support/GenericXmlApplicationContextTests-context.xml rename to spring-context/src/test/resources/org/springframework/context/support/GenericXmlApplicationContextTests-context.xml diff --git a/spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.properties b/spring-context/src/test/resources/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.properties similarity index 100% rename from spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.properties rename to spring-context/src/test/resources/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.properties diff --git a/spring-context/src/test/java/org/springframework/context/support/aliasForParent.xml b/spring-context/src/test/resources/org/springframework/context/support/aliasForParent.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/support/aliasForParent.xml rename to spring-context/src/test/resources/org/springframework/context/support/aliasForParent.xml diff --git a/spring-context/src/test/java/org/springframework/context/support/aliasThatOverridesParent.xml b/spring-context/src/test/resources/org/springframework/context/support/aliasThatOverridesParent.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/support/aliasThatOverridesParent.xml rename to spring-context/src/test/resources/org/springframework/context/support/aliasThatOverridesParent.xml diff --git a/spring-context/src/test/java/org/springframework/context/support/childWithProxy.xml b/spring-context/src/test/resources/org/springframework/context/support/childWithProxy.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/support/childWithProxy.xml rename to spring-context/src/test/resources/org/springframework/context/support/childWithProxy.xml diff --git a/spring-context/src/test/java/org/springframework/context/support/classWithPlaceholder.xml b/spring-context/src/test/resources/org/springframework/context/support/classWithPlaceholder.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/support/classWithPlaceholder.xml rename to spring-context/src/test/resources/org/springframework/context/support/classWithPlaceholder.xml diff --git a/spring-context/src/test/java/org/springframework/context/support/conversionService.xml b/spring-context/src/test/resources/org/springframework/context/support/conversionService.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/support/conversionService.xml rename to spring-context/src/test/resources/org/springframework/context/support/conversionService.xml diff --git a/spring-context/src/test/java/org/springframework/context/support/conversionServiceWithResourceOverriding.xml b/spring-context/src/test/resources/org/springframework/context/support/conversionServiceWithResourceOverriding.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/support/conversionServiceWithResourceOverriding.xml rename to spring-context/src/test/resources/org/springframework/context/support/conversionServiceWithResourceOverriding.xml diff --git a/spring-context/src/test/java/org/springframework/context/support/invalidClass.xml b/spring-context/src/test/resources/org/springframework/context/support/invalidClass.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/support/invalidClass.xml rename to spring-context/src/test/resources/org/springframework/context/support/invalidClass.xml diff --git a/spring-context/src/test/java/org/springframework/context/support/invalidValueType.xml b/spring-context/src/test/resources/org/springframework/context/support/invalidValueType.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/support/invalidValueType.xml rename to spring-context/src/test/resources/org/springframework/context/support/invalidValueType.xml diff --git a/spring-context/src/test/java/org/springframework/context/support/lifecycleTests.xml b/spring-context/src/test/resources/org/springframework/context/support/lifecycleTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/support/lifecycleTests.xml rename to spring-context/src/test/resources/org/springframework/context/support/lifecycleTests.xml diff --git a/spring-context/src/test/java/org/springframework/context/support/messages.properties b/spring-context/src/test/resources/org/springframework/context/support/messages.properties similarity index 100% rename from spring-context/src/test/java/org/springframework/context/support/messages.properties rename to spring-context/src/test/resources/org/springframework/context/support/messages.properties diff --git a/spring-context/src/test/java/org/springframework/context/support/messages_de.properties b/spring-context/src/test/resources/org/springframework/context/support/messages_de.properties similarity index 100% rename from spring-context/src/test/java/org/springframework/context/support/messages_de.properties rename to spring-context/src/test/resources/org/springframework/context/support/messages_de.properties diff --git a/spring-context/src/test/java/org/springframework/context/support/messages_de_AT.properties b/spring-context/src/test/resources/org/springframework/context/support/messages_de_AT.properties similarity index 100% rename from spring-context/src/test/java/org/springframework/context/support/messages_de_AT.properties rename to spring-context/src/test/resources/org/springframework/context/support/messages_de_AT.properties diff --git a/spring-context/src/test/java/org/springframework/context/support/messages_de_AT_oo.properties b/spring-context/src/test/resources/org/springframework/context/support/messages_de_AT_oo.properties similarity index 100% rename from spring-context/src/test/java/org/springframework/context/support/messages_de_AT_oo.properties rename to spring-context/src/test/resources/org/springframework/context/support/messages_de_AT_oo.properties diff --git a/spring-context/src/test/java/org/springframework/context/support/messages_de_DE.xml b/spring-context/src/test/resources/org/springframework/context/support/messages_de_DE.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/support/messages_de_DE.xml rename to spring-context/src/test/resources/org/springframework/context/support/messages_de_DE.xml diff --git a/spring-context/src/test/java/org/springframework/context/support/more-messages.properties b/spring-context/src/test/resources/org/springframework/context/support/more-messages.properties similarity index 100% rename from spring-context/src/test/java/org/springframework/context/support/more-messages.properties rename to spring-context/src/test/resources/org/springframework/context/support/more-messages.properties diff --git a/spring-context/src/test/java/org/springframework/context/support/override.properties b/spring-context/src/test/resources/org/springframework/context/support/override.properties similarity index 100% rename from spring-context/src/test/java/org/springframework/context/support/override.properties rename to spring-context/src/test/resources/org/springframework/context/support/override.properties diff --git a/spring-context/src/test/java/org/springframework/context/support/placeholder.properties b/spring-context/src/test/resources/org/springframework/context/support/placeholder.properties similarity index 100% rename from spring-context/src/test/java/org/springframework/context/support/placeholder.properties rename to spring-context/src/test/resources/org/springframework/context/support/placeholder.properties diff --git a/spring-context/src/test/java/org/springframework/context/support/simpleContext.xml b/spring-context/src/test/resources/org/springframework/context/support/simpleContext.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/support/simpleContext.xml rename to spring-context/src/test/resources/org/springframework/context/support/simpleContext.xml diff --git a/spring-context/src/test/java/org/springframework/context/support/spr7283.xml b/spring-context/src/test/resources/org/springframework/context/support/spr7283.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/support/spr7283.xml rename to spring-context/src/test/resources/org/springframework/context/support/spr7283.xml diff --git a/spring-context/src/test/java/org/springframework/context/support/spr7816.xml b/spring-context/src/test/resources/org/springframework/context/support/spr7816.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/support/spr7816.xml rename to spring-context/src/test/resources/org/springframework/context/support/spr7816.xml diff --git a/spring-context/src/test/java/org/springframework/context/support/test.properties b/spring-context/src/test/resources/org/springframework/context/support/test.properties similarity index 100% rename from spring-context/src/test/java/org/springframework/context/support/test.properties rename to spring-context/src/test/resources/org/springframework/context/support/test.properties diff --git a/spring-context/src/test/java/org/springframework/context/support/test/aliased-contextC.xml b/spring-context/src/test/resources/org/springframework/context/support/test/aliased-contextC.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/support/test/aliased-contextC.xml rename to spring-context/src/test/resources/org/springframework/context/support/test/aliased-contextC.xml diff --git a/spring-context/src/test/java/org/springframework/context/support/test/contextA.xml b/spring-context/src/test/resources/org/springframework/context/support/test/contextA.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/support/test/contextA.xml rename to spring-context/src/test/resources/org/springframework/context/support/test/contextA.xml diff --git a/spring-context/src/test/java/org/springframework/context/support/test/contextB.xml b/spring-context/src/test/resources/org/springframework/context/support/test/contextB.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/support/test/contextB.xml rename to spring-context/src/test/resources/org/springframework/context/support/test/contextB.xml diff --git a/spring-context/src/test/java/org/springframework/context/support/test/contextC.xml b/spring-context/src/test/resources/org/springframework/context/support/test/contextC.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/support/test/contextC.xml rename to spring-context/src/test/resources/org/springframework/context/support/test/contextC.xml diff --git a/spring-context/src/test/java/org/springframework/context/support/test/import1.xml b/spring-context/src/test/resources/org/springframework/context/support/test/import1.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/support/test/import1.xml rename to spring-context/src/test/resources/org/springframework/context/support/test/import1.xml diff --git a/spring-context/src/test/java/org/springframework/context/support/test/subtest/import2.xml b/spring-context/src/test/resources/org/springframework/context/support/test/subtest/import2.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/context/support/test/subtest/import2.xml rename to spring-context/src/test/resources/org/springframework/context/support/test/subtest/import2.xml diff --git a/spring-context/src/test/java/org/springframework/context/support/testBeans.properties b/spring-context/src/test/resources/org/springframework/context/support/testBeans.properties similarity index 100% rename from spring-context/src/test/java/org/springframework/context/support/testBeans.properties rename to spring-context/src/test/resources/org/springframework/context/support/testBeans.properties diff --git a/spring-context/src/test/java/org/springframework/ejb/config/jeeNamespaceHandlerTests.xml b/spring-context/src/test/resources/org/springframework/ejb/config/jeeNamespaceHandlerTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/ejb/config/jeeNamespaceHandlerTests.xml rename to spring-context/src/test/resources/org/springframework/ejb/config/jeeNamespaceHandlerTests.xml diff --git a/spring-context/src/test/java/org/springframework/instrument/classloading/testResource.xml b/spring-context/src/test/resources/org/springframework/instrument/classloading/testResource.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/instrument/classloading/testResource.xml rename to spring-context/src/test/resources/org/springframework/instrument/classloading/testResource.xml diff --git a/spring-context/src/test/java/org/springframework/jmx/applicationContext.xml b/spring-context/src/test/resources/org/springframework/jmx/applicationContext.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/jmx/applicationContext.xml rename to spring-context/src/test/resources/org/springframework/jmx/applicationContext.xml diff --git a/spring-context/src/test/java/org/springframework/jmx/export/annotation/annotations.xml b/spring-context/src/test/resources/org/springframework/jmx/export/annotation/annotations.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/jmx/export/annotation/annotations.xml rename to spring-context/src/test/resources/org/springframework/jmx/export/annotation/annotations.xml diff --git a/spring-context/src/test/java/org/springframework/jmx/export/annotation/componentScan.xml b/spring-context/src/test/resources/org/springframework/jmx/export/annotation/componentScan.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/jmx/export/annotation/componentScan.xml rename to spring-context/src/test/resources/org/springframework/jmx/export/annotation/componentScan.xml diff --git a/spring-context/src/test/java/org/springframework/jmx/export/annotation/lazyAssembling.xml b/spring-context/src/test/resources/org/springframework/jmx/export/annotation/lazyAssembling.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/jmx/export/annotation/lazyAssembling.xml rename to spring-context/src/test/resources/org/springframework/jmx/export/annotation/lazyAssembling.xml diff --git a/spring-context/src/test/java/org/springframework/jmx/export/annotation/lazyNaming.xml b/spring-context/src/test/resources/org/springframework/jmx/export/annotation/lazyNaming.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/jmx/export/annotation/lazyNaming.xml rename to spring-context/src/test/resources/org/springframework/jmx/export/annotation/lazyNaming.xml diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/interfaceAssembler.xml b/spring-context/src/test/resources/org/springframework/jmx/export/assembler/interfaceAssembler.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/jmx/export/assembler/interfaceAssembler.xml rename to spring-context/src/test/resources/org/springframework/jmx/export/assembler/interfaceAssembler.xml diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/interfaceAssemblerCustom.xml b/spring-context/src/test/resources/org/springframework/jmx/export/assembler/interfaceAssemblerCustom.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/jmx/export/assembler/interfaceAssemblerCustom.xml rename to spring-context/src/test/resources/org/springframework/jmx/export/assembler/interfaceAssemblerCustom.xml diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/interfaceAssemblerMapped.xml b/spring-context/src/test/resources/org/springframework/jmx/export/assembler/interfaceAssemblerMapped.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/jmx/export/assembler/interfaceAssemblerMapped.xml rename to spring-context/src/test/resources/org/springframework/jmx/export/assembler/interfaceAssemblerMapped.xml diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/metadata-autodetect.xml b/spring-context/src/test/resources/org/springframework/jmx/export/assembler/metadata-autodetect.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/jmx/export/assembler/metadata-autodetect.xml rename to spring-context/src/test/resources/org/springframework/jmx/export/assembler/metadata-autodetect.xml diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/metadataAssembler.xml b/spring-context/src/test/resources/org/springframework/jmx/export/assembler/metadataAssembler.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/jmx/export/assembler/metadataAssembler.xml rename to spring-context/src/test/resources/org/springframework/jmx/export/assembler/metadataAssembler.xml diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssembler.xml b/spring-context/src/test/resources/org/springframework/jmx/export/assembler/methodExclusionAssembler.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssembler.xml rename to spring-context/src/test/resources/org/springframework/jmx/export/assembler/methodExclusionAssembler.xml diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssemblerCombo.xml b/spring-context/src/test/resources/org/springframework/jmx/export/assembler/methodExclusionAssemblerCombo.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssemblerCombo.xml rename to spring-context/src/test/resources/org/springframework/jmx/export/assembler/methodExclusionAssemblerCombo.xml diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssemblerMapped.xml b/spring-context/src/test/resources/org/springframework/jmx/export/assembler/methodExclusionAssemblerMapped.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssemblerMapped.xml rename to spring-context/src/test/resources/org/springframework/jmx/export/assembler/methodExclusionAssemblerMapped.xml diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssemblerNotMapped.xml b/spring-context/src/test/resources/org/springframework/jmx/export/assembler/methodExclusionAssemblerNotMapped.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssemblerNotMapped.xml rename to spring-context/src/test/resources/org/springframework/jmx/export/assembler/methodExclusionAssemblerNotMapped.xml diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/methodNameAssembler.xml b/spring-context/src/test/resources/org/springframework/jmx/export/assembler/methodNameAssembler.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/jmx/export/assembler/methodNameAssembler.xml rename to spring-context/src/test/resources/org/springframework/jmx/export/assembler/methodNameAssembler.xml diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/methodNameAssemblerMapped.xml b/spring-context/src/test/resources/org/springframework/jmx/export/assembler/methodNameAssemblerMapped.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/jmx/export/assembler/methodNameAssemblerMapped.xml rename to spring-context/src/test/resources/org/springframework/jmx/export/assembler/methodNameAssemblerMapped.xml diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/reflectiveAssembler.xml b/spring-context/src/test/resources/org/springframework/jmx/export/assembler/reflectiveAssembler.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/jmx/export/assembler/reflectiveAssembler.xml rename to spring-context/src/test/resources/org/springframework/jmx/export/assembler/reflectiveAssembler.xml diff --git a/spring-context/src/test/java/org/springframework/jmx/export/autodetectLazyMBeans.xml b/spring-context/src/test/resources/org/springframework/jmx/export/autodetectLazyMBeans.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/jmx/export/autodetectLazyMBeans.xml rename to spring-context/src/test/resources/org/springframework/jmx/export/autodetectLazyMBeans.xml diff --git a/spring-context/src/test/java/org/springframework/jmx/export/autodetectMBeans.xml b/spring-context/src/test/resources/org/springframework/jmx/export/autodetectMBeans.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/jmx/export/autodetectMBeans.xml rename to spring-context/src/test/resources/org/springframework/jmx/export/autodetectMBeans.xml diff --git a/spring-context/src/test/java/org/springframework/jmx/export/autodetectNoMBeans.xml b/spring-context/src/test/resources/org/springframework/jmx/export/autodetectNoMBeans.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/jmx/export/autodetectNoMBeans.xml rename to spring-context/src/test/resources/org/springframework/jmx/export/autodetectNoMBeans.xml diff --git a/spring-context/src/test/java/org/springframework/jmx/export/customConfigurer.xml b/spring-context/src/test/resources/org/springframework/jmx/export/customConfigurer.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/jmx/export/customConfigurer.xml rename to spring-context/src/test/resources/org/springframework/jmx/export/customConfigurer.xml diff --git a/spring-context/src/test/java/org/springframework/jmx/export/excludedBeans.xml b/spring-context/src/test/resources/org/springframework/jmx/export/excludedBeans.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/jmx/export/excludedBeans.xml rename to spring-context/src/test/resources/org/springframework/jmx/export/excludedBeans.xml diff --git a/spring-context/src/test/java/org/springframework/jmx/export/lazyInit.xml b/spring-context/src/test/resources/org/springframework/jmx/export/lazyInit.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/jmx/export/lazyInit.xml rename to spring-context/src/test/resources/org/springframework/jmx/export/lazyInit.xml diff --git a/spring-context/src/test/java/org/springframework/jmx/export/naming/jmx-names.properties b/spring-context/src/test/resources/org/springframework/jmx/export/naming/jmx-names.properties similarity index 100% rename from spring-context/src/test/java/org/springframework/jmx/export/naming/jmx-names.properties rename to spring-context/src/test/resources/org/springframework/jmx/export/naming/jmx-names.properties diff --git a/spring-context/src/test/java/org/springframework/jmx/export/notificationPublisherLazyTests.xml b/spring-context/src/test/resources/org/springframework/jmx/export/notificationPublisherLazyTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/jmx/export/notificationPublisherLazyTests.xml rename to spring-context/src/test/resources/org/springframework/jmx/export/notificationPublisherLazyTests.xml diff --git a/spring-context/src/test/java/org/springframework/jmx/export/notificationPublisherTests.xml b/spring-context/src/test/resources/org/springframework/jmx/export/notificationPublisherTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/jmx/export/notificationPublisherTests.xml rename to spring-context/src/test/resources/org/springframework/jmx/export/notificationPublisherTests.xml diff --git a/spring-context/src/test/java/org/springframework/jmx/export/propertyPlaceholderConfigurer.xml b/spring-context/src/test/resources/org/springframework/jmx/export/propertyPlaceholderConfigurer.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/jmx/export/propertyPlaceholderConfigurer.xml rename to spring-context/src/test/resources/org/springframework/jmx/export/propertyPlaceholderConfigurer.xml diff --git a/spring-context/src/test/java/org/springframework/scheduling/annotation/taskNamespaceTests.xml b/spring-context/src/test/resources/org/springframework/scheduling/annotation/taskNamespaceTests.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/scheduling/annotation/taskNamespaceTests.xml rename to spring-context/src/test/resources/org/springframework/scheduling/annotation/taskNamespaceTests.xml diff --git a/spring-context/src/test/java/org/springframework/scripting/bsh/Broken.bsh b/spring-context/src/test/resources/org/springframework/scripting/bsh/Broken.bsh similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/bsh/Broken.bsh rename to spring-context/src/test/resources/org/springframework/scripting/bsh/Broken.bsh diff --git a/spring-context/src/test/java/org/springframework/scripting/bsh/Calculator.bsh b/spring-context/src/test/resources/org/springframework/scripting/bsh/Calculator.bsh similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/bsh/Calculator.bsh rename to spring-context/src/test/resources/org/springframework/scripting/bsh/Calculator.bsh diff --git a/spring-context/src/test/java/org/springframework/scripting/bsh/Messenger.bsh b/spring-context/src/test/resources/org/springframework/scripting/bsh/Messenger.bsh similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/bsh/Messenger.bsh rename to spring-context/src/test/resources/org/springframework/scripting/bsh/Messenger.bsh diff --git a/spring-context/src/test/java/org/springframework/scripting/bsh/MessengerImpl.bsh b/spring-context/src/test/resources/org/springframework/scripting/bsh/MessengerImpl.bsh similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/bsh/MessengerImpl.bsh rename to spring-context/src/test/resources/org/springframework/scripting/bsh/MessengerImpl.bsh diff --git a/spring-context/src/test/java/org/springframework/scripting/bsh/MessengerInstance.bsh b/spring-context/src/test/resources/org/springframework/scripting/bsh/MessengerInstance.bsh similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/bsh/MessengerInstance.bsh rename to spring-context/src/test/resources/org/springframework/scripting/bsh/MessengerInstance.bsh diff --git a/spring-context/src/test/java/org/springframework/scripting/bsh/bsh-with-xsd.xml b/spring-context/src/test/resources/org/springframework/scripting/bsh/bsh-with-xsd.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/bsh/bsh-with-xsd.xml rename to spring-context/src/test/resources/org/springframework/scripting/bsh/bsh-with-xsd.xml diff --git a/spring-context/src/test/java/org/springframework/scripting/bsh/bshBrokenContext.xml b/spring-context/src/test/resources/org/springframework/scripting/bsh/bshBrokenContext.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/bsh/bshBrokenContext.xml rename to spring-context/src/test/resources/org/springframework/scripting/bsh/bshBrokenContext.xml diff --git a/spring-context/src/test/java/org/springframework/scripting/bsh/bshContext.xml b/spring-context/src/test/resources/org/springframework/scripting/bsh/bshContext.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/bsh/bshContext.xml rename to spring-context/src/test/resources/org/springframework/scripting/bsh/bshContext.xml diff --git a/spring-context/src/test/java/org/springframework/scripting/bsh/bshRefreshableContext.xml b/spring-context/src/test/resources/org/springframework/scripting/bsh/bshRefreshableContext.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/bsh/bshRefreshableContext.xml rename to spring-context/src/test/resources/org/springframework/scripting/bsh/bshRefreshableContext.xml diff --git a/spring-context/src/test/java/org/springframework/scripting/bsh/simple.bsh b/spring-context/src/test/resources/org/springframework/scripting/bsh/simple.bsh similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/bsh/simple.bsh rename to spring-context/src/test/resources/org/springframework/scripting/bsh/simple.bsh diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/Broken.groovyb b/spring-context/src/test/resources/org/springframework/scripting/groovy/Broken.groovyb similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/groovy/Broken.groovyb rename to spring-context/src/test/resources/org/springframework/scripting/groovy/Broken.groovyb diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/Calculator.groovy b/spring-context/src/test/resources/org/springframework/scripting/groovy/Calculator.groovy similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/groovy/Calculator.groovy rename to spring-context/src/test/resources/org/springframework/scripting/groovy/Calculator.groovy diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/CallCounter.groovy b/spring-context/src/test/resources/org/springframework/scripting/groovy/CallCounter.groovy similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/groovy/CallCounter.groovy rename to spring-context/src/test/resources/org/springframework/scripting/groovy/CallCounter.groovy diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/DelegatingCalculator.groovy b/spring-context/src/test/resources/org/springframework/scripting/groovy/DelegatingCalculator.groovy similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/groovy/DelegatingCalculator.groovy rename to spring-context/src/test/resources/org/springframework/scripting/groovy/DelegatingCalculator.groovy diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-groovy-dynamic-context.xml b/spring-context/src/test/resources/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-groovy-dynamic-context.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-groovy-dynamic-context.xml rename to spring-context/src/test/resources/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-groovy-dynamic-context.xml diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-groovy-interface-context.xml b/spring-context/src/test/resources/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-groovy-interface-context.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-groovy-interface-context.xml rename to spring-context/src/test/resources/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-groovy-interface-context.xml diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-groovy-proxy-target-class-context.xml b/spring-context/src/test/resources/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-groovy-proxy-target-class-context.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-groovy-proxy-target-class-context.xml rename to spring-context/src/test/resources/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-groovy-proxy-target-class-context.xml diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-java-context.xml b/spring-context/src/test/resources/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-java-context.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-java-context.xml rename to spring-context/src/test/resources/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-java-context.xml diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyServiceImpl.grv b/spring-context/src/test/resources/org/springframework/scripting/groovy/GroovyServiceImpl.grv similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/groovy/GroovyServiceImpl.grv rename to spring-context/src/test/resources/org/springframework/scripting/groovy/GroovyServiceImpl.grv diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/Messenger.groovy b/spring-context/src/test/resources/org/springframework/scripting/groovy/Messenger.groovy similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/groovy/Messenger.groovy rename to spring-context/src/test/resources/org/springframework/scripting/groovy/Messenger.groovy diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/MessengerInstance.groovy b/spring-context/src/test/resources/org/springframework/scripting/groovy/MessengerInstance.groovy similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/groovy/MessengerInstance.groovy rename to spring-context/src/test/resources/org/springframework/scripting/groovy/MessengerInstance.groovy diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/ScriptBean.groovy b/spring-context/src/test/resources/org/springframework/scripting/groovy/ScriptBean.groovy similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/groovy/ScriptBean.groovy rename to spring-context/src/test/resources/org/springframework/scripting/groovy/ScriptBean.groovy diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/TestFactoryBean.groovy b/spring-context/src/test/resources/org/springframework/scripting/groovy/TestFactoryBean.groovy similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/groovy/TestFactoryBean.groovy rename to spring-context/src/test/resources/org/springframework/scripting/groovy/TestFactoryBean.groovy diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/calculators-with-xsd.xml b/spring-context/src/test/resources/org/springframework/scripting/groovy/calculators-with-xsd.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/groovy/calculators-with-xsd.xml rename to spring-context/src/test/resources/org/springframework/scripting/groovy/calculators-with-xsd.xml diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/calculators.xml b/spring-context/src/test/resources/org/springframework/scripting/groovy/calculators.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/groovy/calculators.xml rename to spring-context/src/test/resources/org/springframework/scripting/groovy/calculators.xml diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/groovy-multiple-properties.xml b/spring-context/src/test/resources/org/springframework/scripting/groovy/groovy-multiple-properties.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/groovy/groovy-multiple-properties.xml rename to spring-context/src/test/resources/org/springframework/scripting/groovy/groovy-multiple-properties.xml diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/groovy-with-xsd-proxy-target-class.xml b/spring-context/src/test/resources/org/springframework/scripting/groovy/groovy-with-xsd-proxy-target-class.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/groovy/groovy-with-xsd-proxy-target-class.xml rename to spring-context/src/test/resources/org/springframework/scripting/groovy/groovy-with-xsd-proxy-target-class.xml diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/groovy-with-xsd.xml b/spring-context/src/test/resources/org/springframework/scripting/groovy/groovy-with-xsd.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/groovy/groovy-with-xsd.xml rename to spring-context/src/test/resources/org/springframework/scripting/groovy/groovy-with-xsd.xml diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/groovyBrokenContext.xml b/spring-context/src/test/resources/org/springframework/scripting/groovy/groovyBrokenContext.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/groovy/groovyBrokenContext.xml rename to spring-context/src/test/resources/org/springframework/scripting/groovy/groovyBrokenContext.xml diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/groovyContext.xml b/spring-context/src/test/resources/org/springframework/scripting/groovy/groovyContext.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/groovy/groovyContext.xml rename to spring-context/src/test/resources/org/springframework/scripting/groovy/groovyContext.xml diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/groovyRefreshableContext.xml b/spring-context/src/test/resources/org/springframework/scripting/groovy/groovyRefreshableContext.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/groovy/groovyRefreshableContext.xml rename to spring-context/src/test/resources/org/springframework/scripting/groovy/groovyRefreshableContext.xml diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/jruby-with-xsd-proxy-target-class.xml b/spring-context/src/test/resources/org/springframework/scripting/groovy/jruby-with-xsd-proxy-target-class.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/groovy/jruby-with-xsd-proxy-target-class.xml rename to spring-context/src/test/resources/org/springframework/scripting/groovy/jruby-with-xsd-proxy-target-class.xml diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/lwspBadGroovyContext.xml b/spring-context/src/test/resources/org/springframework/scripting/groovy/lwspBadGroovyContext.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/groovy/lwspBadGroovyContext.xml rename to spring-context/src/test/resources/org/springframework/scripting/groovy/lwspBadGroovyContext.xml diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/simple.groovy b/spring-context/src/test/resources/org/springframework/scripting/groovy/simple.groovy similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/groovy/simple.groovy rename to spring-context/src/test/resources/org/springframework/scripting/groovy/simple.groovy diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/twoClassesCorrectOneFirst.xml b/spring-context/src/test/resources/org/springframework/scripting/groovy/twoClassesCorrectOneFirst.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/groovy/twoClassesCorrectOneFirst.xml rename to spring-context/src/test/resources/org/springframework/scripting/groovy/twoClassesCorrectOneFirst.xml diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/twoClassesWrongOneFirst.xml b/spring-context/src/test/resources/org/springframework/scripting/groovy/twoClassesWrongOneFirst.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/groovy/twoClassesWrongOneFirst.xml rename to spring-context/src/test/resources/org/springframework/scripting/groovy/twoClassesWrongOneFirst.xml diff --git a/spring-context/src/test/java/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests-beanNameAutoProxyCreator.xml b/spring-context/src/test/resources/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests-beanNameAutoProxyCreator.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests-beanNameAutoProxyCreator.xml rename to spring-context/src/test/resources/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests-beanNameAutoProxyCreator.xml diff --git a/spring-context/src/test/java/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests-factoryBean.xml b/spring-context/src/test/resources/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests-factoryBean.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests-factoryBean.xml rename to spring-context/src/test/resources/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests-factoryBean.xml diff --git a/spring-context/src/test/java/org/springframework/scripting/jruby/Broken.rb b/spring-context/src/test/resources/org/springframework/scripting/jruby/Broken.rb similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/jruby/Broken.rb rename to spring-context/src/test/resources/org/springframework/scripting/jruby/Broken.rb diff --git a/spring-context/src/test/java/org/springframework/scripting/jruby/Calculator.rb b/spring-context/src/test/resources/org/springframework/scripting/jruby/Calculator.rb similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/jruby/Calculator.rb rename to spring-context/src/test/resources/org/springframework/scripting/jruby/Calculator.rb diff --git a/spring-context/src/test/java/org/springframework/scripting/jruby/Messenger.rb b/spring-context/src/test/resources/org/springframework/scripting/jruby/Messenger.rb similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/jruby/Messenger.rb rename to spring-context/src/test/resources/org/springframework/scripting/jruby/Messenger.rb diff --git a/spring-context/src/test/java/org/springframework/scripting/jruby/Printer.rb b/spring-context/src/test/resources/org/springframework/scripting/jruby/Printer.rb similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/jruby/Printer.rb rename to spring-context/src/test/resources/org/springframework/scripting/jruby/Printer.rb diff --git a/spring-context/src/test/java/org/springframework/scripting/jruby/jruby-aop.xml b/spring-context/src/test/resources/org/springframework/scripting/jruby/jruby-aop.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/jruby/jruby-aop.xml rename to spring-context/src/test/resources/org/springframework/scripting/jruby/jruby-aop.xml diff --git a/spring-context/src/test/java/org/springframework/scripting/jruby/jruby-with-xsd.xml b/spring-context/src/test/resources/org/springframework/scripting/jruby/jruby-with-xsd.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/jruby/jruby-with-xsd.xml rename to spring-context/src/test/resources/org/springframework/scripting/jruby/jruby-with-xsd.xml diff --git a/spring-context/src/test/java/org/springframework/scripting/jruby/jrubyBrokenContext.xml b/spring-context/src/test/resources/org/springframework/scripting/jruby/jrubyBrokenContext.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/jruby/jrubyBrokenContext.xml rename to spring-context/src/test/resources/org/springframework/scripting/jruby/jrubyBrokenContext.xml diff --git a/spring-context/src/test/java/org/springframework/scripting/jruby/jrubyContext.xml b/spring-context/src/test/resources/org/springframework/scripting/jruby/jrubyContext.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/jruby/jrubyContext.xml rename to spring-context/src/test/resources/org/springframework/scripting/jruby/jrubyContext.xml diff --git a/spring-context/src/test/java/org/springframework/scripting/jruby/jrubyContextForPrimitives.xml b/spring-context/src/test/resources/org/springframework/scripting/jruby/jrubyContextForPrimitives.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/jruby/jrubyContextForPrimitives.xml rename to spring-context/src/test/resources/org/springframework/scripting/jruby/jrubyContextForPrimitives.xml diff --git a/spring-context/src/test/java/org/springframework/scripting/jruby/jrubyContextForWrappers.xml b/spring-context/src/test/resources/org/springframework/scripting/jruby/jrubyContextForWrappers.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/jruby/jrubyContextForWrappers.xml rename to spring-context/src/test/resources/org/springframework/scripting/jruby/jrubyContextForWrappers.xml diff --git a/spring-context/src/test/java/org/springframework/scripting/jruby/jrubyRefreshableContext.xml b/spring-context/src/test/resources/org/springframework/scripting/jruby/jrubyRefreshableContext.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/jruby/jrubyRefreshableContext.xml rename to spring-context/src/test/resources/org/springframework/scripting/jruby/jrubyRefreshableContext.xml diff --git a/spring-context/src/test/java/org/springframework/scripting/support/groovyReferences.xml b/spring-context/src/test/resources/org/springframework/scripting/support/groovyReferences.xml similarity index 100% rename from spring-context/src/test/java/org/springframework/scripting/support/groovyReferences.xml rename to spring-context/src/test/resources/org/springframework/scripting/support/groovyReferences.xml diff --git a/spring-core/src/test/java/org/springframework/core/io/PathResourceTests.java b/spring-core/src/test/java/org/springframework/core/io/PathResourceTests.java index 4304d8b5c21..ab2cbb02252 100644 --- a/spring-core/src/test/java/org/springframework/core/io/PathResourceTests.java +++ b/spring-core/src/test/java/org/springframework/core/io/PathResourceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,16 +40,17 @@ import static org.mockito.BDDMockito.*; * @author Philippe Marschall * @author Phillip Webb * @author Nicholas Williams + * @author Stephane Nicoll */ public class PathResourceTests { - private static final String TEST_DIR = platformPath("src/test/java/org/" + private static final String TEST_DIR = platformPath("src/test/resources/org/" + "springframework/core/io"); - private static final String TEST_FILE = platformPath("src/test/java/org/" + private static final String TEST_FILE = platformPath("src/test/resources/org/" + "springframework/core/io/example.properties"); - private static final String NON_EXISTING_FILE = platformPath("src/test/java/org/" + private static final String NON_EXISTING_FILE = platformPath("src/test/resources/org/" + "springframework/core/io/doesnotexist.properties"); diff --git a/spring-core/src/test/java/org/springframework/core/io/example.properties b/spring-core/src/test/resources/org/springframework/core/io/example.properties similarity index 100% rename from spring-core/src/test/java/org/springframework/core/io/example.properties rename to spring-core/src/test/resources/org/springframework/core/io/example.properties diff --git a/spring-core/src/test/java/org/springframework/core/io/example.xml b/spring-core/src/test/resources/org/springframework/core/io/example.xml similarity index 100% rename from spring-core/src/test/java/org/springframework/core/io/example.xml rename to spring-core/src/test/resources/org/springframework/core/io/example.xml diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g b/spring-expression/src/main/resources/org/springframework/expression/spel/generated/SpringExpressions.g similarity index 100% rename from spring-expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g rename to spring-expression/src/main/resources/org/springframework/expression/spel/generated/SpringExpressions.g diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/META-INF/persistence.xml b/spring-orm/src/test/resources/org/springframework/orm/jpa/META-INF/persistence.xml similarity index 100% rename from spring-orm/src/test/java/org/springframework/orm/jpa/META-INF/persistence.xml rename to spring-orm/src/test/resources/org/springframework/orm/jpa/META-INF/persistence.xml diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/domain/persistence-context.xml b/spring-orm/src/test/resources/org/springframework/orm/jpa/domain/persistence-context.xml similarity index 100% rename from spring-orm/src/test/java/org/springframework/orm/jpa/domain/persistence-context.xml rename to spring-orm/src/test/resources/org/springframework/orm/jpa/domain/persistence-context.xml diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/domain/persistence-multi.xml b/spring-orm/src/test/resources/org/springframework/orm/jpa/domain/persistence-multi.xml similarity index 100% rename from spring-orm/src/test/java/org/springframework/orm/jpa/domain/persistence-multi.xml rename to spring-orm/src/test/resources/org/springframework/orm/jpa/domain/persistence-multi.xml diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/domain/persistence.xml b/spring-orm/src/test/resources/org/springframework/orm/jpa/domain/persistence.xml similarity index 100% rename from spring-orm/src/test/java/org/springframework/orm/jpa/domain/persistence.xml rename to spring-orm/src/test/resources/org/springframework/orm/jpa/domain/persistence.xml diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/eclipselink-manager.xml b/spring-orm/src/test/resources/org/springframework/orm/jpa/eclipselink/eclipselink-manager.xml similarity index 100% rename from spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/eclipselink-manager.xml rename to spring-orm/src/test/resources/org/springframework/orm/jpa/eclipselink/eclipselink-manager.xml diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/hibernate-manager-multi.xml b/spring-orm/src/test/resources/org/springframework/orm/jpa/hibernate/hibernate-manager-multi.xml similarity index 100% rename from spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/hibernate-manager-multi.xml rename to spring-orm/src/test/resources/org/springframework/orm/jpa/hibernate/hibernate-manager-multi.xml diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/hibernate-manager.xml b/spring-orm/src/test/resources/org/springframework/orm/jpa/hibernate/hibernate-manager.xml similarity index 100% rename from spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/hibernate-manager.xml rename to spring-orm/src/test/resources/org/springframework/orm/jpa/hibernate/hibernate-manager.xml diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/inject.xml b/spring-orm/src/test/resources/org/springframework/orm/jpa/inject.xml similarity index 100% rename from spring-orm/src/test/java/org/springframework/orm/jpa/inject.xml rename to spring-orm/src/test/resources/org/springframework/orm/jpa/inject.xml diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/insertPerson.sql b/spring-orm/src/test/resources/org/springframework/orm/jpa/insertPerson.sql similarity index 100% rename from spring-orm/src/test/java/org/springframework/orm/jpa/insertPerson.sql rename to spring-orm/src/test/resources/org/springframework/orm/jpa/insertPerson.sql diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/jpa-archive.jar b/spring-orm/src/test/resources/org/springframework/orm/jpa/jpa-archive.jar similarity index 100% rename from spring-orm/src/test/java/org/springframework/orm/jpa/jpa-archive.jar rename to spring-orm/src/test/resources/org/springframework/orm/jpa/jpa-archive.jar diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/memdb.xml b/spring-orm/src/test/resources/org/springframework/orm/jpa/memdb.xml similarity index 100% rename from spring-orm/src/test/java/org/springframework/orm/jpa/memdb.xml rename to spring-orm/src/test/resources/org/springframework/orm/jpa/memdb.xml diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/multi-jpa-emf.xml b/spring-orm/src/test/resources/org/springframework/orm/jpa/multi-jpa-emf.xml similarity index 100% rename from spring-orm/src/test/java/org/springframework/orm/jpa/multi-jpa-emf.xml rename to spring-orm/src/test/resources/org/springframework/orm/jpa/multi-jpa-emf.xml diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/openjpa-manager-aspectj-weaving.xml b/spring-orm/src/test/resources/org/springframework/orm/jpa/openjpa/openjpa-manager-aspectj-weaving.xml similarity index 100% rename from spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/openjpa-manager-aspectj-weaving.xml rename to spring-orm/src/test/resources/org/springframework/orm/jpa/openjpa/openjpa-manager-aspectj-weaving.xml diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/openjpa-manager.xml b/spring-orm/src/test/resources/org/springframework/orm/jpa/openjpa/openjpa-manager.xml similarity index 100% rename from spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/openjpa-manager.xml rename to spring-orm/src/test/resources/org/springframework/orm/jpa/openjpa/openjpa-manager.xml diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-complex.xml b/spring-orm/src/test/resources/org/springframework/orm/jpa/persistence-complex.xml similarity index 100% rename from spring-orm/src/test/java/org/springframework/orm/jpa/persistence-complex.xml rename to spring-orm/src/test/resources/org/springframework/orm/jpa/persistence-complex.xml diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example1.xml b/spring-orm/src/test/resources/org/springframework/orm/jpa/persistence-example1.xml similarity index 100% rename from spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example1.xml rename to spring-orm/src/test/resources/org/springframework/orm/jpa/persistence-example1.xml diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example2.xml b/spring-orm/src/test/resources/org/springframework/orm/jpa/persistence-example2.xml similarity index 100% rename from spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example2.xml rename to spring-orm/src/test/resources/org/springframework/orm/jpa/persistence-example2.xml diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example3.xml b/spring-orm/src/test/resources/org/springframework/orm/jpa/persistence-example3.xml similarity index 100% rename from spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example3.xml rename to spring-orm/src/test/resources/org/springframework/orm/jpa/persistence-example3.xml diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example4.xml b/spring-orm/src/test/resources/org/springframework/orm/jpa/persistence-example4.xml similarity index 100% rename from spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example4.xml rename to spring-orm/src/test/resources/org/springframework/orm/jpa/persistence-example4.xml diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example5.xml b/spring-orm/src/test/resources/org/springframework/orm/jpa/persistence-example5.xml similarity index 100% rename from spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example5.xml rename to spring-orm/src/test/resources/org/springframework/orm/jpa/persistence-example5.xml diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example6.xml b/spring-orm/src/test/resources/org/springframework/orm/jpa/persistence-example6.xml similarity index 100% rename from spring-orm/src/test/java/org/springframework/orm/jpa/persistence-example6.xml rename to spring-orm/src/test/resources/org/springframework/orm/jpa/persistence-example6.xml diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-exclude-1.0.xml b/spring-orm/src/test/resources/org/springframework/orm/jpa/persistence-exclude-1.0.xml similarity index 100% rename from spring-orm/src/test/java/org/springframework/orm/jpa/persistence-exclude-1.0.xml rename to spring-orm/src/test/resources/org/springframework/orm/jpa/persistence-exclude-1.0.xml diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-exclude-2.0.xml b/spring-orm/src/test/resources/org/springframework/orm/jpa/persistence-exclude-2.0.xml similarity index 100% rename from spring-orm/src/test/java/org/springframework/orm/jpa/persistence-exclude-2.0.xml rename to spring-orm/src/test/resources/org/springframework/orm/jpa/persistence-exclude-2.0.xml diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-invalid.xml b/spring-orm/src/test/resources/org/springframework/orm/jpa/persistence-invalid.xml similarity index 100% rename from spring-orm/src/test/java/org/springframework/orm/jpa/persistence-invalid.xml rename to spring-orm/src/test/resources/org/springframework/orm/jpa/persistence-invalid.xml diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/persistence-no-schema.xml b/spring-orm/src/test/resources/org/springframework/orm/jpa/persistence-no-schema.xml similarity index 100% rename from spring-orm/src/test/java/org/springframework/orm/jpa/persistence-no-schema.xml rename to spring-orm/src/test/resources/org/springframework/orm/jpa/persistence-no-schema.xml diff --git a/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests-context.properties b/spring-test/src/test/resources/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests-context.properties similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests-context.properties rename to spring-test/src/test/resources/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests-context.properties diff --git a/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesTests-context.properties b/spring-test/src/test/resources/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesTests-context.properties similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesTests-context.properties rename to spring-test/src/test/resources/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesTests-context.properties diff --git a/spring-test/src/test/java/org/springframework/test/context/env/ApplicationPropertyOverridePropertiesFileTestPropertySourceTests.properties b/spring-test/src/test/resources/org/springframework/test/context/env/ApplicationPropertyOverridePropertiesFileTestPropertySourceTests.properties similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/env/ApplicationPropertyOverridePropertiesFileTestPropertySourceTests.properties rename to spring-test/src/test/resources/org/springframework/test/context/env/ApplicationPropertyOverridePropertiesFileTestPropertySourceTests.properties diff --git a/spring-test/src/test/java/org/springframework/test/context/env/DefaultPropertiesFileDetectionTestPropertySourceTests.properties b/spring-test/src/test/resources/org/springframework/test/context/env/DefaultPropertiesFileDetectionTestPropertySourceTests.properties similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/env/DefaultPropertiesFileDetectionTestPropertySourceTests.properties rename to spring-test/src/test/resources/org/springframework/test/context/env/DefaultPropertiesFileDetectionTestPropertySourceTests.properties diff --git a/spring-test/src/test/java/org/springframework/test/context/env/ExtendedDefaultPropertiesFileDetectionTestPropertySourceTests.properties b/spring-test/src/test/resources/org/springframework/test/context/env/ExtendedDefaultPropertiesFileDetectionTestPropertySourceTests.properties similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/env/ExtendedDefaultPropertiesFileDetectionTestPropertySourceTests.properties rename to spring-test/src/test/resources/org/springframework/test/context/env/ExtendedDefaultPropertiesFileDetectionTestPropertySourceTests.properties diff --git a/spring-test/src/test/java/org/springframework/test/context/env/SystemPropertyOverridePropertiesFileTestPropertySourceTests.properties b/spring-test/src/test/resources/org/springframework/test/context/env/SystemPropertyOverridePropertiesFileTestPropertySourceTests.properties similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/env/SystemPropertyOverridePropertiesFileTestPropertySourceTests.properties rename to spring-test/src/test/resources/org/springframework/test/context/env/SystemPropertyOverridePropertiesFileTestPropertySourceTests.properties diff --git a/spring-test/src/test/java/org/springframework/test/context/env/explicit.properties b/spring-test/src/test/resources/org/springframework/test/context/env/explicit.properties similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/env/explicit.properties rename to spring-test/src/test/resources/org/springframework/test/context/env/explicit.properties diff --git a/spring-test/src/test/java/org/springframework/test/context/env/extended.properties b/spring-test/src/test/resources/org/springframework/test/context/env/extended.properties similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/env/extended.properties rename to spring-test/src/test/resources/org/springframework/test/context/env/extended.properties diff --git a/spring-test/src/test/java/org/springframework/test/context/expression/ExpressionUsageTests-context.xml b/spring-test/src/test/resources/org/springframework/test/context/expression/ExpressionUsageTests-context.xml similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/expression/ExpressionUsageTests-context.xml rename to spring-test/src/test/resources/org/springframework/test/context/expression/ExpressionUsageTests-context.xml diff --git a/spring-test/src/test/java/org/springframework/test/context/groovy/DefaultScriptDetectionGroovySpringContextTestsContext.groovy b/spring-test/src/test/resources/org/springframework/test/context/groovy/DefaultScriptDetectionGroovySpringContextTestsContext.groovy similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/groovy/DefaultScriptDetectionGroovySpringContextTestsContext.groovy rename to spring-test/src/test/resources/org/springframework/test/context/groovy/DefaultScriptDetectionGroovySpringContextTestsContext.groovy diff --git a/spring-test/src/test/java/org/springframework/test/context/groovy/DefaultScriptDetectionXmlSupersedesGroovySpringContextTests-context.xml b/spring-test/src/test/resources/org/springframework/test/context/groovy/DefaultScriptDetectionXmlSupersedesGroovySpringContextTests-context.xml similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/groovy/DefaultScriptDetectionXmlSupersedesGroovySpringContextTests-context.xml rename to spring-test/src/test/resources/org/springframework/test/context/groovy/DefaultScriptDetectionXmlSupersedesGroovySpringContextTests-context.xml diff --git a/spring-test/src/test/java/org/springframework/test/context/groovy/DefaultScriptDetectionXmlSupersedesGroovySpringContextTestsContext.groovy b/spring-test/src/test/resources/org/springframework/test/context/groovy/DefaultScriptDetectionXmlSupersedesGroovySpringContextTestsContext.groovy similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/groovy/DefaultScriptDetectionXmlSupersedesGroovySpringContextTestsContext.groovy rename to spring-test/src/test/resources/org/springframework/test/context/groovy/DefaultScriptDetectionXmlSupersedesGroovySpringContextTestsContext.groovy diff --git a/spring-test/src/test/java/org/springframework/test/context/groovy/context.groovy b/spring-test/src/test/resources/org/springframework/test/context/groovy/context.groovy similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/groovy/context.groovy rename to spring-test/src/test/resources/org/springframework/test/context/groovy/context.groovy diff --git a/spring-test/src/test/java/org/springframework/test/context/groovy/contextA.groovy b/spring-test/src/test/resources/org/springframework/test/context/groovy/contextA.groovy similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/groovy/contextA.groovy rename to spring-test/src/test/resources/org/springframework/test/context/groovy/contextA.groovy diff --git a/spring-test/src/test/java/org/springframework/test/context/groovy/contextB.xml b/spring-test/src/test/resources/org/springframework/test/context/groovy/contextB.xml similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/groovy/contextB.xml rename to spring-test/src/test/resources/org/springframework/test/context/groovy/contextB.xml diff --git a/spring-test/src/test/java/org/springframework/test/context/jdbc/DefaultScriptDetectionSqlScriptsTests.methodLevel.sql b/spring-test/src/test/resources/org/springframework/test/context/jdbc/DefaultScriptDetectionSqlScriptsTests.methodLevel.sql similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/jdbc/DefaultScriptDetectionSqlScriptsTests.methodLevel.sql rename to spring-test/src/test/resources/org/springframework/test/context/jdbc/DefaultScriptDetectionSqlScriptsTests.methodLevel.sql diff --git a/spring-test/src/test/java/org/springframework/test/context/jdbc/DefaultScriptDetectionSqlScriptsTests.sql b/spring-test/src/test/resources/org/springframework/test/context/jdbc/DefaultScriptDetectionSqlScriptsTests.sql similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/jdbc/DefaultScriptDetectionSqlScriptsTests.sql rename to spring-test/src/test/resources/org/springframework/test/context/jdbc/DefaultScriptDetectionSqlScriptsTests.sql diff --git a/spring-test/src/test/java/org/springframework/test/context/jdbc/data-add-catbert.sql b/spring-test/src/test/resources/org/springframework/test/context/jdbc/data-add-catbert.sql similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/jdbc/data-add-catbert.sql rename to spring-test/src/test/resources/org/springframework/test/context/jdbc/data-add-catbert.sql diff --git a/spring-test/src/test/java/org/springframework/test/context/jdbc/data-add-dogbert.sql b/spring-test/src/test/resources/org/springframework/test/context/jdbc/data-add-dogbert.sql similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/jdbc/data-add-dogbert.sql rename to spring-test/src/test/resources/org/springframework/test/context/jdbc/data-add-dogbert.sql diff --git a/spring-test/src/test/java/org/springframework/test/context/jdbc/data-add-users-with-custom-script-syntax.sql b/spring-test/src/test/resources/org/springframework/test/context/jdbc/data-add-users-with-custom-script-syntax.sql similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/jdbc/data-add-users-with-custom-script-syntax.sql rename to spring-test/src/test/resources/org/springframework/test/context/jdbc/data-add-users-with-custom-script-syntax.sql diff --git a/spring-test/src/test/java/org/springframework/test/context/jdbc/data.sql b/spring-test/src/test/resources/org/springframework/test/context/jdbc/data.sql similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/jdbc/data.sql rename to spring-test/src/test/resources/org/springframework/test/context/jdbc/data.sql diff --git a/spring-test/src/test/java/org/springframework/test/context/jdbc/drop-schema.sql b/spring-test/src/test/resources/org/springframework/test/context/jdbc/drop-schema.sql similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/jdbc/drop-schema.sql rename to spring-test/src/test/resources/org/springframework/test/context/jdbc/drop-schema.sql diff --git a/spring-test/src/test/java/org/springframework/test/context/jdbc/schema.sql b/spring-test/src/test/resources/org/springframework/test/context/jdbc/schema.sql similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/jdbc/schema.sql rename to spring-test/src/test/resources/org/springframework/test/context/jdbc/schema.sql diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/BeforeAndAfterTransactionAnnotationTests-context.xml b/spring-test/src/test/resources/org/springframework/test/context/junit4/BeforeAndAfterTransactionAnnotationTests-context.xml similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/junit4/BeforeAndAfterTransactionAnnotationTests-context.xml rename to spring-test/src/test/resources/org/springframework/test/context/junit4/BeforeAndAfterTransactionAnnotationTests-context.xml diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests-context.xml b/spring-test/src/test/resources/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests-context.xml similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests-context.xml rename to spring-test/src/test/resources/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests-context.xml diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests-context.xml b/spring-test/src/test/resources/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests-context.xml similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests-context.xml rename to spring-test/src/test/resources/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests-context.xml diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackFalseTransactionalSpringRunnerTests-context.xml b/spring-test/src/test/resources/org/springframework/test/context/junit4/DefaultRollbackFalseTransactionalSpringRunnerTests-context.xml similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackFalseTransactionalSpringRunnerTests-context.xml rename to spring-test/src/test/resources/org/springframework/test/context/junit4/DefaultRollbackFalseTransactionalSpringRunnerTests-context.xml diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackTrueTransactionalSpringRunnerTests-context.xml b/spring-test/src/test/resources/org/springframework/test/context/junit4/DefaultRollbackTrueTransactionalSpringRunnerTests-context.xml similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackTrueTransactionalSpringRunnerTests-context.xml rename to spring-test/src/test/resources/org/springframework/test/context/junit4/DefaultRollbackTrueTransactionalSpringRunnerTests-context.xml diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests-context.xml b/spring-test/src/test/resources/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests-context.xml similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests-context.xml rename to spring-test/src/test/resources/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests-context.xml diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests-context.xml b/spring-test/src/test/resources/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests-context.xml similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests-context.xml rename to spring-test/src/test/resources/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests-context.xml diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context1.xml b/spring-test/src/test/resources/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context1.xml similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context1.xml rename to spring-test/src/test/resources/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context1.xml diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context2.xml b/spring-test/src/test/resources/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context2.xml similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context2.xml rename to spring-test/src/test/resources/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context2.xml diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context3.xml b/spring-test/src/test/resources/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context3.xml similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context3.xml rename to spring-test/src/test/resources/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context3.xml diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/ParameterizedDependencyInjectionTests-context.xml b/spring-test/src/test/resources/org/springframework/test/context/junit4/ParameterizedDependencyInjectionTests-context.xml similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/junit4/ParameterizedDependencyInjectionTests-context.xml rename to spring-test/src/test/resources/org/springframework/test/context/junit4/ParameterizedDependencyInjectionTests-context.xml diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests-context.properties b/spring-test/src/test/resources/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests-context.properties similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests-context.properties rename to spring-test/src/test/resources/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests-context.properties diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackFalseTransactionalSpringRunnerTests-context.xml b/spring-test/src/test/resources/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackFalseTransactionalSpringRunnerTests-context.xml similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackFalseTransactionalSpringRunnerTests-context.xml rename to spring-test/src/test/resources/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackFalseTransactionalSpringRunnerTests-context.xml diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests-context.xml b/spring-test/src/test/resources/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests-context.xml similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests-context.xml rename to spring-test/src/test/resources/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests-context.xml diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests-context.xml b/spring-test/src/test/resources/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests-context.xml similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests-context.xml rename to spring-test/src/test/resources/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests-context.xml diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/aci/xml/MultipleInitializersXmlConfigTests-context.xml b/spring-test/src/test/resources/org/springframework/test/context/junit4/aci/xml/MultipleInitializersXmlConfigTests-context.xml similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/junit4/aci/xml/MultipleInitializersXmlConfigTests-context.xml rename to spring-test/src/test/resources/org/springframework/test/context/junit4/aci/xml/MultipleInitializersXmlConfigTests-context.xml diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/hybrid/HybridContextLoaderTests-context.xml b/spring-test/src/test/resources/org/springframework/test/context/junit4/hybrid/HybridContextLoaderTests-context.xml similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/junit4/hybrid/HybridContextLoaderTests-context.xml rename to spring-test/src/test/resources/org/springframework/test/context/junit4/hybrid/HybridContextLoaderTests-context.xml diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/HibernateSessionFlushingTests-context.xml b/spring-test/src/test/resources/org/springframework/test/context/junit4/orm/HibernateSessionFlushingTests-context.xml similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/junit4/orm/HibernateSessionFlushingTests-context.xml rename to spring-test/src/test/resources/org/springframework/test/context/junit4/orm/HibernateSessionFlushingTests-context.xml diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/db-schema.sql b/spring-test/src/test/resources/org/springframework/test/context/junit4/orm/db-schema.sql similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/junit4/orm/db-schema.sql rename to spring-test/src/test/resources/org/springframework/test/context/junit4/orm/db-schema.sql diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/db-test-data.sql b/spring-test/src/test/resources/org/springframework/test/context/junit4/orm/db-test-data.sql similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/junit4/orm/db-test-data.sql rename to spring-test/src/test/resources/org/springframework/test/context/junit4/orm/db-test-data.sql diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/domain/DriversLicense.hbm.xml b/spring-test/src/test/resources/org/springframework/test/context/junit4/orm/domain/DriversLicense.hbm.xml similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/junit4/orm/domain/DriversLicense.hbm.xml rename to spring-test/src/test/resources/org/springframework/test/context/junit4/orm/domain/DriversLicense.hbm.xml diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/domain/Person.hbm.xml b/spring-test/src/test/resources/org/springframework/test/context/junit4/orm/domain/Person.hbm.xml similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/junit4/orm/domain/Person.hbm.xml rename to spring-test/src/test/resources/org/springframework/test/context/junit4/orm/domain/Person.hbm.xml diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/profile/importresource/import.xml b/spring-test/src/test/resources/org/springframework/test/context/junit4/profile/importresource/import.xml similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/junit4/profile/importresource/import.xml rename to spring-test/src/test/resources/org/springframework/test/context/junit4/profile/importresource/import.xml diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/profile/xml/DefaultProfileXmlConfigTests-context.xml b/spring-test/src/test/resources/org/springframework/test/context/junit4/profile/xml/DefaultProfileXmlConfigTests-context.xml similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/junit4/profile/xml/DefaultProfileXmlConfigTests-context.xml rename to spring-test/src/test/resources/org/springframework/test/context/junit4/profile/xml/DefaultProfileXmlConfigTests-context.xml diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingDefaultLocationsInheritedTests-context.xml b/spring-test/src/test/resources/org/springframework/test/context/junit4/spr3896/BeanOverridingDefaultLocationsInheritedTests-context.xml similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingDefaultLocationsInheritedTests-context.xml rename to spring-test/src/test/resources/org/springframework/test/context/junit4/spr3896/BeanOverridingDefaultLocationsInheritedTests-context.xml diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsBaseTests-context.xml b/spring-test/src/test/resources/org/springframework/test/context/junit4/spr3896/DefaultLocationsBaseTests-context.xml similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsBaseTests-context.xml rename to spring-test/src/test/resources/org/springframework/test/context/junit4/spr3896/DefaultLocationsBaseTests-context.xml diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsInheritedTests-context.xml b/spring-test/src/test/resources/org/springframework/test/context/junit4/spr3896/DefaultLocationsInheritedTests-context.xml similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsInheritedTests-context.xml rename to spring-test/src/test/resources/org/springframework/test/context/junit4/spr3896/DefaultLocationsInheritedTests-context.xml diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr6128/AutowiredQualifierTests-context.xml b/spring-test/src/test/resources/org/springframework/test/context/junit4/spr6128/AutowiredQualifierTests-context.xml similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/junit4/spr6128/AutowiredQualifierTests-context.xml rename to spring-test/src/test/resources/org/springframework/test/context/junit4/spr6128/AutowiredQualifierTests-context.xml diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr8849/TestClass1-context.xml b/spring-test/src/test/resources/org/springframework/test/context/junit4/spr8849/TestClass1-context.xml similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/junit4/spr8849/TestClass1-context.xml rename to spring-test/src/test/resources/org/springframework/test/context/junit4/spr8849/TestClass1-context.xml diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr8849/TestClass2-context.xml b/spring-test/src/test/resources/org/springframework/test/context/junit4/spr8849/TestClass2-context.xml similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/junit4/spr8849/TestClass2-context.xml rename to spring-test/src/test/resources/org/springframework/test/context/junit4/spr8849/TestClass2-context.xml diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr8849/datasource-config.xml b/spring-test/src/test/resources/org/springframework/test/context/junit4/spr8849/datasource-config.xml similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/junit4/spr8849/datasource-config.xml rename to spring-test/src/test/resources/org/springframework/test/context/junit4/spr8849/datasource-config.xml diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr8849/spr8849-schema.sql b/spring-test/src/test/resources/org/springframework/test/context/junit4/spr8849/spr8849-schema.sql similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/junit4/spr8849/spr8849-schema.sql rename to spring-test/src/test/resources/org/springframework/test/context/junit4/spr8849/spr8849-schema.sql diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr9051/schema.sql b/spring-test/src/test/resources/org/springframework/test/context/junit4/spr9051/schema.sql similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/junit4/spr9051/schema.sql rename to spring-test/src/test/resources/org/springframework/test/context/junit4/spr9051/schema.sql diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/transactionalTests-context.xml b/spring-test/src/test/resources/org/springframework/test/context/junit4/transactionalTests-context.xml similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/junit4/transactionalTests-context.xml rename to spring-test/src/test/resources/org/springframework/test/context/junit4/transactionalTests-context.xml diff --git a/spring-test/src/test/java/org/springframework/test/context/support/AbstractContextConfigurationUtilsTests$BareAnnotations-context.xml b/spring-test/src/test/resources/org/springframework/test/context/support/AbstractContextConfigurationUtilsTests$BareAnnotations-context.xml similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/support/AbstractContextConfigurationUtilsTests$BareAnnotations-context.xml rename to spring-test/src/test/resources/org/springframework/test/context/support/AbstractContextConfigurationUtilsTests$BareAnnotations-context.xml diff --git a/spring-test/src/test/java/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests-context.xml b/spring-test/src/test/resources/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests-context.xml similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests-context.xml rename to spring-test/src/test/resources/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests-context.xml diff --git a/spring-test/src/test/java/org/springframework/test/context/support/GenericXmlContextLoaderResourceLocationsTests$1ClasspathExistentDefaultLocationsTestCase-context.xml b/spring-test/src/test/resources/org/springframework/test/context/support/GenericXmlContextLoaderResourceLocationsTests$1ClasspathExistentDefaultLocationsTestCase-context.xml similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/support/GenericXmlContextLoaderResourceLocationsTests$1ClasspathExistentDefaultLocationsTestCase-context.xml rename to spring-test/src/test/resources/org/springframework/test/context/support/GenericXmlContextLoaderResourceLocationsTests$1ClasspathExistentDefaultLocationsTestCase-context.xml diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests-context.xml b/spring-test/src/test/resources/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests-context.xml similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests-context.xml rename to spring-test/src/test/resources/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests-context.xml diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests-context.xml b/spring-test/src/test/resources/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests-context.xml similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests-context.xml rename to spring-test/src/test/resources/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests-context.xml diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests-context.xml b/spring-test/src/test/resources/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests-context.xml similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests-context.xml rename to spring-test/src/test/resources/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests-context.xml diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/TimedTransactionalTestNGSpringContextTests-context.xml b/spring-test/src/test/resources/org/springframework/test/context/testng/TimedTransactionalTestNGSpringContextTests-context.xml similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/testng/TimedTransactionalTestNGSpringContextTests-context.xml rename to spring-test/src/test/resources/org/springframework/test/context/testng/TimedTransactionalTestNGSpringContextTests-context.xml diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/data.sql b/spring-test/src/test/resources/org/springframework/test/context/testng/data.sql similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/testng/data.sql rename to spring-test/src/test/resources/org/springframework/test/context/testng/data.sql diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/schema.sql b/spring-test/src/test/resources/org/springframework/test/context/testng/schema.sql similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/testng/schema.sql rename to spring-test/src/test/resources/org/springframework/test/context/testng/schema.sql diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/transaction/ejb/testng-package.xml b/spring-test/src/test/resources/org/springframework/test/context/testng/transaction/ejb/testng-package.xml similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/testng/transaction/ejb/testng-package.xml rename to spring-test/src/test/resources/org/springframework/test/context/testng/transaction/ejb/testng-package.xml diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/transaction/ejb/testng-test-separate.xml b/spring-test/src/test/resources/org/springframework/test/context/testng/transaction/ejb/testng-test-separate.xml similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/testng/transaction/ejb/testng-test-separate.xml rename to spring-test/src/test/resources/org/springframework/test/context/testng/transaction/ejb/testng-test-separate.xml diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/transaction/ejb/testng-test-together.xml b/spring-test/src/test/resources/org/springframework/test/context/testng/transaction/ejb/testng-test-together.xml similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/testng/transaction/ejb/testng-test-together.xml rename to spring-test/src/test/resources/org/springframework/test/context/testng/transaction/ejb/testng-test-together.xml diff --git a/spring-test/src/test/java/org/springframework/test/context/web/BasicGroovyWacTestsContext.groovy b/spring-test/src/test/resources/org/springframework/test/context/web/BasicGroovyWacTestsContext.groovy similarity index 100% rename from spring-test/src/test/java/org/springframework/test/context/web/BasicGroovyWacTestsContext.groovy rename to spring-test/src/test/resources/org/springframework/test/context/web/BasicGroovyWacTestsContext.groovy diff --git a/spring-tx/src/main/java/org/springframework/jca/context/ra.xml b/spring-tx/src/main/resources/org/springframework/jca/context/ra.xml similarity index 100% rename from spring-tx/src/main/java/org/springframework/jca/context/ra.xml rename to spring-tx/src/main/resources/org/springframework/jca/context/ra.xml diff --git a/spring-tx/src/test/java/org/springframework/transaction/annotation/annotationTransactionNamespaceHandlerTests.xml b/spring-tx/src/test/resources/org/springframework/transaction/annotation/annotationTransactionNamespaceHandlerTests.xml similarity index 100% rename from spring-tx/src/test/java/org/springframework/transaction/annotation/annotationTransactionNamespaceHandlerTests.xml rename to spring-tx/src/test/resources/org/springframework/transaction/annotation/annotationTransactionNamespaceHandlerTests.xml diff --git a/spring-tx/src/test/java/org/springframework/transaction/config/annotationDrivenConfigurationClassTests.xml b/spring-tx/src/test/resources/org/springframework/transaction/config/annotationDrivenConfigurationClassTests.xml similarity index 100% rename from spring-tx/src/test/java/org/springframework/transaction/config/annotationDrivenConfigurationClassTests.xml rename to spring-tx/src/test/resources/org/springframework/transaction/config/annotationDrivenConfigurationClassTests.xml diff --git a/spring-tx/src/test/java/org/springframework/transaction/config/annotationDrivenProxyTargetClassTests.xml b/spring-tx/src/test/resources/org/springframework/transaction/config/annotationDrivenProxyTargetClassTests.xml similarity index 100% rename from spring-tx/src/test/java/org/springframework/transaction/config/annotationDrivenProxyTargetClassTests.xml rename to spring-tx/src/test/resources/org/springframework/transaction/config/annotationDrivenProxyTargetClassTests.xml diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/noTransactionAttributeSource.xml b/spring-tx/src/test/resources/org/springframework/transaction/interceptor/noTransactionAttributeSource.xml similarity index 100% rename from spring-tx/src/test/java/org/springframework/transaction/interceptor/noTransactionAttributeSource.xml rename to spring-tx/src/test/resources/org/springframework/transaction/interceptor/noTransactionAttributeSource.xml diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/transactionalBeanFactory.xml b/spring-tx/src/test/resources/org/springframework/transaction/interceptor/transactionalBeanFactory.xml similarity index 100% rename from spring-tx/src/test/java/org/springframework/transaction/interceptor/transactionalBeanFactory.xml rename to spring-tx/src/test/resources/org/springframework/transaction/interceptor/transactionalBeanFactory.xml diff --git a/spring-tx/src/test/java/org/springframework/transaction/txNamespaceHandlerTests.xml b/spring-tx/src/test/resources/org/springframework/transaction/txNamespaceHandlerTests.xml similarity index 100% rename from spring-tx/src/test/java/org/springframework/transaction/txNamespaceHandlerTests.xml rename to spring-tx/src/test/resources/org/springframework/transaction/txNamespaceHandlerTests.xml diff --git a/spring-web/src/main/java/org/springframework/web/context/ContextLoader.properties b/spring-web/src/main/resources/org/springframework/web/context/ContextLoader.properties similarity index 100% rename from spring-web/src/main/java/org/springframework/web/context/ContextLoader.properties rename to spring-web/src/main/resources/org/springframework/web/context/ContextLoader.properties diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/DispatcherPortlet.properties b/spring-webmvc-portlet/src/main/resources/org/springframework/web/portlet/DispatcherPortlet.properties similarity index 100% rename from spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/DispatcherPortlet.properties rename to spring-webmvc-portlet/src/main/resources/org/springframework/web/portlet/DispatcherPortlet.properties diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/applicationContext.xml b/spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/context/WEB-INF/applicationContext.xml similarity index 100% rename from spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/applicationContext.xml rename to spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/context/WEB-INF/applicationContext.xml diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/context-messages.properties b/spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/context/WEB-INF/context-messages.properties similarity index 100% rename from spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/context-messages.properties rename to spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/context/WEB-INF/context-messages.properties diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/context-messages_en_GB.properties b/spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/context/WEB-INF/context-messages_en_GB.properties similarity index 100% rename from spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/context-messages_en_GB.properties rename to spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/context/WEB-INF/context-messages_en_GB.properties diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/context-messages_en_US.properties b/spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/context/WEB-INF/context-messages_en_US.properties similarity index 100% rename from spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/context-messages_en_US.properties rename to spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/context/WEB-INF/context-messages_en_US.properties diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/contextInclude.xml b/spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/context/WEB-INF/contextInclude.xml similarity index 100% rename from spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/contextInclude.xml rename to spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/context/WEB-INF/contextInclude.xml diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/empty-portlet.xml b/spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/context/WEB-INF/empty-portlet.xml similarity index 100% rename from spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/empty-portlet.xml rename to spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/context/WEB-INF/empty-portlet.xml diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/more-context-messages.properties b/spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/context/WEB-INF/more-context-messages.properties similarity index 100% rename from spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/more-context-messages.properties rename to spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/context/WEB-INF/more-context-messages.properties diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/myoverride.properties b/spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/context/WEB-INF/myoverride.properties similarity index 100% rename from spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/myoverride.properties rename to spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/context/WEB-INF/myoverride.properties diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/myplaceholder.properties b/spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/context/WEB-INF/myplaceholder.properties similarity index 100% rename from spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/myplaceholder.properties rename to spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/context/WEB-INF/myplaceholder.properties diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/resources/messageSource.xml b/spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/context/WEB-INF/resources/messageSource.xml similarity index 100% rename from spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/resources/messageSource.xml rename to spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/context/WEB-INF/resources/messageSource.xml diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/resources/themeSource.xml b/spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/context/WEB-INF/resources/themeSource.xml similarity index 100% rename from spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/resources/themeSource.xml rename to spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/context/WEB-INF/resources/themeSource.xml diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/test-portlet.xml b/spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/context/WEB-INF/test-portlet.xml similarity index 100% rename from spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/test-portlet.xml rename to spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/context/WEB-INF/test-portlet.xml diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/test-servlet.xml b/spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/context/WEB-INF/test-servlet.xml similarity index 100% rename from spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/test-servlet.xml rename to spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/context/WEB-INF/test-servlet.xml diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/parameterMapping.xml b/spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/handler/parameterMapping.xml similarity index 100% rename from spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/parameterMapping.xml rename to spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/handler/parameterMapping.xml diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/portletModeMapping.xml b/spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/handler/portletModeMapping.xml similarity index 100% rename from spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/portletModeMapping.xml rename to spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/handler/portletModeMapping.xml diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/portletModeParameterMapping.xml b/spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/handler/portletModeParameterMapping.xml similarity index 100% rename from spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/portletModeParameterMapping.xml rename to spring-webmvc-portlet/src/test/resources/org/springframework/web/portlet/handler/portletModeParameterMapping.xml diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.properties b/spring-webmvc/src/main/resources/org/springframework/web/servlet/DispatcherServlet.properties similarity index 100% rename from spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.properties rename to spring-webmvc/src/main/resources/org/springframework/web/servlet/DispatcherServlet.properties diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/spring.ftl b/spring-webmvc/src/main/resources/org/springframework/web/servlet/view/freemarker/spring.ftl similarity index 100% rename from spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/spring.ftl rename to spring-webmvc/src/main/resources/org/springframework/web/servlet/view/freemarker/spring.ftl diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/spring.vm b/spring-webmvc/src/main/resources/org/springframework/web/servlet/view/velocity/spring.vm similarity index 100% rename from spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/spring.vm rename to spring-webmvc/src/main/resources/org/springframework/web/servlet/view/velocity/spring.vm diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/ContextLoaderTests-acc-context.xml b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/ContextLoaderTests-acc-context.xml similarity index 100% rename from spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/ContextLoaderTests-acc-context.xml rename to spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/ContextLoaderTests-acc-context.xml diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/applicationContext.xml b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/applicationContext.xml similarity index 100% rename from spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/applicationContext.xml rename to spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/applicationContext.xml diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/context-addition.xml b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/context-addition.xml similarity index 100% rename from spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/context-addition.xml rename to spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/context-addition.xml diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/context-messages.properties b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/context-messages.properties similarity index 100% rename from spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/context-messages.properties rename to spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/context-messages.properties diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/context-messages_en_GB.properties b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/context-messages_en_GB.properties similarity index 100% rename from spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/context-messages_en_GB.properties rename to spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/context-messages_en_GB.properties diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/context-messages_en_US.properties b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/context-messages_en_US.properties similarity index 100% rename from spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/context-messages_en_US.properties rename to spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/context-messages_en_US.properties diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/contextInclude.xml b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/contextInclude.xml similarity index 100% rename from spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/contextInclude.xml rename to spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/contextInclude.xml diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/empty-context.xml b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/empty-context.xml similarity index 100% rename from spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/empty-context.xml rename to spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/empty-context.xml diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/fail.xml b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/fail.xml similarity index 100% rename from spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/fail.xml rename to spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/fail.xml diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/more-context-messages.properties b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/more-context-messages.properties similarity index 100% rename from spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/more-context-messages.properties rename to spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/more-context-messages.properties diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/myoverride.properties b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/myoverride.properties similarity index 100% rename from spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/myoverride.properties rename to spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/myoverride.properties diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/myplaceholder.properties b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/myplaceholder.properties similarity index 100% rename from spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/myplaceholder.properties rename to spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/myplaceholder.properties diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/resources/messageSource.xml b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/resources/messageSource.xml similarity index 100% rename from spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/resources/messageSource.xml rename to spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/resources/messageSource.xml diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/resources/themeSource.xml b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/resources/themeSource.xml similarity index 100% rename from spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/resources/themeSource.xml rename to spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/resources/themeSource.xml diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/test-messages.properties b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/test-messages.properties similarity index 100% rename from spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/test-messages.properties rename to spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/test-messages.properties diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/test-servlet.xml b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/test-servlet.xml similarity index 100% rename from spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/test-servlet.xml rename to spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/test-servlet.xml diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/test-theme.properties b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/test-theme.properties similarity index 100% rename from spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/test-theme.properties rename to spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/test-theme.properties diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/testNamespace.xml b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/testNamespace.xml similarity index 100% rename from spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/testNamespace.xml rename to spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/testNamespace.xml diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/theme.properties b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/theme.properties similarity index 100% rename from spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/theme.properties rename to spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/theme.properties diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/theme_en_GB.properties b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/theme_en_GB.properties similarity index 100% rename from spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/theme_en_GB.properties rename to spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/theme_en_GB.properties diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/theme_en_US.properties b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/theme_en_US.properties similarity index 100% rename from spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/theme_en_US.properties rename to spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/theme_en_US.properties diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/web.xml b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/web.xml similarity index 100% rename from spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/web.xml rename to spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/web.xml diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/beans1.xml b/spring-webmvc/src/test/resources/org/springframework/web/context/beans1.xml similarity index 100% rename from spring-webmvc/src/test/java/org/springframework/web/context/beans1.xml rename to spring-webmvc/src/test/resources/org/springframework/web/context/beans1.xml diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/ref1.xml b/spring-webmvc/src/test/resources/org/springframework/web/context/ref1.xml similarity index 100% rename from spring-webmvc/src/test/java/org/springframework/web/context/ref1.xml rename to spring-webmvc/src/test/resources/org/springframework/web/context/ref1.xml diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/template.xls b/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/document/template.xls similarity index 100% rename from spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/template.xls rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/view/document/template.xls diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/template_de.xls b/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/document/template_de.xls similarity index 100% rename from spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/template_de.xls rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/view/document/template_de.xls diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/template_en_US.xls b/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/document/template_en_US.xls similarity index 100% rename from spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/template_en_US.xls rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/view/document/template_en_US.xls diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/test.ftl b/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/freemarker/test.ftl similarity index 100% rename from spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/test.ftl rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/view/freemarker/test.ftl diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/view.properties b/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/jasperreports/view.properties similarity index 100% rename from spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/view.properties rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/view/jasperreports/view.properties diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/testviews.properties b/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/testviews.properties similarity index 100% rename from spring-webmvc/src/test/java/org/springframework/web/servlet/view/testviews.properties rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/view/testviews.properties diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/testviews_en.properties b/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/testviews_en.properties similarity index 100% rename from spring-webmvc/src/test/java/org/springframework/web/servlet/view/testviews_en.properties rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/view/testviews_en.properties diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/testviews_fr.properties b/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/testviews_fr.properties similarity index 100% rename from spring-webmvc/src/test/java/org/springframework/web/servlet/view/testviews_fr.properties rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/view/testviews_fr.properties diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/error.vm b/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/velocity/error.vm similarity index 100% rename from spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/error.vm rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/view/velocity/error.vm diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/ioerror.vm b/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/velocity/ioerror.vm similarity index 100% rename from spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/ioerror.vm rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/view/velocity/ioerror.vm diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/simple.vm b/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/velocity/simple.vm similarity index 100% rename from spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/simple.vm rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/view/velocity/simple.vm diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/test-spr5172.vm b/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/velocity/test-spr5172.vm similarity index 100% rename from spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/test-spr5172.vm rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/view/velocity/test-spr5172.vm diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/test.vm b/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/velocity/test.vm similarity index 100% rename from spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/test.vm rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/view/velocity/test.vm diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/toolbox.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/velocity/toolbox.xml similarity index 100% rename from spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/toolbox.xml rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/view/velocity/toolbox.xml diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/views.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/views.xml similarity index 100% rename from spring-webmvc/src/test/java/org/springframework/web/servlet/view/views.xml rename to spring-webmvc/src/test/resources/org/springframework/web/servlet/view/views.xml diff --git a/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests-context.xml b/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests-context.xml similarity index 100% rename from src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests-context.xml rename to src/test/resources/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests-context.xml diff --git a/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests-context.xml b/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests-context.xml similarity index 100% rename from src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests-context.xml rename to src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests-context.xml diff --git a/src/test/java/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.xml b/src/test/resources/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.xml similarity index 100% rename from src/test/java/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.xml rename to src/test/resources/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.xml diff --git a/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests-context-dev.xml b/src/test/resources/org/springframework/core/env/EnvironmentIntegrationTests-context-dev.xml similarity index 100% rename from src/test/java/org/springframework/core/env/EnvironmentIntegrationTests-context-dev.xml rename to src/test/resources/org/springframework/core/env/EnvironmentIntegrationTests-context-dev.xml diff --git a/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests-context-prod.xml b/src/test/resources/org/springframework/core/env/EnvironmentIntegrationTests-context-prod.xml similarity index 100% rename from src/test/java/org/springframework/core/env/EnvironmentIntegrationTests-context-prod.xml rename to src/test/resources/org/springframework/core/env/EnvironmentIntegrationTests-context-prod.xml diff --git a/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests-context.xml b/src/test/resources/org/springframework/core/env/EnvironmentIntegrationTests-context.xml similarity index 100% rename from src/test/java/org/springframework/core/env/EnvironmentIntegrationTests-context.xml rename to src/test/resources/org/springframework/core/env/EnvironmentIntegrationTests-context.xml