[libspring-java] 01/13: Merge tag 'upstream/4.2.6'

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Wed Aug 3 17:51:38 UTC 2016


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libspring-java.

commit 3eba9e9299a672c4ec5d0af4968e507643326c24
Merge: e7105bc f69f2a4
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Aug 2 11:13:55 2016 +0200

    Merge tag 'upstream/4.2.6'
    
    Upstream version 4.2.6

 CONTRIBUTING.md                                    |    61 +-
 README.md                                          |    21 +-
 build.gradle                                       |   384 +-
 .../build/gradle/MergePlugin.groovy                |     5 +-
 gradle.properties                                  |     2 +-
 gradle/ide.gradle                                  |     2 +-
 import-into-eclipse.bat                            |     6 +-
 import-into-eclipse.sh                             |     4 +-
 settings.gradle                                    |     1 +
 .../org/springframework/aop/MethodMatcher.java     |     4 +-
 .../springframework/aop/ProxyMethodInvocation.java |     6 +-
 .../org/springframework/aop/TargetClassAware.java  |     4 +-
 .../org/springframework/aop/TrueMethodMatcher.java |    17 +-
 .../aop/aspectj/AbstractAspectJAdvice.java         |    43 +-
 .../aop/aspectj/AspectJAfterAdvice.java            |     3 +-
 .../aop/aspectj/AspectJAfterReturningAdvice.java   |     8 +-
 .../aop/aspectj/AspectJAfterThrowingAdvice.java    |    15 +-
 .../aop/aspectj/AspectJAroundAdvice.java           |     4 +-
 .../aop/aspectj/AspectJExpressionPointcut.java     |     2 +-
 .../aop/aspectj/AspectJMethodBeforeAdvice.java     |     3 +-
 .../annotation/AbstractAspectJAdvisorFactory.java  |    60 +-
 .../aspectj/annotation/AspectJAdvisorFactory.java  |    26 +-
 .../aspectj/annotation/AspectJProxyFactory.java    |     4 +-
 .../aop/aspectj/annotation/AspectMetadata.java     |    22 +-
 .../BeanFactoryAspectInstanceFactory.java          |    19 +-
 ...InstantiationModelAwarePointcutAdvisorImpl.java |    56 +-
 ...azySingletonAspectInstanceFactoryDecorator.java |    10 +-
 .../annotation/PrototypeAspectInstanceFactory.java |     6 +-
 .../ReflectiveAspectJAdvisorFactory.java           |    63 +-
 .../autoproxy/AspectJPrecedenceComparator.java     |     6 +-
 .../aop/config/AdvisorComponentDefinition.java     |     2 +-
 .../aop/config/AopNamespaceHandler.java            |     2 +-
 .../aop/config/ConfigBeanDefinitionParser.java     |     8 +-
 .../config/ScopedProxyBeanDefinitionDecorator.java |     2 +-
 .../AbstractAdvisingBeanPostProcessor.java         |    43 +-
 .../AbstractSingletonProxyFactoryBean.java         |    15 +-
 .../org/springframework/aop/framework/Advised.java |    36 +-
 .../aop/framework/AdvisedSupport.java              |     4 +-
 .../aop/framework/AopProxyUtils.java               |    56 +-
 .../aop/framework/CglibAopProxy.java               |    57 +-
 .../aop/framework/DefaultAopProxyFactory.java      |    10 +-
 .../aop/framework/JdkDynamicAopProxy.java          |     3 +-
 .../aop/framework/ObjenesisCglibAopProxy.java      |    19 +-
 .../aop/framework/ProxyFactory.java                |     8 +-
 .../aop/framework/ProxyFactoryBean.java            |     8 +-
 .../aop/framework/ProxyProcessorSupport.java       |     2 +-
 .../aop/framework/ReflectiveMethodInvocation.java  |     8 +-
 .../framework/adapter/ThrowsAdviceInterceptor.java |     4 +-
 .../autoproxy/AbstractAdvisorAutoProxyCreator.java |     9 +-
 .../autoproxy/AbstractAutoProxyCreator.java        |    41 +-
 ...tractBeanFactoryAwareAdvisingPostProcessor.java |    65 +
 .../aop/framework/autoproxy/AutoProxyUtils.java    |    49 +-
 .../autoproxy/target/QuickTargetSourceCreator.java |    11 +-
 .../interceptor/AsyncExecutionAspectSupport.java   |   210 +-
 .../aop/interceptor/AsyncExecutionInterceptor.java |    58 +-
 .../org/springframework/aop/support/AopUtils.java  |    41 +-
 .../aop/support/ControlFlowPointcut.java           |    11 +-
 .../aop/support/MethodMatchers.java                |     6 +-
 .../org/springframework/aop/support/Pointcuts.java |    14 +-
 .../aop/support/StaticMethodMatcher.java           |     4 +-
 .../AbstractBeanFactoryBasedTargetSource.java      |     6 +-
 .../aop/target/AbstractPoolingTargetSource.java    |     4 +-
 .../target/AbstractPrototypeBasedTargetSource.java |     4 +-
 .../aop/target/CommonsPool2TargetSource.java       |   289 +
 .../aop/target/CommonsPoolTargetSource.java        |     4 +-
 .../src/main/resources/META-INF/spring.schemas     |     3 +-
 .../springframework/aop/config/spring-aop-4.2.xsd  |   409 +
 .../aspectj/AspectJExpressionPointcutTests.java    |    62 +-
 .../MethodInvocationProceedingJoinPointTests.java  |     4 +-
 .../TigerAspectJExpressionPointcutTests.java       |    61 +-
 .../AbstractAspectJAdvisorFactoryTests.java        |     5 +-
 .../annotation/AspectJPointcutAdvisorTests.java    |    34 +-
 .../annotation/AspectProxyFactoryTests.java        |    67 +
 .../aop/framework/MethodInvocationTests.java       |     6 +-
 .../adapter/ThrowsAdviceInterceptorTests.java      |     7 +-
 .../support/AbstractRegexpMethodPointcutTests.java |    28 +-
 .../aop/support/ClassUtilsTests.java               |    11 +-
 .../aop/support/ComposablePointcutTests.java       |    34 +-
 .../aop/support/MethodMatchersTests.java           |    22 +-
 .../aop/support/PointcutsTests.java                |   136 +-
 .../target/CommonsPool2TargetSourceProxyTests.java |    47 +
 .../AopNamespaceHandlerEventTests-context.xml      |     0
 ...spaceHandlerEventTests-directPointcutEvents.xml |     0
 ...opNamespaceHandlerEventTests-pointcutEvents.xml |     0
 ...amespaceHandlerEventTests-pointcutRefEvents.xml |     0
 ...ndlerPointcutErrorTests-pointcutDuplication.xml |     0
 ...ceHandlerPointcutErrorTests-pointcutMissing.xml |     0
 .../aop/config/TopLevelAopTagTests-context.xml     |     0
 .../aop/framework/PrototypeTargetTests-context.xml |     0
 .../ExposeInvocationInterceptorTests-context.xml   |     0
 ...copedProxyAutowireTests-scopedAutowireFalse.xml |     0
 ...ScopedProxyAutowireTests-scopedAutowireTrue.xml |     0
 ...thodPointcutAdvisorIntegrationTests-context.xml |     0
 .../CommonsPool2TargetSourceProxyTests-context.xml |    16 +
 .../CommonsPoolTargetSourceProxyTests-context.xml  |     0
 .../HotSwappableTargetSourceTests-context.xml      |     0
 .../LazyInitTargetSourceTests-customTarget.xml     |     0
 .../LazyInitTargetSourceTests-factoryBean.xml      |     0
 .../target/LazyInitTargetSourceTests-singleton.xml |     0
 .../target/PrototypeTargetSourceTests-context.xml  |     0
 .../ThreadLocalTargetSourceTests-context.xml       |     0
 spring-aspects/aspects.gradle                      |    11 +-
 .../aspectj/AbstractAsyncExecutionAspect.aj        |    42 +-
 .../aspectj/AnnotationAsyncExecutionAspect.aj      |    13 +-
 .../aspectj/AnnotationTransactionAspect.aj         |     9 +-
 .../aspectj/JtaAnnotationTransactionAspect.aj      |    75 +
 spring-aspects/src/main/resources/META-INF/aop.xml |     1 +
 .../AutoProxyWithCodeStyleAspectsTests.java        |    10 +-
 .../SpringConfiguredWithAutoProxyingTests.java     |    15 +-
 .../cache/aspectj/AspectJAnnotationTests.java      |    74 -
 .../cache/aspectj/AspectJCacheAnnotationTests.java |    75 +
 .../config/AnnotatedClassCacheableService.java     |    46 +-
 .../cache/config/AnnotatedJCacheableService.java   |     8 +-
 .../cache/config/CacheableService.java             |     4 +-
 .../cache/config/DefaultCacheableService.java      |    51 +-
 .../AnnotationAsyncExecutionAspectTests.java       |    11 +-
 .../AnnotationDrivenBeanDefinitionParserTests.java |    69 +
 .../aspectj/JtaTransactionAspectsTests.java        |   175 +
 .../aspectj/TransactionAspectTests.java            |    53 +-
 .../aop/aspectj/autoproxy/ajcAutoproxyTests.xml    |     0
 .../factory/aspectj/beanConfigurerTests-beans.xml  |     0
 .../beans/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
 .../scheduling/aspectj/annotationDrivenContext.xml |    18 +
 .../aspectj/TransactionAspectTests-context.xml     |     0
 .../factory/groovy/GroovyBeanDefinitionReader.java |    28 +-
 .../beans/AbstractNestablePropertyAccessor.java    |  1059 +
 .../java/org/springframework/beans/BeanUtils.java  |    18 +-
 .../org/springframework/beans/BeanWrapper.java     |    26 +-
 .../org/springframework/beans/BeanWrapperImpl.java |  1114 +-
 .../beans/CachedIntrospectionResults.java          |     2 +-
 .../springframework/beans/DirectFieldAccessor.java |   286 +-
 .../springframework/beans/ExtendedBeanInfo.java    |     4 +-
 .../beans/PropertyEditorRegistrySupport.java       |     5 +-
 .../org/springframework/beans/PropertyValue.java   |     8 +-
 .../beans/TypeConverterDelegate.java               |    57 +-
 .../beans/annotation/AnnotationBeanUtils.java      |     6 +-
 .../springframework/beans/factory/BeanFactory.java |    22 +-
 .../beans/factory/BeanFactoryUtils.java            |    36 +-
 .../beans/factory/ListableBeanFactory.java         |    32 +-
 .../factory/UnsatisfiedDependencyException.java    |     6 +-
 .../AutowiredAnnotationBeanPostProcessor.java      |    88 +-
 .../InitDestroyAnnotationBeanPostProcessor.java    |    43 +-
 .../factory/annotation/InjectionMetadata.java      |     4 +-
 ...alifierAnnotationAutowireCandidateResolver.java |     2 +-
 .../config/ConfigurableListableBeanFactory.java    |    14 +-
 .../beans/factory/config/DependencyDescriptor.java |     6 +-
 .../factory/config/FieldRetrievingFactoryBean.java |     4 +-
 .../factory/config/ServiceLocatorFactoryBean.java  |     6 +-
 .../factory/config/SingletonBeanRegistry.java      |     9 +-
 .../factory/config/YamlPropertiesFactoryBean.java  |     6 +-
 .../AbstractAutowireCapableBeanFactory.java        |    34 +-
 .../factory/support/AbstractBeanDefinition.java    |    23 +-
 .../beans/factory/support/AbstractBeanFactory.java |    97 +-
 .../factory/support/BeanDefinitionBuilder.java     |     5 +-
 .../CglibSubclassingInstantiationStrategy.java     |    57 +-
 .../beans/factory/support/ConstructorResolver.java |     2 +-
 .../support/DefaultListableBeanFactory.java        |   139 +-
 .../support/DefaultSingletonBeanRegistry.java      |     4 +-
 .../factory/support/DisposableBeanAdapter.java     |    17 +-
 .../beans/factory/support/MethodOverrides.java     |    16 +-
 .../factory/support/StaticListableBeanFactory.java |    68 +-
 .../xml/AbstractSimpleBeanDefinitionParser.java    |    28 +-
 .../beans/factory/xml/BeanDefinitionDecorator.java |     6 +-
 .../factory/xml/BeanDefinitionDocumentReader.java  |    18 +-
 .../factory/xml/BeanDefinitionParserDelegate.java  |    50 +-
 .../xml/DefaultBeanDefinitionDocumentReader.java   |    20 +-
 .../factory/xml/DocumentDefaultsDefinition.java    |     2 +-
 .../beans/factory/xml/NamespaceHandler.java        |     6 +-
 .../beans/factory/xml/XmlBeanDefinitionReader.java |     2 -
 .../propertyeditors/CustomCollectionEditor.java    |     4 +-
 .../beans/propertyeditors/CustomMapEditor.java     |     2 +-
 .../beans/propertyeditors/InputStreamEditor.java   |    13 +-
 .../beans/propertyeditors/ReaderEditor.java        |    89 +
 .../propertyeditors/ResourceBundleEditor.java      |    44 +-
 .../beans/support/ResourceEditorRegistrar.java     |    21 +-
 .../src/main/resources/META-INF/spring.schemas     |     9 +-
 .../beans/factory/xml/spring-beans-4.2.xsd         |  1201 +
 .../beans/factory/xml/spring-tool-4.2.xsd          |   115 +
 .../beans/factory/xml/spring-util-4.2.xsd          |   221 +
 .../AbstractConfigurablePropertyAccessorTests.java |   400 -
 .../beans/AbstractPropertyAccessorTests.java       |  2253 +
 .../beans/BeanWrapperGenericsTests.java            |    15 +-
 .../springframework/beans/BeanWrapperTests.java    |  2026 +-
 .../beans/DirectFieldAccessorTests.java            |    19 +-
 .../beans/ExtendedBeanInfoTests.java               |    57 +-
 .../BeanFactoryUtilsTests-dependentBeans.xml       |    40 -
 .../beans/factory/BeanFactoryUtilsTests-leaf.xml   |    13 -
 .../beans/factory/BeanFactoryUtilsTests.java       |    13 +-
 .../factory/DefaultListableBeanFactoryTests.java   |   137 +-
 .../SingletonBeanFactoryLocatorTests-beans1.xml    |    16 -
 .../SingletonBeanFactoryLocatorTests-beans2.xml    |    16 -
 .../beans/factory/access/beans1.xml                |    16 -
 .../beans/factory/access/beans2.xml                |    16 -
 .../AutowiredAnnotationBeanPostProcessorTests.java |   123 +-
 .../CustomAutowireConfigurerTests-context.xml      |    33 -
 .../factory/annotation/LookupAnnotationTests.java  |     4 +-
 ...jectFactoryCreatingFactoryBeanTests-context.xml |    24 -
 .../PropertyPathFactoryBeanTests-context.xml       |    62 -
 .../config/YamlPropertiesFactoryBeanTests.java     |     4 +-
 .../factory/serviceloader/ServiceLoaderTests.java  |    19 +-
 .../support/BeanDefinitionBuilderTests.java        |    20 +-
 .../beans/factory/support/BeanDefinitionTests.java |    29 +-
 .../factory/support/BeanFactoryGenericsTests.java  |    21 +
 .../beans/factory/support/LookupMethodTests.java   |    16 +-
 .../beans/factory/support/ManagedListTests.java    |    44 +-
 .../beans/factory/support/ManagedMapTests.java     |    43 +-
 .../factory/support/ManagedPropertiesTests.java    |    42 +-
 .../beans/factory/support/ManagedSetTests.java     |    43 +-
 .../PropertiesBeanDefinitionReaderTests.java       |    28 +-
 .../beans/factory/support/lookupMethodTests.xml    |    14 -
 .../beans/factory/support/security/callbacks.xml   |    93 -
 .../factory/wiring/BeanConfigurerSupportTests.java |    35 +-
 .../beans/factory/wiring/BeanWiringInfoTests.java  |    71 +-
 .../ClassNameBeanWiringInfoResolverTests.java      |    21 +-
 .../factory/xml/AbstractBeanFactoryTests.java      |   182 +-
 .../xml/AbstractListableBeanFactoryTests.java      |    20 +-
 .../factory/xml/AutowireWithExclusionTests.java    |    38 +-
 .../beans/factory/xml/BeanNameGenerationTests.java |    15 +-
 .../beans/factory/xml/CollectionMergingTests.java  |    61 +-
 .../factory/xml/DefaultLifecycleMethodsTests.java  |    45 +-
 .../beans/factory/xml/EventPublicationTests.java   |    30 +-
 .../beans/factory/xml/MetadataAttachmentTests.java |    23 +-
 .../beans/factory/xml/SchemaValidationTests.java   |    20 +-
 .../factory/xml/XmlBeanDefinitionReaderTests.java  |    89 +-
 .../factory/xml/XmlListableBeanFactoryTests.java   |    48 +-
 .../beans/propertyeditors/BeanInfoTests.java       |    14 +-
 .../ByteArrayPropertyEditorTests.java              |    19 +-
 .../CharArrayPropertyEditorTests.java              |    19 +-
 .../propertyeditors/PropertiesEditorTests.java     |    40 +-
 .../beans/propertyeditors/ReaderEditorTests.java   |    78 +
 .../propertyeditors/ResourceBundleEditorTests.java |    28 +-
 .../StringArrayPropertyEditorTests.java            |    29 +-
 .../beans/propertyeditors/ZoneIdEditorTests.java   |    28 +-
 .../tests/beans/CollectingReaderEventListener.java |    33 +-
 .../tests/sample/beans/TestBean.java               |    15 +-
 .../BeanFactoryUtilsTests-dependentBeans.xml       |    40 +
 .../beans/factory/BeanFactoryUtilsTests-leaf.xml   |    12 +
 .../beans/factory/BeanFactoryUtilsTests-middle.xml |     0
 .../beans/factory/BeanFactoryUtilsTests-root.xml   |     0
 .../factory/ConcurrentBeanFactoryTests-context.xml |     0
 .../factory/FactoryBeanLookupTests-context.xml     |     0
 .../beans/factory/FactoryBeanTests-abstract.xml    |     0
 .../beans/factory/FactoryBeanTests-circular.xml    |     0
 .../beans/factory/FactoryBeanTests-returnsNull.xml |     0
 .../factory/FactoryBeanTests-withAutowiring.xml    |     0
 .../SingletonBeanFactoryLocatorTests-beans1.xml    |    16 +
 .../SingletonBeanFactoryLocatorTests-beans2.xml    |    16 +
 .../SingletonBeanFactoryLocatorTests-ref1.xml      |     0
 .../beans/factory/access/beans1.xml                |    16 +
 .../beans/factory/access/beans2.xml                |    16 +
 .../CustomAutowireConfigurerTests-context.xml      |    33 +
 .../FieldRetrievingFactoryBeanTests-context.xml    |     0
 ...jectFactoryCreatingFactoryBeanTests-context.xml |    24 +
 .../PropertiesFactoryBeanTests-test.properties     |     0
 .../PropertiesFactoryBeanTests-test.properties.xml |     0
 .../PropertyPathFactoryBeanTests-context.xml       |    62 +
 .../PropertyPlaceholderConfigurerTests.properties  |     0
 ...PropertyResourceConfigurerTests-test.properties |     0
 ...ertyResourceConfigurerTests-test.properties.xml |     0
 .../factory/config/SimpleScopeTests-context.xml    |     0
 .../parsing/CustomProblemReporterTests-context.xml |     0
 .../beans/factory/support/genericBeanTests.xml     |     0
 .../beans/factory/support/lookupMethodTests.xml    |    22 +
 .../beans/factory/support/security/callbacks.xml   |    93 +
 .../beans/factory/support/security/policy.all      |     0
 .../DuplicateBeanIdTests-multiLevel-context.xml    |     0
 .../xml/DuplicateBeanIdTests-sameLevel-context.xml |     0
 .../beans/factory/xml/factory-methods.xml          |    14 +-
 .../xml/simpleConstructorNamespaceHandlerTests.xml |    20 +-
 .../beans/factory/xml/testUtilNamespace.xml        |     4 +-
 .../ResourceBundleEditorTests.properties           |     0
 ...estsLangCountryDialect_en_GB_GLASGOW.properties |     0
 ...ceBundleEditorTestsLangCountry_en_GB.properties |     0
 .../ResourceBundleEditorTestsLang_en.properties    |     0
 .../cache/ehcache/EhCacheCache.java                |     8 +-
 .../cache/ehcache/EhCacheManagerFactoryBean.java   |    16 +-
 .../cache/ehcache/package-info.java                |     7 +-
 .../springframework/cache/guava/GuavaCache.java    |    71 +-
 .../springframework/cache/jcache/JCacheCache.java  |    68 +-
 .../AbstractFallbackJCacheOperationSource.java     |     4 +-
 .../AnnotationJCacheOperationSource.java           |    10 +-
 .../jcache/interceptor/CacheResultInterceptor.java |     6 +-
 .../TransactionAwareCacheDecorator.java            |    23 +-
 .../mail/javamail/JavaMailSenderImpl.java          |    17 +-
 .../commonj/TimerManagerTaskScheduler.java         |     4 +-
 .../scheduling/quartz/CronTriggerFactoryBean.java  |     6 +-
 .../quartz/ResourceLoaderClassLoadHelper.java      |    48 +-
 .../quartz/SimpleTriggerFactoryBean.java           |     6 +-
 .../scheduling/quartz/SpringBeanJobFactory.java    |     6 +-
 .../org/springframework/mail/javamail/mime.types   |     0
 .../springframework/cache/AbstractCacheTests.java  |    17 +-
 .../cache/ehcache/EhCacheCacheTests.java           |    21 -
 .../cache/jcache/JCacheEhCacheAnnotationTests.java |   126 +
 .../cache/jcache/JCacheEhCacheApiTests.java        |    72 +
 .../cache/jcache/JCacheEhCacheTests.java           |   113 -
 .../config/AbstractJCacheAnnotationTests.java      |    19 +-
 .../cache/jcache/config/JCacheableService.java     |     4 +-
 .../interceptor/AnnotatedJCacheableService.java    |     8 +-
 .../TransactionAwareCacheDecoratorTests.java       |    27 +
 .../javamail/ConfigurableMimeFileTypeMapTests.java |    20 +-
 .../mail/javamail/InternetAddressEditorTests.java  |    44 +-
 .../mail/javamail/JavaMailSenderTests.java         |    75 +-
 .../quartz/CronTriggerFactoryBeanTests.java        |    41 +
 .../scheduling/quartz/QuartzSupportTests.java      |    10 +-
 .../quartz/SimpleTriggerFactoryBeanTests.java      |    43 +
 .../ui/jasperreports/JasperReportsUtilsTests.java  |    34 +-
 .../springframework/cache/ehcache/testEhcache.xml  |     4 +-
 .../cache/annotation/CacheConfig.java              |    23 +-
 .../cache/annotation/CacheEvict.java               |    14 +-
 .../springframework/cache/annotation/CachePut.java |    14 +-
 .../cache/annotation/Cacheable.java                |    14 +-
 .../cache/annotation/EnableCaching.java            |    21 +-
 .../annotation/SpringCacheAnnotationParser.java    |    88 +-
 .../cache/concurrent/ConcurrentMapCache.java       |    73 +-
 .../AbstractFallbackCacheOperationSource.java      |     5 +-
 .../cache/interceptor/CacheAspectSupport.java      |    52 +-
 .../cache/interceptor/CacheEvaluationContext.java  |    75 +-
 .../cache/interceptor/CacheOperationInvoker.java   |    13 +-
 .../cache/interceptor/ExpressionEvaluator.java     |    89 +-
 .../cache/interceptor/MethodCacheKey.java          |    66 -
 .../cache/support/AbstractCacheManager.java        |    86 +-
 .../cache/support/AbstractValueAdaptingCache.java  |   116 +
 .../springframework/cache/support/NullValue.java   |    43 +
 .../springframework/context/ApplicationEvent.java  |     4 +-
 .../context/ApplicationEventPublisher.java         |    22 +-
 .../org/springframework/context/Lifecycle.java     |    26 +-
 .../context/PayloadApplicationEvent.java           |    62 +
 .../annotation/AdviceModeImportSelector.java       |     9 +-
 .../annotation/AnnotatedBeanDefinitionReader.java  |     4 +-
 .../context/annotation/AnnotationConfigUtils.java  |    27 +-
 .../AnnotationScopeMetadataResolver.java           |     3 +-
 .../context/annotation/AutoProxyRegistrar.java     |     6 +-
 .../springframework/context/annotation/Bean.java   |    17 +-
 .../context/annotation/BeanAnnotationHelper.java   |    11 +-
 .../CommonAnnotationBeanPostProcessor.java         |   180 +-
 .../context/annotation/ComponentScan.java          |   106 +-
 .../annotation/ComponentScanAnnotationParser.java  |    21 +-
 .../context/annotation/Conditional.java            |    21 +-
 .../context/annotation/Configuration.java          |    69 +-
 .../ConfigurationClassBeanDefinitionReader.java    |    80 +-
 .../annotation/ConfigurationClassEnhancer.java     |   143 +-
 .../annotation/ConfigurationClassParser.java       |    69 +-
 .../ConfigurationClassPostProcessor.java           |    43 +-
 .../annotation/ConfigurationClassUtils.java        |    30 +-
 ...ContextAnnotationAutowireCandidateResolver.java |    12 +-
 .../context/annotation/EnableAspectJAutoProxy.java |     9 +-
 .../context/annotation/EnableLoadTimeWeaving.java  |    25 +-
 .../springframework/context/annotation/Import.java |    11 +-
 .../context/annotation/ImportResource.java         |    53 +-
 .../annotation/LoadTimeWeavingConfiguration.java   |     8 +-
 .../context/annotation/Profile.java                |    38 +-
 .../context/annotation/PropertySource.java         |    25 +-
 .../springframework/context/annotation/Scope.java  |    58 +-
 .../PropertyPlaceholderBeanDefinitionParser.java   |    22 +-
 .../event/AbstractApplicationEventMulticaster.java |    82 +-
 .../context/event/ApplicationEventMulticaster.java |    15 +-
 .../event/ApplicationListenerMethodAdapter.java    |   379 +
 .../context/event/DefaultEventListenerFactory.java |    54 +
 .../context/event/EventExpressionEvaluator.java    |    85 +
 .../context/event/EventExpressionRootObject.java   |    46 +
 .../context/event/EventListener.java               |    94 +
 .../context/event/EventListenerFactory.java        |    48 +
 .../event/EventListenerMethodProcessor.java        |   166 +
 .../context/event/EventPublicationInterceptor.java |     2 +-
 .../context/event/GenericApplicationListener.java  |    46 +
 .../event/GenericApplicationListenerAdapter.java   |    61 +-
 .../event/SimpleApplicationEventMulticaster.java   |    28 +-
 .../context/event/SmartApplicationListener.java    |     7 +-
 .../context/event/SourceFilteringListener.java     |    19 +-
 .../context/expression/AnnotatedElementKey.java    |    69 +
 .../expression/CachedExpressionEvaluator.java      |   117 +
 .../context/expression/MapAccessor.java            |    31 +-
 .../expression/MethodBasedEvaluationContext.java   |    98 +
 .../support/AbstractApplicationContext.java        |   111 +-
 .../support/DefaultMessageSourceResolvable.java    |    10 +-
 .../context/support/GenericApplicationContext.java |    15 +-
 .../support/PostProcessorRegistrationDelegate.java |    66 +-
 .../PropertySourcesPlaceholderConfigurer.java      |    37 +-
 .../ReloadableResourceBundleMessageSource.java     |    45 +-
 .../support/ResourceBundleMessageSource.java       |    80 +-
 .../context/support/SimpleThreadScope.java         |    13 +-
 .../weaving/DefaultContextLoadTimeWeaver.java      |     2 +-
 .../SpringBeanAutowiringInterceptor.java           |     2 +-
 .../format/annotation/DateTimeFormat.java          |     4 +-
 .../format/annotation/NumberFormat.java            |    28 +-
 .../format/datetime/joda/DurationFormatter.java    |    46 +
 ...daDateTimeFormatAnnotationFormatterFactory.java |     6 +-
 .../datetime/joda/JodaTimeFormatterRegistrar.java  |    31 +
 .../format/datetime/joda/MonthDayFormatter.java    |    46 +
 .../format/datetime/joda/PeriodFormatter.java      |    46 +
 .../format/datetime/joda/YearMonthFormatter.java   |    46 +
 .../datetime/standard/DateTimeConverters.java      |    19 +-
 .../standard/DateTimeFormatterRegistrar.java       |     8 +
 .../datetime/standard/DurationFormatter.java       |    47 +
 .../datetime/standard/MonthDayFormatter.java       |    47 +
 .../format/datetime/standard/PeriodFormatter.java  |    47 +
 .../datetime/standard/TemporalAccessorParser.java  |    12 +-
 .../datetime/standard/YearMonthFormatter.java      |    47 +
 .../format/number/AbstractNumberFormatter.java     |     2 +
 .../format/number/CurrencyFormatter.java           |    88 +-
 .../format/number/CurrencyStyleFormatter.java      |   116 +
 .../NumberFormatAnnotationFormatterFactory.java    |    14 +-
 .../format/number/NumberFormatter.java             |    51 +-
 .../format/number/NumberStyleFormatter.java        |    85 +
 .../format/number/PercentFormatter.java            |    25 +-
 .../format/number/PercentStyleFormatter.java       |    46 +
 .../format/number/money/CurrencyUnitFormatter.java |    44 +
 ...r354NumberFormatAnnotationFormatterFactory.java |   163 +
 .../number/money/MonetaryAmountFormatter.java      |    96 +
 .../format/number/money/package-info.java          |     4 +
 .../DefaultFormattingConversionService.java        |    28 +-
 .../support/FormatterPropertyEditorAdapter.java    |    76 +
 .../support/FormattingConversionService.java       |    37 +-
 .../FormattingConversionServiceFactoryBean.java    |    15 +-
 .../classloading/ReflectiveLoadTimeWeaver.java     |     7 +-
 .../classloading/jboss/JBossLoadTimeWeaver.java    |     6 +-
 .../websphere/WebSphereClassLoaderAdapter.java     |    45 +-
 .../annotation/AnnotationJmxAttributeSource.java   |   123 +-
 .../jmx/export/annotation/ManagedAttribute.java    |     6 +-
 .../jmx/export/annotation/ManagedMetric.java       |     8 +-
 .../jmx/export/annotation/ManagedNotification.java |     9 +-
 .../export/annotation/ManagedNotifications.java    |     6 +-
 .../jmx/export/annotation/ManagedOperation.java    |     6 +-
 .../annotation/ManagedOperationParameter.java      |    21 +-
 .../annotation/ManagedOperationParameters.java     |     7 +-
 .../jmx/export/annotation/ManagedResource.java     |    14 +-
 .../AbstractReflectiveMBeanInfoAssembler.java      |     4 +-
 .../jndi/JndiObjectFactoryBean.java                |     4 +-
 .../jndi/support/SimpleJndiBeanFactory.java        |    13 +-
 .../remoting/RemoteTimeoutException.java           |    45 +
 .../AnnotationAsyncExecutionInterceptor.java       |    10 +-
 .../scheduling/annotation/Async.java               |     4 +-
 .../annotation/AsyncAnnotationAdvisor.java         |    10 +-
 .../AsyncAnnotationBeanPostProcessor.java          |    36 +-
 .../scheduling/annotation/AsyncResult.java         |    68 +-
 .../scheduling/annotation/EnableAsync.java         |    99 +-
 .../scheduling/annotation/EnableScheduling.java    |    43 +-
 .../annotation/ProxyAsyncConfiguration.java        |     3 +-
 .../ScheduledAnnotationBeanPostProcessor.java      |    75 +-
 .../annotation/SchedulingConfiguration.java        |     1 +
 .../concurrent/ScheduledExecutorFactoryBean.java   |    11 +-
 .../concurrent/ThreadPoolExecutorFactoryBean.java  |    15 +-
 .../AnnotationDrivenBeanDefinitionParser.java      |     6 +-
 .../config/ExecutorBeanDefinitionParser.java       |     5 +-
 .../scheduling/config/ScheduledTaskRegistrar.java  |    64 +-
 .../scheduling/config/TaskExecutorFactoryBean.java |    57 +-
 .../scheduling/config/TriggerTask.java             |     9 +-
 .../scripting/ScriptCompilationException.java      |    28 +-
 .../scripting/bsh/BshScriptEvaluator.java          |     6 +-
 .../scripting/bsh/BshScriptFactory.java            |    51 +-
 .../scripting/config/LangNamespaceHandler.java     |     3 +-
 .../config/ScriptBeanDefinitionParser.java         |    21 +-
 .../scripting/groovy/GroovyScriptEvaluator.java    |     4 +-
 .../scripting/groovy/GroovyScriptFactory.java      |    36 +-
 .../scripting/groovy/package-info.java             |     2 +-
 .../scripting/jruby/JRubyScriptFactory.java        |     7 +-
 .../scripting/jruby/JRubyScriptUtils.java          |     5 +
 .../support/ScriptFactoryPostProcessor.java        |     2 +-
 .../support/StandardScriptEvalException.java       |    60 +
 .../scripting/support/StandardScriptEvaluator.java |    86 +-
 .../scripting/support/StandardScriptFactory.java   |   255 +
 .../scripting/support/StandardScriptUtils.java     |    79 +
 .../org/springframework/ui/ExtendedModelMap.java   |     7 +-
 .../context/support/ResourceBundleThemeSource.java |    76 +-
 .../org/springframework/validation/DataBinder.java |    96 +-
 .../org/springframework/validation/FieldError.java |     6 +-
 .../springframework/validation/ObjectError.java    |     4 +-
 .../beanvalidation/LocalValidatorFactoryBean.java  |    13 +-
 .../MethodValidationInterceptor.java               |    37 +-
 .../MethodValidationPostProcessor.java             |    24 +-
 .../SpringConstraintValidatorFactory.java          |     8 +-
 .../beanvalidation/SpringValidatorAdapter.java     |    68 +-
 .../validation/support/BindingAwareModelMap.java   |    14 +-
 .../src/main/resources/META-INF/spring.schemas     |    15 +-
 .../cache/config/spring-cache-4.2.xsd              |   310 +
 .../context/config/spring-context-4.2.xsd          |   539 +
 .../springframework/ejb/config/spring-jee-4.2.xsd  |   267 +
 .../remoting/rmi/RmiInvocationWrapperRTD.xml       |     0
 .../scheduling/config/spring-task-4.2.xsd          |   307 +
 .../scripting/config/spring-lang-4.2.xsd           |   240 +
 ...plicationContextDynamicBeanPropertyTests.groovy |    18 +-
 .../groovy/GroovyBeanDefinitionReaderTests.groovy  |   119 +-
 ...ScanAnnotatedConfigWithImplicitBasePackage.java |    10 +-
 .../ConfigurableComponent.java                     |    41 +
 .../ScannedComponent.java                          |     3 +-
 .../aspectj/AfterThrowingAdviceBindingTests.xml    |    42 -
 .../aop/aspectj/AspectAndAdvicePrecedenceTests.xml |    90 -
 .../aop/aspectj/BeanNamePointcutTests.xml          |    62 -
 .../aspectj/DeclarationOrderIndependenceTests.xml  |    32 -
 .../aop/aspectj/DeclareParentsDelegateRefTests.xml |    22 -
 .../ImplicitJPArgumentMatchingAtAspectJTests.xml   |    18 -
 .../aspectj/ImplicitJPArgumentMatchingTests.xml    |    22 -
 .../aspectj/OverloadedAdviceTests-ambiguous.xml    |    20 -
 .../aop/aspectj/OverloadedAdviceTests.xml          |    21 -
 .../aop/aspectj/PropertyDependentAspectTests.java  |    15 +-
 .../SharedPointcutWithArgsMismatchTests.xml        |    20 -
 .../aop/aspectj/SubtypeSensitiveMatchingTests.xml  |    31 -
 .../aop/aspectj/TargetPointcutSelectionTests.java  |    10 +-
 ...TargetSelectionOnlyPointcutsAtAspectJTests.java |    33 +-
 ...dTargetSelectionOnlyPointcutsAtAspectJTests.xml |    17 -
 .../ThisAndTargetSelectionOnlyPointcutsTests.xml   |    56 -
 .../autoproxy/AnnotationPointcutTests-context.xml  |    22 -
 .../AspectImplementingInterfaceTests-context.xml   |    20 -
 .../AspectJAutoProxyCreatorTests-aspects.xml       |    39 -
 ...pectJAutoProxyCreatorTests-aspectsWithCGLIB.xml |    16 -
 ...tJAutoProxyCreatorTests-aspectsWithOrdering.xml |    25 -
 .../AspectJAutoProxyCreatorTests-pertarget.xml     |    23 -
 .../AtAspectJAfterThrowingTests-context.xml        |    12 -
 .../autoproxy/benchmark/BenchmarkTests-aspectj.xml |    32 -
 .../aop/aspectj/autoproxy/spr3064/SPR3064Tests.xml |    14 -
 ...erReturningGenericTypeMatchingTests-context.xml |    14 -
 ...BridgeMethodMatchingClassProxyTests-context.xml |    14 -
 .../config/AopNamespaceHandlerArgNamesTests-ok.xml |    23 -
 .../AopNamespaceHandlerProxyTargetClassTests.java  |    16 +-
 .../aop/config/PrototypeProxyTests-context.xml     |    27 -
 .../aop/framework/AbstractAopProxyTests.java       |   147 +-
 .../aop/framework/CglibProxyTests.java             |    85 +-
 .../aop/framework/JdkDynamicProxyTests.java        |    84 +-
 .../aop/framework/ObjenesisProxyTests.java         |     1 +
 .../ProxyFactoryBeanTests-double-targetsource.xml  |    54 -
 .../ProxyFactoryBeanTests-notlast-targetsource.xml |    34 -
 .../framework/ProxyFactoryBeanTests-prototype.xml  |    37 -
 .../aop/framework/ProxyFactoryBeanTests.java       |    27 +-
 .../AdvisorAdapterRegistrationTests-with-bpp.xml   |    23 -
 ...AdvisorAdapterRegistrationTests-without-bpp.xml |    21 -
 ...orAutoProxyCreatorTests-common-interceptors.xml |    47 -
 ...sorAutoProxyCreatorTests-quick-targetsource.xml |    44 -
 .../autoproxy/AdvisorAutoProxyCreatorTests.java    |     6 +-
 .../framework/autoproxy/AutoProxyCreatorTests.java |    94 +-
 .../BeanNameAutoProxyCreatorInitTests-context.xml  |    29 -
 .../aop/scope/ScopedProxyTests-override.xml        |    21 -
 .../aop/target/CommonsPool2TargetSourceTests.java  |   241 +
 .../CommonsPoolTargetSourceTests-context.xml       |    69 -
 .../aop/target/CommonsPoolTargetSourceTests.java   |     3 +-
 ...ookupMethodWrappedByCglibProxyTests-context.xml |    39 -
 .../xml/QualifierAnnotationTests-context.xml       |    62 -
 .../factory/xml/XmlBeanFactoryTests-child.xml      |    51 -
 .../XmlBeanFactoryTests-complexFactoryCircle.xml   |    33 -
 .../XmlBeanFactoryTests-constructorOverrides.xml   |    34 -
 ...anFactoryTests-invalidOverridesNoSuchMethod.xml |    24 -
 ...mlBeanFactoryTests-localCollectionsUsingXsd.xml |    36 -
 .../XmlBeanFactoryTests-noSuchFactoryMethod.xml    |    17 -
 .../factory/xml/XmlBeanFactoryTests-overrides.xml  |    84 -
 .../xml/XmlBeanFactoryTests-recursiveImport.xml    |     8 -
 .../factory/xml/XmlBeanFactoryTests-resource.xml   |    13 -
 .../XmlBeanFactoryTests-satisfiedAllDepCheck.xml   |    17 -
 ...XmlBeanFactoryTests-satisfiedObjectDepCheck.xml |    13 -
 ...yTests-unsatisfiedAllDepCheckMissingObjects.xml |    14 -
 ...ryTests-unsatisfiedAllDepCheckMissingSimple.xml |    16 -
 .../org/springframework/cache/CacheReproTests.java |    24 +-
 .../AnnotationCacheOperationSourceTests.java       |   190 +-
 .../cache/config/AbstractAnnotationTests.java      |   734 -
 .../cache/config/AbstractCacheAnnotationTests.java |   770 +
 .../config/AnnotatedClassCacheableService.java     |    48 +-
 .../config/AnnotationDrivenCacheConfigTests.java   |    34 +
 .../config/AnnotationNamespaceDrivenTests.java     |    13 +-
 .../cache/config/AnnotationTests.java              |    34 -
 .../cache/config/CacheAdviceNamespaceTests.java    |     4 +-
 .../cache/config/CacheableService.java             |     4 +-
 .../cache/config/CustomInterceptorTests.java       |     3 +-
 .../cache/config/DefaultCacheableService.java      |    50 +-
 .../cache/config/EnableCachingTests.java           |     2 +-
 .../interceptor/ExpressionEvaluatorTests.java      |     5 +-
 .../cache/interceptor/MethodCacheKeyTests.java     |    76 -
 .../context/AbstractApplicationContextTests.java   |    54 +-
 .../access/ContextJndiBeanFactoryLocatorTests.java |    23 +-
 .../context/access/DefaultLocatorFactoryTests.java |    12 +-
 .../AnnotationProcessorPerformanceTests.java       |    23 +-
 .../AnnotationScopeMetadataResolverTests.java      |   103 +-
 .../context/annotation/AutoProxyLazyInitTests.java |     2 +-
 .../ClassPathBeanDefinitionScannerTests.java       |    41 +-
 .../CommonAnnotationBeanPostProcessorTests.java    |   141 +-
 .../ComponentScanAnnotationIntegrationTests.java   |    80 +-
 .../annotation/ComponentScanAnnotationTests.java   |     6 +-
 ...onentScanParserBeanDefinitionDefaultsTests.java |     7 +-
 .../ComponentScanParserScopedProxyTests.java       |    41 +-
 .../annotation/ComponentScanParserTests.java       |     6 +-
 ...ntScanParserWithUserDefinedStrategiesTests.java |     8 +-
 .../ConfigurationClassPostProcessorTests.java      |   209 +-
 ...igurationWithFactoryBeanAndAutowiringTests.java |    28 +
 .../DestroyMethodInferenceTests-context.xml        |    22 -
 .../annotation/DestroyMethodInferenceTests.java    |    14 +-
 .../context/annotation/ImportSelectorTests.java    |    10 +-
 ...yAutowiredAnnotationBeanPostProcessorTests.java |    35 +-
 .../ReflectionUtilsIntegrationTests.java           |     4 +-
 .../context/annotation/Spr12636Tests.java          |   117 +
 .../configuration/ImportResourceTests.java         |    47 +-
 .../annotation/configuration/ImportTests.java      |    48 +-
 .../ImportXmlWithAopNamespace-context.xml          |    16 -
 ...ImportedConfigurationClassEnhancementTests.java |    55 +-
 .../annotation/defaultAutowireByNameTests.xml      |    29 -
 .../annotation/defaultAutowireByTypeTests.xml      |    29 -
 .../annotation/defaultAutowireConstructorTests.xml |    29 -
 .../context/annotation/defaultAutowireNoTests.xml  |    29 -
 .../annotation/defaultDependencyCheckAllTests.xml  |    29 -
 ...pendencyCheckObjectsWithAutowireByNameTests.xml |    27 -
 .../annotation/defaultLazyInitFalseTests.xml       |    16 -
 .../annotation/defaultLazyInitTrueTests.xml        |    16 -
 .../annotation/defaultWithNoOverridesTests.xml     |    28 -
 .../config/ContextNamespaceHandlerTests.java       |    37 +-
 .../AbstractApplicationEventListenerTests.java     |   143 +
 .../event/AnnotationDrivenEventListenerTests.java  |   910 +
 .../event/ApplicationContextEventTests.java        |   190 +-
 .../ApplicationListenerMethodAdapterTests.java     |   500 +
 .../event/EventPublicationInterceptorTests.java    |    12 +-
 .../GenericApplicationListenerAdapterTests.java    |   154 +
 .../context/event/LifecycleEventTests.java         |    14 +-
 .../context/event/test/AbstractIdentifiable.java   |    52 +
 .../context/event/test/AnotherTestEvent.java       |    32 +
 .../context/event/test/EventCollector.java         |   104 +
 .../context/event/test/GenericEventPojo.java       |    53 +
 .../context/event/test/Identifiable.java           |    31 +
 .../event/test/IdentifiableApplicationEvent.java   |    67 +
 .../context/event/test/TestEvent.java              |    45 +
 .../expression/AnnotatedElementKeyTests.java       |    76 +
 .../ApplicationContextExpressionTests.java         |    61 +-
 .../expression/CachedExpressionEvaluatorTests.java |    89 +
 .../context/expression/MapAccessorTests.java       |    98 +
 .../MethodBasedEvaluationContextTests.java         |    78 +
 ...lassPathXmlApplicationContextTests-resource.xml |    17 -
 .../support/EnvironmentIntegrationTests.java       |     9 +-
 .../support/GenericApplicationContextTests.java    |    32 +-
 .../SerializableBeanFactoryMemoryLeakTests.java    |    17 +
 .../StaticApplicationContextMulticasterTests.java  |    21 +-
 .../support/StaticApplicationContextTests.java     |     9 +-
 .../context/support/StaticMessageSourceTests.java  |    88 +-
 .../springframework/context/support/spr7283.xml    |    16 -
 .../springframework/context/support/spr7816.xml    |    19 -
 .../context/support/test/aliased-contextC.xml      |    19 -
 .../context/support/test/contextB.xml              |    11 -
 .../context/support/test/contextC.xml              |    17 -
 .../ejb/config/jeeNamespaceHandlerTests.xml        |    78 -
 .../format/datetime/DateFormatterTests.java        |    22 +-
 .../format/datetime/DateFormattingTests.java       |   125 +-
 .../joda/DateTimeFormatterFactoryTests.java        |     6 +-
 .../datetime/joda/JodaTimeFormattingTests.java     |   187 +-
 .../standard/DateTimeFormatterFactoryTests.java    |     6 +-
 .../datetime/standard/DateTimeFormattingTests.java |   116 +-
 .../format/number/CurrencyFormatterTests.java      |    66 -
 .../format/number/CurrencyStyleFormatterTests.java |    67 +
 .../format/number/NumberFormatterTests.java        |    54 -
 .../format/number/NumberFormattingTests.java       |    13 +-
 .../format/number/NumberStyleFormatterTests.java   |    55 +
 .../format/number/PercentFormatterTests.java       |    55 -
 .../format/number/PercentStyleFormatterTests.java  |    55 +
 .../format/number/money/MoneyFormattingTests.java  |   272 +
 ...ormattingConversionServiceFactoryBeanTests.java |    38 +-
 .../support/FormattingConversionServiceTests.java  |    17 +-
 .../jmx/AbstractMBeanServerTests.java              |    22 +-
 .../java/org/springframework/jmx/IJmxTestBean.java |    16 +-
 .../java/org/springframework/jmx/JmxTestBean.java  |    16 +-
 .../jmx/access/MBeanClientInterceptorTests.java    |   112 +-
 .../access/RemoteMBeanClientInterceptorTests.java  |    38 +-
 .../jmx/export/CustomDateEditorRegistrar.java      |    16 +-
 .../jmx/export/CustomEditorConfigurerTests.java    |    16 +-
 .../org/springframework/jmx/export/DateRange.java  |    16 +-
 .../jmx/export/ExceptionOnInitBean.java            |    16 +-
 .../jmx/export/LazyInitMBeanTests.java             |    36 +-
 .../export/PropertyPlaceholderConfigurerTests.java |    16 +-
 .../annotation/AnnotationLazyInitMBeanTests.java   |    31 +-
 .../AnnotationMetadataAssemblerTests.java          |    41 +-
 .../jmx/export/annotation/AnnotationTestBean.java  |    26 +-
 .../annotation/AnotherAnnotationTestBean.java      |    38 +
 .../annotation/AnotherAnnotationTestBeanImpl.java  |    49 +
 .../EnableMBeanExportConfigurationTests.java       |     8 +-
 .../export/annotation/JmxUtilsAnnotationTests.java |    50 +-
 .../jmx/export/annotation/annotations.xml          |    45 -
 .../export/assembler/AbstractAutodetectTests.java  |    25 +-
 .../assembler/AbstractJmxAssemblerTests.java       |    16 +-
 .../AbstractMetadataAssemblerAutodetectTests.java  |    16 +-
 .../assembler/AbstractMetadataAssemblerTests.java  |    16 +-
 .../jmx/export/assembler/ICustomBase.java          |    16 +-
 .../jmx/export/assembler/ICustomJmxBean.java       |    16 +-
 ...nterfaceBasedMBeanInfoAssemblerCustomTests.java |    17 +-
 .../InterfaceBasedMBeanInfoAssemblerTests.java     |    16 +-
 ...thodNameBasedMBeanInfoAssemblerMappedTests.java |    17 +-
 .../MethodNameBasedMBeanInfoAssemblerTests.java    |    17 +-
 .../export/assembler/ReflectiveAssemblerTests.java |    20 +-
 .../export/naming/AbstractNamingStrategyTests.java |    25 +-
 .../export/naming/IdentityNamingStrategyTests.java |    11 +-
 .../jmx/export/naming/KeyNamingStrategyTests.java  |    17 +-
 .../naming/PropertiesFileNamingStrategyTests.java  |    16 +-
 .../naming/PropertiesNamingStrategyTests.java      |    17 +-
 .../support/ConnectorServerFactoryBeanTests.java   |    38 +-
 .../springframework/jmx/support/JmxUtilsTests.java |    58 +-
 .../MBeanServerConnectionFactoryBeanTests.java     |    27 +-
 .../jmx/support/MBeanServerFactoryBeanTests.java   |    55 +-
 .../remoting/rmi/RmiSupportTests.java              |   102 +-
 .../support/RemoteInvocationUtilsTests.java        |    14 +-
 .../AsyncAnnotationBeanPostProcessorTests.java     |    57 +-
 .../scheduling/annotation/AsyncExecutionTests.java |   125 +-
 .../scheduling/annotation/AsyncResultTests.java    |    89 +
 .../annotation/EnableSchedulingTests.java          |   147 +-
 .../ScheduledAnnotationBeanPostProcessorTests.java |   106 +-
 .../concurrent/ConcurrentTaskExecutorTests.java    |    15 +-
 .../ThreadPoolExecutorFactoryBeanTests.java        |    67 +
 .../AnnotationDrivenBeanDefinitionParserTests.java |    10 +-
 .../config/ScheduledTaskRegistrarTests.java        |    87 +
 .../scheduling/support/CronTriggerTests.java       |     4 +-
 .../scripting/bsh/BshScriptFactoryTests.java       |    61 +-
 .../springframework/scripting/bsh/bsh-with-xsd.xml |    63 -
 .../scripting/config/ScriptingDefaultsTests.java   |    27 +-
 .../scripting/groovy/GroovyAspectTests.java        |    30 +-
 .../scripting/groovy/GroovyClassLoadingTests.java  |    24 +-
 .../scripting/groovy/GroovyScriptFactoryTests.java |   130 +-
 .../scripting/groovy/LogUserAdvice.java            |    26 +-
 .../scripting/groovy/calculators-with-xsd.xml      |    18 -
 .../scripting/groovy/calculators.xml               |    25 -
 .../groovy/groovy-with-xsd-proxy-target-class.xml  |    14 -
 .../scripting/groovy/groovy-with-xsd.xml           |    60 -
 .../scripting/groovy/groovyContext.xml             |    71 -
 .../groovy/jruby-with-xsd-proxy-target-class.xml   |    17 -
 .../scripting/groovy/lwspBadGroovyContext.xml      |    22 -
 .../scripting/groovy/twoClassesCorrectOneFirst.xml |    28 -
 .../scripting/groovy/twoClassesWrongOneFirst.xml   |    28 -
 .../scripting/jruby/JRubyScriptFactoryTests.java   |    60 +-
 .../scripting/jruby/jruby-with-xsd.xml             |    79 -
 .../RefreshableScriptTargetSourceTests.java        |    18 +-
 .../support/ResourceScriptSourceTests.java         |    23 +-
 .../support/StandardScriptFactoryTests.java        |    67 +
 .../scripting/support/StaticScriptSourceTests.java |    61 +-
 .../scripting/support/groovyReferences.xml         |    32 -
 .../validation/DataBinderTests.java                |   323 +-
 .../beanvalidation/MethodValidationTests.java      |    33 +-
 .../aop/aspectj/AfterAdviceBindingTests.xml        |     0
 .../aspectj/AfterReturningAdviceBindingTests.xml   |     0
 .../aspectj/AfterThrowingAdviceBindingTests.xml    |    42 +
 .../aop/aspectj/AroundAdviceBindingTests.xml       |     0
 .../aop/aspectj/AroundAdviceCircularTests.xml      |     0
 .../aop/aspectj/AspectAndAdvicePrecedenceTests.xml |    90 +
 .../AspectJExpressionPointcutAdvisorTests.xml      |     0
 .../aop/aspectj/BeanNamePointcutAtAspectTests.xml  |     0
 .../aop/aspectj/BeanNamePointcutTests.xml          |    62 +
 .../aop/aspectj/BeforeAdviceBindingTests.xml       |     0
 .../aspectj/DeclarationOrderIndependenceTests.xml  |    32 +
 .../aop/aspectj/DeclareParentsDelegateRefTests.xml |    22 +
 .../aop/aspectj/DeclareParentsTests.xml            |     0
 .../ImplicitJPArgumentMatchingAtAspectJTests.xml   |    18 +
 .../aspectj/ImplicitJPArgumentMatchingTests.xml    |    22 +
 .../aspectj/OverloadedAdviceTests-ambiguous.xml    |    20 +
 .../aop/aspectj/OverloadedAdviceTests.xml          |    21 +
 .../springframework/aop/aspectj/ProceedTests.xml   |     0
 .../aspectj/PropertyDependentAspectTests-after.xml |     0
 ...ropertyDependentAspectTests-atAspectJ-after.xml |     0
 ...opertyDependentAspectTests-atAspectJ-before.xml |     0
 .../PropertyDependentAspectTests-before.xml        |     0
 .../SharedPointcutWithArgsMismatchTests.xml        |    20 +
 .../aop/aspectj/SubtypeSensitiveMatchingTests.xml  |    31 +
 .../aop/aspectj/TargetPointcutSelectionTests.xml   |     0
 ...dTargetSelectionOnlyPointcutsAtAspectJTests.xml |    17 +
 .../ThisAndTargetSelectionOnlyPointcutsTests.xml   |    56 +
 .../autoproxy/AnnotationBindingTests-context.xml   |     0
 .../autoproxy/AnnotationPointcutTests-context.xml  |    22 +
 .../AspectImplementingInterfaceTests-context.xml   |    20 +
 ...CreatorAndLazyInitTargetSourceTests-context.xml |     0
 .../AspectJAutoProxyCreatorTests-aspects.xml       |    39 +
 ...ctJAutoProxyCreatorTests-aspectsPlusAdvisor.xml |     0
 ...toProxyCreatorTests-aspectsWithAbstractBean.xml |     0
 ...pectJAutoProxyCreatorTests-aspectsWithCGLIB.xml |    16 +
 ...tJAutoProxyCreatorTests-aspectsWithOrdering.xml |    25 +
 .../AspectJAutoProxyCreatorTests-pertarget.xml     |    23 +
 .../AspectJAutoProxyCreatorTests-perthis.xml       |     0
 .../AspectJAutoProxyCreatorTests-retryAspect.xml   |     0
 ...spectJAutoProxyCreatorTests-twoAdviceAspect.xml |     0
 ...oProxyCreatorTests-twoAdviceAspectPrototype.xml |     0
 .../AspectJAutoProxyCreatorTests-usesInclude.xml   |     0
 ...tJAutoProxyCreatorTests-usesJoinPointAspect.xml |     0
 .../AtAspectJAfterThrowingTests-context.xml        |    12 +
 .../AtAspectJAnnotationBindingTests-context.xml    |     0
 .../autoproxy/benchmark/BenchmarkTests-aspectj.xml |    32 +
 .../benchmark/BenchmarkTests-springAop.xml         |     0
 .../aop/aspectj/autoproxy/spr3064/SPR3064Tests.xml |    14 +
 ...erReturningGenericTypeMatchingTests-context.xml |    14 +
 ...BridgeMethodMatchingClassProxyTests-context.xml |    14 +
 .../GenericBridgeMethodMatchingTests-context.xml   |     0
 .../GenericParameterMatchingTests-context.xml      |     0
 .../AopNamespaceHandlerAdviceTypeTests-error.xml   |     0
 .../AopNamespaceHandlerAdviceTypeTests-ok.xml      |     0
 .../AopNamespaceHandlerArgNamesTests-error.xml     |     0
 .../config/AopNamespaceHandlerArgNamesTests-ok.xml |    23 +
 ...mespaceHandlerProxyTargetClassTests-context.xml |     0
 .../AopNamespaceHandlerReturningTests-error.xml    |     0
 .../AopNamespaceHandlerReturningTests-ok.xml       |     0
 .../config/AopNamespaceHandlerTests-context.xml    |     0
 .../AopNamespaceHandlerThrowingTests-error.xml     |     0
 .../config/AopNamespaceHandlerThrowingTests-ok.xml |     0
 .../aop/config/PrototypeProxyTests-context.xml     |    27 +
 .../CglibProxyTests-with-dependency-checking.xml   |     0
 .../aop/framework/ObjenesisProxyTests-context.xml  |     0
 .../framework/ProxyFactoryBeanTests-autowiring.xml |     0
 .../framework/ProxyFactoryBeanTests-context.xml    |     0
 .../ProxyFactoryBeanTests-double-targetsource.xml  |    54 +
 .../aop/framework/ProxyFactoryBeanTests-frozen.xml |     0
 .../ProxyFactoryBeanTests-inner-bean-target.xml    |     0
 .../framework/ProxyFactoryBeanTests-invalid.xml    |     0
 .../ProxyFactoryBeanTests-notlast-targetsource.xml |    34 +
 .../framework/ProxyFactoryBeanTests-prototype.xml  |    37 +
 .../ProxyFactoryBeanTests-serialization.xml        |     0
 .../ProxyFactoryBeanTests-targetsource.xml         |     0
 .../ProxyFactoryBeanTests-throws-advice.xml        |     0
 .../AdvisorAdapterRegistrationTests-with-bpp.xml   |    23 +
 ...AdvisorAdapterRegistrationTests-without-bpp.xml |    21 +
 ...orAutoProxyCreatorTests-common-interceptors.xml |    46 +
 ...orAutoProxyCreatorTests-custom-targetsource.xml |     0
 .../AdvisorAutoProxyCreatorTests-optimized.xml     |     0
 ...sorAutoProxyCreatorTests-quick-targetsource.xml |    44 +
 .../BeanNameAutoProxyCreatorInitTests-context.xml  |    29 +
 .../BeanNameAutoProxyCreatorTests-context.xml      |     0
 .../aop/scope/ScopedProxyTests-list.xml            |     0
 .../aop/scope/ScopedProxyTests-map.xml             |     0
 .../aop/scope/ScopedProxyTests-override.xml        |    21 +
 .../aop/scope/ScopedProxyTests-testbean.xml        |     0
 .../CommonsPool2TargetSourceTests-context.xml      |    69 +
 .../CommonsPoolTargetSourceTests-context.xml       |    69 +
 ...ookupMethodWrappedByCglibProxyTests-context.xml |    39 +
 .../xml/QualifierAnnotationTests-context.xml       |    62 +
 .../factory/xml/XmlBeanFactoryTests-autowire.xml   |     0
 .../factory/xml/XmlBeanFactoryTests-child.xml      |    51 +
 .../xml/XmlBeanFactoryTests-classNotFound.xml      |     0
 .../xml/XmlBeanFactoryTests-collections.xml        |     0
 .../XmlBeanFactoryTests-complexFactoryCircle.xml   |    33 +
 .../xml/XmlBeanFactoryTests-constructorArg.xml     |     0
 .../XmlBeanFactoryTests-constructorOverrides.xml   |    34 +
 .../xml/XmlBeanFactoryTests-defaultAutowire.xml    |     0
 .../xml/XmlBeanFactoryTests-defaultLazyInit.xml    |     0
 .../XmlBeanFactoryTests-delegationOverrides.xml    |     0
 .../factory/xml/XmlBeanFactoryTests-depCarg.xml    |     0
 .../xml/XmlBeanFactoryTests-depCargAutowire.xml    |     0
 .../xml/XmlBeanFactoryTests-depCargInner.xml       |     0
 .../xml/XmlBeanFactoryTests-depDependsOn.xml       |     0
 .../xml/XmlBeanFactoryTests-depDependsOnInner.xml  |     0
 .../xml/XmlBeanFactoryTests-depMaterializeThis.xml |     0
 .../factory/xml/XmlBeanFactoryTests-depProp.xml    |     0
 .../XmlBeanFactoryTests-depPropAutowireByName.xml  |     0
 .../XmlBeanFactoryTests-depPropAutowireByType.xml  |     0
 .../xml/XmlBeanFactoryTests-depPropInTheMiddle.xml |     0
 .../xml/XmlBeanFactoryTests-depPropInner.xml       |     0
 .../xml/XmlBeanFactoryTests-factoryCircle.xml      |     0
 .../xml/XmlBeanFactoryTests-initializers.xml       |     0
 .../factory/xml/XmlBeanFactoryTests-invalid.xml    |     0
 ...anFactoryTests-invalidOverridesNoSuchMethod.xml |    24 +
 ...mlBeanFactoryTests-localCollectionsUsingXsd.xml |    36 +
 .../XmlBeanFactoryTests-noSuchFactoryMethod.xml    |    17 +
 .../factory/xml/XmlBeanFactoryTests-overrides.xml  |    84 +
 .../factory/xml/XmlBeanFactoryTests-parent.xml     |     0
 .../xml/XmlBeanFactoryTests-recursiveImport.xml    |     8 +
 .../factory/xml/XmlBeanFactoryTests-reftypes.xml   |     0
 .../factory/xml/XmlBeanFactoryTests-resource.xml   |    13 +
 .../xml/XmlBeanFactoryTests-resourceImport.xml     |     0
 .../XmlBeanFactoryTests-satisfiedAllDepCheck.xml   |    17 +
 ...XmlBeanFactoryTests-satisfiedObjectDepCheck.xml |    13 +
 ...XmlBeanFactoryTests-satisfiedSimpleDepCheck.xml |     0
 ...anFactoryTests-testWithDuplicateNameInAlias.xml |     0
 .../XmlBeanFactoryTests-testWithDuplicateNames.xml |     0
 ...yTests-unsatisfiedAllDepCheckMissingObjects.xml |    14 +
 ...ryTests-unsatisfiedAllDepCheckMissingSimple.xml |    16 +
 ...lBeanFactoryTests-unsatisfiedObjectDepCheck.xml |     0
 ...lBeanFactoryTests-unsatisfiedSimpleDepCheck.xml |     0
 .../CustomNamespaceHandlerTests-context.xml        |     0
 .../support/CustomNamespaceHandlerTests.properties |     0
 .../xml/support/CustomNamespaceHandlerTests.xsd    |     0
 .../beans/factory/xml/test.properties              |     0
 .../springframework/cache/config/cache-advice.xml  |     1 +
 ...textJndiBeanFactoryLocatorTests-collections.xml |     0
 .../ContextJndiBeanFactoryLocatorTests-parent.xml  |     0
 ...extSingletonBeanFactoryLocatorTests-context.xml |     0
 .../DestroyMethodInferenceTests-context.xml        |    26 +
 .../EnableLoadTimeWeavingTests-context.xml         |     0
 .../context/annotation/Spr6602Tests-context.xml    |     0
 .../context/annotation/aspectjTypeFilterTests.xml  |     0
 .../aspectjTypeFilterTestsWithPlaceholders.xml     |     0
 ...componentScanRespectsProfileAnnotationTests.xml |     0
 .../componentScanWithAutowiredQualifierTests.xml   |     0
 .../AutowiredConfigurationTests-custom.properties  |     0
 .../AutowiredConfigurationTests-custom.xml         |     0
 .../configuration/AutowiredConfigurationTests.xml  |     0
 .../ImportNonXmlResourceConfig-context.properties  |     0
 .../configuration/ImportXmlConfig-context.xml      |     0
 .../ImportXmlWithAopNamespace-context.xml          |    16 +
 .../ImportXmlWithConfigurationClass-context.xml    |     0
 .../configuration/SecondLevelSubConfig-context.xml |     0
 .../configuration/ValueInjectionTests.xml          |     0
 .../annotation/configuration/annotation-config.xml |     0
 .../configuration/aspectj-autoproxy-config.xml     |     0
 ...onUsedForBothComponentScanAndQualifierTests.xml |     0
 .../annotation/customNameGeneratorTests.xml        |     0
 .../annotation/customScopeResolverTests.xml        |     0
 .../context/annotation/customTypeFilterTests.xml   |     0
 .../annotation/defaultAutowireByNameTests.xml      |    29 +
 .../annotation/defaultAutowireByTypeTests.xml      |    29 +
 .../annotation/defaultAutowireConstructorTests.xml |    29 +
 .../context/annotation/defaultAutowireNoTests.xml  |    29 +
 .../annotation/defaultDependencyCheckAllTests.xml  |    29 +
 ...pendencyCheckObjectsWithAutowireByNameTests.xml |    27 +
 .../defaultInitAndDestroyMethodsTests.xml          |     0
 .../annotation/defaultLazyInitFalseTests.xml       |    16 +
 .../annotation/defaultLazyInitTrueTests.xml        |    16 +
 ...efaultNonExistingInitAndDestroyMethodsTests.xml |     0
 .../annotation/defaultWithNoOverridesTests.xml     |    28 +
 .../context/annotation/doubleScanTests.xml         |     0
 .../invalidClassNameScopeResolverTests.xml         |     0
 .../invalidConstructorNameGeneratorTests.xml       |     0
 .../annotation/matchingResourcePatternTests.xml    |     0
 .../annotation/nonMatchingResourcePatternTests.xml |     0
 .../context/annotation/p1.properties               |     0
 .../context/annotation/p2.properties               |     0
 .../context/annotation/p3.properties               |     0
 .../context/annotation/p4.properties               |     0
 .../context/annotation/scopedProxyDefaultTests.xml |     0
 .../annotation/scopedProxyInterfacesTests.xml      |     0
 .../annotation/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
 .../contextNamespaceHandlerTests-location.xml      |     8 +-
 .../contextNamespaceHandlerTests-override.xml      |     8 +-
 ...contextNamespaceHandlerTests-replace-ignore.xml |    14 +-
 .../contextNamespaceHandlerTests-replace.xml       |    14 +-
 .../config/contextNamespaceHandlerTests-simple.xml |     4 +
 .../config/contextNamespaceHandlerTests-system.xml |    12 +-
 .../conversionservice/conversionService.xml        |     2 +-
 .../context/event/simple-event-configuration.xml   |    17 +
 .../context/groovy/applicationContext-error.groovy |     0
 .../context/groovy/applicationContext.groovy       |     0
 .../context/groovy/applicationContext2.groovy      |     0
 .../org/springframework/context/groovy/test.xml    |     0
 ...lassPathXmlApplicationContextTests-resource.xml |    17 +
 ...thXmlApplicationContextTests-resourceImport.xml |     0
 .../GenericXmlApplicationContextTests-context.xml  |     0
 ...rtySourcesPlaceholderConfigurerTests.properties |     0
 .../context/support/aliasForParent.xml             |     0
 .../context/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
 .../context/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
 .../springframework/context/support/spr7283.xml    |    16 +
 .../springframework/context/support/spr7816.xml    |    19 +
 .../context/support/test.properties                |     0
 .../context/support/test/aliased-contextC.xml      |    19 +
 .../context/support/test/contextA.xml              |     0
 .../context/support/test/contextB.xml              |    11 +
 .../context/support/test/contextC.xml              |    17 +
 .../context/support/test/import1.xml               |     0
 .../context/support/test/subtest/import2.xml       |     0
 .../context/support/testBeans.properties           |     0
 .../ejb/config/jeeNamespaceHandlerTests.xml        |    78 +
 .../instrument/classloading/testResource.xml       |     0
 .../org/springframework/jmx/applicationContext.xml |     0
 .../jmx/export/annotation/annotations.xml          |    41 +
 .../jmx/export/annotation/componentScan.xml        |     0
 .../jmx/export/annotation/lazyAssembling.xml       |     0
 .../jmx/export/annotation/lazyNaming.xml           |     0
 .../jmx/export/assembler/interfaceAssembler.xml    |     0
 .../export/assembler/interfaceAssemblerCustom.xml  |     0
 .../export/assembler/interfaceAssemblerMapped.xml  |     0
 .../jmx/export/assembler/metadata-autodetect.xml   |     0
 .../jmx/export/assembler/metadataAssembler.xml     |     0
 .../export/assembler/methodExclusionAssembler.xml  |     0
 .../assembler/methodExclusionAssemblerCombo.xml    |     0
 .../assembler/methodExclusionAssemblerMapped.xml   |     0
 .../methodExclusionAssemblerNotMapped.xml          |     0
 .../jmx/export/assembler/methodNameAssembler.xml   |     0
 .../export/assembler/methodNameAssemblerMapped.xml |     0
 .../jmx/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
 .../springframework/jmx/export/excludedBeans.xml   |     0
 .../org/springframework/jmx/export/lazyInit.xml    |     0
 .../jmx/export/naming/jmx-names.properties         |     0
 .../jmx/export/notificationPublisherLazyTests.xml  |     0
 .../jmx/export/notificationPublisherTests.xml      |     0
 .../jmx/export/propertyPlaceholderConfigurer.xml   |     0
 .../scheduling/annotation/taskNamespaceTests.xml   |     0
 .../scheduling/config/annotationDrivenContext.xml  |     6 +-
 .../org/springframework/scripting/bsh/Broken.bsh   |     0
 .../springframework/scripting/bsh/Calculator.bsh   |     0
 .../springframework/scripting/bsh/Messenger.bsh    |     0
 .../scripting/bsh/MessengerImpl.bsh                |     0
 .../scripting/bsh/MessengerInstance.bsh            |     0
 .../springframework/scripting/bsh/bsh-with-xsd.xml |    63 +
 .../scripting/bsh/bshBrokenContext.xml             |     0
 .../springframework/scripting/bsh/bshContext.xml   |     0
 .../scripting/bsh/bshRefreshableContext.xml        |     0
 .../org/springframework/scripting/bsh/simple.bsh   |     0
 .../scripting/config/scriptingDefaultsTests.xml    |     2 +-
 .../scripting/groovy/Broken.groovyb                |     0
 .../scripting/groovy/Calculator.groovy             |     0
 .../scripting/groovy/CallCounter.groovy            |     0
 .../scripting/groovy/DelegatingCalculator.groovy   |     0
 ...pectIntegrationTests-groovy-dynamic-context.xml |     0
 ...ctIntegrationTests-groovy-interface-context.xml |     0
 ...tionTests-groovy-proxy-target-class-context.xml |     0
 .../GroovyAspectIntegrationTests-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      |    18 +
 .../scripting/groovy/calculators.xml               |    25 +
 .../groovy/groovy-multiple-properties.xml          |     0
 .../scripting/groovy/groovy-with-xsd-jsr223.xml    |    42 +
 .../groovy/groovy-with-xsd-proxy-target-class.xml  |    13 +
 .../scripting/groovy/groovy-with-xsd.xml           |    60 +
 .../scripting/groovy/groovyBrokenContext.xml       |     0
 .../scripting/groovy/groovyContext.xml             |    66 +
 .../scripting/groovy/groovyContextWithJsr223.xml   |    61 +
 .../scripting/groovy/groovyRefreshableContext.xml  |     0
 .../groovy/jruby-with-xsd-proxy-target-class.xml   |    17 +
 .../scripting/groovy/lwspBadGroovyContext.xml      |    22 +
 .../springframework/scripting/groovy/simple.groovy |     0
 .../scripting/groovy/twoClassesCorrectOneFirst.xml |    28 +
 .../scripting/groovy/twoClassesWrongOneFirst.xml   |    28 +
 ...ScriptFactoryTests-beanNameAutoProxyCreator.xml |     0
 .../AdvisedJRubyScriptFactoryTests-factoryBean.xml |     0
 .../org/springframework/scripting/jruby/Broken.rb  |     0
 .../springframework/scripting/jruby/Calculator.rb  |     0
 .../springframework/scripting/jruby/Messenger.rb   |     0
 .../scripting/jruby/MessengerWithInstance.rb       |    25 +
 .../org/springframework/scripting/jruby/Printer.rb |     0
 .../scripting/jruby/PrinterWithInstance.rb         |    11 +
 .../springframework/scripting/jruby/jruby-aop.xml  |     0
 .../scripting/jruby/jruby-with-xsd-jsr223.xml      |    32 +
 .../scripting/jruby/jruby-with-xsd.xml             |    79 +
 .../scripting/jruby/jrubyBrokenContext.xml         |     0
 .../scripting/jruby/jrubyContext.xml               |     0
 .../scripting/jruby/jrubyContextForPrimitives.xml  |     0
 .../scripting/jruby/jrubyContextForWrappers.xml    |     0
 .../scripting/jruby/jrubyContextWithJsr223.xml     |    40 +
 .../scripting/jruby/jrubyRefreshableContext.xml    |     0
 .../springframework/scripting/support/Messenger.js |     1 +
 .../scripting/support/groovyReferences.xml         |    32 +
 .../scripting/support/jsr223-with-xsd.xml          |    23 +
 .../java/org/springframework/asm/ClassReader.java  |     5 +
 .../java/org/springframework/asm/ClassWriter.java  |    14 +-
 .../springframework/core/BridgeMethodResolver.java |     2 +-
 .../springframework/core/CollectionFactory.java    |    87 +-
 .../java/org/springframework/core/Conventions.java |     2 +-
 .../core/DefaultParameterNameDiscoverer.java       |     8 +-
 .../core/ExceptionDepthComparator.java             |     4 +-
 .../java/org/springframework/core/JdkVersion.java  |    11 +-
 .../springframework/core/MethodIntrospector.java   |   157 +
 .../org/springframework/core/MethodParameter.java  |    63 +-
 .../org/springframework/core/OrderComparator.java  |    43 +-
 .../java/org/springframework/core/Ordered.java     |    39 +-
 .../core/OverridingClassLoader.java                |    19 +-
 .../core/ParameterizedTypeReference.java           |     4 +-
 .../org/springframework/core/PriorityOrdered.java  |    21 +-
 .../org/springframework/core/ResolvableType.java   |   249 +-
 .../core/ResolvableTypeProvider.java               |    40 +
 .../core/SerializableTypeWrapper.java              |     7 +-
 .../springframework/core/SimpleAliasRegistry.java  |    37 +-
 ...ractAliasAwareAnnotationAttributeExtractor.java |   133 +
 .../springframework/core/annotation/AliasFor.java  |   212 +
 .../core/annotation/AnnotatedElementUtils.java     |  1026 +-
 .../annotation/AnnotationAttributeExtractor.java   |    63 +
 .../core/annotation/AnnotationAttributes.java      |   485 +-
 .../annotation/AnnotationAwareOrderComparator.java |    33 +-
 .../AnnotationConfigurationException.java          |    52 +
 .../core/annotation/AnnotationUtils.java           |  1839 +-
 .../DefaultAnnotationAttributeExtractor.java       |    62 +
 .../MapAnnotationAttributeExtractor.java           |   169 +
 .../org/springframework/core/annotation/Order.java |    31 +-
 .../core/annotation/SynthesizedAnnotation.java     |    28 +
 .../SynthesizedAnnotationInvocationHandler.java    |   261 +
 .../annotation/SynthesizingMethodParameter.java    |    58 +
 .../core/annotation/package-info.java              |     3 +-
 .../core/convert/TypeDescriptor.java               |    83 +-
 .../converter/ConditionalGenericConverter.java     |     5 +-
 .../core/convert/converter/Converter.java          |    17 +-
 .../core/convert/converter/GenericConverter.java   |     2 +-
 .../core/convert/support/ByteBufferConverter.java  |     7 +-
 .../convert/support/ConversionServiceFactory.java  |    20 +-
 .../convert/support/DefaultConversionService.java  |    79 +-
 .../convert/support/EnumToStringConverter.java     |    11 +-
 .../support/FallbackObjectToStringConverter.java   |    24 +-
 .../convert/support/GenericConversionService.java  |     8 +-
 .../support/NumberToNumberConverterFactory.java    |     6 +-
 .../convert/support/ObjectToObjectConverter.java   |   147 +-
 .../core/convert/support/StreamConverter.java      |   125 +
 .../convert/support/StringToCharsetConverter.java  |    36 +
 .../convert/support/StringToCurrencyConverter.java |    36 +
 .../support/StringToNumberConverterFactory.java    |     3 +-
 .../convert/support/StringToTimeZoneConverter.java |    39 +
 .../core/env/CommandLinePropertySource.java        |    34 +-
 .../core/env/CompositePropertySource.java          |     8 +-
 .../core/env/EnumerablePropertySource.java         |     5 +-
 .../core/env/PropertySourcesPropertyResolver.java  |     6 +-
 .../core/env/ReadOnlySystemAttributesMap.java      |    11 +-
 .../springframework/core/io/AbstractResource.java  |     6 +-
 .../springframework/core/io/ByteArrayResource.java |    10 +-
 .../core/io/InputStreamResource.java               |    25 +-
 .../springframework/core/io/ResourceEditor.java    |    28 +-
 .../org/springframework/core/io/UrlResource.java   |    20 +-
 .../org/springframework/core/io/VfsResource.java   |     5 +-
 .../core/io/support/EncodedResource.java           |    12 +-
 .../PathMatchingResourcePatternResolver.java       |    16 +-
 .../core/io/support/PropertiesLoaderUtils.java     |     4 +-
 .../io/support/ResourceArrayPropertyEditor.java    |    26 +-
 .../core/io/support/ResourcePropertySource.java    |    15 +-
 .../core/serializer/DefaultDeserializer.java       |    31 +-
 .../serializer/support/DeserializingConverter.java |    12 +
 .../core/type/AnnotatedTypeMetadata.java           |    27 +-
 .../core/type/AnnotationMetadata.java              |    38 +-
 .../springframework/core/type/MethodMetadata.java  |    18 +-
 .../core/type/StandardAnnotationMetadata.java      |    59 +-
 .../core/type/StandardMethodMetadata.java          |    36 +-
 .../AnnotationMetadataReadingVisitor.java          |    42 +-
 .../AnnotationReadingVisitorUtils.java             |    34 +-
 .../classreading/MethodMetadataReadingVisitor.java |    45 +-
 .../core/type/filter/AnnotationTypeFilter.java     |     4 +-
 .../springframework/objenesis/SpringObjenesis.java |   153 +
 .../springframework/objenesis/package-info.java    |    15 +
 .../org/springframework/util/AntPathMatcher.java   |    42 +-
 .../main/java/org/springframework/util/Assert.java |    53 +-
 .../java/org/springframework/util/Base64Utils.java |   184 +-
 .../java/org/springframework/util/ClassUtils.java  |    19 +-
 .../org/springframework/util/CollectionUtils.java  |     5 +-
 .../util/ConcurrentReferenceHashMap.java           |    10 +-
 .../java/org/springframework/util/DigestUtils.java |    72 +-
 .../util/FastByteArrayOutputStream.java            |   546 +
 .../java/org/springframework/util/IdGenerator.java |     4 +-
 .../util/LinkedCaseInsensitiveMap.java             |    32 +-
 .../springframework/util/LinkedMultiValueMap.java  |    29 +
 .../org/springframework/util/Log4jConfigurer.java  |     3 +
 .../java/org/springframework/util/MimeType.java    |    69 +-
 .../org/springframework/util/MimeTypeUtils.java    |    34 +-
 .../java/org/springframework/util/NumberUtils.java |    80 +-
 .../java/org/springframework/util/ObjectUtils.java |    55 +-
 .../org/springframework/util/ReflectionUtils.java  |   148 +-
 .../util/ResizableByteArrayOutputStream.java       |     7 +
 .../java/org/springframework/util/SocketUtils.java |    29 +-
 .../java/org/springframework/util/StopWatch.java   |    32 +-
 .../java/org/springframework/util/StreamUtils.java |    12 +
 .../java/org/springframework/util/StringUtils.java |   359 +-
 .../java/org/springframework/util/TypeUtils.java   |     4 +-
 .../util/UpdateMessageDigestInputStream.java       |    63 +
 .../util/backoff/ExponentialBackOff.java           |    14 +-
 .../springframework/util/backoff/FixedBackOff.java |     8 +-
 .../CompletableToListenableFutureAdapter.java      |    93 +
 .../util/concurrent/FutureAdapter.java             |     6 +
 .../ListenableFutureCallbackRegistry.java          |     1 -
 .../util/xml/AbstractStaxXMLReader.java            |    34 +-
 .../util/xml/AbstractXMLReader.java                |    71 +-
 .../util/xml/SimpleNamespaceContext.java           |   140 +-
 .../core/BridgeMethodResolverTests.java            |     3 +-
 .../org/springframework/core/ConstantsTests.java   |    39 +-
 .../org/springframework/core/ConventionsTests.java |    66 +-
 .../core/ExceptionDepthComparatorTests.java        |     3 +-
 .../core/GenericTypeResolverTests.java             |     6 +-
 ...lVariableTableParameterNameDiscovererTests.java |    56 +-
 .../springframework/core/NestedExceptionTests.java |    25 +-
 .../springframework/core/OrderComparatorTests.java |    75 +-
 .../PrioritizedParameterNameDiscovererTests.java   |    37 +-
 .../springframework/core/ResolvableTypeTests.java  |   104 +-
 ...sAwareAnnotationAttributeExtractorTestCase.java |    68 +
 .../annotation/AnnotatedElementUtilsTests.java     |  1056 +-
 .../core/annotation/AnnotationAttributesTests.java |   578 +-
 .../core/annotation/AnnotationUtilsTests.java      |  2022 +-
 .../DefaultAnnotationAttributeExtractorTests.java  |    34 +
 .../MapAnnotationAttributeExtractorTests.java      |   127 +
 .../subpackage/NonPublicAliasedAnnotatedClass.java |    28 +
 .../subpackage/NonPublicAliasedAnnotation.java     |    40 +
 .../core/convert/TypeDescriptorTests.java          |    48 +-
 .../CollectionToCollectionConverterTests.java      |     4 +-
 .../support/DefaultConversionServiceTests.java     |    46 +-
 .../support/GenericConversionServiceTests.java     |   392 +-
 .../convert/support/MapToMapConverterTests.java    |     3 +-
 .../core/convert/support/StreamConverterTests.java |   194 +
 .../springframework/core/io/PathResourceTests.java |     7 +-
 .../org/springframework/core/io/ResourceTests.java |    10 +-
 .../PathMatchingResourcePatternResolverTests.java  |    86 +-
 .../io/support/ResourcePropertySourceTests.java    |    23 +-
 .../core/style/ToStringCreatorTests.java           |    41 +-
 .../core/task/SimpleAsyncTaskExecutorTests.java    |    55 +-
 .../core/type/AnnotationMetadataTests.java         |     6 +-
 .../core/type/AspectJTypeFilterTests.java          |    39 +-
 .../core/type/AssignableTypeFilterTests.java       |    32 +-
 .../core/type/ClassloadingAssertions.java          |    26 +-
 .../java/org/springframework/tests/Assume.java     |    40 +-
 .../org/springframework/tests/JavaVersion.java     |    23 +-
 .../springframework/tests/JavaVersionTests.java    |     4 +-
 .../java/org/springframework/tests/Matchers.java   |     2 +-
 .../java/org/springframework/tests/TestGroup.java  |     3 +-
 .../springframework/util/AntPathMatcherTests.java  |    60 +-
 .../java/org/springframework/util/AssertTests.java |    15 +-
 .../util/AutoPopulatingListTests.java              |    25 +-
 .../org/springframework/util/Base64UtilsTests.java |   106 +
 .../org/springframework/util/ClassUtilsTests.java  |     3 +-
 .../org/springframework/util/DigestUtilsTests.java |    14 +-
 .../util/FastByteArrayOutputStreamTests.java       |   213 +
 .../springframework/util/FileCopyUtilsTests.java   |    26 +-
 .../springframework/util/FileSystemUtilsTests.java |    23 +-
 .../util/LinkedCaseInsensitiveMapTests.java        |    33 +-
 .../springframework/util/Log4jConfigurerTests.java |    49 +-
 .../springframework/util/MethodInvokerTests.java   |    81 +-
 .../org/springframework/util/MimeTypeTests.java    |    40 +-
 .../springframework/util/MockLog4jAppender.java    |    20 +-
 .../org/springframework/util/NumberUtilsTests.java |    44 +-
 .../org/springframework/util/ObjectUtilsTests.java |   299 +-
 .../util/PropertiesPersisterTests.java             |    32 +-
 .../org/springframework/util/SocketUtilsTests.java |    81 +-
 .../org/springframework/util/StopWatchTests.java   |   137 +-
 .../org/springframework/util/StringUtilsTests.java |     6 +-
 .../util/concurrent/ListenableFutureTaskTests.java |     3 +-
 .../concurrent/SettableListenableFutureTests.java  |    10 +-
 .../util/xml/AbstractStaxHandlerTestCase.java      |    24 +-
 .../util/xml/AbstractStaxXMLReaderTestCase.java    |    15 +-
 .../util/xml/SimpleNamespaceContextTests.java      |   205 +-
 .../util/xml/StaxEventXMLReaderTests.java          |    15 +-
 .../util/xml/StaxStreamXMLReaderTests.java         |     9 +-
 .../org/springframework/core/io/example.properties |     0
 .../org/springframework/core/io/example.xml        |     0
 .../expression/common/ExpressionUtils.java         |    19 +-
 .../springframework/expression/spel/CodeFlow.java  |   142 +-
 .../spel/CompilablePropertyAccessor.java           |     2 +-
 .../expression/spel/CompiledExpression.java        |     4 +-
 .../expression/spel/ExpressionState.java           |    31 +-
 .../expression/spel/SpelMessage.java               |     2 +-
 .../expression/spel/ast/BooleanLiteral.java        |     5 +-
 .../expression/spel/ast/FloatLiteral.java          |     6 +-
 .../expression/spel/ast/Indexer.java               |     2 +-
 .../expression/spel/ast/IntLiteral.java            |     6 +-
 .../expression/spel/ast/LongLiteral.java           |     5 +-
 .../expression/spel/ast/MethodReference.java       |     4 +-
 .../expression/spel/ast/OpDivide.java              |    26 +-
 .../expression/spel/ast/OpMinus.java               |    26 +-
 .../expression/spel/ast/OpModulus.java             |    26 +-
 .../expression/spel/ast/OpMultiply.java            |    26 +-
 .../expression/spel/ast/OpPlus.java                |    24 +-
 .../expression/spel/ast/Projection.java            |    19 +-
 .../spel/ast/PropertyOrFieldReference.java         |     4 +-
 .../expression/spel/ast/Selection.java             |    30 +-
 .../standard/InternalSpelExpressionParser.java     |    20 +-
 .../expression/spel/standard/SpelCompiler.java     |    31 +-
 .../expression/spel/standard/SpelExpression.java   |     6 +-
 .../spel/support/ReflectiveMethodResolver.java     |     7 +-
 .../expression/spel/generated/SpringExpressions.g  |     0
 .../expression/spel/EvaluationTests.java           |     2 +-
 .../expression/spel/IndexingTests.java             |     3 +-
 .../springframework/expression/spel/MapTests.java  |    68 +-
 .../spel/SelectionAndProjectionTests.java          |   104 +-
 .../expression/spel/SetValueTests.java             |    10 +-
 .../spel/SpelCompilationCoverageTests.java         |  1010 +-
 .../spel/SpelCompilationPerformanceTests.java      |   106 +-
 .../expression/spel/SpelDocumentationTests.java    |     3 +-
 .../expression/spel/SpelReproTests.java            |   219 +-
 .../spel/testdata/PersonInOtherPackage.java        |     2 +-
 spring-framework-bom/spring-framework-bom.txt      |     2 +
 .../apache/catalina/loader/WebappClassLoader.java  |    44 +
 .../tomcat/TomcatInstrumentableClassLoader.java    |    22 +-
 .../EmbeddedDatabaseBeanDefinitionParser.java      |    59 +-
 .../jdbc/core/BeanPropertyRowMapper.java           |   160 +-
 .../jdbc/core/ConnectionCallback.java              |     5 +-
 .../springframework/jdbc/core/JdbcOperations.java  |   120 +-
 .../springframework/jdbc/core/JdbcTemplate.java    |    58 +-
 .../jdbc/core/PreparedStatementCallback.java       |     6 +-
 .../jdbc/core/SingleColumnRowMapper.java           |    24 +-
 .../jdbc/core/SqlRowSetResultSetExtractor.java     |    14 +-
 .../jdbc/core/StatementCallback.java               |     6 +-
 .../jdbc/core/StatementCreatorUtils.java           |    16 +-
 .../jdbc/core/metadata/CallMetaDataContext.java    |    37 +-
 .../core/metadata/CallMetaDataProviderFactory.java |     4 +
 .../core/metadata/GenericCallMetaDataProvider.java |    37 +-
 .../core/metadata/HanaCallMetaDataProvider.java    |    42 +
 .../namedparam/NamedParameterJdbcOperations.java   |    74 +-
 .../namedparam/NamedParameterJdbcTemplate.java     |    26 -
 .../jdbc/core/namedparam/NamedParameterUtils.java  |    12 +-
 .../jdbc/core/simple/AbstractJdbcCall.java         |    17 +
 .../simple/ParameterizedBeanPropertyRowMapper.java |    71 -
 .../jdbc/core/simple/ParameterizedRowMapper.java   |    36 -
 .../simple/ParameterizedSingleColumnRowMapper.java |    53 -
 .../jdbc/core/simple/SimpleJdbcCall.java           |     7 +
 .../jdbc/core/simple/SimpleJdbcCallOperations.java |    10 +-
 .../jdbc/core/simple/SimpleJdbcDaoSupport.java     |    55 -
 .../jdbc/core/simple/SimpleJdbcOperations.java     |   491 -
 .../jdbc/core/simple/SimpleJdbcTemplate.java       |   323 -
 .../embedded/DerbyEmbeddedDatabaseConfigurer.java  |     4 +-
 .../jdbc/datasource/embedded/EmbeddedDatabase.java |     6 +-
 .../embedded/EmbeddedDatabaseBuilder.java          |    25 +-
 .../embedded/EmbeddedDatabaseConfigurer.java       |    12 +-
 .../embedded/EmbeddedDatabaseFactory.java          |    94 +-
 .../datasource/init/ResourceDatabasePopulator.java |    38 +-
 .../init/ScriptStatementFailedException.java       |    24 +-
 .../jdbc/datasource/init/ScriptUtils.java          |    50 +-
 .../jdbc/object/BatchSqlUpdate.java                |    16 +-
 .../springframework/jdbc/support/JdbcUtils.java    |    34 +-
 .../SQLErrorCodeSQLExceptionTranslator.java        |    20 +-
 .../jdbc/support/lob/OracleLobHandler.java         |     4 +-
 .../nativejdbc/CommonsDbcpNativeJdbcExtractor.java |     2 +
 .../src/main/resources/META-INF/spring.schemas     |     3 +-
 .../jdbc/config/spring-jdbc-4.2.xsd                |   207 +
 .../jdbc/config/JdbcNamespaceIntegrationTests.java |    51 +-
 .../jdbc/core/JdbcTemplateQueryTests.java          |    35 +-
 .../springframework/jdbc/core/RowMapperTests.java  |    84 +-
 .../core/namedparam/NamedParameterUtilsTests.java  |    57 +-
 .../jdbc/core/simple/CallMetaDataContextTests.java |    20 +
 .../ParameterizedBeanPropertyRowMapperTests.java   |    77 -
 .../jdbc/core/simple/SimpleJdbcCallTests.java      |    44 +-
 .../jdbc/core/simple/SimpleJdbcInsertTests.java    |    13 +-
 .../jdbc/core/simple/SimpleJdbcTemplateTests.java  |   369 -
 .../core/simple/TableMetaDataContextTests.java     |     9 +-
 .../embedded/EmbeddedDatabaseBuilderTests.java     |    54 +-
 .../init/ScriptUtilsIntegrationTests.java          |    19 +-
 .../jdbc/datasource/init/ScriptUtilsUnitTests.java |    21 +-
 .../lookup/MapDataSourceLookupTests.java           |    42 +-
 .../jdbc/object/RdbmsOperationTests.java           |   177 +-
 .../jdbc/object/SqlUpdateTests.java                |    31 +-
 ...CustomSQLExceptionTranslatorRegistrarTests.java |    18 +-
 .../jdbc/support/JdbcUtilsTests.java               |    34 +-
 .../jdbc/support/KeyHolderTests.java               |   133 +-
 .../jdbc/support/NativeJdbcExtractorTests.java     |    10 +-
 .../SQLErrorCodeSQLExceptionTranslatorTests.java   |    39 +-
 .../support/SQLExceptionCustomTranslatorTests.java |    41 +-
 .../SQLExceptionSubclassTranslatorTests.java       |    18 +-
 .../support/SQLStateExceptionTranslatorTests.java  |    30 +-
 spring-jdbc/src/test/resources/log4j.properties    |    12 +-
 ...ig-db-name-default-and-anonymous-datasource.xml |    12 +
 .../jdbc/config/jdbc-config-db-name-explicit.xml   |    12 +
 .../jdbc/config/jdbc-config-db-name-generated.xml  |    12 +
 .../jdbc/config/jdbc-config-db-name-implicit.xml   |    12 +
 .../jdbc/config/jdbc-config-pattern.xml            |     2 +-
 .../springframework/jdbc/config/jdbc-config.xml    |    23 +-
 .../jdbc/config/jdbc-destroy-config.xml            |     2 +-
 .../jdbc/config/jdbc-initialize-cache-config.xml   |     4 +-
 .../jdbc/config/jdbc-initialize-config.xml         |     2 +-
 .../config/jdbc-initialize-expression-config.xml   |     2 +-
 .../jdbc/config/jdbc-initialize-fail-config.xml    |     2 +-
 .../jdbc/config/jdbc-initialize-pattern-config.xml |     2 +-
 .../embedded/db-schema-without-dropping.sql        |     1 +
 ...-with-single-quotes-nested-in-double-quotes.sql |     7 +
 .../jdbc/object/GenericSqlQueryTests-context.xml   |     2 +-
 .../object/GenericStoredProcedureTests-context.xml |     2 +-
 .../jdbc/support/custom-error-codes.xml            |     2 +-
 .../jdbc/support/test-error-codes.xml              |     2 +-
 .../jdbc/support/wildcard-error-codes.xml          |     2 +-
 .../springframework/jms/annotation/EnableJms.java  |    24 +-
 .../jms/annotation/JmsBootstrapConfiguration.java  |     3 +-
 .../jms/annotation/JmsListener.java                |     3 +
 .../JmsListenerAnnotationBeanPostProcessor.java    |    77 +-
 .../jms/annotation/JmsListeners.java               |    44 +
 .../AbstractJmsListenerContainerFactory.java       |    25 +-
 .../config/AbstractListenerContainerParser.java    |    23 +-
 .../jms/config/JcaListenerContainerParser.java     |     2 +-
 .../jms/config/JmsListenerContainerParser.java     |     2 +-
 .../jms/config/JmsListenerEndpointRegistrar.java   |    35 +-
 .../jms/config/JmsListenerEndpointRegistry.java    |   119 +-
 .../jms/config/MethodJmsListenerEndpoint.java      |    61 +-
 .../jms/connection/CachedMessageProducer.java      |     2 +-
 .../jms/connection/CachingConnectionFactory.java   |     2 +-
 .../TransactionAwareConnectionFactoryProxy.java    |     6 +-
 .../listener/AbstractJmsListeningContainer.java    |     4 +-
 .../listener/AbstractMessageListenerContainer.java |    32 +
 .../AbstractPollingMessageListenerContainer.java   |    10 +-
 .../listener/DefaultMessageListenerContainer.java  |    46 +-
 .../jms/listener/MessageListenerContainer.java     |    10 +-
 .../adapter/AbstractAdaptableMessageListener.java  |    47 +-
 .../jms/listener/adapter/JmsResponse.java          |   155 +
 .../listener/endpoint/JmsActivationSpecConfig.java |    17 +-
 .../endpoint/JmsMessageEndpointManager.java        |    11 +-
 .../jms/remoting/JmsInvokerClientInterceptor.java  |    89 +-
 .../converter/MessagingMessageConverter.java       |    12 +-
 .../src/main/resources/META-INF/spring.schemas     |     3 +-
 .../springframework/jms/config/spring-jms-4.2.xsd  |   638 +
 .../AbstractJmsAnnotationDrivenTests.java          |   168 +-
 .../annotation/AnnotationDrivenNamespaceTests.java |    24 +-
 .../jms/annotation/EnableJmsTests.java             |   105 +-
 ...msListenerAnnotationBeanPostProcessorTests.java |    37 +-
 ...msListenerContainerFactoryIntegrationTests.java |    80 +-
 .../config/JmsListenerContainerFactoryTests.java   |    14 +-
 .../config/JmsListenerContainerTestFactory.java    |    26 +-
 .../config/JmsListenerEndpointRegistrarTests.java  |    12 +-
 .../config/JmsListenerEndpointRegistryTests.java   |    12 +-
 .../jms/config/JmsListenerEndpointTests.java       |     4 +-
 .../jms/config/JmsNamespaceHandlerTests.java       |    28 +-
 .../jms/config/MessageListenerTestContainer.java   |    24 +-
 .../jms/config/MethodJmsListenerEndpointTests.java |    63 +-
 .../jms/config/SimpleJmsListenerEndpointTests.java |     5 +-
 .../DefaultMessageListenerContainerTests.java      |    91 +-
 .../jms/listener/adapter/JmsResponseTests.java     |    84 +
 .../MessagingMessageListenerAdapterTests.java      |   242 +-
 .../DefaultJmsActivationSpecFactoryTests.java      |    38 +-
 .../endpoint/JmsMessageEndpointManagerTests.java   |    23 +-
 .../jms/remoting/JmsInvokerTests.java              |    30 +-
 .../DynamicDestinationResolverTests.java           |    19 +-
 .../annotation-driven-jms-listener-repeatable.xml  |    18 +
 .../annotation/annotation-driven-jms-listeners.xml |    18 +
 .../jms/annotation/jms-listener.properties         |     3 +-
 .../jms/config/jmsNamespaceHandlerTests.xml        |     6 +-
 .../springframework/messaging/MessageHeaders.java  |    40 +-
 .../converter/AbstractMessageConverter.java        |    80 +-
 .../converter/ByteArrayMessageConverter.java       |     9 +-
 .../converter/CompositeMessageConverter.java       |    54 +-
 .../converter/MappingJackson2MessageConverter.java |    97 +-
 .../converter/MarshallingMessageConverter.java     |   184 +
 .../messaging/converter/SmartMessageConverter.java |    62 +
 .../converter/StringMessageConverter.java          |    12 +-
 .../core/AbstractMessageSendingTemplate.java       |    27 +-
 .../handler/AbstractMessageCondition.java          |    18 +-
 .../messaging/handler/HandlerMethod.java           |     3 +-
 .../messaging/handler/HandlerMethodSelector.java   |    36 +-
 .../messaging/handler/MessagingAdviceBean.java     |    56 +
 .../messaging/handler/annotation/Header.java       |    25 +-
 .../handler/annotation/MessageMapping.java         |    31 +-
 .../messaging/handler/annotation/Payload.java      |    20 +-
 .../AnnotationExceptionHandlerMethodResolver.java  |    43 +-
 .../DefaultMessageHandlerMethodFactory.java        |     4 +-
 .../DestinationVariableMethodArgumentResolver.java |    13 +-
 .../support/HeaderMethodArgumentResolver.java      |     2 +-
 .../support/HeadersMethodArgumentResolver.java     |     9 +-
 .../support/PayloadArgumentResolver.java           |     7 +-
 .../AbstractAsyncReturnValueHandler.java           |    44 +
 .../invocation/AbstractMethodMessageHandler.java   |   177 +-
 .../AsyncHandlerMethodReturnValueHandler.java      |    66 +
 .../CompletableFutureReturnValueHandler.java       |    46 +
 .../HandlerMethodArgumentResolverComposite.java    |    43 +-
 .../HandlerMethodReturnValueHandlerComposite.java  |    17 +-
 .../handler/invocation/InvocableHandlerMethod.java |    44 +-
 .../ListenableFutureReturnValueHandler.java        |    41 +
 .../messaging/simp/SimpMessageHeaderAccessor.java  |    26 +-
 .../messaging/simp/SimpMessageType.java            |     4 +-
 .../messaging/simp/annotation/SendToUser.java      |    15 +-
 .../simp/annotation/SubscribeMapping.java          |    35 +-
 .../support/SendToMethodReturnValueHandler.java    |    48 +-
 .../SimpAnnotationMethodMessageHandler.java        |    62 +-
 .../SubscriptionMethodReturnValueHandler.java      |     8 +-
 .../simp/broker/DefaultSubscriptionRegistry.java   |   300 +-
 .../simp/broker/SimpleBrokerMessageHandler.java    |   215 +-
 .../config/AbstractMessageBrokerConfiguration.java |   114 +-
 .../simp/config/MessageBrokerRegistry.java         |    12 +-
 .../simp/config/SimpleBrokerRegistration.java      |    43 +-
 .../simp/config/StompBrokerRelayRegistration.java  |    46 +-
 .../simp/stomp/ConnectionHandlingStompSession.java |    40 +
 .../simp/stomp/ConnectionLostException.java        |    32 +
 .../messaging/simp/stomp/DefaultStompSession.java  |   655 +
 .../messaging/simp/stomp/Reactor11StompCodec.java  |   102 -
 .../messaging/simp/stomp/Reactor2StompCodec.java   |   106 +
 .../simp/stomp/Reactor2TcpStompClient.java         |   150 +
 .../simp/stomp/StompBrokerRelayMessageHandler.java |   143 +-
 .../messaging/simp/stomp/StompClientSupport.java   |   170 +
 .../messaging/simp/stomp/StompDecoder.java         |     4 +-
 .../messaging/simp/stomp/StompEncoder.java         |     3 +
 .../messaging/simp/stomp/StompFrameHandler.java    |    44 +
 .../messaging/simp/stomp/StompHeaders.java         |   528 +
 .../messaging/simp/stomp/StompSession.java         |   137 +
 .../messaging/simp/stomp/StompSessionHandler.java  |    71 +
 .../simp/stomp/StompSessionHandlerAdapter.java     |    69 +
 .../simp/user/DefaultUserDestinationResolver.java  |   203 +-
 .../simp/user/DefaultUserSessionRegistry.java      |    10 +-
 .../simp/user/DestinationUserNameProvider.java     |    26 +-
 .../simp/user/MultiServerUserRegistry.java         |   478 +
 .../messaging/simp/user/SimpSession.java           |    44 +
 .../messaging/simp/user/SimpSubscription.java      |    42 +
 .../simp/user/SimpSubscriptionMatcher.java         |    34 +
 .../messaging/simp/user/SimpUser.java              |    53 +
 .../messaging/simp/user/SimpUserRegistry.java      |    50 +
 .../simp/user/UserDestinationMessageHandler.java   |   211 +-
 .../simp/user/UserDestinationResolver.java         |    38 +-
 .../messaging/simp/user/UserDestinationResult.java |    37 +-
 .../simp/user/UserRegistryMessageHandler.java      |   136 +
 .../messaging/simp/user/UserSessionRegistry.java   |    49 +-
 .../simp/user/UserSessionRegistryAdapter.java      |   121 +
 .../messaging/simp/user/package-info.java          |     2 +-
 .../support/NativeMessageHeaderAccessor.java       |    24 +
 .../messaging/tcp/TcpOperations.java               |     2 +-
 .../AbstractPromiseToListenableFutureAdapter.java  |     6 +-
 ...assThroughPromiseToListenableFutureAdapter.java |     8 +-
 .../messaging/tcp/reactor/Reactor11TcpClient.java  |   206 -
 .../tcp/reactor/Reactor11TcpConnection.java        |    66 -
 .../messaging/tcp/reactor/Reactor2TcpClient.java   |   364 +
 .../tcp/reactor/Reactor2TcpConnection.java         |    76 +
 .../messaging/MessageHeadersTests.java             |    34 +-
 .../MappingJackson2MessageConverterTests.java      |    78 +-
 .../MarshallingMessageConverterTests.java          |   104 +
 .../support/HeaderMethodArgumentResolverTests.java |    18 +-
 .../support/PayloadArgumentResolverTests.java      |    22 +-
 .../invocation/MethodMessageHandlerTests.java      |     9 +-
 .../SendToMethodReturnValueHandlerTests.java       |   331 +-
 .../SimpAnnotationMethodMessageHandlerTests.java   |   307 +-
 .../SubscriptionMethodReturnValueHandlerTests.java |    93 +-
 .../simp/broker/BrokerMessageHandlerTests.java     |     7 +-
 .../broker/DefaultSubscriptionRegistryTests.java   |   179 +-
 .../broker/SimpleBrokerMessageHandlerTests.java    |   177 +-
 .../config/MessageBrokerConfigurationTests.java    |    98 +-
 .../config/StompBrokerRelayRegistrationTests.java  |    40 +-
 .../simp/stomp/DefaultStompSessionTests.java       |   587 +
 .../simp/stomp/Reactor2TcpStompClientTests.java    |   235 +
 ...pBrokerRelayMessageHandlerIntegrationTests.java |    31 +-
 .../stomp/StompBrokerRelayMessageHandlerTests.java |   223 +-
 .../simp/stomp/StompClientSupportTests.java        |    87 +
 .../messaging/simp/stomp/StompCodecTests.java      |    55 +-
 .../user/DefaultUserDestinationResolverTests.java  |    99 +-
 .../simp/user/DefaultUserSessionRegistryTests.java |    82 -
 .../simp/user/MultiServerUserRegistryTests.java    |   166 +
 .../messaging/simp/user/TestSimpSession.java       |    62 +
 .../messaging/simp/user/TestSimpSubscription.java  |    52 +
 .../messaging/simp/user/TestSimpUser.java          |    62 +
 .../user/UserDestinationMessageHandlerTests.java   |   134 +-
 .../simp/user/UserRegistryMessageHandlerTests.java |   182 +
 .../src/test/resources/log4j.properties            |    11 +-
 .../orm/hibernate4/HibernateCallback.java          |     4 +-
 .../orm/hibernate4/HibernateTemplate.java          |    11 +-
 .../support/AsyncRequestInterceptor.java           |    15 +-
 .../SpringHibernateJpaPersistenceProvider.java     |    30 +-
 .../jpa21/PersistenceContextTransactionTests.java  |   133 +-
 .../BeanValidationPostProcessorTests.java          |     7 +-
 .../hibernatevalidator5/MethodValidationTests.java |    48 +-
 .../hibernatevalidator5/ValidatorFactoryTests.java |    42 +-
 .../orm/hibernate5/ConfigurableJtaPlatform.java    |   110 +
 .../orm/hibernate5/HibernateCallback.java          |    50 +
 .../hibernate5/HibernateExceptionTranslator.java   |    60 +
 .../orm/hibernate5/HibernateJdbcException.java     |    55 +
 .../HibernateObjectRetrievalFailureException.java  |    43 +
 .../orm/hibernate5/HibernateOperations.java        |   795 +
 ...HibernateOptimisticLockingFailureException.java |    49 +
 .../orm/hibernate5/HibernateQueryException.java    |    45 +
 .../orm/hibernate5/HibernateSystemException.java   |    44 +
 .../orm/hibernate5/HibernateTemplate.java          |  1261 +
 .../hibernate5/HibernateTransactionManager.java    |   855 +
 .../orm/hibernate5/LocalSessionFactoryBean.java    |   453 +
 .../orm/hibernate5/LocalSessionFactoryBuilder.java |   269 +
 .../orm/hibernate5/SessionFactoryUtils.java        |   222 +
 .../orm/hibernate5/SessionHolder.java              |    80 +
 .../orm/hibernate5/SpringFlushSynchronization.java |    64 +
 .../orm/hibernate5/SpringJtaSessionContext.java    |    49 +
 .../orm/hibernate5/SpringSessionContext.java       |   136 +
 .../hibernate5/SpringSessionSynchronization.java   |   155 +
 .../orm/hibernate5/package-info.java               |    16 +
 .../support/AsyncRequestInterceptor.java           |   120 +
 .../hibernate5/support/HibernateDaoSupport.java    |   132 +
 .../support/OpenSessionInViewFilter.java           |   221 +
 .../support/OpenSessionInViewInterceptor.java      |   211 +
 .../hibernate5/support/OpenSessionInterceptor.java |   116 +
 .../orm/hibernate5/support/package-info.java       |     4 +
 .../orm/hibernate3/HibernateAccessor.java          |     2 +-
 .../orm/hibernate3/HibernateCallback.java          |     5 +-
 .../orm/hibernate3/HibernateTemplate.java          |    11 +-
 .../hibernate3/HibernateTransactionManager.java    |     2 +-
 .../support/AsyncRequestInterceptor.java           |    27 +-
 .../orm/jpa/AbstractEntityManagerFactoryBean.java  |    21 +-
 .../orm/jpa/EntityManagerFactoryUtils.java         |    29 +-
 .../LocalContainerEntityManagerFactoryBean.java    |     2 +-
 .../orm/jpa/SharedEntityManagerCreator.java        |    14 +-
 .../ClassFileTransformerAdapter.java               |    19 +-
 .../DefaultPersistenceUnitManager.java             |     2 +-
 .../orm/jpa/support/AsyncRequestInterceptor.java   |    13 +-
 .../PersistenceAnnotationBeanPostProcessor.java    |    62 +-
 .../orm/jpa/vendor/AbstractJpaVendorAdapter.java   |     6 +-
 .../orm/jpa/vendor/HibernateJpaDialect.java        |    38 +-
 .../orm/jpa/vendor/HibernateJpaVendorAdapter.java  |    10 +-
 .../support/ScopedBeanInterceptorTests.java        |    22 +-
 ...stractEntityManagerFactoryIntegrationTests.java |    17 +-
 ...cationManagedEntityManagerIntegrationTests.java |     3 +-
 ...tainerManagedEntityManagerIntegrationTests.java |     1 +
 .../orm/jpa/JpaTransactionManagerTests.java        |     5 +-
 ...ocalContainerEntityManagerFactoryBeanTests.java |     4 +-
 .../jpa/LocalEntityManagerFactoryBeanTests.java    |     3 +-
 ...seLinkEntityManagerFactoryIntegrationTests.java |     4 +-
 ...ernateEntityManagerFactoryIntegrationTests.java |     4 +-
 ...eMultiEntityManagerFactoryIntegrationTests.java |    12 +-
 .../orm/jpa/hibernate/hibernate-manager-multi.xml  |    22 -
 ...penJpaEntityManagerFactoryIntegrationTests.java |     5 +-
 ...rFactoryWithAspectJWeavingIntegrationTests.java |     5 +-
 .../orm/jpa/persistence-complex.xml                |    30 -
 .../orm/jpa/persistence-example1.xml               |     8 -
 .../orm/jpa/persistence-example2.xml               |    10 -
 .../orm/jpa/persistence-example4.xml               |    18 -
 .../PersistenceContextTransactionTests.java        |     8 +-
 .../PersistenceInjectionIntegrationTests.java      |    28 +-
 .../orm/jpa/support/PersistenceInjectionTests.java |     8 +-
 ...tractDependencyInjectionSpringContextTests.java |   201 +-
 .../test/AbstractSingleSpringContextTests.java     |   210 +-
 .../test/AbstractSpringContextTests.java           |   114 +-
 ...tTransactionalDataSourceSpringContextTests.java |   199 -
 .../AbstractTransactionalSpringContextTests.java   |   149 +-
 .../springframework/test/ConditionalTestCase.java  |   102 -
 .../AbstractAnnotationAwareTransactionalTests.java |   134 -
 .../springframework/test/jdbc/JdbcTestUtils.java   |   104 -
 .../springframework/test/jpa/AbstractJpaTests.java |    40 +-
 .../springframework/beans/factory/xml/child.xml    |     8 +-
 .../orm/jpa/META-INF/persistence.xml               |     0
 .../orm/jpa/domain/persistence-context.xml         |     0
 .../orm/jpa/domain/persistence-multi.xml           |     0
 .../springframework/orm/jpa/domain/persistence.xml |     0
 .../orm/jpa/eclipselink/eclipselink-manager.xml    |     0
 .../orm/jpa/hibernate/hibernate-manager-multi.xml  |    22 +
 .../orm/jpa/hibernate/hibernate-manager.xml        |     0
 .../org/springframework/orm/jpa/inject.xml         |     0
 .../org/springframework/orm/jpa/insertPerson.sql   |     0
 .../org/springframework/orm/jpa/memdb.xml          |     0
 .../org/springframework/orm/jpa/multi-jpa-emf.xml  |     0
 .../openjpa/openjpa-manager-aspectj-weaving.xml    |     0
 .../orm/jpa/openjpa/openjpa-manager.xml            |     0
 .../orm/jpa/persistence-complex.xml                |    30 +
 .../orm/jpa/persistence-example1.xml               |     8 +
 .../orm/jpa/persistence-example2.xml               |    10 +
 .../orm/jpa/persistence-example3.xml               |     0
 .../orm/jpa/persistence-example4.xml               |    18 +
 .../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
 spring-oxm/oxm.gradle                              |     2 +-
 .../oxm/castor/CastorMarshaller.java               |    10 -
 .../springframework/oxm/castor/package-info.java   |     2 +-
 .../CastorMarshallerBeanDefinitionParser.java      |     2 +-
 .../oxm/config/OxmNamespaceHandler.java            |     5 +-
 .../XmlBeansMarshallerBeanDefinitionParser.java    |     2 +
 .../oxm/jaxb/ClassPathJaxb2TypeScanner.java        |     4 +-
 .../springframework/oxm/jaxb/Jaxb2Marshaller.java  |    45 +-
 .../springframework/oxm/jibx/JibxMarshaller.java   |     2 +-
 .../oxm/support/AbstractMarshaller.java            |     5 +-
 .../oxm/xmlbeans/XmlBeansMarshaller.java           |     2 +
 .../oxm/xstream/XStreamMarshaller.java             |     6 +-
 .../springframework/oxm/xstream/package-info.java  |     2 +-
 .../src/main/resources/META-INF/spring.schemas     |     3 +-
 .../springframework/oxm/config/spring-oxm-4.2.xsd  |   136 +
 .../oxm/AbstractMarshallerTests.java               |    19 +-
 .../oxm/AbstractUnmarshallerTests.java             |    10 +-
 .../oxm/castor/CastorMarshallerTests.java          |    79 +-
 .../oxm/castor/CastorUnmarshallerTests.java        |    80 +-
 .../oxm/config/OxmNamespaceHandlerTests.java       |    18 +-
 .../oxm/jaxb/Jaxb2MarshallerTests.java             |    14 +-
 .../oxm/jaxb/Jaxb2UnmarshallerTests.java           |    43 +-
 .../oxm/jibx/JibxMarshallerTests.java              |    25 +-
 .../oxm/jibx/JibxUnmarshallerTests.java            |    19 +-
 .../oxm/xmlbeans/XmlBeansMarshallerTests.java      |    13 +-
 .../oxm/xmlbeans/XmlBeansUnmarshallerTests.java    |    15 +-
 .../org/springframework/oxm/castor/mapping.xml     |     2 +-
 .../oxm/config/oxmNamespaceHandlerTest.xml         |     2 +-
 .../springframework/mock/web/MockAsyncContext.java |     3 +-
 .../mock/web/MockHttpServletRequest.java           |   112 +-
 .../mock/web/MockHttpServletResponse.java          |    58 +-
 .../mock/web/MockMultipartHttpServletRequest.java  |     4 +-
 .../springframework/mock/web/MockPageContext.java  |     9 +-
 .../mock/web/MockServletContext.java               |    16 +-
 .../org/springframework/test/AssertThrows.java     |   246 -
 .../springframework/test/annotation/Commit.java    |    56 +
 .../test/annotation/DirtiesContext.java            |   166 +-
 .../test/annotation/IfProfileValue.java            |   103 +-
 .../test/annotation/ProfileValueUtils.java         |     2 +-
 .../springframework/test/annotation/Repeat.java    |    19 +-
 .../springframework/test/annotation/Rollback.java  |    49 +-
 .../test/annotation/TestAnnotationUtils.java       |    62 +
 .../org/springframework/test/annotation/Timed.java |    22 +-
 .../test/context/ActiveProfiles.java               |    14 +-
 .../test/context/BootstrapContext.java             |     7 +-
 .../test/context/BootstrapUtils.java               |    98 +-
 .../context/CacheAwareContextLoaderDelegate.java   |    13 +-
 .../springframework/test/context/ContextCache.java |   257 -
 .../test/context/ContextConfiguration.java         |     3 +
 .../context/ContextConfigurationAttributes.java    |    67 +-
 .../test/context/DefaultBootstrapContext.java      |    68 -
 .../DefaultCacheAwareContextLoaderDelegate.java    |   119 -
 .../test/context/DefaultTestContext.java           |   116 -
 .../test/context/MergedContextConfiguration.java   |    20 +-
 .../springframework/test/context/TestContext.java  |    23 +-
 .../test/context/TestContextBootstrapper.java      |    89 +-
 .../test/context/TestContextManager.java           |    74 +-
 .../test/context/TestExecutionListener.java        |    10 +-
 .../test/context/TestExecutionListeners.java       |    90 +-
 .../test/context/TestPropertySource.java           |    34 +-
 .../test/context/cache/ContextCache.java           |   152 +
 .../DefaultCacheAwareContextLoaderDelegate.java    |   147 +
 .../test/context/cache/DefaultContextCache.java    |   268 +
 .../test/context/jdbc/MergedSqlConfig.java         |    74 +-
 .../org/springframework/test/context/jdbc/Sql.java |    92 +-
 .../test/context/jdbc/SqlConfig.java               |   236 +-
 .../test/context/jdbc/SqlGroup.java                |    11 +-
 .../jdbc/SqlScriptsTestExecutionListener.java      |    64 +-
 .../junit4/AbstractJUnit4SpringContextTests.java   |    36 +-
 ...tractTransactionalJUnit4SpringContextTests.java |    22 +-
 .../context/junit4/SpringJUnit4ClassRunner.java    |    64 +-
 .../test/context/junit4/rules/SpringClassRule.java |   256 +
 .../context/junit4/rules/SpringMethodRule.java     |   247 +
 .../test/context/junit4/rules/package-info.java    |     4 +
 .../junit4/statements/ProfileValueChecker.java     |   106 +
 .../statements/RunAfterTestClassCallbacks.java     |     2 +-
 .../RunPrepareTestInstanceCallbacks.java           |    67 +
 .../junit4/statements/SpringFailOnTimeout.java     |    37 +-
 .../context/junit4/statements/SpringRepeat.java    |    14 +
 .../context/support/AbstractContextLoader.java     |    89 +-
 ...bstractDirtiesContextTestExecutionListener.java |   151 +
 .../support/AbstractTestContextBootstrapper.java   |   155 +-
 .../test/context/support/ActiveProfilesUtils.java  |    52 +-
 .../AnnotationConfigContextLoaderUtils.java        |     6 +-
 .../test/context/support/ContextLoaderUtils.java   |    30 +-
 .../support/DefaultActiveProfilesResolver.java     |    33 +-
 .../context/support/DefaultBootstrapContext.java   |    76 +
 .../test/context/support/DefaultTestContext.java   |   142 +
 ...iesContextBeforeModesTestExecutionListener.java |    98 +
 .../DirtiesContextTestExecutionListener.java       |   126 +-
 .../support/GenericGroovyXmlContextLoader.java     |    23 +-
 .../support/TestPropertySourceAttributes.java      |    43 +-
 .../context/support/TestPropertySourceUtils.java   |    10 +-
 .../testng/AbstractTestNGSpringContextTests.java   |    22 +-
 ...tractTransactionalTestNGSpringContextTests.java |     3 +-
 .../test/context/transaction/AfterTransaction.java |     9 +-
 .../context/transaction/BeforeTransaction.java     |     9 +-
 .../transaction/TestContextTransactionUtils.java   |     8 +-
 .../transaction/TransactionConfiguration.java      |    19 +-
 .../TransactionConfigurationAttributes.java        |    32 +-
 .../TransactionalTestExecutionListener.java        |   135 +-
 .../context/util/TestContextResourceUtils.java     |    25 +-
 .../web/GenericGroovyXmlWebContextLoader.java      |    22 +-
 .../context/web/ServletTestExecutionListener.java  |    16 +-
 .../test/context/web/WebAppConfiguration.java      |    12 +-
 .../context/web/WebMergedContextConfiguration.java |    39 +-
 .../springframework/test/util/AopTestUtils.java    |    97 +
 .../test/util/JsonExpectationsHelper.java          |    53 +-
 .../test/util/JsonPathExpectationsHelper.java      |   214 +-
 .../test/util/MatcherAssertionErrors.java          |    36 +-
 .../test/util/MetaAnnotationUtils.java             |    56 +-
 .../test/util/ReflectionTestUtils.java             |   240 +-
 .../test/util/XmlExpectationsHelper.java           |     4 +-
 .../test/util/XpathExpectationsHelper.java         |    53 +-
 .../test/web/client/MockRestServiceServer.java     |     8 +-
 .../web/client/match/ContentRequestMatchers.java   |     5 +-
 .../web/client/match/JsonPathRequestMatchers.java  |   162 +-
 .../web/client/match/MockRestRequestMatchers.java  |    35 +-
 .../web/client/match/XpathRequestMatchers.java     |    24 +-
 .../test/web/servlet/DefaultMvcResult.java         |    49 +-
 .../springframework/test/web/servlet/MockMvc.java  |    31 +-
 .../test/web/servlet/MockMvcBuilder.java           |     8 +-
 .../test/web/servlet/MvcResult.java                |    10 +-
 .../test/web/servlet/RequestBuilder.java           |     7 +-
 .../test/web/servlet/ResultActions.java            |    18 +-
 .../test/web/servlet/ResultHandler.java            |    24 +-
 .../test/web/servlet/ResultMatcher.java            |    23 +-
 .../servlet/htmlunit/DelegatingWebConnection.java  |   111 +
 .../htmlunit/ForwardRequestPostProcessor.java      |    44 +
 .../web/servlet/htmlunit/HostRequestMatcher.java   |    89 +
 .../servlet/htmlunit/HtmlUnitRequestBuilder.java   |   521 +
 .../servlet/htmlunit/MockMvcWebClientBuilder.java  |   129 +
 .../web/servlet/htmlunit/MockMvcWebConnection.java |   157 +
 .../MockMvcWebConnectionBuilderSupport.java        |   166 +
 .../servlet/htmlunit/MockWebResponseBuilder.java   |   106 +
 .../servlet/htmlunit/UrlRegexRequestMatcher.java   |    59 +
 .../web/servlet/htmlunit/WebRequestMatcher.java    |    38 +
 .../test/web/servlet/htmlunit/package-info.java    |     6 +
 .../webdriver/MockMvcHtmlUnitDriverBuilder.java    |   154 +
 .../webdriver/WebConnectionHtmlUnitDriver.java     |   107 +
 .../servlet/htmlunit/webdriver/package-info.java   |     7 +
 .../request/MockHttpServletRequestBuilder.java     |   103 +-
 .../MockMultipartHttpServletRequestBuilder.java    |     7 +-
 .../servlet/request/MockMvcRequestBuilders.java    |    28 +-
 .../web/servlet/result/ContentResultMatchers.java  |    42 +-
 .../web/servlet/result/CookieResultMatchers.java   |    12 +-
 .../result/FlashAttributeResultMatchers.java       |    11 +-
 .../web/servlet/result/HandlerResultMatchers.java  |    14 +-
 .../web/servlet/result/HeaderResultMatchers.java   |    43 +-
 .../web/servlet/result/JsonPathResultMatchers.java |   107 +-
 .../web/servlet/result/MockMvcResultHandlers.java  |    96 +-
 .../web/servlet/result/ModelResultMatchers.java    |    10 +-
 .../web/servlet/result/PrintingResultHandler.java  |    71 +-
 .../web/servlet/result/RequestResultMatchers.java  |    45 +-
 .../web/servlet/result/StatusResultMatchers.java   |    12 +-
 .../web/servlet/result/ViewResultMatchers.java     |    14 +-
 .../web/servlet/result/XpathResultMatchers.java    |    57 +-
 .../test/web/servlet/result/package-info.java      |     4 +-
 .../test/web/servlet/setup/MockMvcBuilders.java    |    58 +-
 .../servlet/setup/PatternMappingFilterProxy.java   |    15 +-
 .../servlet/setup/StandaloneMockMvcBuilder.java    |    44 +-
 .../servlet/setup/StubWebApplicationContext.java   |    21 +-
 .../src/main/resources/META-INF/spring.factories   |     3 +-
 .../jcache/JCacheEhCache3AnnotationTests.java      |    35 +
 .../cache/jcache/JCacheEhCache3ApiTests.java       |    35 +
 .../mock/web/MockFilterChainTests.java             |    16 +-
 .../mock/web/MockHttpServletRequestTests.java      |    92 +-
 .../mock/web/MockHttpServletResponseTests.java     |    45 +
 .../mock/web/MockPageContextTests.java             |    26 +-
 .../test/context/BootstrapTestUtils.java           |     2 +
 .../test/context/BootstrapUtilsTests.java          |   127 +
 .../context/ClassLevelDirtiesContextTests.java     |   272 -
 .../test/context/ContextCacheTests.java            |   357 -
 .../context/MergedContextConfigurationTests.java   |     9 +-
 .../context/SpringRunnerContextCacheTests.java     |   131 -
 .../test/context/TestContextTestUtils.java         |    12 +-
 .../test/context/TestExecutionListenersTests.java  |   165 +-
 .../cache/ClassLevelDirtiesContextTestNGTests.java |   264 +
 .../cache/ClassLevelDirtiesContextTests.java       |   243 +
 .../test/context/cache/ContextCacheTestUtils.java  |    71 +
 .../test/context/cache/ContextCacheTests.java      |   365 +
 .../cache/MethodLevelDirtiesContextTests.java      |   111 +
 .../cache/SpringRunnerContextCacheTests.java       |    97 +
 ...actionManagersTransactionalSqlScriptsTests.java |     6 +-
 .../jdbc/SqlScriptsTestExecutionListenerTests.java |    31 +-
 ...nsactionalInlinedStatementsSqlScriptsTests.java |    86 +
 ...lutePathSpringJUnit4ClassRunnerAppCtxTests.java |     5 +-
 .../AbstractTransactionalSpringRunnerTests.java    |    15 +-
 ...eAndAfterTransactionAnnotationTests-context.xml |     8 -
 .../BeforeAndAfterTransactionAnnotationTests.java  |    44 +-
 ...LevelTransactionalSpringRunnerTests-context.xml |     8 -
 .../ClassLevelTransactionalSpringRunnerTests.java  |    32 +-
 ...ResourceSpringJUnit4ClassRunnerAppCtxTests.java |     3 -
 ...ansactionalJUnit4SpringContextTests-context.xml |    28 -
 ...creteTransactionalJUnit4SpringContextTests.java |    90 +-
 ...kFalseRollbackAnnotationTransactionalTests.java |    87 +
 ...FalseTransactionalSpringRunnerTests-context.xml |    15 -
 ...ollbackFalseTransactionalSpringRunnerTests.java |    91 -
 .../DefaultRollbackFalseTransactionalTests.java    |    85 +
 ...ckTrueRollbackAnnotationTransactionalTests.java |    88 +
 ...kTrueTransactionalSpringRunnerTests-context.xml |     8 -
 ...RollbackTrueTransactionalSpringRunnerTests.java |    88 -
 .../DefaultRollbackTrueTransactionalTests.java     |    80 +
 .../junit4/EmbeddedPersonDatabaseTestsConfig.java  |    50 +
 .../junit4/ExpectedExceptionSpringRunnerTests.java |    27 +-
 .../FailingBeforeAndAfterMethodsJUnitTests.java    |    85 +-
 .../FailingBeforeAndAfterMethodsTestNGTests.java   |    89 +-
 .../FailingBeforeAndAfterMethodsTests-context.xml  |    12 -
 .../test/context/junit4/JUnitTestingUtils.java     |   103 +
 ...LevelTransactionalSpringRunnerTests-context.xml |     8 -
 .../MethodLevelTransactionalSpringRunnerTests.java |    37 +-
 ...esourcesSpringJUnit4ClassRunnerAppCtxTests.java |     5 +-
 ...rameterizedDependencyInjectionTests-context.xml |    21 -
 .../ParameterizedDependencyInjectionTests.java     |    53 +-
 ...tivePathSpringJUnit4ClassRunnerAppCtxTests.java |     3 -
 .../context/junit4/RepeatedSpringRunnerTests.java  |    79 +-
 ...kFalseRollbackAnnotationTransactionalTests.java |    82 +
 ...FalseTransactionalSpringRunnerTests-context.xml |    15 -
 ...ollbackFalseTransactionalSpringRunnerTests.java |    88 -
 ...rideDefaultRollbackFalseTransactionalTests.java |    83 +
 ...ckTrueRollbackAnnotationTransactionalTests.java |    80 +
 ...kTrueTransactionalSpringRunnerTests-context.xml |     8 -
 ...RollbackTrueTransactionalSpringRunnerTests.java |    87 -
 ...rrideDefaultRollbackTrueTransactionalTests.java |    77 +
 .../junit4/SpringJUnit4ClassRunnerAppCtxTests.java |    20 +-
 .../test/context/junit4/SpringJUnit4TestSuite.java |    22 +-
 .../context/junit4/TimedSpringRunnerTests.java     |    34 +-
 .../test/context/junit4/TrackingRunListener.java   |    24 +-
 .../context/junit4/rules/BaseAppCtxRuleTests.java  |    70 +
 .../BasicAnnotationConfigWacSpringRuleTests.java   |    45 +
 ...dAfterTransactionAnnotationSpringRuleTests.java |    45 +
 .../rules/ClassLevelDisabledSpringRuleTests.java   |    45 +
 .../rules/EnabledAndIgnoredSpringRuleTests.java    |    45 +
 ...ailingBeforeAndAfterMethodsSpringRuleTests.java |   158 +
 .../junit4/rules/ParameterizedSpringRuleTests.java |   102 +
 .../rules/ProgrammaticTxMgmtSpringRuleTests.java   |    73 +
 .../junit4/rules/RepeatedSpringRuleTests.java      |   177 +
 .../junit4/rules/Subclass1AppCtxRuleTests.java     |    55 +
 .../junit4/rules/Subclass2AppCtxRuleTests.java     |    55 +
 .../context/junit4/rules/TimedSpringRuleTests.java |    77 +
 .../rules/TimedTransactionalSpringRuleTests.java   |    75 +
 .../TransactionalSqlScriptsSpringRuleTests.java    |    79 +
 .../test/context/junit4/spr8849/Spr8849Tests.java  |    27 +-
 .../context/junit4/spr8849/TestClass1-context.xml  |     7 -
 .../test/context/junit4/spr8849/TestClass1.java    |    21 +-
 .../context/junit4/spr8849/TestClass2-context.xml  |     7 -
 .../test/context/junit4/spr8849/TestClass2.java    |    19 +-
 .../test/context/junit4/spr8849/TestClass3.java    |    58 +
 .../test/context/junit4/spr8849/TestClass4.java    |    58 +
 .../context/junit4/spr8849/datasource-config.xml   |    12 -
 ...notatedConfigClassWithAtConfigurationTests.java |     4 +-
 ...edConfigClassesWithoutAtConfigurationTests.java |     4 +-
 .../test/context/junit4/spr9051/schema.sql         |     6 -
 .../spr9645/LookUpTxMgrByTypeAndNameTests.java     |     6 +-
 .../context/junit4/transactionalTests-context.xml  |    19 -
 .../AbstractContextConfigurationUtilsTests.java    |    26 +-
 .../context/support/ActiveProfilesUtilsTests.java  |    27 +-
 ...extLoaderUtilsConfigurationAttributesTests.java |    59 +-
 .../DirtiesContextTestExecutionListenerTests.java  |   228 +-
 ...ericXmlContextLoaderResourceLocationsTests.java |    30 +-
 .../support/TestPropertySourceUtilsTests.java      |     3 +-
 ...onfigTransactionalTestNGSpringContextTests.java |     4 +-
 ...ansactionalTestNGSpringContextTests-context.xml |    25 -
 .../context/testng/TrackingTestNGTestListener.java |    69 +
 .../springframework/test/context/testng/data.sql   |     1 -
 .../springframework/test/context/testng/schema.sql |     4 -
 .../ejb/CommitForRequiredEjbTxDaoTestNGTests.java  |    10 +-
 .../CommitForRequiresNewEjbTxDaoTestNGTests.java   |    10 +-
 .../RollbackForRequiredEjbTxDaoTestNGTests.java    |    10 +-
 .../RollbackForRequiresNewEjbTxDaoTestNGTests.java |    10 +-
 .../ProgrammaticTxMgmtTestNGTests.java             |     7 +-
 .../TransactionalTestExecutionListenerTests.java   |   178 +-
 .../ejb/CommitForRequiredEjbTxDaoTests.java        |     4 +-
 .../ejb/CommitForRequiresNewEjbTxDaoTests.java     |     6 +-
 .../ejb/RollbackForRequiredEjbTxDaoTests.java      |     6 +-
 .../ejb/RollbackForRequiresNewEjbTxDaoTests.java   |     6 +-
 .../programmatic/ProgrammaticTxMgmtTests.java      |    46 +-
 .../web/ServletContextAwareBeanWacTests.java       |    22 +-
 .../test/util/AopTestUtilsTests.java               |   148 +
 .../test/util/JsonPathExpectationsHelperTests.java |   293 +-
 .../test/util/MetaAnnotationUtilsTests.java        |    26 +-
 .../test/util/ReflectionTestUtilsTests.java        |   146 +-
 .../test/util/subpackage/StaticFields.java         |    41 +
 .../client/match/ContentRequestMatchersTests.java  |     2 +-
 .../client/match/JsonPathRequestMatchersTests.java |   200 +-
 .../client/match/MockRestRequestMatchersTests.java |   135 +
 .../web/client/match/RequestMatchersTests.java     |   139 -
 .../client/match/XpathRequestMatchersTests.java    |     5 +-
 .../test/web/client/samples/SampleTests.java       |     7 +-
 .../matchers/ContentRequestMatcherTests.java       |   104 -
 .../ContentRequestMatchersIntegrationTests.java    |   105 +
 .../matchers/HeaderRequestMatcherTests.java        |    85 -
 .../HeaderRequestMatchersIntegrationTests.java     |    86 +
 .../matchers/JsonPathRequestMatcherTests.java      |   146 -
 .../JsonPathRequestMatchersIntegrationTests.java   |   160 +
 .../matchers/XmlContentRequestMatcherTests.java    |   131 -
 .../XmlContentRequestMatchersIntegrationTests.java |   131 +
 .../samples/matchers/XpathRequestMatcherTests.java |   226 -
 .../XpathRequestMatchersIntegrationTests.java      |   226 +
 .../test/web/servlet/MockMvcReuseTests.java        |   123 +
 .../htmlunit/AbstractWebRequestMatcherTests.java   |    42 +
 .../htmlunit/DelegatingWebConnectionTests.java     |   150 +
 .../web/servlet/htmlunit/ForwardController.java    |    34 +
 .../test/web/servlet/htmlunit/HelloController.java |    36 +
 .../servlet/htmlunit/HostRequestMatcherTests.java  |    69 +
 .../htmlunit/HtmlUnitRequestBuilderTests.java      |   891 +
 .../MockMvcConnectionBuilderSupportTests.java      |   166 +
 .../htmlunit/MockMvcWebClientBuilderTests.java     |   127 +
 .../htmlunit/MockMvcWebConnectionTests.java        |    98 +
 .../htmlunit/MockWebResponseBuilderTests.java      |   143 +
 .../htmlunit/UrlRegexRequestMatcherTests.java      |    37 +
 .../MockMvcHtmlUnitDriverBuilderTests.java         |   139 +
 .../WebConnectionHtmlUnitDriverTests.java          |    78 +
 .../MockHttpServletRequestBuilderTests.java        |    97 +-
 .../servlet/result/ContentResultMatchersTests.java |    19 +-
 .../result/JsonPathResultMatchersTests.java        |   196 +-
 .../servlet/result/PrintingResultHandlerTests.java |    93 +-
 .../servlet/result/XpathResultMatchersTests.java   |    64 +-
 .../context/AsyncControllerJavaConfigTests.java    |   132 +
 .../servlet/samples/context/JavaConfigTests.java   |     1 -
 ...RequestAttributesRequestContextHolderTests.java |   139 +
 .../samples/spr/RequestContextHolderTests.java     |   265 +-
 .../web/servlet/samples/standalone/AsyncTests.java |   160 +-
 .../samples/standalone/ExceptionHandlerTests.java  |    36 +-
 .../standalone/FileUploadControllerTests.java      |    85 +-
 .../servlet/samples/standalone/FilterTests.java    |    15 +-
 .../servlet/samples/standalone/RedirectTests.java  |    37 +-
 .../PrintingResultHandlerSmokeTests.java           |    82 +
 .../resulthandlers/PrintingResultHandlerTests.java |    54 -
 .../resultmatchers/HeaderAssertionTests.java       |    89 +-
 .../resultmatchers/JsonPathAssertionTests.java     |    31 +-
 .../resultmatchers/ModelAssertionTests.java        |    18 +-
 .../resultmatchers/StatusAssertionTests.java       |    44 +-
 .../ConditionalDelegatingFilterProxyTests.java     |    37 +-
 .../servlet/setup/DefaultMockMvcBuilderTests.java  |    16 +-
 .../setup/StandaloneMockMvcBuilderTests.java       |    47 +-
 spring-test/src/test/resources/log4j.properties    |    11 +-
 ...rtiesAndInheritedLoaderTests-context.properties |     0
 ...tiesExtendingPropertiesTests-context.properties |     0
 ...ropertiesFileTestPropertySourceTests.properties |     0
 ...FileDetectionTestPropertySourceTests.properties |     0
 ...FileDetectionTestPropertySourceTests.properties |     0
 ...ropertiesFileTestPropertySourceTests.properties |     0
 .../test/context/env/explicit.properties           |     0
 .../test/context/env/extended.properties           |     0
 .../expression/ExpressionUsageTests-context.xml    |     0
 ...DetectionGroovySpringContextTestsContext.groovy |     0
 ...lSupersedesGroovySpringContextTests-context.xml |     0
 ...upersedesGroovySpringContextTestsContext.groovy |     0
 .../test/context/groovy/context.groovy             |     0
 .../test/context/groovy/contextA.groovy            |     0
 .../test/context/groovy/contextB.xml               |     0
 ...tScriptDetectionSqlScriptsTests.methodLevel.sql |     0
 .../jdbc/DefaultScriptDetectionSqlScriptsTests.sql |     0
 .../test/context/jdbc/data-add-catbert.sql         |     0
 .../test/context/jdbc/data-add-dogbert.sql         |     0
 .../data-add-users-with-custom-script-syntax.sql   |     0
 .../org/springframework/test/context/jdbc/data.sql |     0
 .../test/context/jdbc/drop-schema.sql              |     0
 .../springframework/test/context/jdbc/schema.sql   |     0
 ...ansactionalJUnit4SpringContextTests-context.xml |    31 +
 .../FailingBeforeAndAfterMethodsTests-context.xml  |    12 +
 ...SpringJUnit4ClassRunnerAppCtxTests-context1.xml |     0
 ...SpringJUnit4ClassRunnerAppCtxTests-context2.xml |     0
 ...SpringJUnit4ClassRunnerAppCtxTests-context3.xml |     0
 ...rameterizedDependencyInjectionTests-context.xml |    21 +
 ...JUnit4ClassRunnerAppCtxTests-context.properties |     0
 .../SpringJUnit4ClassRunnerAppCtxTests-context.xml |     0
 .../MultipleInitializersXmlConfigTests-context.xml |     0
 .../hybrid/HybridContextLoaderTests-context.xml    |     0
 .../orm/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
 .../test/context/junit4/orm/domain/Person.hbm.xml  |     0
 .../junit4/profile/importresource/import.xml       |     0
 .../xml/DefaultProfileXmlConfigTests-context.xml   |     0
 ...idingDefaultLocationsInheritedTests-context.xml |     0
 .../spr3896/DefaultLocationsBaseTests-context.xml  |     0
 .../DefaultLocationsInheritedTests-context.xml     |     0
 .../spr6128/AutowiredQualifierTests-context.xml    |     0
 ...tasource-config-with-auto-generated-db-name.xml |    12 +
 .../context/junit4/spr8849/datasource-config.xml   |    12 +
 .../test/context/junit4/spr8849/spr8849-schema.sql |     0
 .../context/junit4/transactionalTests-context.xml  |    22 +
 ...igurationUtilsTests$BareAnnotations-context.xml |     0
 ...tomizedGenericXmlContextLoaderTests-context.xml |     0
 ...athExistentDefaultLocationsTestCase-context.xml |     0
 ...ansactionalTestNGSpringContextTests-context.xml |    25 +
 ...ansactionalTestNGSpringContextTests-context.xml |     0
 .../FailingBeforeAndAfterMethodsTests-context.xml  |     0
 ...ansactionalTestNGSpringContextTests-context.xml |     0
 .../testng/transaction/ejb/testng-package.xml      |     0
 .../transaction/ejb/testng-test-separate.xml       |     0
 .../transaction/ejb/testng-test-together.xml       |     0
 .../context/web/BasicGroovyWacTestsContext.groovy  |     0
 .../org/springframework/test/jdbc/schema.sql       |     2 +
 .../test/web/servlet/samples/context/security.xml  |    18 -
 ...rsistenceExceptionTranslationPostProcessor.java |    10 +-
 .../dao/support/DataAccessUtils.java               |     2 +-
 .../jca/cci/core/ConnectionCallback.java           |     5 +-
 .../jca/cci/core/InteractionCallback.java          |     5 +-
 .../endpoint/GenericMessageEndpointManager.java    |     4 +-
 ...AbstractTransactionManagementConfiguration.java |    13 +
 .../AnnotationTransactionAttributeSource.java      |    12 +-
 .../annotation/EnableTransactionManagement.java    |    18 +-
 .../annotation/JtaTransactionAnnotationParser.java |     8 +-
 .../SpringTransactionAnnotationParser.java         |     8 +-
 .../transaction/annotation/Transactional.java      |    72 +-
 .../AnnotationDrivenBeanDefinitionParser.java      |    31 +-
 .../config/TransactionManagementConfigUtils.java   |     9 +-
 .../transaction/config/TxNamespaceHandler.java     |     4 +-
 ...licationListenerMethodTransactionalAdapter.java |   140 +
 .../transaction/event/TransactionPhase.java        |    59 +
 .../event/TransactionalEventListener.java          |    84 +
 .../event/TransactionalEventListenerFactory.java   |    58 +
 .../interceptor/RollbackRuleAttribute.java         |     4 +-
 .../interceptor/TransactionAspectSupport.java      |    40 +-
 .../interceptor/TransactionProxyFactoryBean.java   |    12 +-
 .../transaction/jta/JtaTransactionManager.java     |    13 +-
 .../AbstractPlatformTransactionManager.java        |     4 +
 .../support/SimpleTransactionScope.java            |   128 +
 .../transaction/support/TransactionCallback.java   |    21 +-
 .../support/TransactionSynchronizationManager.java |     6 +-
 .../src/main/resources/META-INF/spring.schemas     |     3 +-
 .../org/springframework/jca/context/ra.xml         |     0
 .../transaction/config/spring-tx-4.2.xsd           |   247 +
 ...ersistenceExceptionTranslationAdvisorTests.java |    45 +-
 ...enceExceptionTranslationPostProcessorTests.java |    15 +-
 ...ChainedPersistenceExceptionTranslatorTests.java |    14 +-
 .../dao/support/DataAccessUtilsTests.java          |    38 +-
 .../JndiJtaTransactionManagerTests.java            |    30 +-
 .../transaction/JtaTransactionManagerTests.java    |   144 +-
 .../transaction/TransactionSupportTests.java       |    56 +-
 .../transaction/TxNamespaceHandlerEventTests.java  |    17 +-
 .../transaction/TxNamespaceHandlerTests.java       |    21 +-
 .../AnnotationTransactionAttributeSourceTests.java |   161 +-
 .../AnnotationTransactionInterceptorTests.java     |    49 +-
 ...AnnotationTransactionNamespaceHandlerTests.java |    49 +-
 .../EnableTransactionManagementTests.java          |    65 +-
 .../transaction/config/AnnotationDrivenTests.java  |    23 +-
 .../annotationDrivenProxyTargetClassTests.xml      |    26 -
 ...ionListenerMethodTransactionalAdapterTests.java |   123 +
 .../event/TransactionalEventListenerTests.java     |   549 +
 .../interceptor/BeanFactoryTransactionTests.java   |     5 +
 .../transaction/interceptor/RollbackRuleTests.java |    58 +-
 .../TransactionAttributeSourceAdvisorTests.java    |    14 +-
 .../TransactionAttributeSourceEditorTests.java     |    64 +-
 .../TransactionAttributeSourceTests.java           |    78 +-
 .../interceptor/TransactionInterceptorTests.java   |     5 +-
 .../interceptor/transactionalBeanFactory.xml       |   137 -
 .../transaction/jta/MockUOWManager.java            |     4 +-
 .../jta/WebSphereUowTransactionManagerTests.java   |   116 +-
 .../JtaTransactionManagerSerializationTests.java   |    12 +-
 .../support/SimpleTransactionScopeTests.java       |   197 +
 .../transaction/txNamespaceHandlerTests.xml        |    33 -
 .../annotationTransactionNamespaceHandlerTests.xml |     0
 .../annotationDrivenConfigurationClassTests.xml    |     0
 .../annotationDrivenProxyTargetClassTests.xml      |    26 +
 .../interceptor/noTransactionAttributeSource.xml   |     0
 .../interceptor/transactionalBeanFactory.xml       |   137 +
 .../transaction/txNamespaceHandlerTests.xml        |    33 +
 .../org/springframework/http/CacheControl.java     |   255 +
 .../java/org/springframework/http/HttpEntity.java  |     2 +-
 .../java/org/springframework/http/HttpHeaders.java |   270 +-
 .../java/org/springframework/http/HttpMethod.java  |    36 +
 .../java/org/springframework/http/HttpRange.java   |   285 +
 .../java/org/springframework/http/HttpRequest.java |    11 +-
 .../java/org/springframework/http/MediaType.java   |    24 +-
 .../org/springframework/http/RequestEntity.java    |     3 -
 .../org/springframework/http/ResponseEntity.java   |    30 +
 .../AbstractBufferingAsyncClientHttpRequest.java   |     4 +-
 .../client/AbstractBufferingClientHttpRequest.java |     4 +-
 .../HttpComponentsAsyncClientHttpRequest.java      |     8 +-
 ...ttpComponentsAsyncClientHttpRequestFactory.java |    31 +-
 .../HttpComponentsAsyncClientHttpResponse.java     |     4 +-
 .../client/HttpComponentsClientHttpRequest.java    |    14 +-
 .../HttpComponentsClientHttpRequestFactory.java    |    87 +-
 .../client/HttpComponentsClientHttpResponse.java   |    15 +-
 .../HttpComponentsStreamingClientHttpRequest.java  |    14 +-
 .../http/client/Netty4ClientHttpRequest.java       |    15 +-
 .../client/Netty4ClientHttpRequestFactory.java     |    69 +-
 .../http/client/Netty4ClientHttpResponse.java      |     6 +-
 .../http/client/OkHttpClientHttpRequest.java       |   144 +
 .../client/OkHttpClientHttpRequestFactory.java     |   116 +
 .../http/client/OkHttpClientHttpResponse.java      |    86 +
 .../SimpleBufferingAsyncClientHttpRequest.java     |     8 +-
 .../client/SimpleBufferingClientHttpRequest.java   |    12 +-
 .../SimpleStreamingAsyncClientHttpRequest.java     |     4 +-
 .../client/SimpleStreamingClientHttpRequest.java   |     4 +-
 .../http/client/support/HttpAccessor.java          |     3 +-
 .../AbstractGenericHttpMessageConverter.java       |   124 +
 .../converter/AbstractHttpMessageConverter.java    |    65 +-
 .../BufferedImageHttpMessageConverter.java         |    41 +-
 .../converter/ByteArrayHttpMessageConverter.java   |     2 +-
 .../http/converter/FormHttpMessageConverter.java   |    68 +-
 .../converter/GenericHttpMessageConverter.java     |    52 +-
 .../converter/ResourceHttpMessageConverter.java    |    16 +-
 .../http/converter/StringHttpMessageConverter.java |     2 +-
 .../json/AbstractJackson2HttpMessageConverter.java |    75 +-
 .../http/converter/json/GsonBuilderUtils.java      |     6 +-
 .../converter/json/GsonHttpMessageConverter.java   |    39 +-
 .../json/Jackson2ObjectMapperBuilder.java          |   170 +-
 .../json/Jackson2ObjectMapperFactoryBean.java      |    61 +-
 .../json/MappingJackson2HttpMessageConverter.java  |    24 +-
 .../converter/json/MappingJacksonInputMessage.java |    70 +
 .../http/converter/json/MappingJacksonValue.java   |    27 +-
 .../protobuf/ProtobufHttpMessageConverter.java     |   126 +-
 .../AllEncompassingFormHttpMessageConverter.java   |    22 +-
 .../xml/Jaxb2CollectionHttpMessageConverter.java   |    27 +-
 .../xml/Jaxb2RootElementHttpMessageConverter.java  |    14 +-
 .../MappingJackson2XmlHttpMessageConverter.java    |    10 +-
 .../xml/MarshallingHttpMessageConverter.java       |     9 +-
 .../converter/xml/SourceHttpMessageConverter.java  |    10 +-
 .../http/server/ServletServerHttpRequest.java      |    19 +-
 .../http/server/ServletServerHttpResponse.java     |     7 +-
 .../HttpComponentsHttpInvokerRequestExecutor.java  |    80 +-
 .../httpinvoker/HttpInvokerProxyFactoryBean.java   |     7 +-
 .../httpinvoker/HttpInvokerServiceExporter.java    |     7 +-
 .../HttpRequestMethodNotSupportedException.java    |    16 +-
 .../web/SpringServletContainerInitializer.java     |    18 +-
 .../AbstractMappingContentNegotiationStrategy.java |    48 +-
 .../web/accept/ContentNegotiationManager.java      |   107 +-
 .../ContentNegotiationManagerFactoryBean.java      |   158 +-
 .../web/accept/ContentNegotiationStrategy.java     |    10 +-
 .../accept/FixedContentNegotiationStrategy.java    |    23 +-
 .../accept/HeaderContentNegotiationStrategy.java   |    29 +-
 .../MappingMediaTypeFileExtensionResolver.java     |     4 +-
 .../web/accept/MediaTypeFileExtensionResolver.java |     8 +-
 .../ParameterContentNegotiationStrategy.java       |    42 +-
 .../PathExtensionContentNegotiationStrategy.java   |    73 +-
 ...letPathExtensionContentNegotiationStrategy.java |    33 +-
 .../web/bind/MissingPathVariableException.java     |    71 +
 ...nsatisfiedServletRequestParameterException.java |    72 +-
 .../springframework/web/bind/WebDataBinder.java    |     2 +-
 .../web/bind/annotation/ControllerAdvice.java      |    18 +-
 .../web/bind/annotation/CookieValue.java           |    39 +-
 .../web/bind/annotation/CrossOrigin.java           |   116 +
 .../web/bind/annotation/ExceptionHandler.java      |     4 +
 .../web/bind/annotation/MatrixVariable.java        |    31 +-
 .../web/bind/annotation/RequestHeader.java         |    36 +-
 .../web/bind/annotation/RequestMapping.java        |    47 +-
 .../web/bind/annotation/RequestParam.java          |    38 +-
 .../web/bind/annotation/RequestPart.java           |    26 +-
 .../web/bind/annotation/ResponseStatus.java        |    45 +-
 .../web/bind/annotation/SessionAttributes.java     |    42 +-
 .../annotation/support/HandlerMethodInvoker.java   |    17 +-
 .../annotation/support/HandlerMethodResolver.java  |     4 +-
 .../SpringWebConstraintValidatorFactory.java       |    69 +
 .../web/client/AsyncRestTemplate.java              |    30 +-
 .../springframework/web/client/RestOperations.java |     4 +-
 .../springframework/web/client/RestTemplate.java   |    37 +-
 .../context/AbstractContextLoaderInitializer.java  |    19 +-
 .../springframework/web/context/ContextLoader.java |    83 +-
 .../web/context/ContextLoaderListener.java         |     1 +
 .../web/context/request/FacesWebRequest.java       |    12 +-
 .../Log4jNestedDiagnosticContextInterceptor.java   |     3 +
 .../web/context/request/ServletWebRequest.java     |   164 +-
 .../web/context/request/WebRequest.java            |    52 +-
 .../web/context/request/async/DeferredResult.java  |     5 +-
 .../async/DeferredResultProcessingInterceptor.java |    12 +-
 .../async/StandardServletAsyncWebRequest.java      |     1 +
 .../web/context/request/async/WebAsyncManager.java |    43 +-
 ...ervletContextPropertyPlaceholderConfigurer.java |   162 -
 .../support/WebApplicationContextUtils.java        |    40 +-
 .../web/cors/CorsConfiguration.java                |   393 +
 .../web/cors/CorsConfigurationSource.java          |    35 +
 .../springframework/web/cors/CorsProcessor.java    |    50 +
 .../org/springframework/web/cors/CorsUtils.java    |    48 +
 .../web/cors/DefaultCorsProcessor.java             |   199 +
 .../web/cors/UrlBasedCorsConfigurationSource.java  |   134 +
 .../org/springframework/web/cors/package-info.java |     5 +
 .../web/filter/AbstractRequestLoggingFilter.java   |     7 +-
 .../web/filter/CharacterEncodingFilter.java        |    36 +
 .../org/springframework/web/filter/CorsFilter.java |    95 +
 .../web/filter/DelegatingFilterProxy.java          |    14 +-
 .../filter/Log4jNestedDiagnosticContextFilter.java |     3 +
 .../web/filter/ShallowEtagHeaderFilter.java        |    85 +-
 .../web/method/ControllerAdviceBean.java           |     5 -
 .../springframework/web/method/HandlerMethod.java  |    33 +-
 .../web/method/HandlerMethodSelector.java          |    38 +-
 .../AbstractCookieValueMethodArgumentResolver.java |     4 +-
 .../AbstractNamedValueMethodArgumentResolver.java  |    17 +-
 .../annotation/ExceptionHandlerMethodResolver.java |    11 +-
 ...hodArgumentConversionNotSupportedException.java |    61 +
 .../MethodArgumentTypeMismatchException.java       |    61 +
 .../web/method/annotation/ModelFactory.java        |   126 +-
 .../RequestHeaderMapMethodArgumentResolver.java    |    13 +-
 .../RequestHeaderMethodArgumentResolver.java       |     8 +-
 .../RequestParamMapMethodArgumentResolver.java     |     8 +-
 .../RequestParamMethodArgumentResolver.java        |    23 +-
 .../annotation/SessionAttributesHandler.java       |     6 +-
 .../SessionStatusMethodArgumentResolver.java       |     2 +-
 .../AsyncHandlerMethodReturnValueHandler.java      |    50 +
 .../support/CompositeUriComponentsContributor.java |    16 +-
 .../HandlerMethodArgumentResolverComposite.java    |    43 +-
 .../HandlerMethodReturnValueHandlerComposite.java  |    51 +-
 .../web/method/support/InvocableHandlerMethod.java |     8 +-
 .../web/method/support/ModelAndViewContainer.java  |     8 +-
 .../web/multipart/MultipartFile.java               |     5 +-
 .../commons/CommonsFileUploadSupport.java          |    14 +-
 .../multipart/commons/CommonsMultipartFile.java    |     4 +-
 .../AbstractMultipartHttpServletRequest.java       |     4 +-
 .../MissingServletRequestPartException.java        |    19 +-
 .../RequestPartServletServerHttpRequest.java       |    30 +-
 .../StandardMultipartHttpServletRequest.java       |    49 +-
 .../web/util/ContentCachingRequestWrapper.java     |     6 +-
 .../web/util/ContentCachingResponseWrapper.java    |    68 +-
 .../springframework/web/util/CookieGenerator.java  |    15 +-
 .../web/util/DefaultUriTemplateHandler.java        |   130 +
 .../web/util/HierarchicalUriComponents.java        |   155 +-
 .../web/util/Log4jConfigListener.java              |     3 +
 .../web/util/Log4jWebConfigurer.java               |    10 +-
 .../web/util/OpaqueUriComponents.java              |     9 +-
 .../springframework/web/util/UriComponents.java    |    34 +-
 .../web/util/UriComponentsBuilder.java             |   179 +-
 .../org/springframework/web/util/UriTemplate.java  |   130 +-
 .../web/util/UriTemplateHandler.java               |    46 +
 .../org/springframework/web/util/UriUtils.java     |   190 +-
 .../springframework/web/util/UrlPathHelper.java    |    41 +-
 .../org/springframework/web/util/WebUtils.java     |    28 +-
 .../web/context/ContextLoader.properties           |     0
 .../springframework/http/CacheControlTests.java    |    66 +
 .../org/springframework/http/HttpHeadersTests.java |   102 +-
 .../org/springframework/http/HttpRangeTests.java   |   103 +
 .../http/MockHttpOutputMessage.java                |    30 +-
 .../springframework/http/ResponseEntityTests.java  |    69 +-
 .../AbstractAsyncHttpRequestFactoryTestCase.java   |     6 +-
 .../client/AbstractHttpRequestFactoryTestCase.java |     9 +
 .../http/client/AbstractJettyServerTestCase.java   |    22 +-
 ...BufferedSimpleAsyncHttpRequestFactoryTests.java |     1 +
 .../BufferedSimpleHttpRequestFactoryTests.java     |     5 +-
 ...mponentsAsyncClientHttpRequestFactoryTests.java |    51 +-
 ...ttpComponentsClientHttpRequestFactoryTests.java |   100 +-
 .../Netty4AsyncClientHttpRequestFactoryTests.java  |     1 +
 .../Netty4ClientHttpRequestFactoryTests.java       |     1 +
 .../OkHttpAsyncClientHttpRequestFactoryTests.java  |    40 +
 .../OkHttpClientHttpRequestFactoryTests.java       |    40 +
 .../SimpleClientHttpRequestFactoryTests.java       |    41 +
 .../BufferedImageHttpMessageConverterTests.java    |    11 +-
 .../converter/FormHttpMessageConverterTests.java   |   128 +-
 .../http/converter/HttpMessageConverterTests.java  |    51 +-
 .../ResourceHttpMessageConverterTests.java         |    32 +-
 .../http/converter/json/GsonFactoryBeanTests.java  |     9 +-
 .../json/GsonHttpMessageConverterTests.java        |    12 +-
 .../json/Jackson2ObjectMapperBuilderTests.java     |   115 +-
 .../json/Jackson2ObjectMapperFactoryBeanTests.java |   206 +-
 .../MappingJackson2HttpMessageConverterTests.java  |   125 +-
 .../json/SpringHandlerInstantiatorTests.java       |    18 +-
 .../ProtobufHttpMessageConverterTests.java         |    21 +-
 .../Jaxb2CollectionHttpMessageConverterTests.java  |     3 +-
 .../Jaxb2RootElementHttpMessageConverterTests.java |     1 -
 ...appingJackson2XmlHttpMessageConverterTests.java |     5 +-
 .../xml/SourceHttpMessageConverterTests.java       |     1 +
 .../http/server/ServletServerHttpRequestTests.java |    14 +-
 .../mock/web/test/MockAsyncContext.java            |    14 +-
 .../mock/web/test/MockExpressionEvaluator.java     |    46 +-
 .../mock/web/test/MockFilterConfig.java            |     2 +-
 .../mock/web/test/MockHttpServletRequest.java      |   176 +-
 .../mock/web/test/MockHttpServletResponse.java     |    58 +-
 .../mock/web/test/MockHttpSession.java             |     5 +-
 .../web/test/MockMultipartHttpServletRequest.java  |     4 +-
 .../mock/web/test/MockPageContext.java             |    15 +-
 .../mock/web/test/MockServletContext.java          |    87 +-
 .../java/org/springframework/protobuf/Msg.java     |    11 +-
 .../org/springframework/protobuf/SecondMsg.java    |     3 +-
 .../remoting/caucho/CauchoRemotingTests.java       |   136 +-
 ...pComponentsHttpInvokerRequestExecutorTests.java |    81 +-
 .../HttpInvokerFactoryBeanIntegrationTests.java    |     7 +-
 .../remoting/httpinvoker/HttpInvokerTests.java     |    33 +-
 .../WebRequestDataBinderIntegrationTests.java      |    44 +-
 .../bind/support/WebRequestDataBinderTests.java    |     4 +-
 .../web/client/AbstractJettyServerTestCase.java    |    78 +-
 .../client/AsyncRestTemplateIntegrationTests.java  |    69 +-
 .../client/HttpMessageConverterExtractorTests.java |     1 +
 .../web/client/RestTemplateIntegrationTests.java   |    22 +-
 .../web/client/RestTemplateTests.java              |    30 +
 .../request/RequestAndSessionScopedBeanTests.java  |     4 +-
 .../request/RequestContextListenerTests.java       |    17 +-
 .../web/context/request/RequestScopeTests.java     |   159 +-
 .../request/ServletWebRequestHttpMethodsTests.java |   296 +
 .../context/request/ServletWebRequestTests.java    |   121 +-
 .../web/context/request/SessionScopeTests.java     |   134 +-
 .../async/StandardServletAsyncWebRequestTests.java |    66 +-
 ...AnnotationConfigWebApplicationContextTests.java |     6 +-
 .../web/cors/CorsConfigurationTests.java           |   219 +
 .../springframework/web/cors/CorsUtilsTests.java   |    72 +
 .../web/cors/DefaultCorsProcessorTests.java        |   310 +
 .../cors/UrlBasedCorsConfigurationSourceTests.java |    51 +
 .../web/filter/CharacterEncodingFilterTests.java   |    37 +-
 .../web/filter/CompositeFilterTests.java           |     7 +-
 .../web/filter/CorsFilterTests.java                |   120 +
 .../web/filter/DelegatingFilterProxyTests.java     |   126 +-
 .../web/filter/RequestContextFilterTests.java      |    17 +-
 .../web/filter/RequestLoggingFilterTests.java      |    44 +-
 .../web/filter/ShallowEtagHeaderFilterTests.java   |   145 +-
 .../web/jsf/DelegatingNavigationHandlerTests.java  |    51 +-
 .../web/jsf/DelegatingPhaseListenerTests.java      |    38 +-
 .../CookieValueMethodArgumentResolverTests.java    |    16 +-
 ...ExpressionValueMethodArgumentResolverTests.java |     3 +-
 .../ModelAttributeMethodProcessorTests.java        |    27 +-
 .../annotation/ModelFactoryOrderingTests.java      |    10 +-
 ...equestHeaderMapMethodArgumentResolverTests.java |    16 +-
 .../RequestHeaderMethodArgumentResolverTests.java  |    25 +-
 ...RequestParamMapMethodArgumentResolverTests.java |    16 +-
 .../RequestParamMethodArgumentResolverTests.java   |   102 +-
 .../annotation/SessionAttributesHandlerTests.java  |    22 +-
 .../CompositeUriComponentsContributorTests.java    |     3 +-
 ...dlerMethodReturnValueHandlerCompositeTests.java |    96 +-
 .../support/InvocableHandlerMethodTests.java       |    26 +-
 .../method/support/ModelAndViewContainerTests.java |    18 +-
 .../web/method/support/StubReturnValueHandler.java |    52 -
 .../support/ByteArrayMultipartFileEditorTests.java |    42 +-
 .../RequestPartServletServerHttpRequestTests.java  |   119 +-
 .../web/util/DefaultUriTemplateHandlerTests.java   |    88 +
 .../web/util/Log4jWebConfigurerTests.java          |    12 +-
 .../web/util/UriComponentsBuilderTests.java        |   103 +-
 .../web/util/UriComponentsTests.java               |    33 +-
 .../springframework/web/util/UriTemplateTests.java |    19 +-
 .../springframework/web/util/UriUtilsTests.java    |    58 -
 .../web/util/UrlPathHelperTests.java               |    82 +-
 .../springframework/web/util/WebUtilsTests.java    |    72 +-
 .../web/portlet/DispatcherPortlet.java             |    10 +-
 .../web/portlet/FrameworkPortlet.java              |     7 +-
 .../web/portlet/bind/annotation/ActionMapping.java |    32 +-
 .../web/portlet/bind/annotation/RenderMapping.java |    28 +-
 .../web/portlet/context/PortletWebRequest.java     |    12 +-
 .../handler/AbstractHandlerExceptionResolver.java  |    53 +-
 .../handler/SimpleMappingExceptionResolver.java    |     4 +-
 .../multipart/CommonsPortletMultipartResolver.java |     1 -
 .../annotation/AnnotationMethodHandlerAdapter.java |    10 +-
 .../AnnotationMethodHandlerExceptionResolver.java  |     7 +-
 .../DefaultAnnotationHandlerMapping.java           |     6 +-
 .../web/portlet/DispatcherPortlet.properties       |     0
 .../web/portlet/ServletWrappingPortletContext.java |     3 -
 .../web/portlet/DispatcherPortletTests.java        |   172 +-
 .../web/portlet/GenericPortletBeanTests.java       |    53 +-
 .../bind/PortletRequestDataBinderTests.java        |    77 +-
 ...PortletRequestParameterPropertyValuesTests.java |    27 +-
 .../AbstractXmlWebApplicationContextTests.java     |    14 +-
 .../context/PortletContextAwareProcessorTests.java |    84 +-
 .../web/portlet/context/WEB-INF/empty-portlet.xml  |    12 -
 .../web/portlet/context/WEB-INF/test-portlet.xml   |    12 -
 .../web/portlet/context/WEB-INF/test-servlet.xml   |    59 -
 .../context/XmlPortletApplicationContextTests.java |    30 +-
 .../handler/ParameterHandlerMappingTests.java      |    68 +-
 .../handler/ParameterMappingInterceptorTests.java  |    69 +-
 .../handler/PortletModeHandlerMappingTests.java    |    56 +-
 .../PortletModeParameterHandlerMappingTests.java   |    74 +-
 .../SimpleMappingExceptionResolverTests.java       |   106 +-
 .../UserRoleAuthorizationInterceptorTests.java     |    75 +-
 .../web/portlet/handler/parameterMapping.xml       |    19 -
 .../web/portlet/handler/portletModeMapping.xml     |    22 -
 .../handler/portletModeParameterMapping.xml        |    30 -
 .../mvc/ParameterizableViewControllerTests.java    |    50 +-
 .../mvc/PortletModeNameViewControllerTests.java    |    48 +-
 .../mvc/PortletWrappingControllerTests.java        |    56 +-
 .../Portlet20AnnotationControllerTests.java        |    21 +-
 .../PortletAnnotationControllerTests.java          |    54 +-
 .../portlet/context/WEB-INF/applicationContext.xml |     0
 .../context/WEB-INF/context-messages.properties    |     0
 .../WEB-INF/context-messages_en_GB.properties      |     0
 .../WEB-INF/context-messages_en_US.properties      |     0
 .../web/portlet/context/WEB-INF/contextInclude.xml |     0
 .../web/portlet/context/WEB-INF/empty-portlet.xml  |    12 +
 .../WEB-INF/more-context-messages.properties       |     0
 .../portlet/context/WEB-INF/myoverride.properties  |     0
 .../context/WEB-INF/myplaceholder.properties       |     0
 .../context/WEB-INF/resources/messageSource.xml    |     0
 .../context/WEB-INF/resources/themeSource.xml      |     0
 .../web/portlet/context/WEB-INF/test-portlet.xml   |    12 +
 .../web/portlet/context/WEB-INF/test-servlet.xml   |    59 +
 .../web/portlet/handler/parameterMapping.xml       |    19 +
 .../web/portlet/handler/portletModeMapping.xml     |    22 +
 .../handler/portletModeParameterMapping.xml        |    30 +
 .../view/tiles2/AbstractSpringPreparerFactory.java |     2 +
 .../view/tiles2/SimpleSpringPreparerFactory.java   |     2 +
 .../view/tiles2/SpringBeanPreparerFactory.java     |     2 +
 .../servlet/view/tiles2/SpringLocaleResolver.java  |     2 +
 ...ringWildcardServletTilesApplicationContext.java |     2 +
 .../web/servlet/view/tiles2/TilesConfigurer.java   |     2 +
 .../web/servlet/view/tiles2/TilesView.java         |     2 +
 .../web/servlet/view/tiles2/TilesViewResolver.java |     2 +
 .../servlet/view/tiles2/TilesConfigurerTests.java  |     5 +-
 .../web/servlet/AsyncHandlerInterceptor.java       |    49 +-
 .../web/servlet/DispatcherServlet.java             |    33 +-
 .../org/springframework/web/servlet/FlashMap.java  |    39 +-
 .../web/servlet/FrameworkServlet.java              |    32 +-
 .../web/servlet/HandlerExceptionResolver.java      |    24 +-
 .../web/servlet/HandlerInterceptor.java            |    19 +
 .../web/servlet/HandlerMapping.java                |     4 +-
 .../web/servlet/NoHandlerFoundException.java       |    10 +-
 .../web/servlet/ViewRendererServlet.java           |     4 +-
 .../AnnotationDrivenBeanDefinitionParser.java      |    12 +
 .../servlet/config/CorsBeanDefinitionParser.java   |   120 +
 .../web/servlet/config/MvcNamespaceHandler.java    |     5 +-
 .../web/servlet/config/MvcNamespaceUtils.java      |    32 +
 .../config/ResourcesBeanDefinitionParser.java      |    56 +-
 ...riptTemplateConfigurerBeanDefinitionParser.java |    91 +
 .../TilesConfigurerBeanDefinitionParser.java       |     7 +
 .../config/ViewControllerBeanDefinitionParser.java |     3 +
 .../config/ViewResolversBeanDefinitionParser.java  |    11 +-
 .../annotation/ContentNegotiationConfigurer.java   |   165 +-
 .../config/annotation/CorsRegistration.java        |    99 +
 .../servlet/config/annotation/CorsRegistry.java    |    63 +
 .../annotation/DelegatingWebMvcConfiguration.java  |     5 +
 .../servlet/config/annotation/EnableWebMvc.java    |    52 +-
 .../config/annotation/PathMatchConfigurer.java     |    55 +-
 .../annotation/ResourceChainRegistration.java      |    11 +-
 .../annotation/ResourceHandlerRegistration.java    |    25 +-
 .../config/annotation/ViewResolverRegistry.java    |    28 +-
 .../annotation/WebMvcConfigurationSupport.java     |    58 +-
 .../config/annotation/WebMvcConfigurer.java        |     6 +
 .../config/annotation/WebMvcConfigurerAdapter.java |     8 +
 .../annotation/WebMvcConfigurerComposite.java      |     7 +
 .../handler/AbstractHandlerExceptionResolver.java  |    68 +-
 .../servlet/handler/AbstractHandlerMapping.java    |   184 +-
 .../handler/AbstractHandlerMethodMapping.java      |   573 +-
 .../servlet/handler/AbstractUrlHandlerMapping.java |    27 +
 .../web/servlet/handler/MappedInterceptor.java     |    30 +-
 .../handler/SimpleMappingExceptionResolver.java    |     4 +-
 .../web/servlet/i18n/CookieLocaleResolver.java     |     8 +-
 .../web/servlet/i18n/LocaleChangeInterceptor.java  |    83 +-
 .../web/servlet/i18n/SessionLocaleResolver.java    |    18 +-
 .../web/servlet/mvc/AbstractController.java        |     9 +-
 .../web/servlet/mvc/WebContentInterceptor.java     |    98 +-
 .../annotation/AnnotationMethodHandlerAdapter.java |    26 +-
 .../AnnotationMethodHandlerExceptionResolver.java  |    18 +-
 .../DefaultAnnotationHandlerMapping.java           |     5 +-
 .../ResponseStatusExceptionResolver.java           |    16 +-
 .../annotation/ServletAnnotationMappingUtils.java  |     7 +-
 .../mvc/condition/AbstractMediaTypeExpression.java |     2 +-
 .../mvc/condition/AbstractRequestCondition.java    |     2 +-
 .../web/servlet/mvc/method/RequestMappingInfo.java |   311 +-
 .../method/RequestMappingInfoHandlerMapping.java   |    25 +-
 .../AbstractJsonpResponseBodyAdvice.java           |     2 +-
 ...ractMessageConverterMethodArgumentResolver.java |   192 +-
 .../AbstractMessageConverterMethodProcessor.java   |   118 +-
 .../AsyncTaskMethodReturnValueHandler.java         |    11 +-
 .../CallableMethodReturnValueHandler.java          |    11 +-
 .../CompletionStageReturnValueHandler.java         |    80 +
 .../DeferredResultMethodReturnValueHandler.java    |    11 +-
 .../ExceptionHandlerExceptionResolver.java         |    11 +-
 .../annotation/HttpEntityMethodProcessor.java      |   115 +-
 .../annotation/JsonViewRequestBodyAdvice.java      |    73 +
 .../annotation/JsonViewResponseBodyAdvice.java     |     2 +-
 .../ListenableFutureReturnValueHandler.java        |    11 +-
 .../MatrixVariableMapMethodArgumentResolver.java   |    12 +-
 .../MatrixVariableMethodArgumentResolver.java      |    32 +-
 .../method/annotation/MvcUriComponentsBuilder.java |   459 +-
 .../PathVariableMethodArgumentResolver.java        |    38 +-
 .../mvc/method/annotation/RequestBodyAdvice.java   |    91 +
 .../annotation/RequestBodyAdviceAdapter.java       |    70 +
 .../annotation/RequestMappingHandlerAdapter.java   |   171 +-
 .../annotation/RequestMappingHandlerMapping.java   |   177 +-
 .../RequestPartMethodArgumentResolver.java         |    63 +-
 .../annotation/RequestResponseBodyAdviceChain.java |   177 +
 .../RequestResponseBodyMethodProcessor.java        |   114 +-
 .../mvc/method/annotation/ResponseBodyAdvice.java  |     4 +-
 .../method/annotation/ResponseBodyAdviceChain.java |    78 -
 .../mvc/method/annotation/ResponseBodyEmitter.java |   286 +
 .../ResponseBodyEmitterReturnValueHandler.java     |   232 +
 .../annotation/ResponseEntityExceptionHandler.java |   108 +-
 .../annotation/ServletInvocableHandlerMethod.java  |    18 +-
 .../ServletRequestMethodArgumentResolver.java      |    12 +-
 .../servlet/mvc/method/annotation/SseEmitter.java  |   251 +
 .../method/annotation/StreamingResponseBody.java   |    47 +
 .../StreamingResponseBodyReturnValueHandler.java   |   113 +
 ...UriComponentsBuilderMethodArgumentResolver.java |     7 +-
 .../ViewNameMethodReturnValueHandler.java          |    24 +-
 .../mvc/multiaction/MultiActionController.java     |    21 +-
 .../support/DefaultHandlerExceptionResolver.java   |   100 +-
 .../resource/DefaultResourceResolverChain.java     |     5 +-
 .../web/servlet/resource/PathResourceResolver.java |     2 +-
 .../resource/ResourceHttpRequestHandler.java       |   193 +-
 .../resource/ResourceUrlEncodingFilter.java        |    42 +-
 .../web/servlet/resource/ResourceUrlProvider.java  |    21 +-
 .../ResourceUrlProviderExposingInterceptor.java    |    11 +-
 .../servlet/resource/VersionResourceResolver.java  |   107 +-
 .../web/servlet/resource/VersionedResource.java    |    33 +
 .../servlet/resource/WebJarsResourceResolver.java  |   107 +
 .../AbstractDispatcherServletInitializer.java      |    35 +-
 .../servlet/support/AbstractFlashMapManager.java   |    33 +-
 .../web/servlet/support/RequestContext.java        |    22 +-
 .../web/servlet/support/RequestContextUtils.java   |    75 +-
 .../support/ServletUriComponentsBuilder.java       |     2 +-
 .../web/servlet/support/WebContentGenerator.java   |   359 +-
 .../web/servlet/tags/TransformTag.java             |     3 +-
 .../springframework/web/servlet/tags/UrlTag.java   |     7 +-
 .../tags/form/AbstractMultiCheckedElementTag.java  |     2 +-
 .../web/servlet/tags/form/CheckboxTag.java         |     2 +-
 .../web/servlet/tags/form/ErrorsTag.java           |     6 +-
 .../web/servlet/tags/form/FormTag.java             |    14 +-
 .../web/servlet/tags/form/OptionTag.java           |    12 +-
 .../web/servlet/tags/form/TextareaTag.java         |     4 +-
 .../view/ContentNegotiatingViewResolver.java       |    98 +-
 .../servlet/view/InternalResourceViewResolver.java |     4 +-
 .../web/servlet/view/RedirectView.java             |    35 +-
 .../servlet/view/document/AbstractExcelView.java   |     3 +
 .../web/servlet/view/document/AbstractXlsView.java |   120 +
 .../view/document/AbstractXlsxStreamingView.java   |    59 +
 .../servlet/view/document/AbstractXlsxView.java    |    54 +
 .../web/servlet/view/freemarker/spring.ftl         |   383 -
 .../JasperReportsMultiFormatView.java              |     3 +
 .../view/jasperreports/JasperReportsXlsxView.java  |    50 +
 .../servlet/view/json/AbstractJackson2View.java    |    53 +-
 .../servlet/view/json/MappingJackson2JsonView.java |    50 +-
 .../servlet/view/script/ScriptTemplateConfig.java  |    79 +
 .../view/script/ScriptTemplateConfigurer.java      |   225 +
 .../servlet/view/script/ScriptTemplateView.java    |   408 +
 .../view/script/ScriptTemplateViewResolver.java    |    47 +
 .../web/servlet/view/script/package-info.java      |     6 +
 .../view/velocity/VelocityViewResolver.java        |     2 +-
 .../web/servlet/view/velocity/spring.vm            |   319 -
 .../servlet/view/xml/MappingJackson2XmlView.java   |    10 +-
 .../src/main/resources/META-INF/spring-form.tld    |   159 +-
 .../src/main/resources/META-INF/spring.schemas     |     3 +-
 .../src/main/resources/META-INF/spring.tld         |   137 +-
 .../web/servlet/DispatcherServlet.properties       |     0
 .../web/servlet/config/spring-mvc-3.2.xsd          |    57 +-
 .../web/servlet/config/spring-mvc-4.2.xsd          |  1386 +
 .../web/servlet/view/freemarker/spring.ftl         |   384 +
 .../web/servlet/view/velocity/spring.vm            |   320 +
 .../web/context/ContextLoaderTests.java            |    52 +-
 .../context/ServletContextAwareProcessorTests.java |    44 +-
 .../web/context/WEB-INF/context-addition.xml       |    50 -
 .../web/context/WEB-INF/test-servlet.xml           |    59 -
 .../springframework/web/context/WEB-INF/web.xml    |   151 -
 .../web/context/XmlWebApplicationContextTests.java |    22 +-
 .../org/springframework/web/context/beans1.xml     |    16 -
 .../support/ServletContextSupportTests.java        |   234 +-
 .../web/servlet/ComplexWebApplicationContext.java  |    11 +-
 .../web/servlet/DispatcherServletTests.java        |   213 +-
 .../web/servlet/SimpleWebApplicationContext.java   |     5 +-
 .../AnnotationDrivenBeanDefinitionParserTests.java |    14 +-
 .../web/servlet/config/MvcNamespaceTests.java      |   175 +-
 .../config/annotation/CorsRegistryTests.java       |    71 +
 .../DelegatingWebMvcConfigurationTests.java        |     3 +-
 .../annotation/ResourceHandlerRegistryTests.java   |    29 +-
 .../annotation/ViewResolverRegistryTests.java      |    19 +-
 .../WebMvcConfigurationSupportExtensionTests.java  |    15 +
 .../WebMvcConfigurationSupportTests.java           |    41 +-
 .../handler/BeanNameUrlHandlerMappingTests.java    |    33 +-
 .../handler/CorsAbstractHandlerMappingTests.java   |   209 +
 .../web/servlet/handler/HandlerMappingTests.java   |    94 +
 .../servlet/handler/HandlerMethodMappingTests.java |   206 +-
 .../servlet/handler/MappedInterceptorTests.java    |    41 +-
 .../handler/SimpleUrlHandlerMappingTests.java      |     5 +
 .../web/servlet/mvc/ControllerTests.java           |    27 +-
 .../mvc/UrlFilenameViewControllerTests.java        |    48 +-
 .../servlet/mvc/WebContentInterceptorTests.java    |   121 +-
 ...otationMethodHandlerExceptionResolverTests.java |    61 +-
 .../ControllerClassNameHandlerMappingTests.java    |    70 +-
 .../ResponseStatusExceptionResolverTests.java      |    72 +-
 .../ServletAnnotationControllerTests.java          |     6 +-
 .../ControllerBeanNameHandlerMappingTests.java     |    49 +-
 .../ControllerClassNameHandlerMappingTests.java    |    39 +-
 .../RequestMappingInfoHandlerMappingTests.java     |    24 +-
 .../mvc/method/RequestMappingInfoTests.java        |    22 +-
 .../mvc/method/annotation/CrossOriginTests.java    |   433 +
 .../ExceptionHandlerExceptionResolverTests.java    |    72 +-
 .../HandlerMethodAnnotationDetectionTests.java     |   147 +-
 .../HttpEntityMethodProcessorMockTests.java        |   262 +-
 .../annotation/HttpEntityMethodProcessorTests.java |   115 +-
 ...rixVariablesMapMethodArgumentResolverTests.java |    20 +-
 ...MatrixVariablesMethodArgumentResolverTests.java |     4 +-
 .../ModelAndViewMethodReturnValueHandlerTests.java |    19 +-
 ...dViewResolverMethodReturnValueHandlerTests.java |    11 +-
 .../annotation/MvcUriComponentsBuilderTests.java   |   196 +-
 .../PathVariableMethodArgumentResolverTests.java   |    13 +-
 ...questMappingHandlerAdapterIntegrationTests.java |    71 +-
 .../RequestMappingHandlerAdapterTests.java         |    27 +-
 .../RequestMappingHandlerMappingTests.java         |    60 +-
 .../annotation/RequestPartIntegrationTests.java    |   117 +-
 .../RequestPartMethodArgumentResolverTests.java    |   236 +-
 .../RequestResponseBodyAdviceChainTests.java       |   191 +
 ...equestResponseBodyMethodProcessorMockTests.java |    50 +-
 .../RequestResponseBodyMethodProcessorTests.java   |   400 +-
 .../annotation/ResponseBodyAdviceChainTests.java   |   161 -
 ...ResponseBodyEmitterReturnValueHandlerTests.java |   257 +
 .../annotation/ResponseBodyEmitterTests.java       |   221 +
 .../ResponseEntityExceptionHandlerTests.java       |    34 +-
 ...vletAnnotationControllerHandlerMethodTests.java |    63 +-
 ...vletCookieValueMethodArgumentResolverTests.java |    14 +-
 .../ServletInvocableHandlerMethodTests.java        |   107 +-
 .../mvc/method/annotation/SseEmitterTests.java     |   160 +
 ...reamingResponseBodyReturnValueHandlerTests.java |   170 +
 ...vletAnnotationControllerHandlerMethodTests.java |     6 +-
 .../multiaction/MultiActionControllerTests.java    |    78 +-
 .../DefaultHandlerExceptionResolverTests.java      |    27 +-
 .../resource/ResourceHttpRequestHandlerTests.java  |   219 +-
 .../resource/ResourceUrlEncodingFilterTests.java   |    65 +-
 .../servlet/resource/ResourceUrlProviderTests.java |    13 +
 .../resource/VersionResourceResolverTests.java     |    30 +-
 .../resource/WebJarsResourceResolverTests.java     |   153 +
 .../support/DispatcherServletInitializerTests.java |    45 +-
 .../web/servlet/support/FlashMapManagerTests.java  |    98 +-
 .../web/servlet/tags/AbstractTagTests.java         |     6 +-
 .../web/servlet/tags/ArgumentTagTests.java         |    28 +-
 .../web/servlet/tags/BindTagTests.java             |   108 +-
 .../web/servlet/tags/EvalTagTests.java             |    48 +-
 .../web/servlet/tags/HtmlEscapeTagTests.java       |    33 +-
 .../web/servlet/tags/MessageTagTests.java          |    85 +-
 .../web/servlet/tags/ParamTagTests.java            |    53 +-
 .../web/servlet/tags/ParamTests.java               |    27 +-
 .../web/servlet/tags/ThemeTagTests.java            |    13 +-
 .../web/servlet/tags/UrlTagTests.java              |   135 +-
 .../tags/form/AbstractHtmlElementTagTests.java     |    20 +-
 .../web/servlet/tags/form/ButtonTagTests.java      |    13 +-
 .../web/servlet/tags/form/CheckboxTagTests.java    |    85 +-
 .../web/servlet/tags/form/CheckboxesTagTests.java  |    55 +-
 .../web/servlet/tags/form/Country.java             |     3 +-
 .../web/servlet/tags/form/ErrorsTagTests.java      |    79 +-
 .../web/servlet/tags/form/FormTagTests.java        |    49 +-
 .../web/servlet/tags/form/HiddenInputTagTests.java |    21 +-
 .../web/servlet/tags/form/InputTagTests.java       |    48 +-
 .../web/servlet/tags/form/LabelTagTests.java       |    24 +-
 .../web/servlet/tags/form/OptionTagEnumTests.java  |     9 +-
 .../web/servlet/tags/form/OptionTagTests.java      |    62 +-
 .../web/servlet/tags/form/OptionsTagTests.java     |    28 +-
 .../servlet/tags/form/PasswordInputTagTests.java   |    31 +-
 .../web/servlet/tags/form/RadioButtonTagTests.java |    36 +-
 .../servlet/tags/form/RadioButtonsTagTests.java    |    49 +-
 .../web/servlet/tags/form/SelectTagTests.java      |   106 +-
 .../web/servlet/tags/form/TagIdGeneratorTests.java |    34 +-
 .../web/servlet/tags/form/TagWriterTests.java      |    43 +-
 .../web/servlet/tags/form/TextareaTagTests.java    |    31 +-
 .../web/servlet/theme/ThemeResolverTests.java      |    20 +-
 .../web/servlet/view/BaseViewTests.java            |   139 +-
 .../servlet/view/InternalResourceViewTests.java    |   131 +-
 .../web/servlet/view/RedirectViewTests.java        |    12 +
 .../view/ResourceBundleViewResolverTests.java      |   110 +-
 .../web/servlet/view/document/XlsViewTests.java    |   121 +
 .../view/freemarker/FreeMarkerMacroTests.java      |     9 +-
 .../view/freemarker/FreeMarkerViewTests.java       |    57 +-
 .../servlet/view/groovy/GroovyMarkupViewTests.java |     3 +-
 ...AbstractConfigurableJasperReportsViewTests.java |    17 +-
 .../jasperreports/AbstractJasperReportsTests.java  |    20 +-
 .../AbstractJasperReportsViewTests.java            |   218 +-
 ...nfigurableJasperReportsViewWithStreamTests.java |     8 +-
 .../view/jasperreports/ExporterParameterTests.java |    12 +-
 .../JasperReportViewResolverTests.java             |    52 +-
 .../jasperreports/JasperReportsHtmlViewTests.java  |     9 +-
 .../JasperReportsMultiFormatViewTests.java         |    29 +-
 .../jasperreports/JasperReportsXlsxViewTests.java  |    35 +
 .../view/json/MappingJackson2JsonViewTests.java    |    86 +-
 .../view/script/JRubyScriptTemplateTests.java      |    99 +
 .../view/script/JythonScriptTemplateTests.java     |    99 +
 .../view/script/NashornScriptTemplateTests.java    |   122 +
 .../script/ScriptTemplateViewResolverTests.java    |    40 +
 .../view/script/ScriptTemplateViewTests.java       |   271 +
 .../servlet/view/velocity/TestVelocityEngine.java  |     8 +-
 .../view/velocity/VelocityConfigurerTests.java     |    39 +-
 .../servlet/view/velocity/VelocityMacroTests.java  |    34 +-
 .../view/xml/MappingJackson2XmlViewTests.java      |     8 +-
 .../servlet/view/xslt/XsltViewResolverTests.java   |     9 +-
 .../web/servlet/view/xslt/XsltViewTests.java       |    65 +-
 .../WEB-INF/ContextLoaderTests-acc-context.xml     |     0
 .../web/context/WEB-INF/applicationContext.xml     |     0
 .../web/context/WEB-INF/context-addition.xml       |    50 +
 .../context/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/empty-servlet.xml          |     2 +-
 .../springframework/web/context/WEB-INF/fail.xml   |     0
 .../WEB-INF/more-context-messages.properties       |     0
 .../web/context/WEB-INF/myoverride.properties      |     0
 .../web/context/WEB-INF/myplaceholder.properties   |     0
 .../context/WEB-INF/resources/messageSource.xml    |     0
 .../web/context/WEB-INF/resources/themeSource.xml  |     0
 .../web/context/WEB-INF/test-messages.properties   |     0
 .../web/context/WEB-INF/test-servlet.xml           |    59 +
 .../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
 .../springframework/web/context/WEB-INF/web.xml    |   151 +
 .../org/springframework/web/context/beans1.xml     |    16 +
 .../org/springframework/web/context/ref1.xml       |     0
 .../web/servlet/config/mvc-config-cors-minimal.xml |    15 +
 .../web/servlet/config/mvc-config-cors.xml         |    20 +
 .../config/mvc-config-resources-chain-no-auto.xml  |     1 +
 ...-config-view-resolution-content-negotiation.xml |     4 +-
 .../mvc-config-view-resolution-custom-order.xml    |     1 -
 .../servlet/config/mvc-config-view-resolution.xml  |    47 +-
 .../springframework/web/servlet/handler/map2.xml   |     4 +-
 .../web/servlet/handler/map2err.xml                |     2 +-
 .../web/servlet/mvc/annotation/class-mapping.xml   |     2 +-
 .../web/servlet/mvc/mapping/class-mapping.xml      |     2 +-
 .../web/servlet/mvc/mapping/name-mapping.xml       |     2 +-
 .../META-INF/resources/webjars/foo/2.3/foo.txt     |     1 +
 .../web/servlet/view/document/template.xls         |   Bin
 .../web/servlet/view/document/template_de.xls      |   Bin
 .../web/servlet/view/document/template_en_US.xls   |   Bin
 .../web/servlet/view/freemarker/test.ftl           |     0
 .../web/servlet/view/jasperreports/view.properties |     0
 .../web/servlet/view/script/empty.txt}             |     0
 .../web/servlet/view/script/jruby/render.rb        |    20 +
 .../web/servlet/view/script/jruby/template.erb     |     1 +
 .../web/servlet/view/script/jython/render.py       |     5 +
 .../web/servlet/view/script/jython/template.html   |     1 +
 .../web/servlet/view/script/nashorn/render.js      |     7 +
 .../web/servlet/view/script/nashorn/template.html  |     1 +
 .../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
 .../org/springframework/web/servlet/view/views.xml |     0
 .../socket/adapter/AbstractWebSocketSession.java   |     3 +-
 .../socket/client/ConnectionManagerSupport.java    |    60 +-
 .../AnnotatedEndpointConnectionManager.java        |    17 +-
 .../client/standard/EndpointConnectionManager.java |    19 +-
 .../client/standard/StandardWebSocketClient.java   |    42 +-
 .../config/HandlersBeanDefinitionParser.java       |     4 +-
 .../config/MessageBrokerBeanDefinitionParser.java  |   221 +-
 .../socket/config/annotation/EnableWebSocket.java  |    32 +-
 .../annotation/EnableWebSocketMessageBroker.java   |    43 +-
 .../ServletWebSocketHandlerRegistry.java           |     3 +-
 .../config/annotation/StompEndpointRegistry.java   |    25 +-
 .../annotation/WebMvcStompEndpointRegistry.java    |    56 +-
 ...WebSocketMessageBrokerConfigurationSupport.java |    57 +-
 .../ConcurrentWebSocketSessionDecorator.java       |    29 +-
 .../socket/handler/WebSocketSessionDecorator.java  |     4 +-
 .../socket/messaging/AbstractSubProtocolEvent.java |    24 +
 .../socket/messaging/DefaultSimpUserRegistry.java  |   338 +
 .../web/socket/messaging/SessionConnectEvent.java  |     6 +
 .../socket/messaging/SessionConnectedEvent.java    |     6 +
 .../socket/messaging/SessionDisconnectEvent.java   |    27 +-
 .../socket/messaging/SessionSubscribeEvent.java    |     6 +
 .../socket/messaging/SessionUnsubscribeEvent.java  |     6 +
 .../messaging/StompSubProtocolErrorHandler.java    |    71 +
 .../socket/messaging/StompSubProtocolHandler.java  |   171 +-
 .../socket/messaging/SubProtocolErrorHandler.java  |    55 +
 .../messaging/SubProtocolWebSocketHandler.java     |    20 +-
 .../WebSocketAnnotationMethodMessageHandler.java   |   121 +
 .../web/socket/messaging/WebSocketStompClient.java |   507 +
 .../server/jetty/JettyRequestUpgradeStrategy.java  |    61 +-
 .../AbstractTyrusRequestUpgradeStrategy.java       |    52 +-
 .../socket/server/standard/SpringConfigurator.java |     8 +-
 .../standard/UndertowRequestUpgradeStrategy.java   |    89 +-
 .../standard/WebLogicRequestUpgradeStrategy.java   |   162 +-
 .../standard/WebSphereRequestUpgradeStrategy.java  |    95 +
 .../server/support/AbstractHandshakeHandler.java   |   415 +
 .../server/support/DefaultHandshakeHandler.java    |   333 +-
 .../support/HttpSessionHandshakeInterceptor.java   |    20 +-
 .../server/support/OriginHandshakeInterceptor.java |     2 +-
 .../server/support/WebSocketHandlerMapping.java    |    94 +
 .../support/WebSocketHttpRequestHandler.java       |    43 +-
 .../socket/sockjs/client/AbstractXhrTransport.java |    89 +-
 .../sockjs/client/DefaultTransportRequest.java     |    11 +-
 .../web/socket/sockjs/client/InfoReceiver.java     |    16 +-
 .../socket/sockjs/client/JettyXhrTransport.java    |    46 +-
 .../sockjs/client/RestTemplateXhrTransport.java    |    33 +-
 .../web/socket/sockjs/client/SockJsClient.java     |    50 +-
 .../web/socket/sockjs/client/SockJsUrlInfo.java    |     5 +-
 .../web/socket/sockjs/client/TransportRequest.java |    37 +-
 .../socket/sockjs/client/UndertowXhrTransport.java |   274 +-
 .../sockjs/client/XhrClientSockJsSession.java      |    26 +-
 .../web/socket/sockjs/client/XhrTransport.java     |     4 +-
 .../sockjs/frame/AbstractSockJsMessageCodec.java   |     2 +-
 .../sockjs/support/AbstractSockJsService.java      |   108 +-
 .../sockjs/support/SockJsHttpRequestHandler.java   |    52 +-
 .../transport/TransportHandlingSockJsService.java  |    88 +-
 .../AbstractHttpSendingTransportHandler.java       |     5 +-
 .../transport/handler/DefaultSockJsService.java    |    13 +-
 .../handler/EventSourceTransportHandler.java       |     8 +-
 .../handler/HtmlFileTransportHandler.java          |    11 +-
 .../handler/WebSocketTransportHandler.java         |    41 +-
 .../handler/XhrStreamingTransportHandler.java      |    20 +-
 .../session/AbstractHttpSockJsSession.java         |    80 +-
 .../transport/session/PollingSockJsSession.java    |    30 +-
 .../transport/session/StreamingSockJsSession.java  |    44 +-
 .../src/main/resources/META-INF/spring.schemas     |     3 +-
 .../web/socket/config/spring-websocket-4.0.xsd     |    19 +-
 .../web/socket/config/spring-websocket-4.1.xsd     |    30 +-
 .../web/socket/config/spring-websocket-4.2.xsd     |   924 +
 .../web/socket/AbstractHttpRequestTests.java       |     5 -
 .../socket/AbstractWebSocketIntegrationTests.java  |     9 +-
 .../web/socket/JettyWebSocketTestServer.java       |    36 +-
 .../web/socket/TomcatWebSocketTestServer.java      |    26 +-
 .../web/socket/UndertowTestServer.java             |    35 +-
 .../web/socket/WebSocketIntegrationTests.java      |    14 +-
 .../web/socket/WebSocketTestServer.java            |    14 +-
 .../standard/StandardWebSocketClientTests.java     |    89 +-
 .../MessageBrokerBeanDefinitionParserTests.java    |    57 +-
 .../WebMvcStompEndpointRegistryTests.java          |    38 +-
 .../annotation/WebSocketConfigurationTests.java    |     4 +-
 ...cketMessageBrokerConfigurationSupportTests.java |    49 +-
 .../ConcurrentWebSocketSessionDecoratorTests.java  |   106 +-
 .../messaging/DefaultSimpUserRegistryTests.java    |   214 +
 .../StompSubProtocolErrorHandlerTests.java         |    74 +
 .../messaging/StompSubProtocolHandlerTests.java    |   321 +-
 .../messaging/StompWebSocketIntegrationTests.java  |    38 +-
 .../SubProtocolWebSocketHandlerTests.java          |     5 +-
 ...bSocketAnnotationMethodMessageHandlerTests.java |   115 +
 .../WebSocketStompClientIntegrationTests.java      |   221 +
 .../messaging/WebSocketStompClientTests.java       |   370 +
 .../support/OriginHandshakeInterceptorTests.java   |    53 +-
 .../client/AbstractSockJsIntegrationTests.java     |   169 +-
 .../sockjs/client/ClientSockJsSessionTests.java    |     4 +-
 .../client/DefaultTransportRequestTests.java       |     5 +-
 .../sockjs/client/JettySockJsIntegrationTests.java |     3 +-
 .../client/RestTemplateXhrTransportTests.java      |     5 +-
 .../socket/sockjs/client/SockJsClientTests.java    |    75 +-
 .../web/socket/sockjs/client/TestTransport.java    |    16 +-
 .../socket/sockjs/client/XhrTransportTests.java    |    16 +-
 .../socket/sockjs/support/SockJsServiceTests.java  |   144 +-
 .../handler/DefaultSockJsServiceTests.java         |    50 +-
 .../handler/HttpSendingTransportHandlerTests.java  |    12 +-
 .../transport/session/HttpSockJsSessionTests.java  |    11 +-
 .../transport/session/TestHttpSockJsSession.java   |     7 +-
 .../session/WebSocketServerSockJsSessionTests.java |     3 +-
 .../src/test/resources/log4j.properties            |    15 +-
 .../config/websocket-config-broker-relay.xml       |     4 +-
 .../config/websocket-config-broker-simple.xml      |    13 +-
 src/asciidoc/Guardfile                             |     5 +-
 src/asciidoc/appendix.adoc                         |  2727 +-
 src/asciidoc/appx-spring-form-tld.adoc             |  2055 +
 src/asciidoc/appx-spring-tld.adoc                  |   496 +
 src/asciidoc/core-aop-api.adoc                     |  1750 +
 src/asciidoc/core-aop.adoc                         |  3559 ++
 src/asciidoc/core-beans.adoc                       |  8489 ++++
 src/asciidoc/core-expressions.adoc                 |  1455 +
 src/asciidoc/core-resources.adoc                   |   666 +
 src/asciidoc/core-validation.adoc                  |  1635 +
 src/asciidoc/core.adoc                             |    42 +
 src/asciidoc/data-access.adoc                      |  7189 +++
 src/asciidoc/images/message-flow-broker-relay.png  |   Bin 0 -> 80126 bytes
 src/asciidoc/images/message-flow-simple-broker.png |   Bin 0 -> 65382 bytes
 src/asciidoc/images/mvc-context-hierarchy.png      |   Bin 0 -> 64492 bytes
 src/asciidoc/images/mvc-context-hierarchy.svg      |   612 +
 src/asciidoc/images/mvc-contexts.gif               |   Bin 40817 -> 0 bytes
 src/asciidoc/images/mvc-root-context.png           |   Bin 0 -> 55250 bytes
 src/asciidoc/images/mvc-root-context.svg           |   328 +
 src/asciidoc/index-docinfo.xml                     |     2 +-
 src/asciidoc/index.adoc                            | 50357 +------------------
 src/asciidoc/integration.adoc                      |  9178 ++++
 src/asciidoc/overview.adoc                         |   849 +
 src/asciidoc/testing.adoc                          |  5211 ++
 src/asciidoc/web-cors.adoc                         |   206 +
 src/asciidoc/web-integration.adoc                  |   249 +
 src/asciidoc/web-mvc.adoc                          |  5544 ++
 src/asciidoc/web-portlet.adoc                      |  1521 +
 src/asciidoc/web-view.adoc                         |  2625 +
 src/asciidoc/web-websocket.adoc                    |  2314 +
 src/asciidoc/web.adoc                              |    36 +
 src/asciidoc/whats-new.adoc                        |   624 +
 src/eclipse/org.eclipse.jdt.core.prefs             |    13 +-
 src/eclipse/org.eclipse.jdt.ui.prefs               |     2 +-
 .../org.eclipse.wst.common.project.facet.core.xml  |     2 +-
 .../ltw/ComponentScanningWithLTWTests.java         |    14 +-
 .../ltw/ComponentScanningWithLTWTests.xml          |    20 -
 .../env/EnvironmentIntegrationTests-context.xml    |    11 -
 .../core/env/EnvironmentIntegrationTests.java      |   711 -
 .../env/EnvironmentSystemIntegrationTests.java     |   709 +
 .../core/env/scan1/package-info.java               |     4 +-
 .../core/env/scan2/package-info.java               |     8 +-
 ...AndTransactionalAnnotationIntegrationTests.java |    30 +-
 ...mespaceHandlerScopeIntegrationTests-context.xml |     0
 ...sorAutoProxyCreatorIntegrationTests-context.xml |     0
 .../ltw/ComponentScanningWithLTWTests.xml          |    20 +
 ...ironmentSystemIntegrationTests-context-dev.xml} |     0
 ...ronmentSystemIntegrationTests-context-prod.xml} |     0
 .../EnvironmentSystemIntegrationTests-context.xml  |    11 +
 2896 files changed, 173091 insertions(+), 93397 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libspring-java.git



More information about the pkg-java-commits mailing list