From babbf6e8710ab937cd05ece20270f51490299270 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Sat, 28 Feb 2015 10:32:34 +0100
Subject: [PATCH] Harmonize resources location

Issue: SPR-12766
---
 build.gradle                                   |  17 -----------------
 .../AopNamespaceHandlerEventTests-context.xml  |   0
 ...eHandlerEventTests-directPointcutEvents.xml |   0
 ...mespaceHandlerEventTests-pointcutEvents.xml |   0
 ...paceHandlerEventTests-pointcutRefEvents.xml |   0
 ...rPointcutErrorTests-pointcutDuplication.xml |   0
 ...ndlerPointcutErrorTests-pointcutMissing.xml |   0
 .../aop/config/TopLevelAopTagTests-context.xml |   0
 .../framework/PrototypeTargetTests-context.xml |   0
 ...xposeInvocationInterceptorTests-context.xml |   0
 ...dProxyAutowireTests-scopedAutowireFalse.xml |   0
 ...edProxyAutowireTests-scopedAutowireTrue.xml |   0
 ...PointcutAdvisorIntegrationTests-context.xml |   0
 ...monsPool2TargetSourceProxyTests-context.xml |   0
 ...mmonsPoolTargetSourceProxyTests-context.xml |   0
 .../HotSwappableTargetSourceTests-context.xml  |   0
 .../LazyInitTargetSourceTests-customTarget.xml |   0
 .../LazyInitTargetSourceTests-factoryBean.xml  |   0
 .../LazyInitTargetSourceTests-singleton.xml    |   0
 .../PrototypeTargetSourceTests-context.xml     |   0
 .../ThreadLocalTargetSourceTests-context.xml   |   0
 .../aspectj/autoproxy/ajcAutoproxyTests.xml    |   0
 .../aspectj/beanConfigurerTests-beans.xml      |   0
 .../factory/aspectj/beanConfigurerTests.xml    |   0
 .../beans/factory/aspectj/springConfigured.xml |   0
 .../cache/config/annotation-cache-aspectj.xml  |   0
 .../cache/config/annotation-jcache-aspectj.xml |   0
 .../aspectj/annotationDrivenContext.xml        |   0
 .../aspectj/TransactionAspectTests-context.xml |   0
 .../BeanFactoryUtilsTests-dependentBeans.xml   |   0
 .../factory/BeanFactoryUtilsTests-leaf.xml     |   0
 .../factory/BeanFactoryUtilsTests-middle.xml   |   0
 .../factory/BeanFactoryUtilsTests-root.xml     |   0
 .../ConcurrentBeanFactoryTests-context.xml     |   0
 .../factory/FactoryBeanLookupTests-context.xml |   0
 .../factory/FactoryBeanTests-abstract.xml      |   0
 .../factory/FactoryBeanTests-circular.xml      |   0
 .../factory/FactoryBeanTests-returnsNull.xml   |   0
 .../FactoryBeanTests-withAutowiring.xml        |   0
 ...SingletonBeanFactoryLocatorTests-beans1.xml |   0
 ...SingletonBeanFactoryLocatorTests-beans2.xml |   0
 .../SingletonBeanFactoryLocatorTests-ref1.xml  |   0
 .../beans/factory/access/beans1.xml            |   0
 .../beans/factory/access/beans2.xml            |   0
 .../CustomAutowireConfigurerTests-context.xml  |   0
 ...FieldRetrievingFactoryBeanTests-context.xml |   0
 ...FactoryCreatingFactoryBeanTests-context.xml |   0
 .../PropertiesFactoryBeanTests-test.properties |   0
 ...pertiesFactoryBeanTests-test.properties.xml |   0
 .../PropertyPathFactoryBeanTests-context.xml   |   0
 ...opertyPlaceholderConfigurerTests.properties |   0
 ...ertyResourceConfigurerTests-test.properties |   0
 ...ResourceConfigurerTests-test.properties.xml |   0
 .../config/SimpleScopeTests-context.xml        |   0
 .../CustomProblemReporterTests-context.xml     |   0
 .../beans/factory/support/genericBeanTests.xml |   0
 .../factory/support/lookupMethodTests.xml      |   0
 .../factory/support/security/callbacks.xml     |   0
 .../beans/factory/support/security/policy.all  |   0
 ...DuplicateBeanIdTests-multiLevel-context.xml |   0
 .../DuplicateBeanIdTests-sameLevel-context.xml |   0
 .../ResourceBundleEditorTests.properties       |   0
 ...LangCountryDialect_en_GB_GLASGOW.properties |   0
 ...ndleEditorTestsLangCountry_en_GB.properties |   0
 ...ResourceBundleEditorTestsLang_en.properties |   0
 .../springframework/mail/javamail/mime.types   |   0
 .../remoting/rmi/RmiInvocationWrapperRTD.xml   |   0
 .../aop/aspectj/AfterAdviceBindingTests.xml    |   0
 .../AfterReturningAdviceBindingTests.xml       |   0
 .../AfterThrowingAdviceBindingTests.xml        |   0
 .../aop/aspectj/AroundAdviceBindingTests.xml   |   0
 .../aop/aspectj/AroundAdviceCircularTests.xml  |   0
 .../aspectj/AspectAndAdvicePrecedenceTests.xml |   0
 .../AspectJExpressionPointcutAdvisorTests.xml  |   0
 .../aspectj/BeanNamePointcutAtAspectTests.xml  |   0
 .../aop/aspectj/BeanNamePointcutTests.xml      |   0
 .../aop/aspectj/BeforeAdviceBindingTests.xml   |   0
 .../DeclarationOrderIndependenceTests.xml      |   0
 .../aspectj/DeclareParentsDelegateRefTests.xml |   0
 .../aop/aspectj/DeclareParentsTests.xml        |   0
 ...mplicitJPArgumentMatchingAtAspectJTests.xml |   0
 .../ImplicitJPArgumentMatchingTests.xml        |   0
 .../OverloadedAdviceTests-ambiguous.xml        |   0
 .../aop/aspectj/OverloadedAdviceTests.xml      |   0
 .../aop/aspectj/ProceedTests.xml               |   0
 .../PropertyDependentAspectTests-after.xml     |   0
 ...rtyDependentAspectTests-atAspectJ-after.xml |   0
 ...tyDependentAspectTests-atAspectJ-before.xml |   0
 .../PropertyDependentAspectTests-before.xml    |   0
 .../SharedPointcutWithArgsMismatchTests.xml    |   0
 .../aspectj/SubtypeSensitiveMatchingTests.xml  |   0
 .../aspectj/TargetPointcutSelectionTests.xml   |   0
 ...getSelectionOnlyPointcutsAtAspectJTests.xml |   0
 ...hisAndTargetSelectionOnlyPointcutsTests.xml |   0
 .../AnnotationBindingTests-context.xml         |   0
 .../AnnotationPointcutTests-context.xml        |   0
 ...spectImplementingInterfaceTests-context.xml |   0
 ...torAndLazyInitTargetSourceTests-context.xml |   0
 .../AspectJAutoProxyCreatorTests-aspects.xml   |   0
 ...utoProxyCreatorTests-aspectsPlusAdvisor.xml |   0
 ...oxyCreatorTests-aspectsWithAbstractBean.xml |   0
 ...JAutoProxyCreatorTests-aspectsWithCGLIB.xml |   0
 ...toProxyCreatorTests-aspectsWithOrdering.xml |   0
 .../AspectJAutoProxyCreatorTests-pertarget.xml |   0
 .../AspectJAutoProxyCreatorTests-perthis.xml   |   0
 ...spectJAutoProxyCreatorTests-retryAspect.xml |   0
 ...tJAutoProxyCreatorTests-twoAdviceAspect.xml |   0
 ...xyCreatorTests-twoAdviceAspectPrototype.xml |   0
 ...spectJAutoProxyCreatorTests-usesInclude.xml |   0
 ...toProxyCreatorTests-usesJoinPointAspect.xml |   0
 .../AtAspectJAfterThrowingTests-context.xml    |   0
 ...AtAspectJAnnotationBindingTests-context.xml |   0
 .../benchmark/BenchmarkTests-aspectj.xml       |   0
 .../benchmark/BenchmarkTests-springAop.xml     |   0
 .../aspectj/autoproxy/spr3064/SPR3064Tests.xml |   0
 ...turningGenericTypeMatchingTests-context.xml |   0
 ...geMethodMatchingClassProxyTests-context.xml |   0
 ...enericBridgeMethodMatchingTests-context.xml |   0
 .../GenericParameterMatchingTests-context.xml  |   0
 ...opNamespaceHandlerAdviceTypeTests-error.xml |   0
 .../AopNamespaceHandlerAdviceTypeTests-ok.xml  |   0
 .../AopNamespaceHandlerArgNamesTests-error.xml |   0
 .../AopNamespaceHandlerArgNamesTests-ok.xml    |   0
 ...aceHandlerProxyTargetClassTests-context.xml |   0
 ...AopNamespaceHandlerReturningTests-error.xml |   0
 .../AopNamespaceHandlerReturningTests-ok.xml   |   0
 .../AopNamespaceHandlerTests-context.xml       |   0
 .../AopNamespaceHandlerThrowingTests-error.xml |   0
 .../AopNamespaceHandlerThrowingTests-ok.xml    |   0
 .../aop/config/PrototypeProxyTests-context.xml |   0
 ...glibProxyTests-with-dependency-checking.xml |   0
 .../framework/ObjenesisProxyTests-context.xml  |   0
 .../ProxyFactoryBeanTests-autowiring.xml       |   0
 .../ProxyFactoryBeanTests-context.xml          |   0
 ...oxyFactoryBeanTests-double-targetsource.xml |   0
 .../framework/ProxyFactoryBeanTests-frozen.xml |   0
 ...ProxyFactoryBeanTests-inner-bean-target.xml |   0
 .../ProxyFactoryBeanTests-invalid.xml          |   0
 ...xyFactoryBeanTests-notlast-targetsource.xml |   0
 .../ProxyFactoryBeanTests-prototype.xml        |   0
 .../ProxyFactoryBeanTests-serialization.xml    |   0
 .../ProxyFactoryBeanTests-targetsource.xml     |   0
 .../ProxyFactoryBeanTests-throws-advice.xml    |   0
 ...dvisorAdapterRegistrationTests-with-bpp.xml |   0
 ...sorAdapterRegistrationTests-without-bpp.xml |   0
 ...toProxyCreatorTests-common-interceptors.xml |   0
 ...toProxyCreatorTests-custom-targetsource.xml |   0
 .../AdvisorAutoProxyCreatorTests-optimized.xml |   0
 ...utoProxyCreatorTests-quick-targetsource.xml |   0
 ...anNameAutoProxyCreatorInitTests-context.xml |   0
 .../BeanNameAutoProxyCreatorTests-context.xml  |   0
 .../aop/scope/ScopedProxyTests-list.xml        |   0
 .../aop/scope/ScopedProxyTests-map.xml         |   0
 .../aop/scope/ScopedProxyTests-override.xml    |   0
 .../aop/scope/ScopedProxyTests-testbean.xml    |   0
 .../CommonsPool2TargetSourceTests-context.xml  |   0
 ...pMethodWrappedByCglibProxyTests-context.xml |   0
 .../xml/QualifierAnnotationTests-context.xml   |   0
 .../xml/XmlBeanFactoryTests-autowire.xml       |   0
 .../factory/xml/XmlBeanFactoryTests-child.xml  |   0
 .../xml/XmlBeanFactoryTests-classNotFound.xml  |   0
 .../xml/XmlBeanFactoryTests-collections.xml    |   0
 ...mlBeanFactoryTests-complexFactoryCircle.xml |   0
 .../xml/XmlBeanFactoryTests-constructorArg.xml |   0
 ...mlBeanFactoryTests-constructorOverrides.xml |   0
 .../XmlBeanFactoryTests-defaultAutowire.xml    |   0
 .../XmlBeanFactoryTests-defaultLazyInit.xml    |   0
 ...XmlBeanFactoryTests-delegationOverrides.xml |   0
 .../xml/XmlBeanFactoryTests-depCarg.xml        |   0
 .../XmlBeanFactoryTests-depCargAutowire.xml    |   0
 .../xml/XmlBeanFactoryTests-depCargInner.xml   |   0
 .../xml/XmlBeanFactoryTests-depDependsOn.xml   |   0
 .../XmlBeanFactoryTests-depDependsOnInner.xml  |   0
 .../XmlBeanFactoryTests-depMaterializeThis.xml |   0
 .../xml/XmlBeanFactoryTests-depProp.xml        |   0
 ...lBeanFactoryTests-depPropAutowireByName.xml |   0
 ...lBeanFactoryTests-depPropAutowireByType.xml |   0
 .../XmlBeanFactoryTests-depPropInTheMiddle.xml |   0
 .../xml/XmlBeanFactoryTests-depPropInner.xml   |   0
 .../xml/XmlBeanFactoryTests-factoryCircle.xml  |   0
 .../xml/XmlBeanFactoryTests-initializers.xml   |   0
 .../xml/XmlBeanFactoryTests-invalid.xml        |   0
 ...ctoryTests-invalidOverridesNoSuchMethod.xml |   0
 ...anFactoryTests-localCollectionsUsingXsd.xml |   0
 ...XmlBeanFactoryTests-noSuchFactoryMethod.xml |   0
 .../xml/XmlBeanFactoryTests-overrides.xml      |   0
 .../factory/xml/XmlBeanFactoryTests-parent.xml |   0
 .../XmlBeanFactoryTests-recursiveImport.xml    |   0
 .../xml/XmlBeanFactoryTests-reftypes.xml       |   0
 .../xml/XmlBeanFactoryTests-resource.xml       |   0
 .../xml/XmlBeanFactoryTests-resourceImport.xml |   0
 ...mlBeanFactoryTests-satisfiedAllDepCheck.xml |   0
 ...eanFactoryTests-satisfiedObjectDepCheck.xml |   0
 ...eanFactoryTests-satisfiedSimpleDepCheck.xml |   0
 ...ctoryTests-testWithDuplicateNameInAlias.xml |   0
 ...BeanFactoryTests-testWithDuplicateNames.xml |   0
 ...ts-unsatisfiedAllDepCheckMissingObjects.xml |   0
 ...sts-unsatisfiedAllDepCheckMissingSimple.xml |   0
 ...nFactoryTests-unsatisfiedObjectDepCheck.xml |   0
 ...nFactoryTests-unsatisfiedSimpleDepCheck.xml |   0
 .../CustomNamespaceHandlerTests-context.xml    |   0
 .../CustomNamespaceHandlerTests.properties     |   0
 .../support/CustomNamespaceHandlerTests.xsd    |   0
 .../beans/factory/xml/test.properties          |   0
 ...JndiBeanFactoryLocatorTests-collections.xml |   0
 ...ntextJndiBeanFactoryLocatorTests-parent.xml |   0
 ...ingletonBeanFactoryLocatorTests-context.xml |   0
 .../DestroyMethodInferenceTests-context.xml    |   0
 .../EnableLoadTimeWeavingTests-context.xml     |   0
 .../annotation/Spr6602Tests-context.xml        |   0
 .../annotation/aspectjTypeFilterTests.xml      |   0
 .../aspectjTypeFilterTestsWithPlaceholders.xml |   0
 ...onentScanRespectsProfileAnnotationTests.xml |   0
 ...omponentScanWithAutowiredQualifierTests.xml |   0
 ...towiredConfigurationTests-custom.properties |   0
 .../AutowiredConfigurationTests-custom.xml     |   0
 .../AutowiredConfigurationTests.xml            |   0
 ...portNonXmlResourceConfig-context.properties |   0
 .../configuration/ImportXmlConfig-context.xml  |   0
 .../ImportXmlWithAopNamespace-context.xml      |   0
 ...ImportXmlWithConfigurationClass-context.xml |   0
 .../SecondLevelSubConfig-context.xml           |   0
 .../configuration/ValueInjectionTests.xml      |   0
 .../configuration/annotation-config.xml        |   0
 .../configuration/aspectj-autoproxy-config.xml |   0
 ...edForBothComponentScanAndQualifierTests.xml |   0
 .../annotation/customNameGeneratorTests.xml    |   0
 .../annotation/customScopeResolverTests.xml    |   0
 .../annotation/customTypeFilterTests.xml       |   0
 .../annotation/defaultAutowireByNameTests.xml  |   0
 .../annotation/defaultAutowireByTypeTests.xml  |   0
 .../defaultAutowireConstructorTests.xml        |   0
 .../annotation/defaultAutowireNoTests.xml      |   0
 .../defaultDependencyCheckAllTests.xml         |   0
 ...encyCheckObjectsWithAutowireByNameTests.xml |   0
 .../defaultInitAndDestroyMethodsTests.xml      |   0
 .../annotation/defaultLazyInitFalseTests.xml   |   0
 .../annotation/defaultLazyInitTrueTests.xml    |   0
 ...ltNonExistingInitAndDestroyMethodsTests.xml |   0
 .../annotation/defaultWithNoOverridesTests.xml |   0
 .../context/annotation/doubleScanTests.xml     |   0
 .../invalidClassNameScopeResolverTests.xml     |   0
 .../invalidConstructorNameGeneratorTests.xml   |   0
 .../matchingResourcePatternTests.xml           |   0
 .../nonMatchingResourcePatternTests.xml        |   0
 .../context/annotation/p1.properties           |   0
 .../context/annotation/p2.properties           |   0
 .../context/annotation/p3.properties           |   0
 .../context/annotation/p4.properties           |   0
 .../annotation/scopedProxyDefaultTests.xml     |   0
 .../annotation/scopedProxyInterfacesTests.xml  |   0
 .../scopedProxyInvalidConfigTests.xml          |   0
 .../context/annotation/scopedProxyNoTests.xml  |   0
 .../annotation/scopedProxyTargetClassTests.xml |   0
 .../context/annotation/simpleConfigTests.xml   |   0
 .../context/annotation/simpleScanTests.xml     |   0
 .../annotation/spr10546/importedResource.xml   |   0
 .../groovy/applicationContext-error.groovy     |   0
 .../context/groovy/applicationContext.groovy   |   0
 .../context/groovy/applicationContext2.groovy  |   0
 .../springframework/context/groovy/test.xml    |   0
 ...PathXmlApplicationContextTests-resource.xml |   0
 ...lApplicationContextTests-resourceImport.xml |   0
 ...nericXmlApplicationContextTests-context.xml |   0
 ...ourcesPlaceholderConfigurerTests.properties |   0
 .../context/support/aliasForParent.xml         |   0
 .../support/aliasThatOverridesParent.xml       |   0
 .../context/support/childWithProxy.xml         |   0
 .../context/support/classWithPlaceholder.xml   |   0
 .../context/support/conversionService.xml      |   0
 ...conversionServiceWithResourceOverriding.xml |   0
 .../context/support/invalidClass.xml           |   0
 .../context/support/invalidValueType.xml       |   0
 .../context/support/lifecycleTests.xml         |   0
 .../context/support/messages.properties        |   0
 .../context/support/messages_de.properties     |   0
 .../context/support/messages_de_AT.properties  |   0
 .../support/messages_de_AT_oo.properties       |   0
 .../context/support/messages_de_DE.xml         |   0
 .../context/support/more-messages.properties   |   0
 .../context/support/override.properties        |   0
 .../context/support/placeholder.properties     |   0
 .../context/support/simpleContext.xml          |   0
 .../context/support/spr7283.xml                |   0
 .../context/support/spr7816.xml                |   0
 .../context/support/test.properties            |   0
 .../context/support/test/aliased-contextC.xml  |   0
 .../context/support/test/contextA.xml          |   0
 .../context/support/test/contextB.xml          |   0
 .../context/support/test/contextC.xml          |   0
 .../context/support/test/import1.xml           |   0
 .../context/support/test/subtest/import2.xml   |   0
 .../context/support/testBeans.properties       |   0
 .../ejb/config/jeeNamespaceHandlerTests.xml    |   0
 .../instrument/classloading/testResource.xml   |   0
 .../springframework/jmx/applicationContext.xml |   0
 .../jmx/export/annotation/annotations.xml      |   0
 .../jmx/export/annotation/componentScan.xml    |   0
 .../jmx/export/annotation/lazyAssembling.xml   |   0
 .../jmx/export/annotation/lazyNaming.xml       |   0
 .../export/assembler/interfaceAssembler.xml    |   0
 .../assembler/interfaceAssemblerCustom.xml     |   0
 .../assembler/interfaceAssemblerMapped.xml     |   0
 .../export/assembler/metadata-autodetect.xml   |   0
 .../jmx/export/assembler/metadataAssembler.xml |   0
 .../assembler/methodExclusionAssembler.xml     |   0
 .../methodExclusionAssemblerCombo.xml          |   0
 .../methodExclusionAssemblerMapped.xml         |   0
 .../methodExclusionAssemblerNotMapped.xml      |   0
 .../export/assembler/methodNameAssembler.xml   |   0
 .../assembler/methodNameAssemblerMapped.xml    |   0
 .../export/assembler/reflectiveAssembler.xml   |   0
 .../jmx/export/autodetectLazyMBeans.xml        |   0
 .../jmx/export/autodetectMBeans.xml            |   0
 .../jmx/export/autodetectNoMBeans.xml          |   0
 .../jmx/export/customConfigurer.xml            |   0
 .../jmx/export/excludedBeans.xml               |   0
 .../springframework/jmx/export/lazyInit.xml    |   0
 .../jmx/export/naming/jmx-names.properties     |   0
 .../export/notificationPublisherLazyTests.xml  |   0
 .../jmx/export/notificationPublisherTests.xml  |   0
 .../export/propertyPlaceholderConfigurer.xml   |   0
 .../annotation/taskNamespaceTests.xml          |   0
 .../springframework/scripting/bsh/Broken.bsh   |   0
 .../scripting/bsh/Calculator.bsh               |   0
 .../scripting/bsh/Messenger.bsh                |   0
 .../scripting/bsh/MessengerImpl.bsh            |   0
 .../scripting/bsh/MessengerInstance.bsh        |   0
 .../scripting/bsh/bsh-with-xsd.xml             |   0
 .../scripting/bsh/bshBrokenContext.xml         |   0
 .../scripting/bsh/bshContext.xml               |   0
 .../scripting/bsh/bshRefreshableContext.xml    |   0
 .../springframework/scripting/bsh/simple.bsh   |   0
 .../scripting/groovy/Broken.groovyb            |   0
 .../scripting/groovy/Calculator.groovy         |   0
 .../scripting/groovy/CallCounter.groovy        |   0
 .../groovy/DelegatingCalculator.groovy         |   0
 ...IntegrationTests-groovy-dynamic-context.xml |   0
 ...tegrationTests-groovy-interface-context.xml |   0
 ...Tests-groovy-proxy-target-class-context.xml |   0
 ...oovyAspectIntegrationTests-java-context.xml |   0
 .../scripting/groovy/GroovyServiceImpl.grv     |   0
 .../scripting/groovy/Messenger.groovy          |   0
 .../scripting/groovy/MessengerInstance.groovy  |   0
 .../scripting/groovy/ScriptBean.groovy         |   0
 .../scripting/groovy/TestFactoryBean.groovy    |   0
 .../scripting/groovy/calculators-with-xsd.xml  |   0
 .../scripting/groovy/calculators.xml           |   0
 .../groovy/groovy-multiple-properties.xml      |   0
 .../groovy-with-xsd-proxy-target-class.xml     |   0
 .../scripting/groovy/groovy-with-xsd.xml       |   0
 .../scripting/groovy/groovyBrokenContext.xml   |   0
 .../scripting/groovy/groovyContext.xml         |   0
 .../groovy/groovyRefreshableContext.xml        |   0
 .../jruby-with-xsd-proxy-target-class.xml      |   0
 .../scripting/groovy/lwspBadGroovyContext.xml  |   0
 .../scripting/groovy/simple.groovy             |   0
 .../groovy/twoClassesCorrectOneFirst.xml       |   0
 .../groovy/twoClassesWrongOneFirst.xml         |   0
 ...ptFactoryTests-beanNameAutoProxyCreator.xml |   0
 ...isedJRubyScriptFactoryTests-factoryBean.xml |   0
 .../springframework/scripting/jruby/Broken.rb  |   0
 .../scripting/jruby/Calculator.rb              |   0
 .../scripting/jruby/Messenger.rb               |   0
 .../springframework/scripting/jruby/Printer.rb |   0
 .../scripting/jruby/jruby-aop.xml              |   0
 .../scripting/jruby/jruby-with-xsd.xml         |   0
 .../scripting/jruby/jrubyBrokenContext.xml     |   0
 .../scripting/jruby/jrubyContext.xml           |   0
 .../jruby/jrubyContextForPrimitives.xml        |   0
 .../jruby/jrubyContextForWrappers.xml          |   0
 .../jruby/jrubyRefreshableContext.xml          |   0
 .../scripting/support/groovyReferences.xml     |   0
 .../core/io/PathResourceTests.java             |   9 +++++----
 .../springframework/core/io/example.properties |   0
 .../org/springframework/core/io/example.xml    |   0
 .../spel/generated/SpringExpressions.g         |   0
 .../orm/jpa/META-INF/persistence.xml           |   0
 .../orm/jpa/domain/persistence-context.xml     |   0
 .../orm/jpa/domain/persistence-multi.xml       |   0
 .../orm/jpa/domain/persistence.xml             |   0
 .../jpa/eclipselink/eclipselink-manager.xml    |   0
 .../jpa/hibernate/hibernate-manager-multi.xml  |   0
 .../orm/jpa/hibernate/hibernate-manager.xml    |   0
 .../org/springframework/orm/jpa/inject.xml     |   0
 .../springframework/orm/jpa/insertPerson.sql   |   0
 .../springframework/orm/jpa/jpa-archive.jar    | Bin
 .../org/springframework/orm/jpa/memdb.xml      |   0
 .../springframework/orm/jpa/multi-jpa-emf.xml  |   0
 .../openjpa-manager-aspectj-weaving.xml        |   0
 .../orm/jpa/openjpa/openjpa-manager.xml        |   0
 .../orm/jpa/persistence-complex.xml            |   0
 .../orm/jpa/persistence-example1.xml           |   0
 .../orm/jpa/persistence-example2.xml           |   0
 .../orm/jpa/persistence-example3.xml           |   0
 .../orm/jpa/persistence-example4.xml           |   0
 .../orm/jpa/persistence-example5.xml           |   0
 .../orm/jpa/persistence-example6.xml           |   0
 .../orm/jpa/persistence-exclude-1.0.xml        |   0
 .../orm/jpa/persistence-exclude-2.0.xml        |   0
 .../orm/jpa/persistence-invalid.xml            |   0
 .../orm/jpa/persistence-no-schema.xml          |   0
 ...sAndInheritedLoaderTests-context.properties |   0
 ...ExtendingPropertiesTests-context.properties |   0
 ...rtiesFileTestPropertySourceTests.properties |   0
 ...DetectionTestPropertySourceTests.properties |   0
 ...DetectionTestPropertySourceTests.properties |   0
 ...rtiesFileTestPropertySourceTests.properties |   0
 .../test/context/env/explicit.properties       |   0
 .../test/context/env/extended.properties       |   0
 .../ExpressionUsageTests-context.xml           |   0
 ...ctionGroovySpringContextTestsContext.groovy |   0
 ...ersedesGroovySpringContextTests-context.xml |   0
 ...sedesGroovySpringContextTestsContext.groovy |   0
 .../test/context/groovy/context.groovy         |   0
 .../test/context/groovy/contextA.groovy        |   0
 .../test/context/groovy/contextB.xml           |   0
 ...iptDetectionSqlScriptsTests.methodLevel.sql |   0
 .../DefaultScriptDetectionSqlScriptsTests.sql  |   0
 .../test/context/jdbc/data-add-catbert.sql     |   0
 .../test/context/jdbc/data-add-dogbert.sql     |   0
 ...ata-add-users-with-custom-script-syntax.sql |   0
 .../springframework/test/context/jdbc/data.sql |   0
 .../test/context/jdbc/drop-schema.sql          |   0
 .../test/context/jdbc/schema.sql               |   0
 ...AfterTransactionAnnotationTests-context.xml |   0
 ...lTransactionalSpringRunnerTests-context.xml |   0
 ...ctionalJUnit4SpringContextTests-context.xml |   0
 ...eTransactionalSpringRunnerTests-context.xml |   0
 ...eTransactionalSpringRunnerTests-context.xml |   0
 ...ilingBeforeAndAfterMethodsTests-context.xml |   0
 ...lTransactionalSpringRunnerTests-context.xml |   0
 ...ngJUnit4ClassRunnerAppCtxTests-context1.xml |   0
 ...ngJUnit4ClassRunnerAppCtxTests-context2.xml |   0
 ...ngJUnit4ClassRunnerAppCtxTests-context3.xml |   0
 ...terizedDependencyInjectionTests-context.xml |   0
 ...t4ClassRunnerAppCtxTests-context.properties |   0
 ...eTransactionalSpringRunnerTests-context.xml |   0
 ...eTransactionalSpringRunnerTests-context.xml |   0
 ...ingJUnit4ClassRunnerAppCtxTests-context.xml |   0
 ...tipleInitializersXmlConfigTests-context.xml |   0
 .../HybridContextLoaderTests-context.xml       |   0
 .../HibernateSessionFlushingTests-context.xml  |   0
 .../test/context/junit4/orm/db-schema.sql      |   0
 .../test/context/junit4/orm/db-test-data.sql   |   0
 .../junit4/orm/domain/DriversLicense.hbm.xml   |   0
 .../context/junit4/orm/domain/Person.hbm.xml   |   0
 .../junit4/profile/importresource/import.xml   |   0
 .../DefaultProfileXmlConfigTests-context.xml   |   0
 ...gDefaultLocationsInheritedTests-context.xml |   0
 .../DefaultLocationsBaseTests-context.xml      |   0
 .../DefaultLocationsInheritedTests-context.xml |   0
 .../AutowiredQualifierTests-context.xml        |   0
 .../junit4/spr8849/TestClass1-context.xml      |   0
 .../junit4/spr8849/TestClass2-context.xml      |   0
 .../junit4/spr8849/datasource-config.xml       |   0
 .../context/junit4/spr8849/spr8849-schema.sql  |   0
 .../test/context/junit4/spr9051/schema.sql     |   0
 .../junit4/transactionalTests-context.xml      |   0
 ...ationUtilsTests$BareAnnotations-context.xml |   0
 ...zedGenericXmlContextLoaderTests-context.xml |   0
 ...xistentDefaultLocationsTestCase-context.xml |   0
 ...ctionalTestNGSpringContextTests-context.xml |   0
 ...ctionalTestNGSpringContextTests-context.xml |   0
 ...ilingBeforeAndAfterMethodsTests-context.xml |   0
 ...ctionalTestNGSpringContextTests-context.xml |   0
 .../test/context/testng/data.sql               |   0
 .../test/context/testng/schema.sql             |   0
 .../testng/transaction/ejb/testng-package.xml  |   0
 .../transaction/ejb/testng-test-separate.xml   |   0
 .../transaction/ejb/testng-test-together.xml   |   0
 .../web/BasicGroovyWacTestsContext.groovy      |   0
 .../org/springframework/jca/context/ra.xml     |   0
 ...otationTransactionNamespaceHandlerTests.xml |   0
 ...annotationDrivenConfigurationClassTests.xml |   0
 .../annotationDrivenProxyTargetClassTests.xml  |   0
 .../noTransactionAttributeSource.xml           |   0
 .../interceptor/transactionalBeanFactory.xml   |   0
 .../transaction/txNamespaceHandlerTests.xml    |   0
 .../web/context/ContextLoader.properties       |   0
 .../web/portlet/DispatcherPortlet.properties   |   0
 .../context/WEB-INF/applicationContext.xml     |   0
 .../WEB-INF/context-messages.properties        |   0
 .../WEB-INF/context-messages_en_GB.properties  |   0
 .../WEB-INF/context-messages_en_US.properties  |   0
 .../portlet/context/WEB-INF/contextInclude.xml |   0
 .../portlet/context/WEB-INF/empty-portlet.xml  |   0
 .../WEB-INF/more-context-messages.properties   |   0
 .../context/WEB-INF/myoverride.properties      |   0
 .../context/WEB-INF/myplaceholder.properties   |   0
 .../WEB-INF/resources/messageSource.xml        |   0
 .../context/WEB-INF/resources/themeSource.xml  |   0
 .../portlet/context/WEB-INF/test-portlet.xml   |   0
 .../portlet/context/WEB-INF/test-servlet.xml   |   0
 .../web/portlet/handler/parameterMapping.xml   |   0
 .../web/portlet/handler/portletModeMapping.xml |   0
 .../handler/portletModeParameterMapping.xml    |   0
 .../web/servlet/DispatcherServlet.properties   |   0
 .../web/servlet/view/freemarker/spring.ftl     |   0
 .../web/servlet/view/velocity/spring.vm        |   0
 .../WEB-INF/ContextLoaderTests-acc-context.xml |   0
 .../web/context/WEB-INF/applicationContext.xml |   0
 .../web/context/WEB-INF/context-addition.xml   |   0
 .../WEB-INF/context-messages.properties        |   0
 .../WEB-INF/context-messages_en_GB.properties  |   0
 .../WEB-INF/context-messages_en_US.properties  |   0
 .../web/context/WEB-INF/contextInclude.xml     |   0
 .../web/context/WEB-INF/empty-context.xml      |   0
 .../web/context/WEB-INF/fail.xml               |   0
 .../WEB-INF/more-context-messages.properties   |   0
 .../web/context/WEB-INF/myoverride.properties  |   0
 .../context/WEB-INF/myplaceholder.properties   |   0
 .../WEB-INF/resources/messageSource.xml        |   0
 .../context/WEB-INF/resources/themeSource.xml  |   0
 .../context/WEB-INF/test-messages.properties   |   0
 .../web/context/WEB-INF/test-servlet.xml       |   0
 .../web/context/WEB-INF/test-theme.properties  |   0
 .../web/context/WEB-INF/testNamespace.xml      |   0
 .../web/context/WEB-INF/theme.properties       |   0
 .../web/context/WEB-INF/theme_en_GB.properties |   0
 .../web/context/WEB-INF/theme_en_US.properties |   0
 .../web/context/WEB-INF/web.xml                |   0
 .../org/springframework/web/context/beans1.xml |   0
 .../org/springframework/web/context/ref1.xml   |   0
 .../web/servlet/view/document/template.xls     | Bin
 .../web/servlet/view/document/template_de.xls  | Bin
 .../servlet/view/document/template_en_US.xls   | Bin
 .../web/servlet/view/freemarker/test.ftl       |   0
 .../servlet/view/jasperreports/view.properties |   0
 .../web/servlet/view/testviews.properties      |   0
 .../web/servlet/view/testviews_en.properties   |   0
 .../web/servlet/view/testviews_fr.properties   |   0
 .../web/servlet/view/velocity/error.vm         |   0
 .../web/servlet/view/velocity/ioerror.vm       |   0
 .../web/servlet/view/velocity/simple.vm        |   0
 .../web/servlet/view/velocity/test-spr5172.vm  |   0
 .../web/servlet/view/velocity/test.vm          |   0
 .../web/servlet/view/velocity/toolbox.xml      |   0
 .../springframework/web/servlet/view/views.xml |   0
 ...aceHandlerScopeIntegrationTests-context.xml |   0
 ...utoProxyCreatorIntegrationTests-context.xml |   0
 .../ltw/ComponentScanningWithLTWTests.xml      |   0
 ...EnvironmentIntegrationTests-context-dev.xml |   0
 ...nvironmentIntegrationTests-context-prod.xml |   0
 .../EnvironmentIntegrationTests-context.xml    |   0
 545 files changed, 5 insertions(+), 21 deletions(-)
 rename spring-aop/src/test/{java => resources}/org/springframework/aop/config/AopNamespaceHandlerEventTests-context.xml (100%)
 rename spring-aop/src/test/{java => resources}/org/springframework/aop/config/AopNamespaceHandlerEventTests-directPointcutEvents.xml (100%)
 rename spring-aop/src/test/{java => resources}/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutEvents.xml (100%)
 rename spring-aop/src/test/{java => resources}/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutRefEvents.xml (100%)
 rename spring-aop/src/test/{java => resources}/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutDuplication.xml (100%)
 rename spring-aop/src/test/{java => resources}/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutMissing.xml (100%)
 rename spring-aop/src/test/{java => resources}/org/springframework/aop/config/TopLevelAopTagTests-context.xml (100%)
 rename spring-aop/src/test/{java => resources}/org/springframework/aop/framework/PrototypeTargetTests-context.xml (100%)
 rename spring-aop/src/test/{java => resources}/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests-context.xml (100%)
 rename spring-aop/src/test/{java => resources}/org/springframework/aop/scope/ScopedProxyAutowireTests-scopedAutowireFalse.xml (100%)
 rename spring-aop/src/test/{java => resources}/org/springframework/aop/scope/ScopedProxyAutowireTests-scopedAutowireTrue.xml (100%)
 rename spring-aop/src/test/{java => resources}/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests-context.xml (100%)
 rename spring-aop/src/test/{java => resources}/org/springframework/aop/target/CommonsPool2TargetSourceProxyTests-context.xml (100%)
 rename spring-aop/src/test/{java => resources}/org/springframework/aop/target/CommonsPoolTargetSourceProxyTests-context.xml (100%)
 rename spring-aop/src/test/{java => resources}/org/springframework/aop/target/HotSwappableTargetSourceTests-context.xml (100%)
 rename spring-aop/src/test/{java => resources}/org/springframework/aop/target/LazyInitTargetSourceTests-customTarget.xml (100%)
 rename spring-aop/src/test/{java => resources}/org/springframework/aop/target/LazyInitTargetSourceTests-factoryBean.xml (100%)
 rename spring-aop/src/test/{java => resources}/org/springframework/aop/target/LazyInitTargetSourceTests-singleton.xml (100%)
 rename spring-aop/src/test/{java => resources}/org/springframework/aop/target/PrototypeTargetSourceTests-context.xml (100%)
 rename spring-aop/src/test/{java => resources}/org/springframework/aop/target/ThreadLocalTargetSourceTests-context.xml (100%)
 rename spring-aspects/src/test/{java => resources}/org/springframework/aop/aspectj/autoproxy/ajcAutoproxyTests.xml (100%)
 rename spring-aspects/src/test/{java => resources}/org/springframework/beans/factory/aspectj/beanConfigurerTests-beans.xml (100%)
 rename spring-aspects/src/test/{java => resources}/org/springframework/beans/factory/aspectj/beanConfigurerTests.xml (100%)
 rename spring-aspects/src/test/{java => resources}/org/springframework/beans/factory/aspectj/springConfigured.xml (100%)
 rename spring-aspects/src/test/{java => resources}/org/springframework/cache/config/annotation-cache-aspectj.xml (100%)
 rename spring-aspects/src/test/{java => resources}/org/springframework/cache/config/annotation-jcache-aspectj.xml (100%)
 rename spring-aspects/src/test/{java => resources}/org/springframework/scheduling/aspectj/annotationDrivenContext.xml (100%)
 rename spring-aspects/src/test/{java => resources}/org/springframework/transaction/aspectj/TransactionAspectTests-context.xml (100%)
 rename spring-beans/src/test/{java => resources}/org/springframework/beans/factory/BeanFactoryUtilsTests-dependentBeans.xml (100%)
 rename spring-beans/src/test/{java => resources}/org/springframework/beans/factory/BeanFactoryUtilsTests-leaf.xml (100%)
 rename spring-beans/src/test/{java => resources}/org/springframework/beans/factory/BeanFactoryUtilsTests-middle.xml (100%)
 rename spring-beans/src/test/{java => resources}/org/springframework/beans/factory/BeanFactoryUtilsTests-root.xml (100%)
 rename spring-beans/src/test/{java => resources}/org/springframework/beans/factory/ConcurrentBeanFactoryTests-context.xml (100%)
 rename spring-beans/src/test/{java => resources}/org/springframework/beans/factory/FactoryBeanLookupTests-context.xml (100%)
 rename spring-beans/src/test/{java => resources}/org/springframework/beans/factory/FactoryBeanTests-abstract.xml (100%)
 rename spring-beans/src/test/{java => resources}/org/springframework/beans/factory/FactoryBeanTests-circular.xml (100%)
 rename spring-beans/src/test/{java => resources}/org/springframework/beans/factory/FactoryBeanTests-returnsNull.xml (100%)
 rename spring-beans/src/test/{java => resources}/org/springframework/beans/factory/FactoryBeanTests-withAutowiring.xml (100%)
 rename spring-beans/src/test/{java => resources}/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-beans1.xml (100%)
 rename spring-beans/src/test/{java => resources}/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-beans2.xml (100%)
 rename spring-beans/src/test/{java => resources}/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests-ref1.xml (100%)
 rename spring-beans/src/test/{java => resources}/org/springframework/beans/factory/access/beans1.xml (100%)
 rename spring-beans/src/test/{java => resources}/org/springframework/beans/factory/access/beans2.xml (100%)
 rename spring-beans/src/test/{java => resources}/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests-context.xml (100%)
 rename spring-beans/src/test/{java => resources}/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests-context.xml (100%)
 rename spring-beans/src/test/{java => resources}/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests-context.xml (100%)
 rename spring-beans/src/test/{java => resources}/org/springframework/beans/factory/config/PropertiesFactoryBeanTests-test.properties (100%)
 rename spring-beans/src/test/{java => resources}/org/springframework/beans/factory/config/PropertiesFactoryBeanTests-test.properties.xml (100%)
 rename spring-beans/src/test/{java => resources}/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests-context.xml (100%)
 rename spring-beans/src/test/{java => resources}/org/springframework/beans/factory/config/PropertyPlaceholderConfigurerTests.properties (100%)
 rename spring-beans/src/test/{java => resources}/org/springframework/beans/factory/config/PropertyResourceConfigurerTests-test.properties (100%)
 rename spring-beans/src/test/{java => resources}/org/springframework/beans/factory/config/PropertyResourceConfigurerTests-test.properties.xml (100%)
 rename spring-beans/src/test/{java => resources}/org/springframework/beans/factory/config/SimpleScopeTests-context.xml (100%)
 rename spring-beans/src/test/{java => resources}/org/springframework/beans/factory/parsing/CustomProblemReporterTests-context.xml (100%)
 rename spring-beans/src/test/{java => resources}/org/springframework/beans/factory/support/genericBeanTests.xml (100%)
 rename spring-beans/src/test/{java => resources}/org/springframework/beans/factory/support/lookupMethodTests.xml (100%)
 rename spring-beans/src/test/{java => resources}/org/springframework/beans/factory/support/security/callbacks.xml (100%)
 rename spring-beans/src/test/{java => resources}/org/springframework/beans/factory/support/security/policy.all (100%)
 rename spring-beans/src/test/{java => resources}/org/springframework/beans/factory/xml/DuplicateBeanIdTests-multiLevel-context.xml (100%)
 rename spring-beans/src/test/{java => resources}/org/springframework/beans/factory/xml/DuplicateBeanIdTests-sameLevel-context.xml (100%)
 rename spring-beans/src/test/{java => resources}/org/springframework/beans/propertyeditors/ResourceBundleEditorTests.properties (100%)
 rename spring-beans/src/test/{java => resources}/org/springframework/beans/propertyeditors/ResourceBundleEditorTestsLangCountryDialect_en_GB_GLASGOW.properties (100%)
 rename spring-beans/src/test/{java => resources}/org/springframework/beans/propertyeditors/ResourceBundleEditorTestsLangCountry_en_GB.properties (100%)
 rename spring-beans/src/test/{java => resources}/org/springframework/beans/propertyeditors/ResourceBundleEditorTestsLang_en.properties (100%)
 rename spring-context-support/src/main/{java => resources}/org/springframework/mail/javamail/mime.types (100%)
 rename spring-context/src/main/{java => resources}/org/springframework/remoting/rmi/RmiInvocationWrapperRTD.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/AfterAdviceBindingTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/AroundAdviceBindingTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/AroundAdviceCircularTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/BeanNamePointcutTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/BeforeAdviceBindingTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/DeclareParentsTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/OverloadedAdviceTests-ambiguous.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/OverloadedAdviceTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/ProceedTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/PropertyDependentAspectTests-after.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-after.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-before.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/PropertyDependentAspectTests-before.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/TargetPointcutSelectionTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/autoproxy/AnnotationBindingTests-context.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests-context.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests-context.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorAndLazyInitTargetSourceTests-context.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspects.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsPlusAdvisor.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithAbstractBean.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithCGLIB.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithOrdering.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-pertarget.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-perthis.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-retryAspect.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-twoAdviceAspect.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-twoAdviceAspectPrototype.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-usesInclude.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-usesJoinPointAspect.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/autoproxy/AtAspectJAfterThrowingTests-context.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests-context.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests-aspectj.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests-springAop.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/generic/AfterReturningGenericTypeMatchingTests-context.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingClassProxyTests-context.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingTests-context.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests-context.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests-error.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests-ok.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-error.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-ok.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/config/AopNamespaceHandlerProxyTargetClassTests-context.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/config/AopNamespaceHandlerReturningTests-error.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/config/AopNamespaceHandlerReturningTests-ok.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/config/AopNamespaceHandlerTests-context.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/config/AopNamespaceHandlerThrowingTests-error.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/config/AopNamespaceHandlerThrowingTests-ok.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/config/PrototypeProxyTests-context.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/framework/CglibProxyTests-with-dependency-checking.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/framework/ObjenesisProxyTests-context.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/framework/ProxyFactoryBeanTests-autowiring.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/framework/ProxyFactoryBeanTests-context.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/framework/ProxyFactoryBeanTests-double-targetsource.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/framework/ProxyFactoryBeanTests-frozen.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/framework/ProxyFactoryBeanTests-inner-bean-target.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/framework/ProxyFactoryBeanTests-invalid.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/framework/ProxyFactoryBeanTests-notlast-targetsource.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/framework/ProxyFactoryBeanTests-prototype.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/framework/ProxyFactoryBeanTests-serialization.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/framework/ProxyFactoryBeanTests-targetsource.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/framework/ProxyFactoryBeanTests-throws-advice.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-with-bpp.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-without-bpp.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-common-interceptors.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-custom-targetsource.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-optimized.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-quick-targetsource.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests-context.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests-context.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/scope/ScopedProxyTests-list.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/scope/ScopedProxyTests-map.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/scope/ScopedProxyTests-override.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/scope/ScopedProxyTests-testbean.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/aop/target/CommonsPool2TargetSourceTests-context.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests-context.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/QualifierAnnotationTests-context.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/XmlBeanFactoryTests-autowire.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/XmlBeanFactoryTests-child.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/XmlBeanFactoryTests-classNotFound.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/XmlBeanFactoryTests-collections.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/XmlBeanFactoryTests-complexFactoryCircle.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorArg.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorOverrides.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultAutowire.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultLazyInit.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/XmlBeanFactoryTests-delegationOverrides.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCarg.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCargAutowire.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCargInner.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depDependsOn.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depDependsOnInner.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depMaterializeThis.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depProp.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropAutowireByName.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropAutowireByType.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropInTheMiddle.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropInner.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/XmlBeanFactoryTests-factoryCircle.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/XmlBeanFactoryTests-initializers.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalid.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalidOverridesNoSuchMethod.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/XmlBeanFactoryTests-localCollectionsUsingXsd.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/XmlBeanFactoryTests-noSuchFactoryMethod.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/XmlBeanFactoryTests-overrides.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/XmlBeanFactoryTests-parent.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/XmlBeanFactoryTests-recursiveImport.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/XmlBeanFactoryTests-reftypes.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resource.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resourceImport.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedAllDepCheck.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedObjectDepCheck.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedSimpleDepCheck.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNameInAlias.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNames.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingObjects.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingSimple.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedObjectDepCheck.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedSimpleDepCheck.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests-context.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.properties (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.xsd (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/beans/factory/xml/test.properties (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-collections.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-parent.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests-context.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/DestroyMethodInferenceTests-context.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/EnableLoadTimeWeavingTests-context.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/Spr6602Tests-context.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/aspectjTypeFilterTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/aspectjTypeFilterTestsWithPlaceholders.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/componentScanRespectsProfileAnnotationTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/componentScanWithAutowiredQualifierTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/configuration/AutowiredConfigurationTests-custom.properties (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/configuration/AutowiredConfigurationTests-custom.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/configuration/ImportNonXmlResourceConfig-context.properties (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/configuration/ImportXmlConfig-context.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/configuration/ImportXmlWithAopNamespace-context.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/configuration/ImportXmlWithConfigurationClass-context.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/configuration/SecondLevelSubConfig-context.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/configuration/ValueInjectionTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/configuration/annotation-config.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/configuration/aspectj-autoproxy-config.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/customAnnotationUsedForBothComponentScanAndQualifierTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/customNameGeneratorTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/customScopeResolverTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/customTypeFilterTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/defaultAutowireByNameTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/defaultAutowireByTypeTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/defaultAutowireConstructorTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/defaultAutowireNoTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/defaultDependencyCheckAllTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/defaultDependencyCheckObjectsWithAutowireByNameTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/defaultInitAndDestroyMethodsTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/defaultLazyInitFalseTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/defaultLazyInitTrueTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/defaultNonExistingInitAndDestroyMethodsTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/defaultWithNoOverridesTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/doubleScanTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/invalidClassNameScopeResolverTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/invalidConstructorNameGeneratorTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/matchingResourcePatternTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/nonMatchingResourcePatternTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/p1.properties (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/p2.properties (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/p3.properties (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/p4.properties (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/scopedProxyDefaultTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/scopedProxyInterfacesTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/scopedProxyInvalidConfigTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/scopedProxyNoTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/scopedProxyTargetClassTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/simpleConfigTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/simpleScanTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/annotation/spr10546/importedResource.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/groovy/applicationContext-error.groovy (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/groovy/applicationContext.groovy (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/groovy/applicationContext2.groovy (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/groovy/test.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/support/ClassPathXmlApplicationContextTests-resource.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/support/ClassPathXmlApplicationContextTests-resourceImport.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/support/GenericXmlApplicationContextTests-context.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.properties (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/support/aliasForParent.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/support/aliasThatOverridesParent.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/support/childWithProxy.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/support/classWithPlaceholder.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/support/conversionService.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/support/conversionServiceWithResourceOverriding.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/support/invalidClass.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/support/invalidValueType.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/support/lifecycleTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/support/messages.properties (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/support/messages_de.properties (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/support/messages_de_AT.properties (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/support/messages_de_AT_oo.properties (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/support/messages_de_DE.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/support/more-messages.properties (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/support/override.properties (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/support/placeholder.properties (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/support/simpleContext.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/support/spr7283.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/support/spr7816.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/support/test.properties (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/support/test/aliased-contextC.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/support/test/contextA.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/support/test/contextB.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/support/test/contextC.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/support/test/import1.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/support/test/subtest/import2.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/context/support/testBeans.properties (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/ejb/config/jeeNamespaceHandlerTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/instrument/classloading/testResource.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/jmx/applicationContext.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/jmx/export/annotation/annotations.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/jmx/export/annotation/componentScan.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/jmx/export/annotation/lazyAssembling.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/jmx/export/annotation/lazyNaming.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/jmx/export/assembler/interfaceAssembler.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/jmx/export/assembler/interfaceAssemblerCustom.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/jmx/export/assembler/interfaceAssemblerMapped.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/jmx/export/assembler/metadata-autodetect.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/jmx/export/assembler/metadataAssembler.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/jmx/export/assembler/methodExclusionAssembler.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/jmx/export/assembler/methodExclusionAssemblerCombo.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/jmx/export/assembler/methodExclusionAssemblerMapped.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/jmx/export/assembler/methodExclusionAssemblerNotMapped.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/jmx/export/assembler/methodNameAssembler.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/jmx/export/assembler/methodNameAssemblerMapped.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/jmx/export/assembler/reflectiveAssembler.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/jmx/export/autodetectLazyMBeans.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/jmx/export/autodetectMBeans.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/jmx/export/autodetectNoMBeans.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/jmx/export/customConfigurer.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/jmx/export/excludedBeans.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/jmx/export/lazyInit.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/jmx/export/naming/jmx-names.properties (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/jmx/export/notificationPublisherLazyTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/jmx/export/notificationPublisherTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/jmx/export/propertyPlaceholderConfigurer.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scheduling/annotation/taskNamespaceTests.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/bsh/Broken.bsh (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/bsh/Calculator.bsh (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/bsh/Messenger.bsh (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/bsh/MessengerImpl.bsh (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/bsh/MessengerInstance.bsh (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/bsh/bsh-with-xsd.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/bsh/bshBrokenContext.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/bsh/bshContext.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/bsh/bshRefreshableContext.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/bsh/simple.bsh (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/groovy/Broken.groovyb (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/groovy/Calculator.groovy (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/groovy/CallCounter.groovy (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/groovy/DelegatingCalculator.groovy (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-groovy-dynamic-context.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-groovy-interface-context.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-groovy-proxy-target-class-context.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/groovy/GroovyAspectIntegrationTests-java-context.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/groovy/GroovyServiceImpl.grv (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/groovy/Messenger.groovy (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/groovy/MessengerInstance.groovy (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/groovy/ScriptBean.groovy (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/groovy/TestFactoryBean.groovy (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/groovy/calculators-with-xsd.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/groovy/calculators.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/groovy/groovy-multiple-properties.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/groovy/groovy-with-xsd-proxy-target-class.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/groovy/groovy-with-xsd.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/groovy/groovyBrokenContext.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/groovy/groovyContext.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/groovy/groovyRefreshableContext.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/groovy/jruby-with-xsd-proxy-target-class.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/groovy/lwspBadGroovyContext.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/groovy/simple.groovy (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/groovy/twoClassesCorrectOneFirst.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/groovy/twoClassesWrongOneFirst.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests-beanNameAutoProxyCreator.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests-factoryBean.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/jruby/Broken.rb (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/jruby/Calculator.rb (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/jruby/Messenger.rb (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/jruby/Printer.rb (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/jruby/jruby-aop.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/jruby/jruby-with-xsd.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/jruby/jrubyBrokenContext.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/jruby/jrubyContext.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/jruby/jrubyContextForPrimitives.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/jruby/jrubyContextForWrappers.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/jruby/jrubyRefreshableContext.xml (100%)
 rename spring-context/src/test/{java => resources}/org/springframework/scripting/support/groovyReferences.xml (100%)
 rename spring-core/src/test/{java => resources}/org/springframework/core/io/example.properties (100%)
 rename spring-core/src/test/{java => resources}/org/springframework/core/io/example.xml (100%)
 rename spring-expression/src/main/{java => resources}/org/springframework/expression/spel/generated/SpringExpressions.g (100%)
 rename spring-orm/src/test/{java => resources}/org/springframework/orm/jpa/META-INF/persistence.xml (100%)
 rename spring-orm/src/test/{java => resources}/org/springframework/orm/jpa/domain/persistence-context.xml (100%)
 rename spring-orm/src/test/{java => resources}/org/springframework/orm/jpa/domain/persistence-multi.xml (100%)
 rename spring-orm/src/test/{java => resources}/org/springframework/orm/jpa/domain/persistence.xml (100%)
 rename spring-orm/src/test/{java => resources}/org/springframework/orm/jpa/eclipselink/eclipselink-manager.xml (100%)
 rename spring-orm/src/test/{java => resources}/org/springframework/orm/jpa/hibernate/hibernate-manager-multi.xml (100%)
 rename spring-orm/src/test/{java => resources}/org/springframework/orm/jpa/hibernate/hibernate-manager.xml (100%)
 rename spring-orm/src/test/{java => resources}/org/springframework/orm/jpa/inject.xml (100%)
 rename spring-orm/src/test/{java => resources}/org/springframework/orm/jpa/insertPerson.sql (100%)
 rename spring-orm/src/test/{java => resources}/org/springframework/orm/jpa/jpa-archive.jar (100%)
 rename spring-orm/src/test/{java => resources}/org/springframework/orm/jpa/memdb.xml (100%)
 rename spring-orm/src/test/{java => resources}/org/springframework/orm/jpa/multi-jpa-emf.xml (100%)
 rename spring-orm/src/test/{java => resources}/org/springframework/orm/jpa/openjpa/openjpa-manager-aspectj-weaving.xml (100%)
 rename spring-orm/src/test/{java => resources}/org/springframework/orm/jpa/openjpa/openjpa-manager.xml (100%)
 rename spring-orm/src/test/{java => resources}/org/springframework/orm/jpa/persistence-complex.xml (100%)
 rename spring-orm/src/test/{java => resources}/org/springframework/orm/jpa/persistence-example1.xml (100%)
 rename spring-orm/src/test/{java => resources}/org/springframework/orm/jpa/persistence-example2.xml (100%)
 rename spring-orm/src/test/{java => resources}/org/springframework/orm/jpa/persistence-example3.xml (100%)
 rename spring-orm/src/test/{java => resources}/org/springframework/orm/jpa/persistence-example4.xml (100%)
 rename spring-orm/src/test/{java => resources}/org/springframework/orm/jpa/persistence-example5.xml (100%)
 rename spring-orm/src/test/{java => resources}/org/springframework/orm/jpa/persistence-example6.xml (100%)
 rename spring-orm/src/test/{java => resources}/org/springframework/orm/jpa/persistence-exclude-1.0.xml (100%)
 rename spring-orm/src/test/{java => resources}/org/springframework/orm/jpa/persistence-exclude-2.0.xml (100%)
 rename spring-orm/src/test/{java => resources}/org/springframework/orm/jpa/persistence-invalid.xml (100%)
 rename spring-orm/src/test/{java => resources}/org/springframework/orm/jpa/persistence-no-schema.xml (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests-context.properties (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesTests-context.properties (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/env/ApplicationPropertyOverridePropertiesFileTestPropertySourceTests.properties (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/env/DefaultPropertiesFileDetectionTestPropertySourceTests.properties (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/env/ExtendedDefaultPropertiesFileDetectionTestPropertySourceTests.properties (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/env/SystemPropertyOverridePropertiesFileTestPropertySourceTests.properties (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/env/explicit.properties (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/env/extended.properties (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/expression/ExpressionUsageTests-context.xml (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/groovy/DefaultScriptDetectionGroovySpringContextTestsContext.groovy (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/groovy/DefaultScriptDetectionXmlSupersedesGroovySpringContextTests-context.xml (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/groovy/DefaultScriptDetectionXmlSupersedesGroovySpringContextTestsContext.groovy (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/groovy/context.groovy (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/groovy/contextA.groovy (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/groovy/contextB.xml (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/jdbc/DefaultScriptDetectionSqlScriptsTests.methodLevel.sql (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/jdbc/DefaultScriptDetectionSqlScriptsTests.sql (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/jdbc/data-add-catbert.sql (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/jdbc/data-add-dogbert.sql (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/jdbc/data-add-users-with-custom-script-syntax.sql (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/jdbc/data.sql (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/jdbc/drop-schema.sql (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/jdbc/schema.sql (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/junit4/BeforeAndAfterTransactionAnnotationTests-context.xml (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests-context.xml (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests-context.xml (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/junit4/DefaultRollbackFalseTransactionalSpringRunnerTests-context.xml (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/junit4/DefaultRollbackTrueTransactionalSpringRunnerTests-context.xml (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests-context.xml (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests-context.xml (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context1.xml (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context2.xml (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context3.xml (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/junit4/ParameterizedDependencyInjectionTests-context.xml (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests-context.properties (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackFalseTransactionalSpringRunnerTests-context.xml (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests-context.xml (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests-context.xml (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/junit4/aci/xml/MultipleInitializersXmlConfigTests-context.xml (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/junit4/hybrid/HybridContextLoaderTests-context.xml (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/junit4/orm/HibernateSessionFlushingTests-context.xml (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/junit4/orm/db-schema.sql (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/junit4/orm/db-test-data.sql (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/junit4/orm/domain/DriversLicense.hbm.xml (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/junit4/orm/domain/Person.hbm.xml (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/junit4/profile/importresource/import.xml (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/junit4/profile/xml/DefaultProfileXmlConfigTests-context.xml (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/junit4/spr3896/BeanOverridingDefaultLocationsInheritedTests-context.xml (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/junit4/spr3896/DefaultLocationsBaseTests-context.xml (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/junit4/spr3896/DefaultLocationsInheritedTests-context.xml (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/junit4/spr6128/AutowiredQualifierTests-context.xml (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/junit4/spr8849/TestClass1-context.xml (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/junit4/spr8849/TestClass2-context.xml (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/junit4/spr8849/datasource-config.xml (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/junit4/spr8849/spr8849-schema.sql (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/junit4/spr9051/schema.sql (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/junit4/transactionalTests-context.xml (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/support/AbstractContextConfigurationUtilsTests$BareAnnotations-context.xml (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests-context.xml (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/support/GenericXmlContextLoaderResourceLocationsTests$1ClasspathExistentDefaultLocationsTestCase-context.xml (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests-context.xml (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests-context.xml (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests-context.xml (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/testng/TimedTransactionalTestNGSpringContextTests-context.xml (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/testng/data.sql (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/testng/schema.sql (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/testng/transaction/ejb/testng-package.xml (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/testng/transaction/ejb/testng-test-separate.xml (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/testng/transaction/ejb/testng-test-together.xml (100%)
 rename spring-test/src/test/{java => resources}/org/springframework/test/context/web/BasicGroovyWacTestsContext.groovy (100%)
 rename spring-tx/src/main/{java => resources}/org/springframework/jca/context/ra.xml (100%)
 rename spring-tx/src/test/{java => resources}/org/springframework/transaction/annotation/annotationTransactionNamespaceHandlerTests.xml (100%)
 rename spring-tx/src/test/{java => resources}/org/springframework/transaction/config/annotationDrivenConfigurationClassTests.xml (100%)
 rename spring-tx/src/test/{java => resources}/org/springframework/transaction/config/annotationDrivenProxyTargetClassTests.xml (100%)
 rename spring-tx/src/test/{java => resources}/org/springframework/transaction/interceptor/noTransactionAttributeSource.xml (100%)
 rename spring-tx/src/test/{java => resources}/org/springframework/transaction/interceptor/transactionalBeanFactory.xml (100%)
 rename spring-tx/src/test/{java => resources}/org/springframework/transaction/txNamespaceHandlerTests.xml (100%)
 rename spring-web/src/main/{java => resources}/org/springframework/web/context/ContextLoader.properties (100%)
 rename spring-webmvc-portlet/src/main/{java => resources}/org/springframework/web/portlet/DispatcherPortlet.properties (100%)
 rename spring-webmvc-portlet/src/test/{java => resources}/org/springframework/web/portlet/context/WEB-INF/applicationContext.xml (100%)
 rename spring-webmvc-portlet/src/test/{java => resources}/org/springframework/web/portlet/context/WEB-INF/context-messages.properties (100%)
 rename spring-webmvc-portlet/src/test/{java => resources}/org/springframework/web/portlet/context/WEB-INF/context-messages_en_GB.properties (100%)
 rename spring-webmvc-portlet/src/test/{java => resources}/org/springframework/web/portlet/context/WEB-INF/context-messages_en_US.properties (100%)
 rename spring-webmvc-portlet/src/test/{java => resources}/org/springframework/web/portlet/context/WEB-INF/contextInclude.xml (100%)
 rename spring-webmvc-portlet/src/test/{java => resources}/org/springframework/web/portlet/context/WEB-INF/empty-portlet.xml (100%)
 rename spring-webmvc-portlet/src/test/{java => resources}/org/springframework/web/portlet/context/WEB-INF/more-context-messages.properties (100%)
 rename spring-webmvc-portlet/src/test/{java => resources}/org/springframework/web/portlet/context/WEB-INF/myoverride.properties (100%)
 rename spring-webmvc-portlet/src/test/{java => resources}/org/springframework/web/portlet/context/WEB-INF/myplaceholder.properties (100%)
 rename spring-webmvc-portlet/src/test/{java => resources}/org/springframework/web/portlet/context/WEB-INF/resources/messageSource.xml (100%)
 rename spring-webmvc-portlet/src/test/{java => resources}/org/springframework/web/portlet/context/WEB-INF/resources/themeSource.xml (100%)
 rename spring-webmvc-portlet/src/test/{java => resources}/org/springframework/web/portlet/context/WEB-INF/test-portlet.xml (100%)
 rename spring-webmvc-portlet/src/test/{java => resources}/org/springframework/web/portlet/context/WEB-INF/test-servlet.xml (100%)
 rename spring-webmvc-portlet/src/test/{java => resources}/org/springframework/web/portlet/handler/parameterMapping.xml (100%)
 rename spring-webmvc-portlet/src/test/{java => resources}/org/springframework/web/portlet/handler/portletModeMapping.xml (100%)
 rename spring-webmvc-portlet/src/test/{java => resources}/org/springframework/web/portlet/handler/portletModeParameterMapping.xml (100%)
 rename spring-webmvc/src/main/{java => resources}/org/springframework/web/servlet/DispatcherServlet.properties (100%)
 rename spring-webmvc/src/main/{java => resources}/org/springframework/web/servlet/view/freemarker/spring.ftl (100%)
 rename spring-webmvc/src/main/{java => resources}/org/springframework/web/servlet/view/velocity/spring.vm (100%)
 rename spring-webmvc/src/test/{java => resources}/org/springframework/web/context/WEB-INF/ContextLoaderTests-acc-context.xml (100%)
 rename spring-webmvc/src/test/{java => resources}/org/springframework/web/context/WEB-INF/applicationContext.xml (100%)
 rename spring-webmvc/src/test/{java => resources}/org/springframework/web/context/WEB-INF/context-addition.xml (100%)
 rename spring-webmvc/src/test/{java => resources}/org/springframework/web/context/WEB-INF/context-messages.properties (100%)
 rename spring-webmvc/src/test/{java => resources}/org/springframework/web/context/WEB-INF/context-messages_en_GB.properties (100%)
 rename spring-webmvc/src/test/{java => resources}/org/springframework/web/context/WEB-INF/context-messages_en_US.properties (100%)
 rename spring-webmvc/src/test/{java => resources}/org/springframework/web/context/WEB-INF/contextInclude.xml (100%)
 rename spring-webmvc/src/test/{java => resources}/org/springframework/web/context/WEB-INF/empty-context.xml (100%)
 rename spring-webmvc/src/test/{java => resources}/org/springframework/web/context/WEB-INF/fail.xml (100%)
 rename spring-webmvc/src/test/{java => resources}/org/springframework/web/context/WEB-INF/more-context-messages.properties (100%)
 rename spring-webmvc/src/test/{java => resources}/org/springframework/web/context/WEB-INF/myoverride.properties (100%)
 rename spring-webmvc/src/test/{java => resources}/org/springframework/web/context/WEB-INF/myplaceholder.properties (100%)
 rename spring-webmvc/src/test/{java => resources}/org/springframework/web/context/WEB-INF/resources/messageSource.xml (100%)
 rename spring-webmvc/src/test/{java => resources}/org/springframework/web/context/WEB-INF/resources/themeSource.xml (100%)
 rename spring-webmvc/src/test/{java => resources}/org/springframework/web/context/WEB-INF/test-messages.properties (100%)
 rename spring-webmvc/src/test/{java => resources}/org/springframework/web/context/WEB-INF/test-servlet.xml (100%)
 rename spring-webmvc/src/test/{java => resources}/org/springframework/web/context/WEB-INF/test-theme.properties (100%)
 rename spring-webmvc/src/test/{java => resources}/org/springframework/web/context/WEB-INF/testNamespace.xml (100%)
 rename spring-webmvc/src/test/{java => resources}/org/springframework/web/context/WEB-INF/theme.properties (100%)
 rename spring-webmvc/src/test/{java => resources}/org/springframework/web/context/WEB-INF/theme_en_GB.properties (100%)
 rename spring-webmvc/src/test/{java => resources}/org/springframework/web/context/WEB-INF/theme_en_US.properties (100%)
 rename spring-webmvc/src/test/{java => resources}/org/springframework/web/context/WEB-INF/web.xml (100%)
 rename spring-webmvc/src/test/{java => resources}/org/springframework/web/context/beans1.xml (100%)
 rename spring-webmvc/src/test/{java => resources}/org/springframework/web/context/ref1.xml (100%)
 rename spring-webmvc/src/test/{java => resources}/org/springframework/web/servlet/view/document/template.xls (100%)
 rename spring-webmvc/src/test/{java => resources}/org/springframework/web/servlet/view/document/template_de.xls (100%)
 rename spring-webmvc/src/test/{java => resources}/org/springframework/web/servlet/view/document/template_en_US.xls (100%)
 rename spring-webmvc/src/test/{java => resources}/org/springframework/web/servlet/view/freemarker/test.ftl (100%)
 rename spring-webmvc/src/test/{java => resources}/org/springframework/web/servlet/view/jasperreports/view.properties (100%)
 rename spring-webmvc/src/test/{java => resources}/org/springframework/web/servlet/view/testviews.properties (100%)
 rename spring-webmvc/src/test/{java => resources}/org/springframework/web/servlet/view/testviews_en.properties (100%)
 rename spring-webmvc/src/test/{java => resources}/org/springframework/web/servlet/view/testviews_fr.properties (100%)
 rename spring-webmvc/src/test/{java => resources}/org/springframework/web/servlet/view/velocity/error.vm (100%)
 rename spring-webmvc/src/test/{java => resources}/org/springframework/web/servlet/view/velocity/ioerror.vm (100%)
 rename spring-webmvc/src/test/{java => resources}/org/springframework/web/servlet/view/velocity/simple.vm (100%)
 rename spring-webmvc/src/test/{java => resources}/org/springframework/web/servlet/view/velocity/test-spr5172.vm (100%)
 rename spring-webmvc/src/test/{java => resources}/org/springframework/web/servlet/view/velocity/test.vm (100%)
 rename spring-webmvc/src/test/{java => resources}/org/springframework/web/servlet/view/velocity/toolbox.xml (100%)
 rename spring-webmvc/src/test/{java => resources}/org/springframework/web/servlet/view/views.xml (100%)
 rename src/test/{java => resources}/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests-context.xml (100%)
 rename src/test/{java => resources}/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests-context.xml (100%)
 rename src/test/{java => resources}/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.xml (100%)
 rename src/test/{java => resources}/org/springframework/core/env/EnvironmentIntegrationTests-context-dev.xml (100%)
 rename src/test/{java => resources}/org/springframework/core/env/EnvironmentIntegrationTests-context-prod.xml (100%)
 rename src/test/{java => resources}/org/springframework/core/env/EnvironmentIntegrationTests-context.xml (100%)

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