[libspring-java] 01/18: Merge tag 'upstream/4.1.9'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Mon May 30 21:26:29 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 11fc87cd9133712218362e5ce51414b882174655
Merge: 051b253 5575b60
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Tue May 24 10:26:03 2016 +0200
Merge tag 'upstream/4.1.9'
Upstream version 4.1.9
.mailmap | 23 +
README.md | 6 +-
build.gradle | 375 +-
.../build/gradle/MergePlugin.groovy | 4 +-
gradle.properties | 2 +-
gradle/ide.gradle | 23 +-
gradle/publish-maven.gradle | 2 +-
import-into-eclipse.sh | 87 +-
import-into-idea.md | 14 +-
settings.gradle | 2 +-
.../AspectJAdviceParameterNameDiscoverer.java | 1 +
.../aop/aspectj/AspectJExpressionPointcut.java | 58 +-
.../MethodInvocationProceedingJoinPoint.java | 8 +-
.../aop/aspectj/RuntimeTestWalker.java | 2 +-
.../annotation/AbstractAspectJAdvisorFactory.java | 1 +
.../aspectj/annotation/AspectJProxyFactory.java | 4 +-
.../BeanFactoryAspectInstanceFactory.java | 10 +-
.../SimpleMetadataAwareAspectInstanceFactory.java | 18 +-
...ingletonMetadataAwareAspectInstanceFactory.java | 17 +-
.../aop/aspectj/annotation/package-info.java | 4 -
.../autoproxy/AspectJPrecedenceComparator.java | 21 +-
.../aop/aspectj/autoproxy/package-info.java | 4 -
.../springframework/aop/aspectj/package-info.java | 3 -
.../springframework/aop/config/package-info.java | 4 -
.../AbstractAdvisingBeanPostProcessor.java | 37 +-
.../aop/framework/CglibAopProxy.java | 61 +-
.../aop/framework/DefaultAopProxyFactory.java | 19 +-
.../aop/framework/ObjenesisCglibAopProxy.java | 44 +-
.../aop/framework/ProxyProcessorSupport.java | 145 +
.../aop/framework/adapter/package-info.java | 18 +-
.../autoproxy/AbstractAutoProxyCreator.java | 98 +-
.../aop/framework/autoproxy/package-info.java | 4 -
.../aop/framework/package-info.java | 4 -
.../interceptor/AsyncExecutionAspectSupport.java | 74 +-
.../aop/interceptor/AsyncExecutionInterceptor.java | 60 +-
.../interceptor/AsyncUncaughtExceptionHandler.java | 42 +
.../interceptor/ExposeInvocationInterceptor.java | 8 +-
.../JamonPerformanceMonitorInterceptor.java | 36 +-
.../SimpleAsyncUncaughtExceptionHandler.java | 42 +
.../aop/interceptor/package-info.java | 4 -
.../java/org/springframework/aop/package-info.java | 23 +-
.../aop/scope/ScopedProxyUtils.java | 11 +-
.../springframework/aop/scope/package-info.java | 4 -
.../aop/support/NameMatchMethodPointcut.java | 2 +-
.../aop/support/annotation/package-info.java | 4 -
.../springframework/aop/support/package-info.java | 4 -
.../aop/target/CommonsPoolTargetSource.java | 2 +-
.../src/main/resources/META-INF/spring.schemas | 3 +-
.../springframework/aop/config/spring-aop-2.0.xsd | 11 +-
.../springframework/aop/config/spring-aop-2.5.xsd | 11 +-
.../springframework/aop/config/spring-aop-3.0.xsd | 11 +-
.../springframework/aop/config/spring-aop-3.1.xsd | 11 +-
.../springframework/aop/config/spring-aop-3.2.xsd | 11 +-
.../springframework/aop/config/spring-aop-4.0.xsd | 11 +-
.../springframework/aop/config/spring-aop-4.1.xsd | 409 ++
.../AspectJAdviceParameterNameDiscovererTests.java | 5 +-
.../aspectj/AspectJExpressionPointcutTests.java | 6 +-
.../aop/aspectj/BeanNamePointcutMatchingTests.java | 4 +-
.../MethodInvocationProceedingJoinPointTests.java | 7 +-
...rAspectJAdviceParameterNameDiscovererTests.java | 1 +
.../TigerAspectJExpressionPointcutTests.java | 7 +-
.../TrickyAspectJPointcutExpressionTests.java | 6 +-
.../aop/aspectj/TypePatternClassFilterTests.java | 6 +-
.../AbstractAspectJAdvisorFactoryTests.java | 19 +-
.../aspectj/annotation/ArgumentBindingTests.java | 6 +-
.../annotation/AspectJPointcutAdvisorTests.java | 8 +-
.../aspectj/annotation/AspectMetadataTests.java | 4 +-
.../annotation/AspectProxyFactoryTests.java | 18 +-
.../autoproxy/AspectJNamespaceHandlerTests.java | 5 +-
.../aop/config/AopNamespaceHandlerEventTests.java | 9 +-
.../AopNamespaceHandlerPointcutErrorTests.java | 8 +-
.../aop/config/TopLevelAopTagTests.java | 7 +-
.../aop/framework/AopProxyUtilsTests.java | 6 +-
.../aop/framework/ClassWithConstructor.java | 2 +-
.../aop/framework/IntroductionBenchmarkTests.java | 4 +-
.../aop/framework/MethodInvocationTests.java | 4 +-
.../aop/framework/NullPrimitiveTests.java | 5 +-
.../aop/framework/PrototypeTargetTests.java | 7 +-
.../aop/framework/ProxyFactoryTests.java | 11 +-
.../adapter/ThrowsAdviceInterceptorTests.java | 2 +-
.../ConcurrencyThrottleInterceptorTests.java | 5 +-
.../interceptor/ExposeBeanNameAdvisorsTests.java | 6 +-
.../ExposeInvocationInterceptorTests.java | 8 +-
.../JamonPerformanceMonitorInterceptorTests.java | 86 +
.../aop/scope/DefaultScopedObjectTests.java | 1 +
.../aop/scope/ScopedProxyAutowireTests.java | 7 +-
.../support/AbstractRegexpMethodPointcutTests.java | 1 +
.../springframework/aop/support/AopUtilsTests.java | 7 +-
.../aop/support/ClassFiltersTests.java | 6 +-
.../aop/support/ComposablePointcutTests.java | 6 +-
.../aop/support/ControlFlowPointcutTests.java | 6 +-
.../DelegatingIntroductionInterceptorTests.java | 1 +
.../aop/support/MethodMatchersTests.java | 7 +-
.../aop/support/NameMatchMethodPointcutTests.java | 7 +-
.../aop/support/PointcutsTests.java | 6 +-
...egexpMethodPointcutAdvisorIntegrationTests.java | 7 +-
.../target/CommonsPoolTargetSourceProxyTests.java | 7 +-
.../aop/target/HotSwappableTargetSourceTests.java | 9 +-
.../aop/target/LazyCreationTargetSourceTests.java | 5 +-
.../aop/target/LazyInitTargetSourceTests.java | 9 +-
.../target/PrototypeBasedTargetSourceTests.java | 6 +-
.../aop/target/PrototypeTargetSourceTests.java | 7 +-
.../aop/target/ThreadLocalTargetSourceTests.java | 9 +-
.../dynamic/RefreshableTargetSourceTests.java | 5 +-
.../aop/advice/TimestampIntroductionAdvisor.java | 2 +-
.../src/test/java/test/aop/PerTargetAspect.java | 17 +-
.../aspectj/AbstractBeanConfigurerAspect.aj | 85 -
.../aspectj/AnnotationBeanConfigurerAspect.aj | 14 +-
.../cache/aspectj/AbstractCacheAspect.aj | 15 +-
.../cache/aspectj/AspectJCachingConfiguration.java | 4 +-
.../cache/aspectj/AspectJJCacheConfiguration.java | 47 +
.../cache/aspectj/JCacheCacheAspect.aj | 124 +
.../aspectj/SpringConfiguredConfiguration.java | 11 +-
.../staticmock/AbstractMethodMockingControl.aj | 4 +
.../AnnotationDrivenStaticEntityMockingControl.aj | 6 +
.../jpa/aspectj/JpaExceptionTranslatorAspect.aj | 9 +-
.../aspectj/AbstractAsyncExecutionAspect.aj | 33 +-
.../aspectj/AnnotationAsyncExecutionAspect.aj | 48 +-
.../aspectj/AspectJAsyncConfiguration.java | 8 +-
.../aspectj/AbstractTransactionAspect.aj | 9 +-
.../aspectj/AnnotationTransactionAspect.aj | 6 +-
spring-aspects/src/main/resources/META-INF/aop.xml | 1 +
.../AutoProxyWithCodeStyleAspectsTests.java | 4 +-
.../aspectj/AbstractBeanConfigurerTests.java | 676 ---
.../aspectj/ShouldBeConfiguredBySpring.java | 37 +
.../SpringConfiguredWithAutoProxyingTests.java | 4 +-
.../factory/aspectj/XmlBeanConfigurerTests.java | 21 +-
.../factory/aspectj/beanConfigurerTests-beans.xml | 58 +-
.../cache/aspectj/AspectJAnnotationTests.java | 14 +-
.../aspectj/JCacheAspectJJavaConfigTests.java | 71 +
.../aspectj/JCacheAspectJNamespaceConfigTests.java | 34 +
.../config/AnnotatedClassCacheableService.java | 53 +-
.../cache/config/AnnotatedJCacheableService.java | 213 +
.../cache/config/CacheableService.java | 11 +-
.../cache/config/DefaultCacheableService.java | 63 +-
.../cache/config/SomeCustomKeyGenerator.java | 47 +
.../springframework/cache/config/TestEntity.java | 5 +-
.../cache/config/annotation-cache-aspectj.xml | 21 +-
.../cache/config/annotation-jcache-aspectj.xml | 36 +
.../aspectj/AnnotationBeanConfigurerTests.java | 25 +-
.../AnnotationAsyncExecutionAspectTests.java | 71 +-
.../TestableAsyncUncaughtExceptionHandler.java | 87 +
.../aspectj/TransactionAspectTests.java | 4 +-
.../factory/groovy/GroovyBeanDefinitionReader.java | 134 +-
.../beans/factory/groovy/package-info.java | 4 -
.../beans/AbstractPropertyAccessor.java | 15 +-
.../beans/BeanInstantiationException.java | 2 +-
.../java/org/springframework/beans/BeanUtils.java | 15 +-
.../org/springframework/beans/BeanWrapper.java | 16 -
.../org/springframework/beans/BeanWrapperImpl.java | 135 +-
.../beans/CachedIntrospectionResults.java | 118 +-
.../beans/ConfigurablePropertyAccessor.java | 18 +-
.../springframework/beans/DirectFieldAccessor.java | 271 +-
.../springframework/beans/ExtendedBeanInfo.java | 542 +-
.../beans/GenericTypeAwarePropertyDescriptor.java | 69 +-
.../beans/PropertyDescriptorUtils.java | 174 +
.../org/springframework/beans/PropertyMatches.java | 195 +-
.../org/springframework/beans/PropertyValue.java | 6 +-
.../beans/TypeConverterDelegate.java | 25 +-
.../beans/TypeMismatchException.java | 14 +-
.../beans/annotation/package-info.java | 4 -
.../springframework/beans/factory/BeanFactory.java | 29 +-
.../beans/factory/BeanFactoryUtils.java | 3 +-
.../beans/factory/ListableBeanFactory.java | 2 +-
.../beans/factory/SmartInitializingSingleton.java | 58 +
.../access/SingletonBeanFactoryLocator.java | 1 +
.../beans/factory/access/el/package-info.java | 4 -
.../beans/factory/access/package-info.java | 4 -
.../annotation/AnnotatedBeanDefinition.java | 10 +-
.../annotation/AnnotatedGenericBeanDefinition.java | 24 +-
.../AutowiredAnnotationBeanPostProcessor.java | 51 +-
.../annotation/BeanFactoryAnnotationUtils.java | 13 +-
.../beans/factory/annotation/Lookup.java | 68 +
.../beans/factory/annotation/package-info.java | 4 -
.../beans/factory/config/BeanDefinition.java | 4 +-
.../beans/factory/config/BeanPostProcessor.java | 10 +-
.../factory/config/BeanReferenceFactoryBean.java | 117 -
.../factory/config/CommonsLogFactoryBean.java | 78 -
.../config/ConfigurableListableBeanFactory.java | 18 +-
.../factory/config/CustomScopeConfigurer.java | 17 +-
.../beans/factory/config/DependencyDescriptor.java | 22 +-
.../config/PlaceholderConfigurerSupport.java | 44 +-
.../config/PropertyPlaceholderConfigurer.java | 5 +-
.../beans/factory/config/YamlMapFactoryBean.java | 142 +
.../beans/factory/config/YamlProcessor.java | 430 ++
.../factory/config/YamlPropertiesFactoryBean.java | 131 +
.../beans/factory/config/package-info.java | 4 -
.../beans/factory/package-info.java | 8 +-
.../beans/factory/parsing/package-info.java | 4 -
.../beans/factory/serviceloader/package-info.java | 6 +-
.../AbstractAutowireCapableBeanFactory.java | 88 +-
.../factory/support/AbstractBeanDefinition.java | 2 +-
.../support/AbstractBeanDefinitionReader.java | 3 +-
.../beans/factory/support/AbstractBeanFactory.java | 69 +-
.../beans/factory/support/AutowireUtils.java | 6 +-
.../factory/support/BeanDefinitionBuilder.java | 4 +-
.../factory/support/BeanDefinitionReaderUtils.java | 6 +-
.../support/BeanDefinitionValueResolver.java | 35 +-
.../CglibSubclassingInstantiationStrategy.java | 40 +-
.../beans/factory/support/ConstructorResolver.java | 53 +-
.../support/DefaultListableBeanFactory.java | 456 +-
.../support/DefaultSingletonBeanRegistry.java | 38 +-
.../factory/support/DisposableBeanAdapter.java | 15 +-
.../factory/support/InstantiationStrategy.java | 49 +-
.../beans/factory/support/LookupOverride.java | 44 +-
.../support/SimpleInstantiationStrategy.java | 63 +-
.../factory/support/StaticListableBeanFactory.java | 9 +
.../beans/factory/support/package-info.java | 4 -
.../beans/factory/wiring/package-info.java | 4 -
.../factory/xml/AbstractBeanDefinitionParser.java | 30 +-
.../factory/xml/BeanDefinitionDocumentReader.java | 2 +-
.../factory/xml/BeanDefinitionParserDelegate.java | 19 +-
.../beans/factory/xml/BeansDtdResolver.java | 49 +-
.../xml/DefaultBeanDefinitionDocumentReader.java | 33 +-
.../beans/factory/xml/UtilNamespaceHandler.java | 35 +-
.../beans/factory/xml/XmlReaderContext.java | 7 +-
.../beans/factory/xml/package-info.java | 5 +-
.../org/springframework/beans/package-info.java | 4 -
.../beans/propertyeditors/CharacterEditor.java | 21 +-
.../beans/propertyeditors/CustomBooleanEditor.java | 15 +-
.../beans/propertyeditors/ZoneIdEditor.java | 5 +-
.../beans/propertyeditors/package-info.java | 4 -
.../beans/support/PropertyComparator.java | 1 +
.../beans/support/package-info.java | 4 -
.../src/main/resources/META-INF/spring.schemas | 9 +-
.../beans/factory/xml/spring-beans-4.1.xsd | 1201 +++++
.../beans/factory/xml/spring-tool-4.1.xsd | 115 +
.../beans/factory/xml/spring-util-4.1.xsd | 221 +
.../AbstractConfigurablePropertyAccessorTests.java | 400 ++
.../beans/AbstractPropertyValuesTests.java | 4 +-
.../beans/BeanWrapperAutoGrowingTests.java | 14 +-
.../beans/BeanWrapperEnumTests.java | 55 +-
.../springframework/beans/BeanWrapperTests.java | 152 +-
.../beans/CachedIntrospectionResultsTests.java | 18 +-
.../beans/ConcurrentBeanWrapperTests.java | 4 +-
.../beans/DirectFieldAccessorTests.java | 7 +-
.../beans/ExtendedBeanInfoFactoryTests.java | 6 +-
.../beans/ExtendedBeanInfoTests.java | 127 +-
.../beans/MutablePropertyValuesTests.java | 4 +-
.../beans/PropertyAccessorUtilsTests.java | 4 +-
.../beans/PropertyMatchesTests.java | 192 +
.../beans/SimplePropertyDescriptorTests.java | 30 +-
.../beans/factory/BeanFactoryUtilsTests.java | 71 +-
.../beans/factory/ConcurrentBeanFactoryTests.java | 3 +-
.../factory/DefaultListableBeanFactoryTests.java | 526 +-
.../beans/factory/FactoryBeanLookupTests.java | 8 +-
.../factory/FactoryBeanTests-withAutowiring.xml | 2 +-
.../beans/factory/FactoryBeanTests.java | 16 +-
.../beans/factory/Spr5475Tests.java | 10 +-
.../access/SingletonBeanFactoryLocatorTests.java | 5 +-
.../AnnotationBeanWiringInfoResolverTests.java | 8 +-
.../AutowiredAnnotationBeanPostProcessorTests.java | 26 +
.../InjectAnnotationBeanPostProcessorTests.java | 249 +-
.../factory/annotation/LookupAnnotationTests.java | 116 +
.../factory/config/CommonsLogFactoryBeanTests.java | 62 -
.../config/CustomEditorConfigurerTests.java | 4 +-
.../factory/config/CustomScopeConfigurerTests.java | 1 +
.../config/FieldRetrievingFactoryBeanTests.java | 7 +-
.../ObjectFactoryCreatingFactoryBeanTests.java | 2 +-
.../factory/config/PropertiesFactoryBeanTests.java | 7 +-
.../config/PropertyPathFactoryBeanTests.java | 10 +-
.../config/PropertyPlaceholderConfigurerTests.java | 14 +-
.../config/PropertyResourceConfigurerTests.java | 229 +-
.../config/ServiceLocatorFactoryBeanTests.java | 1 +
.../factory/config/SimpleScopeTests-context.xml | 6 +-
.../beans/factory/config/SimpleScopeTests.java | 7 +-
.../factory/config/YamlMapFactoryBeanTests.java | 115 +
.../beans/factory/config/YamlProcessorTests.java | 158 +
.../config/YamlPropertiesFactoryBeanTests.java | 244 +
.../parsing/CustomProblemReporterTests.java | 7 +-
.../parsing/FailFastProblemReporterTests.java | 2 +-
.../factory/parsing/NullSourceExtractorTests.java | 4 +-
.../beans/factory/parsing/ParseStateTests.java | 4 +-
.../parsing/PassThroughSourceExtractorTests.java | 4 +-
.../factory/serviceloader/ServiceLoaderTests.java | 6 +-
.../factory/support/BeanFactoryGenericsTests.java | 31 +-
.../beans/factory/support/LookupMethodTests.java | 107 +
.../PropertiesBeanDefinitionReaderTests.java | 1 +
...ualifierAnnotationAutowireBeanFactoryTests.java | 7 +-
.../beans/factory/support/lookupMethodTests.xml | 14 +
.../support/security/CallbacksSecurityTests.java | 1 -
.../xml/CollectionsWithDefaultTypesTests.java | 6 +-
.../beans/factory/xml/DuplicateBeanIdTests.java | 8 +-
.../beans/factory/xml/FactoryMethodTests.java | 34 +-
.../NestedBeansElementAttributeRecursionTests.java | 11 +-
.../beans/factory/xml/NestedBeansElementTests.java | 7 +-
.../factory/xml/ProfileXmlBeanDefinitionTests.java | 7 +-
.../SimpleConstructorNamespaceHandlerTests.java | 5 +-
.../xml/SimplePropertyNamespaceHandlerTests.java | 5 +-
.../beans/factory/xml/XmlBeanCollectionTests.java | 8 +-
.../DefaultNamespaceHandlerResolverTests.java | 5 +-
.../ByteArrayPropertyEditorTests.java | 4 +-
.../CharArrayPropertyEditorTests.java | 4 +-
.../CustomCollectionEditorTests.java | 4 +-
.../beans/propertyeditors/CustomEditorTests.java | 44 +-
.../beans/propertyeditors/FileEditorTests.java | 5 +-
.../propertyeditors/InputStreamEditorTests.java | 22 +-
.../propertyeditors/ResourceBundleEditorTests.java | 4 +-
.../beans/propertyeditors/URIEditorTests.java | 3 +-
.../beans/propertyeditors/URLEditorTests.java | 5 +-
.../beans/support/PagedListHolderTests.java | 1 -
.../beans/support/PropertyComparatorTests.java | 5 +-
.../tests/sample/beans/DummyFactory.java | 1 -
.../tests/sample/beans/GenericBean.java | 24 +-
.../springframework/beans/factory/xml/import.xml | 2 +-
...eConstructorNamespaceHandlerTestsWithErrors.xml | 5 +-
.../xml/simplePropertyNamespaceHandlerTests.xml | 10 +-
...mplePropertyNamespaceHandlerTestsWithErrors.xml | 10 +-
.../beans/factory/xml/testUtilNamespace.xml | 7 +-
.../cache/ehcache/EhCacheCache.java | 13 +-
.../cache/ehcache/EhCacheCacheManager.java | 42 +-
.../cache/ehcache/EhCacheFactoryBean.java | 36 +-
.../cache/ehcache/EhCacheManagerFactoryBean.java | 69 +-
.../cache/ehcache/EhCacheManagerUtils.java | 125 +
.../springframework/cache/guava/GuavaCache.java | 75 +-
.../springframework/cache/jcache/JCacheCache.java | 13 +-
.../cache/jcache/JCacheCacheManager.java | 17 +-
.../jcache/config/AbstractJCacheConfiguration.java | 69 +
.../cache/jcache/config/JCacheConfigurer.java | 63 +
.../jcache/config/JCacheConfigurerSupport.java | 41 +
.../jcache/config/ProxyJCacheConfiguration.java | 63 +
.../cache/jcache/config/package-info.java | 9 +
.../interceptor/AbstractCacheInterceptor.java | 87 +
.../AbstractFallbackJCacheOperationSource.java | 126 +
.../interceptor/AbstractJCacheKeyOperation.java | 103 +
.../interceptor/AbstractJCacheOperation.java | 231 +
.../interceptor/AbstractKeyCacheInterceptor.java | 64 +
.../AnnotationJCacheOperationSource.java | 247 +
.../BeanFactoryJCacheOperationSourceAdvisor.java | 64 +
.../jcache/interceptor/CachePutInterceptor.java | 76 +
.../jcache/interceptor/CachePutOperation.java | 105 +
.../interceptor/CacheRemoveAllInterceptor.java | 77 +
.../interceptor/CacheRemoveAllOperation.java | 58 +
.../interceptor/CacheRemoveEntryInterceptor.java | 76 +
.../jcache/interceptor/CacheRemoveOperation.java | 61 +
.../jcache/interceptor/CacheResolverAdapter.java | 53 +
.../jcache/interceptor/CacheResultInterceptor.java | 165 +
.../jcache/interceptor/CacheResultOperation.java | 85 +
.../interceptor/DefaultCacheInvocationContext.java | 110 +
.../DefaultCacheKeyInvocationContext.java | 58 +
.../interceptor/DefaultCacheMethodDetails.java | 84 +
.../interceptor/DefaultJCacheOperationSource.java | 219 +
.../jcache/interceptor/JCacheAspectSupport.java | 179 +
.../jcache/interceptor/JCacheInterceptor.java | 68 +
.../cache/jcache/interceptor/JCacheOperation.java | 51 +
.../jcache/interceptor/JCacheOperationSource.java | 42 +
.../interceptor/JCacheOperationSourcePointcut.java | 70 +
.../jcache/interceptor/KeyGeneratorAdapter.java | 104 +
.../interceptor/SimpleExceptionCacheResolver.java | 57 +
.../cache/jcache/interceptor/package-info.java | 10 +
.../TransactionAwareCacheDecorator.java | 11 +-
.../java/org/springframework/mail/MailSender.java | 22 +-
.../springframework/mail/SimpleMailMessage.java | 2 +-
.../mail/javamail/InternetAddressEditor.java | 3 +-
.../mail/javamail/JavaMailSender.java | 7 +-
.../mail/javamail/JavaMailSenderImpl.java | 99 +-
.../mail/javamail/MimeMailMessage.java | 3 +-
.../mail/javamail/package-info.java | 4 -
.../org/springframework/mail/package-info.java | 4 -
.../scheduling/commonj/package-info.java | 4 -
.../scheduling/quartz/AdaptableJobFactory.java | 29 +-
.../scheduling/quartz/CronTriggerBean.java | 175 -
.../scheduling/quartz/CronTriggerFactoryBean.java | 54 +-
.../scheduling/quartz/JobDetailAwareTrigger.java | 56 -
.../scheduling/quartz/JobDetailBean.java | 169 -
.../scheduling/quartz/JobDetailFactoryBean.java | 33 +-
.../scheduling/quartz/LocalDataSourceJobStore.java | 3 +-
.../quartz/MethodInvokingJobDetailFactoryBean.java | 103 +-
.../scheduling/quartz/QuartzJobBean.java | 47 +-
.../quartz/ResourceLoaderClassLoadHelper.java | 1 +
.../scheduling/quartz/SchedulerAccessor.java | 275 +-
.../scheduling/quartz/SchedulerAccessorBean.java | 30 +-
.../scheduling/quartz/SchedulerContextAware.java | 1 +
.../scheduling/quartz/SchedulerFactoryBean.java | 3 +-
.../scheduling/quartz/SimpleTriggerBean.java | 176 -
.../quartz/SimpleTriggerFactoryBean.java | 50 +-
.../scheduling/quartz/SpringBeanJobFactory.java | 33 +-
.../scheduling/quartz/package-info.java | 4 -
.../freemarker/FreeMarkerConfigurationFactory.java | 11 +-
.../ui/freemarker/package-info.java | 4 -
.../ui/jasperreports/JasperReportsUtils.java | 48 +-
.../ui/jasperreports/package-info.java | 4 -
.../springframework/ui/velocity/package-info.java | 4 -
.../springframework/cache/AbstractCacheTests.java | 105 +
.../cache/ehcache/EhCacheCacheManagerTests.java | 85 +
.../cache/ehcache/EhCacheCacheTests.java | 69 +-
.../cache/guava/GuavaCacheManagerTests.java | 32 +-
.../cache/guava/GuavaCacheTests.java | 67 +
.../cache/jcache/AbstractJCacheTests.java | 66 +
.../cache/jcache/JCacheCacheManagerTests.java | 113 +
.../cache/jcache/JCacheEhCacheTests.java | 113 +
.../config/AbstractJCacheAnnotationTests.java | 558 ++
.../config/JCacheCustomInterceptorTests.java | 158 +
.../cache/jcache/config/JCacheJavaConfigTests.java | 247 +
.../jcache/config/JCacheNamespaceDrivenTests.java | 57 +
.../jcache/config/JCacheStandaloneConfigTests.java | 33 +
.../cache/jcache/config/JCacheableService.java | 66 +
.../interceptor/AbstractCacheOperationTests.java | 76 +
.../interceptor/AnnotatedJCacheableService.java | 212 +
.../AnnotationCacheOperationSourceTests.java | 272 +
.../jcache/interceptor/CachePutOperationTests.java | 95 +
.../interceptor/CacheRemoveAllOperationTests.java | 48 +
.../interceptor/CacheRemoveOperationTests.java | 49 +
.../interceptor/CacheResolverAdapterTests.java | 101 +
.../interceptor/CacheResultOperationTests.java | 130 +
.../interceptor/JCacheErrorHandlerTests.java | 161 +
.../jcache/interceptor/JCacheInterceptorTests.java | 144 +
.../interceptor/JCacheKeyGeneratorTests.java | 158 +
.../cache/jcache/interceptor/SampleObject.java | 80 +
.../jcache/support/TestableCacheKeyGenerator.java | 34 +
.../jcache/support/TestableCacheResolver.java | 39 +
.../support/TestableCacheResolverFactory.java | 40 +
...ractTransactionSupportingCacheManagerTests.java | 118 +
.../TransactionAwareCacheDecoratorTests.java | 20 +-
.../mail/SimpleMailMessageTests.java | 4 +-
.../mail/javamail/JavaMailSenderTests.java | 35 +-
.../scheduling/quartz/CronTriggerBeanTests.java | 79 -
.../quartz/QuartzSchedulerLifecycleTests.java | 5 +-
.../scheduling/quartz/QuartzSupportTests.java | 840 +--
.../config/jCacheNamespaceDriven-resolver.xml | 31 +
.../cache/jcache/config/jCacheNamespaceDriven.xml | 40 +
.../cache/jcache/config/jCacheStandaloneConfig.xml | 48 +
.../scheduling/quartz/databasePersistence.xml | 19 +-
.../multipleAnonymousMethodInvokingJobDetailFB.xml | 4 +-
.../scheduling/quartz/quartz-hsql.sql | 120 +-
.../scheduling/quartz/schedulerAccessorBean.xml | 5 +-
.../quartz/schedulerRepositoryExposure.xml | 8 +-
.../main/java/org/springframework/cache/Cache.java | 34 +-
.../annotation/AbstractCachingConfiguration.java | 86 +-
.../annotation/AnnotationCacheOperationSource.java | 46 +-
.../cache/annotation/CacheAnnotationParser.java | 28 +-
.../cache/annotation/CacheConfig.java | 73 +
.../cache/annotation/CacheEvict.java | 97 +-
.../springframework/cache/annotation/CachePut.java | 109 +-
.../cache/annotation/Cacheable.java | 108 +-
.../springframework/cache/annotation/Caching.java | 7 +-
.../annotation/CachingConfigurationSelector.java | 59 +-
.../cache/annotation/CachingConfigurer.java | 71 +-
.../cache/annotation/CachingConfigurerSupport.java | 54 +
.../cache/annotation/EnableCaching.java | 35 +-
.../annotation/ProxyCachingConfiguration.java | 14 +-
.../annotation/SpringCacheAnnotationParser.java | 154 +-
.../cache/concurrent/ConcurrentMapCache.java | 27 +-
.../AnnotationDrivenCacheBeanDefinitionParser.java | 188 +-
.../cache/config/CacheAdviceParser.java | 16 +
.../cache/config/CacheManagementConfigUtils.java | 39 +
.../cache/config/CacheNamespaceHandler.java | 3 +-
.../springframework/cache/config/package-info.java | 1 -
.../cache/interceptor/AbstractCacheInvoker.java | 115 +
.../cache/interceptor/AbstractCacheResolver.java | 98 +
.../AbstractFallbackCacheOperationSource.java | 63 +-
.../cache/interceptor/BasicOperation.java | 34 +
.../cache/interceptor/CacheAspectSupport.java | 396 +-
.../cache/interceptor/CacheErrorHandler.java | 78 +
.../cache/interceptor/CacheEvaluationContext.java | 138 +
.../cache/interceptor/CacheInterceptor.java | 17 +-
.../cache/interceptor/CacheOperation.java | 4 +-
.../CacheOperationInvocationContext.java | 52 +
.../cache/interceptor/CacheOperationInvoker.java | 59 +
.../cache/interceptor/CacheProxyFactoryBean.java | 1 +
.../cache/interceptor/CacheResolver.java | 40 +
.../cache/interceptor/ExpressionEvaluator.java | 66 +-
.../LazyParamAwareEvaluationContext.java | 114 -
.../cache/interceptor/MethodCacheKey.java | 12 +-
.../interceptor/NameMatchCacheOperationSource.java | 2 +
.../cache/interceptor/NamedCacheResolver.java | 57 +
.../cache/interceptor/SimpleCacheErrorHandler.java | 49 +
.../cache/interceptor/SimpleCacheResolver.java | 47 +
.../cache/interceptor/SimpleKey.java | 13 +-
.../cache/interceptor/SimpleKeyGenerator.java | 9 +-
.../interceptor/VariableNotAvailableException.java | 42 +
.../cache/support/AbstractCacheManager.java | 85 +-
.../cache/support/NoOpCacheManager.java | 8 +-
.../context/ApplicationContext.java | 22 +-
.../context/ApplicationListener.java | 2 +-
.../org/springframework/context/Lifecycle.java | 23 +-
.../springframework/context/SmartLifecycle.java | 35 +-
.../context/access/package-info.java | 4 -
.../annotation/AdviceModeImportSelector.java | 6 +-
.../AnnotationConfigApplicationContext.java | 16 +-
.../annotation/AnnotationConfigRegistry.java | 43 +
.../context/annotation/AnnotationConfigUtils.java | 73 -
.../AnnotationScopeMetadataResolver.java | 17 +-
.../annotation/ClassPathBeanDefinitionScanner.java | 8 +
.../CommonAnnotationBeanPostProcessor.java | 164 +-
.../context/annotation/ComponentScan.java | 9 +-
.../annotation/ComponentScanAnnotationParser.java | 28 +-
.../ComponentScanBeanDefinitionParser.java | 32 +-
.../context/annotation/ConditionEvaluator.java | 27 +-
.../context/annotation/Configuration.java | 17 +-
.../context/annotation/ConfigurationClass.java | 22 +-
.../ConfigurationClassBeanDefinitionReader.java | 131 +-
.../annotation/ConfigurationClassEnhancer.java | 53 +-
.../annotation/ConfigurationClassParser.java | 254 +-
.../ConfigurationClassPostProcessor.java | 67 +-
.../annotation/ConfigurationClassUtils.java | 94 +-
.../context/annotation/ConfigurationCondition.java | 2 +-
.../context/annotation/DeferredImportSelector.java | 2 +-
.../context/annotation/DependsOn.java | 4 +-
.../springframework/context/annotation/Import.java | 13 +-
.../context/annotation/ImportRegistry.java | 31 +
.../context/annotation/ImportResource.java | 41 +-
.../annotation/LoadTimeWeavingConfiguration.java | 21 +-
.../annotation/MBeanExportConfiguration.java | 14 +-
.../springframework/context/annotation/Role.java | 18 +-
.../annotation/ScannedGenericBeanDefinition.java | 8 +-
.../context/annotation/package-info.java | 4 -
.../PropertyOverrideBeanDefinitionParser.java | 4 +-
.../PropertyPlaceholderBeanDefinitionParser.java | 4 +-
.../context/config/package-info.java | 4 -
.../event/AbstractApplicationEventMulticaster.java | 75 +-
.../event/SimpleApplicationEventMulticaster.java | 72 +-
.../context/event/package-info.java | 4 -
.../expression/StandardBeanExpressionResolver.java | 22 +-
.../context/expression/package-info.java | 4 -
.../springframework/context/i18n/package-info.java | 4 -
.../org/springframework/context/package-info.java | 4 -
.../support/AbstractApplicationContext.java | 84 +-
...bstractRefreshableConfigApplicationContext.java | 4 +-
.../support/ContextTypeMatchClassLoader.java | 17 +-
.../support/EmbeddedValueResolutionSupport.java | 50 +
.../support/GenericGroovyApplicationContext.java | 29 +-
.../ReloadableResourceBundleMessageSource.java | 230 +-
.../support/ResourceBundleMessageSource.java | 11 +-
.../context/support/package-info.java | 4 -
.../context/weaving/package-info.java | 4 -
.../AbstractRemoteSlsbInvokerInterceptor.java | 1 -
.../ejb/access/AbstractSlsbInvokerInterceptor.java | 1 -
.../ejb/access/LocalSlsbInvokerInterceptor.java | 1 -
.../access/SimpleRemoteSlsbInvokerInterceptor.java | 1 -
.../springframework/ejb/access/package-info.java | 4 -
.../AbstractJndiLocatingBeanDefinitionParser.java | 3 +-
.../springframework/ejb/config/package-info.java | 4 -
.../ejb/interceptor/package-info.java | 3 -
.../format/annotation/DateTimeFormat.java | 20 +-
.../format/annotation/NumberFormat.java | 40 +-
.../DateTimeFormatAnnotationFormatterFactory.java | 22 +-
...daDateTimeFormatAnnotationFormatterFactory.java | 23 +-
.../format/datetime/joda/JodaTimeConverters.java | 2 +-
.../datetime/joda/JodaTimeFormatterRegistrar.java | 10 +-
.../format/datetime/standard/DateTimeContext.java | 4 +-
.../datetime/standard/DateTimeContextHolder.java | 4 +-
.../datetime/standard/DateTimeConverters.java | 41 +-
.../standard/DateTimeFormatterFactory.java | 4 +-
.../standard/DateTimeFormatterRegistrar.java | 6 +-
.../format/datetime/standard/InstantFormatter.java | 4 +-
...10DateTimeFormatAnnotationFormatterFactory.java | 27 +-
.../datetime/standard/TemporalAccessorParser.java | 4 +-
.../datetime/standard/TemporalAccessorPrinter.java | 4 +-
.../NumberFormatAnnotationFormatterFactory.java | 47 +-
.../support/FormattingConversionService.java | 34 +-
.../SimpleInstrumentableClassLoader.java | 22 +-
.../classloading/SimpleThrowawayClassLoader.java | 13 +-
.../classloading/glassfish/package-info.java | 4 -
.../classloading/jboss/package-info.java | 4 -
.../instrument/classloading/package-info.java | 4 -
.../classloading/tomcat/package-info.java | 1 -
.../classloading/weblogic/package-info.java | 6 +-
.../classloading/websphere/package-info.java | 6 +-
.../jmx/access/ConnectorDelegate.java | 5 +-
.../jmx/access/NotificationListenerRegistrar.java | 1 -
.../springframework/jmx/access/package-info.java | 6 +-
.../springframework/jmx/export/MBeanExporter.java | 56 +-
.../jmx/export/annotation/package-info.java | 6 +-
.../jmx/export/assembler/package-info.java | 4 -
.../jmx/export/metadata/package-info.java | 4 -
.../jmx/export/naming/IdentityNamingStrategy.java | 1 -
.../jmx/export/naming/KeyNamingStrategy.java | 1 -
.../jmx/export/naming/package-info.java | 4 -
.../jmx/export/notification/package-info.java | 4 -
.../springframework/jmx/export/package-info.java | 4 -
.../java/org/springframework/jmx/package-info.java | 4 -
.../jmx/support/MBeanRegistrationSupport.java | 5 +-
.../springframework/jmx/support/package-info.java | 3 -
.../springframework/jndi/JndiLocatorDelegate.java | 2 +-
.../org/springframework/jndi/package-info.java | 4 -
.../jndi/support/SimpleJndiBeanFactory.java | 9 +
.../springframework/jndi/support/package-info.java | 4 -
.../org/springframework/remoting/package-info.java | 4 -
.../remoting/rmi/JndiRmiServiceExporter.java | 1 -
.../springframework/remoting/rmi/package-info.java | 4 -
.../remoting/soap/package-info.java | 4 -
.../support/SimpleHttpServerFactoryBean.java | 4 +-
.../remoting/support/package-info.java | 4 -
.../annotation/AbstractAsyncConfiguration.java | 16 +-
.../AnnotationAsyncExecutionInterceptor.java | 20 +-
.../annotation/AsyncAnnotationAdvisor.java | 27 +-
.../AsyncAnnotationBeanPostProcessor.java | 21 +-
.../annotation/AsyncConfigurationSelector.java | 6 +-
.../scheduling/annotation/AsyncConfigurer.java | 22 +-
.../annotation/AsyncConfigurerSupport.java | 43 +
.../scheduling/annotation/AsyncResult.java | 32 +-
.../scheduling/annotation/EnableAsync.java | 47 +-
.../annotation/ProxyAsyncConfiguration.java | 10 +-
.../ScheduledAnnotationBeanPostProcessor.java | 129 +-
.../annotation/SchedulingConfiguration.java | 17 +-
.../scheduling/annotation/package-info.java | 6 +-
.../DefaultManagedAwareThreadFactory.java | 28 +-
.../concurrent/ForkJoinPoolFactoryBean.java | 4 +-
.../concurrent/ScheduledExecutorFactoryBean.java | 2 +
.../concurrent/ThreadPoolTaskScheduler.java | 4 +
.../scheduling/concurrent/package-info.java | 3 -
.../AnnotationDrivenBeanDefinitionParser.java | 49 +-
.../ContextLifecycleScheduledTaskRegistrar.java | 41 +-
.../config/ScheduledTasksBeanDefinitionParser.java | 8 +-
.../config/TaskManagementConfigUtils.java | 45 +
.../scheduling/config/package-info.java | 4 -
.../springframework/scheduling/package-info.java | 4 -
.../scheduling/support/CronSequenceGenerator.java | 63 +-
.../scheduling/support/CronTrigger.java | 37 +-
.../scheduling/support/package-info.java | 4 -
.../springframework/scripting/ScriptEvaluator.java | 4 +-
.../scripting/bsh/package-info.java | 4 -
.../scripting/config/package-info.java | 4 -
.../scripting/groovy/GroovyScriptEvaluator.java | 20 +-
.../scripting/groovy/GroovyScriptFactory.java | 5 +-
.../scripting/groovy/package-info.java | 4 -
.../scripting/jruby/JRubyScriptUtils.java | 3 +-
.../scripting/jruby/package-info.java | 4 -
.../springframework/scripting/package-info.java | 4 -
.../support/ScriptFactoryPostProcessor.java | 23 +-
.../scripting/support/package-info.java | 4 -
.../springframework/stereotype/package-info.java | 4 -
.../main/java/org/springframework/ui/ModelMap.java | 5 +-
.../springframework/ui/context/package-info.java | 26 -
.../ui/context/support/package-info.java | 4 -
.../org/springframework/validation/DataBinder.java | 54 +-
.../validation/DirectFieldBindingResult.java | 19 +-
.../validation/annotation/Validated.java | 10 +-
.../beanvalidation/LocalValidatorFactoryBean.java | 4 +-
.../MessageSourceResourceBundleLocator.java | 4 +-
.../MethodValidationInterceptor.java | 25 +-
.../MethodValidationPostProcessor.java | 6 +-
.../src/main/resources/META-INF/spring.schemas | 15 +-
.../cache/config/spring-cache-4.0.xsd | 14 +-
.../cache/config/spring-cache-4.1.xsd | 310 ++
.../context/config/spring-context-4.1.xsd | 520 ++
.../springframework/ejb/config/spring-jee-4.1.xsd | 267 +
.../scheduling/config/spring-task-3.0.xsd | 11 +-
.../scheduling/config/spring-task-3.1.xsd | 11 +-
.../scheduling/config/spring-task-3.2.xsd | 11 +-
.../scheduling/config/spring-task-4.0.xsd | 11 +-
.../scheduling/config/spring-task-4.1.xsd | 307 ++
.../scripting/config/spring-lang-2.0.xsd | 11 +-
.../scripting/config/spring-lang-2.5.xsd | 11 +-
.../scripting/config/spring-lang-3.0.xsd | 11 +-
.../scripting/config/spring-lang-3.1.xsd | 11 +-
.../scripting/config/spring-lang-3.2.xsd | 11 +-
.../scripting/config/spring-lang-4.0.xsd | 11 +-
.../scripting/config/spring-lang-4.1.xsd | 232 +
.../java/example/scannable/FooServiceImpl.java | 5 +
.../java/example/scannable/NamedComponent.java | 2 +-
.../aop/aspectj/AfterAdviceBindingTests.java | 1 +
.../aspectj/AfterReturningAdviceBindingTests.java | 1 +
.../aspectj/AfterThrowingAdviceBindingTests.java | 1 +
.../aop/aspectj/AroundAdviceBindingTests.java | 1 +
.../aop/aspectj/AroundAdviceCircularTests.java | 5 +-
.../aspectj/AspectAndAdvicePrecedenceTests.java | 7 +-
.../AspectJExpressionPointcutAdvisorTests.java | 7 +-
.../aop/aspectj/BeanNamePointcutAtAspectTests.java | 20 +-
.../aop/aspectj/BeanNamePointcutTests.java | 7 +-
.../aop/aspectj/BeforeAdviceBindingTests.java | 1 +
.../aspectj/DeclarationOrderIndependenceTests.java | 5 +-
.../aspectj/DeclareParentsDelegateRefTests.java | 5 +-
.../aop/aspectj/DeclareParentsTests.java | 8 +-
.../ImplicitJPArgumentMatchingAtAspectJTests.java | 3 +-
.../aspectj/ImplicitJPArgumentMatchingTests.java | 1 +
.../aop/aspectj/OverloadedAdviceTests.java | 5 +-
.../springframework/aop/aspectj/ProceedTests.java | 5 +-
.../aop/aspectj/PropertyDependentAspectTests.java | 5 +-
.../SharedPointcutWithArgsMismatchTests.java | 1 +
.../aop/aspectj/SubtypeSensitiveMatchingTests.java | 5 +-
.../aop/aspectj/TargetPointcutSelectionTests.java | 5 +-
...TargetSelectionOnlyPointcutsAtAspectJTests.java | 5 +-
.../ThisAndTargetSelectionOnlyPointcutsTests.java | 5 +-
.../aspectj/autoproxy/AnnotationBindingTests.java | 5 +-
.../aspectj/autoproxy/AnnotationPointcutTests.java | 5 +-
.../AspectImplementingInterfaceTests.java | 7 +-
...CreatorAndLazyInitTargetSourceTests-context.xml | 6 +-
...toProxyCreatorAndLazyInitTargetSourceTests.java | 7 +-
...toProxyCreatorTests-aspectsWithAbstractBean.xml | 7 +-
.../AspectJAutoProxyCreatorTests-retryAspect.xml | 8 +-
.../autoproxy/AspectJAutoProxyCreatorTests.java | 22 +-
.../AtAspectJAfterThrowingTests-context.xml | 5 +-
.../autoproxy/AtAspectJAfterThrowingTests.java | 7 +-
.../AtAspectJAnnotationBindingTests-context.xml | 10 +-
.../autoproxy/AtAspectJAnnotationBindingTests.java | 5 +-
.../autoproxy/benchmark/BenchmarkTests.java | 7 +-
.../aspectj/autoproxy/spr3064/SPR3064Tests.java | 5 +-
.../AfterReturningGenericTypeMatchingTests.java | 8 +-
...GenericBridgeMethodMatchingClassProxyTests.java | 4 +-
.../generic/GenericBridgeMethodMatchingTests.java | 5 +-
.../generic/GenericParameterMatchingTests.java | 5 +-
.../config/AopNamespaceHandlerAdviceTypeTests.java | 7 +-
.../config/AopNamespaceHandlerArgNamesTests.java | 5 +-
.../AopNamespaceHandlerProxyTargetClassTests.java | 7 +-
.../config/AopNamespaceHandlerReturningTests.java | 7 +-
.../aop/config/AopNamespaceHandlerTests.java | 6 +-
.../config/AopNamespaceHandlerThrowingTests.java | 7 +-
.../aop/config/MethodLocatingFactoryBeanTests.java | 1 +
.../aop/config/PrototypeProxyTests.java | 1 +
.../aop/framework/AbstractAopProxyTests.java | 11 +-
.../aop/framework/CglibProxyTests.java | 5 +-
.../aop/framework/ClassWithComplexConstructor.java | 7 +-
.../springframework/aop/framework/Dependency.java | 2 +-
.../aop/framework/JdkDynamicProxyTests.java | 40 +-
.../aop/framework/ObjenesisProxyTests-context.xml | 9 +-
.../aop/framework/ObjenesisProxyTests.java | 8 +-
.../aop/framework/ProxyFactoryBeanTests.java | 18 +-
.../adapter/AdvisorAdapterRegistrationTests.java | 7 +-
.../autoproxy/AdvisorAutoProxyCreatorTests.java | 8 +-
.../BeanNameAutoProxyCreatorInitTests.java | 7 +-
.../autoproxy/BeanNameAutoProxyCreatorTests.java | 11 +-
.../aop/scope/ScopedProxyTests.java | 13 +-
.../aop/target/CommonsPoolTargetSourceTests.java | 13 +-
.../InjectAnnotationAutowireContextTests.java | 17 +-
.../xml/LookupMethodWrappedByCglibProxyTests.java | 7 +-
...amespaceHandlerWithExpressionLanguageTests.java | 5 +-
.../xml/support/CustomNamespaceHandlerTests.java | 18 +-
.../org/springframework/cache/CacheReproTests.java | 84 +-
.../org/springframework/cache/CacheTestUtils.java | 70 +
.../cache/NoOpCacheManagerTests.java | 5 +-
.../AnnotationCacheOperationSourceTests.java | 312 +-
.../cache/concurrent/ConcurrentCacheTests.java | 15 +-
.../concurrent/ConcurrentMapCacheManagerTests.java | 14 +-
.../cache/config/AbstractAnnotationTests.java | 87 +-
.../config/AnnotatedClassCacheableService.java | 55 +-
.../config/AnnotationNamespaceDrivenTests.java | 42 +-
.../cache/config/AnnotationTests.java | 7 +-
.../cache/config/CacheAdviceNamespaceTests.java | 8 +-
.../cache/config/CacheAdviceParserTests.java | 41 +
.../cache/config/CacheableService.java | 11 +-
.../cache/config/CustomInterceptorTests.java | 137 +
.../cache/config/DefaultCacheableService.java | 63 +-
.../config/EnableCachingIntegrationTests.java | 99 +
.../cache/config/EnableCachingTests.java | 164 +-
.../config/ExpressionCachingIntegrationTests.java | 6 +-
.../cache/config/SomeCustomKeyGenerator.java | 46 +
.../springframework/cache/config/TestEntity.java | 2 +-
.../cache/interceptor/CacheErrorHandlerTests.java | 223 +
.../cache/interceptor/CachePutEvaluationTests.java | 146 +
.../CacheResolverCustomizationTests.java | 283 +
.../interceptor/DefaultKeyGeneratorTests.java | 2 +-
.../interceptor/ExpressionEvaluatorTests.java | 18 +-
.../cache/interceptor/MethodCacheKeyTests.java | 76 +
.../cache/interceptor/SimpleKeyGeneratorTests.java | 2 +-
.../context/AbstractApplicationContextTests.java | 1 +
.../access/ContextBeanFactoryReferenceTests.java | 1 +
.../ContextSingletonBeanFactoryLocatorTests.java | 6 +-
.../AnnotationBeanNameGeneratorTests.java | 3 +-
.../AnnotationConfigApplicationContextTests.java | 31 +-
.../context/annotation/AutoProxyLazyInitTests.java | 223 +
.../annotation/BeanMethodMetadataTests.java | 70 +
.../ClassPathBeanDefinitionScannerTests.java | 5 +-
...ClassPathFactoryBeanDefinitionScannerTests.java | 28 +-
...entScanAndImportAnnotationInteractionTests.java | 12 +-
.../ComponentScanAnnotationIntegrationTests.java | 37 +-
.../ComponentScanAnnotationRecursionTests.java | 7 +-
.../annotation/ComponentScanAnnotationTests.java | 17 +-
...onentScanParserBeanDefinitionDefaultsTests.java | 5 +-
.../ComponentScanParserScopedProxyTests.java | 3 +-
.../annotation/ComponentScanParserTests.java | 32 +-
...ntScanParserWithUserDefinedStrategiesTests.java | 5 +-
.../annotation/ConfigurationClassAndBFPPTests.java | 12 +-
...rationClassPostConstructAndAutowiringTests.java | 9 +-
.../ConfigurationClassPostProcessorTests.java | 174 +-
.../annotation/ConfigurationClassSpr8954Tests.java | 1 +
.../ConfigurationClassWithConditionTests.java | 81 +-
...igurationWithFactoryBeanAndAutowiringTests.java | 216 +-
.../DestroyMethodInferenceTests-context.xml | 9 +-
.../annotation/EnableAspectJAutoProxyTests.java | 114 +-
.../annotation/EnableLoadTimeWeavingTests.java | 2 +-
.../context/annotation/ImportAwareTests.java | 136 +-
.../context/annotation/ImportSelectorTests.java | 2 +-
.../InvalidConfigurationClassDefinitionTests.java | 9 +-
.../annotation/NestedConfigurationClassTests.java | 181 +-
.../PrimitiveBeanLookupAndAutowiringTests.java | 7 +-
.../annotation/PropertySourceAnnotationTests.java | 56 +-
.../ReflectionUtilsIntegrationTests.java | 8 +-
.../context/annotation/SimpleConfigTests.java | 3 +-
.../context/annotation/SimpleScanTests.java | 8 +-
.../context/annotation/Spr11310Tests.java | 89 +
.../Spr3775InitDestroyLifecycleTests.java | 6 +-
.../context/annotation/Spr6602Tests.java | 8 +-
.../context/annotation/aspectjTypeFilterTests.xml | 2 +-
.../aspectjTypeFilterTestsWithPlaceholders.xml | 14 +
.../componentscan/level1/Level1Config.java | 2 +-
.../componentscan/level2/Level2Config.java | 2 +-
.../simple/ClassWithNestedComponents.java | 31 +
.../configuration/AutowiredConfigurationTests.java | 137 +-
.../BeanAnnotationAttributePropagationTests.java | 7 +-
.../configuration/ConfigurationBeanNameTests.java | 1 +
.../ConfigurationClassAspectIntegrationTests.java | 78 +-
...ationClassCglibCallbackDeregistrationTests.java | 78 -
.../ConfigurationClassProcessingTests.java | 88 +-
...ionClassWithPlaceholderConfigurerBeanTests.java | 9 +-
.../ConfigurationMetaAnnotationTests.java | 2 +-
...licateConfigurationClassPostProcessorTests.java | 1 +
.../ImportAnnotationDetectionTests.java | 9 +-
.../configuration/ImportResourceTests.java | 154 +-
.../annotation/configuration/ImportTests.java | 9 +-
.../ImportXmlWithConfigurationClass-context.xml | 8 +
...ImportedConfigurationClassEnhancementTests.java | 9 +-
.../PackagePrivateBeanMethodInheritanceTests.java | 8 +-
.../annotation/configuration/Spr10668Tests.java | 3 +-
.../annotation/configuration/Spr10744Tests.java | 2 +-
.../annotation/configuration/Spr7167Tests.java | 8 +-
.../configuration/aspectj-autoproxy-config.xml | 11 +-
.../configuration/spr8955/Spr8955Tests.java | 1 +
.../configuration/spr9031/Spr9031Tests.java | 8 +-
.../context/annotation/p1.properties | 4 +-
.../annotation/spr10546/ImportedConfig.java | 2 +-
.../context/annotation/spr10546/ParentConfig.java | 2 +-
.../spr10546/ParentWithComponentScanConfig.java | 2 +-
.../spr10546/ParentWithImportConfig.java | 2 +-
.../spr10546/ParentWithImportResourceConfig.java | 2 +-
.../spr10546/ParentWithParentConfig.java | 2 +-
.../context/annotation/spr10546/Spr10546Tests.java | 3 +-
.../spr10546/scanpackage/AEnclosingConfig.java | 2 +-
.../annotation/spr12111/TestProfileBean.java | 25 +
.../context/annotation/spr12233/Spr12233Tests.java | 80 +
.../context/annotation/spr8761/Spr8761Tests.java | 7 +-
.../context/annotation/spr8808/Spr8808Tests.java | 1 +
.../context/annotation3/StubFooDao.java | 4 +-
.../annotation4/FactoryMethodComponent.java | 2 +-
.../context/annotation4/SimpleBean.java | 2 +-
.../context/annotation6/ConfigForScanning.java | 1 -
.../ConversionServiceContextConfigTests.java | 3 +-
.../event/ApplicationContextEventTests.java | 56 +
.../event/EventPublicationInterceptorTests.java | 1 +
.../EnvironmentAccessorIntegrationTests.java | 10 +-
.../groovy/GroovyApplicationContextTests.java | 6 +
.../context/groovy/applicationContext-error.groovy | 6 +
.../org/springframework/context/groovy/test.xml | 3 +-
.../support/ApplicationContextLifecycleTests.java | 4 +-
.../ClassPathXmlApplicationContextTests.java | 39 +-
.../support/ConversionServiceFactoryBeanTests.java | 4 +-
.../support/DefaultLifecycleProcessorTests.java | 1 +
.../support/EnvironmentIntegrationTests.java | 1 +
...EnvironmentSecurityManagerIntegrationTests.java | 2 +-
.../support/GenericXmlApplicationContextTests.java | 7 +-
...PropertyResourceConfigurerIntegrationTests.java | 8 +-
.../PropertySourcesPlaceholderConfigurerTests.java | 1 +
.../support/ResourceBundleMessageSourceTests.java | 85 +-
.../SerializableBeanFactoryMemoryLeakTests.java | 9 +-
.../context/support/Spr7283Tests.java | 3 +-
.../context/support/Spr7816Tests.java | 5 +-
.../StaticApplicationContextMulticasterTests.java | 2 +-
.../support/StaticApplicationContextTests.java | 2 +-
.../springframework/context/support/spr7283.xml | 9 +-
.../access/LocalSlsbInvokerInterceptorTests.java | 1 +
...LocalStatelessSessionProxyFactoryBeanTests.java | 2 +-
.../SimpleRemoteSlsbInvokerInterceptorTests.java | 2 +-
...emoteStatelessSessionProxyFactoryBeanTests.java | 2 +-
.../ejb/config/JeeNamespaceHandlerEventTests.java | 5 +-
.../ejb/config/JeeNamespaceHandlerTests.java | 7 +-
.../format/datetime/DateFormatterTests.java | 8 +-
.../format/datetime/DateFormattingTests.java | 9 +-
.../joda/DateTimeFormatterFactoryBeanTests.java | 8 +-
.../joda/DateTimeFormatterFactoryTests.java | 7 +-
.../format/number/CurrencyFormatterTests.java | 5 +-
.../format/number/NumberFormatterTests.java | 5 +-
.../format/number/NumberFormattingTests.java | 5 +-
.../format/number/PercentFormatterTests.java | 5 +-
.../support/FormattingConversionServiceTests.java | 28 +-
.../InstrumentableClassLoaderTests.java | 5 +-
.../ReflectiveLoadTimeWeaverTests.java | 4 +-
...esourceOverridingShadowingClassLoaderTests.java | 4 +-
.../jmx/AbstractMBeanServerTests.java | 10 +
.../jmx/access/MBeanClientInterceptorTests.java | 4 +-
.../access/RemoteMBeanClientInterceptorTests.java | 1 -
.../jmx/export/CustomEditorConfigurerTests.java | 2 +-
.../jmx/export/MBeanExporterOperationsTests.java | 4 +-
.../jmx/export/MBeanExporterTests.java | 268 +-
.../jmx/export/NotificationListenerTests.java | 25 +-
.../jmx/export/NotificationPublisherTests.java | 1 +
.../export/PropertyPlaceholderConfigurerTests.java | 1 +
.../AnnotationMetadataAssemblerTests.java | 3 +-
.../EnableMBeanExportConfigurationTests.java | 36 +
.../assembler/AbstractJmxAssemblerTests.java | 1 +
.../assembler/AbstractMetadataAssemblerTests.java | 4 +-
...nterfaceBasedMBeanInfoAssemblerMappedTests.java | 1 -
...ethodExclusionMBeanInfoAssemblerComboTests.java | 1 -
...thodExclusionMBeanInfoAssemblerMappedTests.java | 1 -
...dExclusionMBeanInfoAssemblerNotMappedTests.java | 1 -
.../MethodExclusionMBeanInfoAssemblerTests.java | 2 +-
...thodNameBasedMBeanInfoAssemblerMappedTests.java | 1 -
.../jmx/export/autodetectLazyMBeans.xml | 6 -
.../jmx/export/autodetectMBeans.xml | 6 -
.../ModelMBeanNotificationPublisherTests.java | 5 +-
.../support/ConnectorServerFactoryBeanTests.java | 2 +-
.../springframework/jmx/support/JmxUtilsTests.java | 1 -
.../MBeanServerConnectionFactoryBeanTests.java | 2 +-
.../jmx/support/MBeanServerFactoryBeanTests.java | 1 -
.../jndi/JndiLocatorDelegateTests.java | 50 +
.../jndi/JndiPropertySourceTests.java | 8 +-
.../jndi/JndiTemplateEditorTests.java | 4 +-
.../AsyncAnnotationBeanPostProcessorTests.java | 200 +-
.../scheduling/annotation/AsyncExecutionTests.java | 27 +-
.../scheduling/annotation/EnableAsyncTests.java | 209 +-
.../annotation/EnableSchedulingTests.java | 31 +-
.../ScheduledAnnotationBeanPostProcessorTests.java | 2 +-
.../TestableAsyncUncaughtExceptionHandler.java | 86 +
.../scheduling/annotation/taskNamespaceTests.xml | 16 +-
.../ScheduledExecutorFactoryBeanTests.java | 1 +
.../AnnotationDrivenBeanDefinitionParserTests.java | 18 +-
.../config/ExecutorBeanDefinitionParserTests.java | 11 +-
...azyScheduledTasksBeanDefinitionParserTests.java | 1 +
.../ScheduledTasksBeanDefinitionParserTests.java | 1 -
.../config/SchedulerBeanDefinitionParserTests.java | 4 +-
.../support/CronSequenceGeneratorTests.java | 12 +-
.../scheduling/support/PeriodicTriggerTests.java | 6 +-
.../scripting/ContextScriptBean.java | 2 +-
.../springframework/scripting/bsh/bsh-with-xsd.xml | 8 +-
...pectIntegrationTests-groovy-dynamic-context.xml | 12 +-
...ctIntegrationTests-groovy-interface-context.xml | 12 +-
...tionTests-groovy-proxy-target-class-context.xml | 12 +-
.../GroovyAspectIntegrationTests-java-context.xml | 12 +-
.../scripting/groovy/GroovyScriptFactoryTests.java | 5 +-
.../org/springframework/scripting/groovy/Log.java | 6 +-
.../scripting/groovy/ScriptBean.groovy | 2 +-
.../groovy/groovy-with-xsd-proxy-target-class.xml | 8 +-
.../groovy/jruby-with-xsd-proxy-target-class.xml | 8 +-
.../jruby/AdvisedJRubyScriptFactoryTests.java | 6 +-
.../support/ScriptFactoryPostProcessorTests.java | 1 +
.../tests/mock/jndi/ExpectedLookupTemplate.java | 1 -
.../tests/sample/beans/FieldAccessBean.java | 3 +-
.../org/springframework/util/MBeanTestUtils.java | 1 -
.../validation/DataBinderFieldAccessTests.java | 59 +-
.../DefaultMessageCodesResolverTests.java | 8 +-
.../validation/ValidationUtilsTests.java | 5 +-
.../BeanValidationPostProcessorTests.java | 9 +-
.../beanvalidation/MethodValidationTests.java | 44 +-
.../beanvalidation/ValidatorFactoryTests.java | 54 +-
.../src/test/java/test/aspect/PerTargetAspect.java | 1 +
.../src/test/java/test/mixin/LockMixin.java | 1 +
.../cache/config/annotationDrivenCacheConfig.xml | 32 +-
...tationDrivenCacheNamespace-manager-resolver.xml | 22 +
.../annotationDrivenCacheNamespace-resolver.xml | 22 +
.../config/annotationDrivenCacheNamespace.xml | 29 +-
.../cache/config/cache-advice-invalid.xml | 14 +
.../springframework/cache/config/cache-advice.xml | 58 +-
.../contextNamespaceHandlerTests-location.xml | 9 +-
.../config/contextNamespaceHandlerTests-simple.xml | 9 +-
.../conversionservice/conversionService.xml | 5 +-
.../java/org/springframework/asm/ClassReader.java | 24 +-
.../java/org/springframework/asm/MethodWriter.java | 14 +-
.../java/org/springframework/asm/package-info.java | 3 -
.../org/springframework/cglib/package-info.java | 3 -
.../MemorySafeUndeclaredThrowableStrategy.java | 60 -
.../org/springframework/core/AliasRegistry.java | 6 +-
.../springframework/core/CollectionFactory.java | 176 +-
.../core/DecoratingClassLoader.java | 19 +-
.../springframework/core/GenericTypeResolver.java | 26 +-
.../org/springframework/core/MethodParameter.java | 52 +-
.../org/springframework/core/OrderComparator.java | 91 +-
.../core/OverridingClassLoader.java | 15 +-
.../org/springframework/core/ResolvableType.java | 274 +-
.../core/SerializableTypeWrapper.java | 59 +-
.../springframework/core/SimpleAliasRegistry.java | 36 +-
.../StandardReflectionParameterNameDiscoverer.java | 5 +-
.../core/annotation/AnnotatedElementUtils.java | 67 +-
.../annotation/AnnotationAwareOrderComparator.java | 73 +-
.../core/annotation/AnnotationUtils.java | 233 +-
.../org/springframework/core/annotation/Order.java | 7 +-
.../core/annotation/OrderUtils.java | 94 +
.../core/annotation/package-info.java | 4 -
.../core/convert/ConversionFailedException.java | 5 +-
.../core/convert/ConverterNotFoundException.java | 12 +-
.../core/convert/TypeDescriptor.java | 8 +-
.../core/convert/converter/Converter.java | 7 +-
.../core/convert/converter/ConverterFactory.java | 6 +-
.../convert/converter/ConvertingComparator.java | 25 +-
.../core/convert/converter/GenericConverter.java | 39 +-
.../core/convert/converter/package-info.java | 4 -
.../springframework/core/convert/package-info.java | 4 -
.../support/ArrayToCollectionConverter.java | 3 +-
.../core/convert/support/ByteBufferConverter.java | 52 +-
.../support/CollectionToCollectionConverter.java | 4 +-
.../convert/support/DefaultConversionService.java | 7 +
.../convert/support/GenericConversionService.java | 120 +-
.../core/convert/support/MapToMapConverter.java | 4 +-
.../support/ObjectToCollectionConverter.java | 3 +-
.../convert/support/ObjectToOptionalConverter.java | 89 +
.../support/StringToCollectionConverter.java | 3 +-
.../convert/support/StringToLocaleConverter.java | 5 +-
.../convert/support/StringToUUIDConverter.java | 10 +-
.../convert/support/ZoneIdToTimeZoneConverter.java | 4 +-
.../support/ZonedDateTimeToCalendarConverter.java | 4 +-
.../core/convert/support/package-info.java | 4 -
.../core/env/AbstractEnvironment.java | 86 +-
.../core/env/CompositePropertySource.java | 61 +-
.../core/env/EnumerablePropertySource.java | 30 +-
.../core/env/JOptCommandLinePropertySource.java | 3 +-
.../core/env/MapPropertySource.java | 6 +
.../springframework/core/env/PropertyResolver.java | 3 +-
.../springframework/core/env/PropertySource.java | 8 +-
.../core/env/SystemEnvironmentPropertySource.java | 17 +-
.../org/springframework/core/env/package-info.java | 2 -
.../core/io/AbstractFileResolvingResource.java | 4 +-
.../springframework/core/io/ClassPathResource.java | 7 +-
.../core/io/FileSystemResource.java | 45 +-
.../org/springframework/core/io/PathResource.java | 82 +-
.../org/springframework/core/io/package-info.java | 4 -
.../core/io/support/EncodedResource.java | 85 +-
.../PathMatchingResourcePatternResolver.java | 118 +-
.../core/io/support/ResourcePropertySource.java | 43 +-
.../core/io/support/SpringFactoriesLoader.java | 49 +-
.../core/io/support/package-info.java | 4 -
.../org/springframework/core/package-info.java | 4 -
.../core/serializer/DefaultDeserializer.java | 6 +-
.../core/serializer/DefaultSerializer.java | 8 +-
.../core/serializer/package-info.java | 4 -
.../serializer/support/DeserializingConverter.java | 10 +-
.../serializer/support/SerializingConverter.java | 11 +-
.../core/serializer/support/package-info.java | 4 -
.../springframework/core/style/package-info.java | 4 -
.../springframework/core/task/package-info.java | 4 -
.../core/task/support/package-info.java | 4 -
.../springframework/core/type/ClassMetadata.java | 9 +-
.../core/type/StandardAnnotationMetadata.java | 34 +-
.../core/type/StandardClassMetadata.java | 7 +-
.../AnnotationMetadataReadingVisitor.java | 15 +-
.../classreading/ClassMetadataReadingVisitor.java | 10 +-
.../classreading/MethodMetadataReadingVisitor.java | 25 +-
.../core/type/classreading/package-info.java | 4 -
.../core/type/filter/package-info.java | 4 -
.../springframework/core/type/package-info.java | 4 -
.../java/org/springframework/lang/UsesJava7.java | 36 +
.../java/org/springframework/lang/UsesJava8.java | 36 +
.../springframework/lang/UsesSunHttpServer.java | 36 +
.../org/springframework/lang/package-info.java | 5 +
.../util/AlternativeJdkIdGenerator.java | 13 +-
.../org/springframework/util/AntPathMatcher.java | 393 +-
.../main/java/org/springframework/util/Assert.java | 4 +-
.../java/org/springframework/util/Base64Utils.java | 168 +
.../java/org/springframework/util/ClassUtils.java | 34 +-
.../org/springframework/util/CollectionUtils.java | 18 +-
.../util/ConcurrentReferenceHashMap.java | 6 +-
.../springframework/util/ExceptionTypeFilter.java | 41 +
.../java/org/springframework/util/IdGenerator.java | 2 +-
.../org/springframework/util/InstanceFilter.java | 124 +
.../org/springframework/util/JdkIdGenerator.java | 34 +
.../springframework/util/LinkedMultiValueMap.java | 13 +-
.../org/springframework/util/Log4jConfigurer.java | 10 +-
.../org/springframework/util/MimeTypeUtils.java | 8 +-
.../java/org/springframework/util/NumberUtils.java | 26 +-
.../springframework/util/PatternMatchUtils.java | 9 +-
.../org/springframework/util/ReflectionUtils.java | 98 +-
.../util/ResizableByteArrayOutputStream.java | 4 +-
.../org/springframework/util/ResourceUtils.java | 65 +-
.../springframework/util/SimpleIdGenerator.java | 44 +
.../java/org/springframework/util/SocketUtils.java | 3 +-
.../java/org/springframework/util/StreamUtils.java | 8 +-
.../java/org/springframework/util/StringUtils.java | 18 +-
.../java/org/springframework/util/TypeUtils.java | 2 -
.../org/springframework/util/backoff/BackOff.java | 54 +
.../util/backoff/BackOffExecution.java | 43 +
.../util/backoff/ExponentialBackOff.java | 229 +
.../springframework/util/backoff/FixedBackOff.java | 123 +
.../springframework/util/backoff/package-info.java | 4 +
.../util/comparator/CompoundComparator.java | 2 +-
.../util/comparator/InstanceComparator.java | 4 +-
.../util/comparator/package-info.java | 4 -
.../util/concurrent/FailureCallback.java | 34 +
.../util/concurrent/FutureAdapter.java | 12 +-
.../util/concurrent/ListenableFuture.java | 14 +-
.../util/concurrent/ListenableFutureAdapter.java | 16 +-
.../util/concurrent/ListenableFutureCallback.java | 15 +-
.../ListenableFutureCallbackRegistry.java | 57 +-
.../util/concurrent/ListenableFutureTask.java | 8 +-
.../util/concurrent/SettableListenableFuture.java | 186 +
.../util/concurrent/SuccessCallback.java | 34 +
.../util/concurrent/package-info.java | 4 -
.../org/springframework/util/package-info.java | 4 -
.../util/xml/StaxEventXMLReader.java | 6 +-
.../org/springframework/util/xml/StaxResult.java | 1 -
.../org/springframework/util/xml/package-info.java | 4 -
.../core/BridgeMethodResolverTests.java | 1 +
.../core/CollectionFactoryTests.java | 302 ++
.../core/GenericCollectionTypeResolverTests.java | 1 +
.../core/GenericTypeResolverTests.java | 16 +-
...lVariableTableParameterNameDiscovererTests.java | 2 +-
.../springframework/core/OrderComparatorTests.java | 4 +-
.../core/SerializableTypeWrapperTests.java | 2 +-
...andardReflectionParameterNameDiscoverTests.java | 9 +-
.../annotation/AnnotatedElementUtilsTests.java | 3 +-
.../core/annotation/AnnotationAttributesTests.java | 8 +-
.../AnnotationAwareOrderComparatorTests.java | 31 +-
.../core/annotation/AnnotationUtilsTests.java | 11 +-
.../core/annotation/OrderSourceProviderTests.java | 188 +
.../core/annotation/OrderUtilsTests.java | 73 +
.../subpackage/NonPublicAnnotatedClass.java | 2 +-
.../annotation/subpackage/NonPublicAnnotation.java | 2 +-
.../convert/support/ByteBufferConverterTests.java | 47 +-
.../CollectionToCollectionConverterTests.java | 54 +-
.../support/DefaultConversionServiceTests.java | 1077 ++++
.../convert/support/DefaultConversionTests.java | 887 ----
.../support/GenericConversionServiceTests.java | 299 +-
.../convert/support/MapToMapConverterTests.java | 64 +-
.../core/env/CompositePropertySourceTests.java | 49 +
.../core/env/CustomEnvironmentTests.java | 6 +-
.../env/JOptCommandLinePropertySourceTests.java | 24 +-
.../core/env/PropertySourceTests.java | 7 +-
.../core/env/SimpleCommandLineParserTests.java | 8 +-
.../env/SystemEnvironmentPropertySourceTests.java | 42 +-
.../core/io/ClassPathResourceTests.java | 7 +-
.../springframework/core/io/PathResourceTests.java | 18 +-
.../core/io/ResourceEditorTests.java | 4 +-
.../org/springframework/core/io/ResourceTests.java | 1 +
.../core/io/support/EncodedResourceTests.java | 83 +
.../PathMatchingResourcePatternResolverTests.java | 43 +-
.../support/ResourceArrayPropertyEditorTests.java | 3 +-
.../serializer/SerializationConverterTests.java | 3 +-
.../AbstractClassMetadataMemberClassTests.java | 6 +-
.../core/type/AnnotationMetadataTests.java | 108 +-
.../core/type/AnnotationTypeFilterTests.java | 5 +-
.../core/type/AspectJTypeFilterTests.java | 2 +-
.../core/type/AssignableTypeFilterTests.java | 2 +-
.../core/type/CachingMetadataReaderLeakTests.java | 1 +
.../java/org/springframework/tests/Assume.java | 2 +-
.../java/org/springframework/tests/BuildTests.java | 2 +-
.../springframework/tests/JavaVersionTests.java | 6 +-
.../org/springframework/tests/MockitoUtils.java | 7 +-
.../java/org/springframework/tests/TestGroup.java | 5 +-
.../springframework/tests/TestResourceUtils.java | 4 +-
.../springframework/util/AntPathMatcherTests.java | 62 +-
.../util/AutoPopulatingListTests.java | 2 +-
.../org/springframework/util/ClassUtilsTests.java | 6 +-
.../springframework/util/CollectionUtilsTests.java | 3 +-
.../org/springframework/util/DigestUtilsTests.java | 3 +-
.../util/ExceptionTypeFilterTests.java | 37 +
.../util/ExponentialBackOffTests.java | 138 +
.../springframework/util/FixedBackOffTests.java | 92 +
.../springframework/util/InstanceFilterTests.java | 75 +
.../util/LinkedMultiValueMapTests.java | 3 +-
.../org/springframework/util/MimeTypeTests.java | 3 +-
.../util/PatternMatchUtilsTests.java | 31 +-
.../util/PropertyPlaceholderHelperTests.java | 3 +-
.../springframework/util/ReflectionUtilsTests.java | 51 +-
.../springframework/util/ResourceUtilsTests.java | 43 +-
.../util/SerializationUtilsTests.java | 6 +-
.../org/springframework/util/SocketUtilsTests.java | 2 +-
.../org/springframework/util/StreamUtilsTests.java | 2 +-
.../util/SystemPropertyUtilsTests.java | 3 +-
.../org/springframework/util/TypeUtilsTests.java | 5 +-
.../util/comparator/BooleanComparatorTests.java | 6 +-
.../util/comparator/ComparableComparatorTests.java | 4 +-
.../util/comparator/InstanceComparatorTests.java | 6 +-
.../util/comparator/NullSafeComparatorTests.java | 4 +-
.../util/concurrent/FutureAdapterTests.java | 7 +-
.../util/concurrent/ListenableFutureTaskTests.java | 31 +
.../concurrent/SettableListenableFutureTests.java | 333 ++
.../util/xml/AbstractStaxHandlerTestCase.java | 3 +-
.../util/xml/AbstractStaxXMLReaderTestCase.java | 5 +-
.../util/xml/DomContentHandlerTests.java | 3 +-
.../util/xml/SimpleNamespaceContextTests.java | 3 +-
.../util/xml/StaxEventXMLReaderTests.java | 1 -
.../util/xml/StaxStreamXMLReaderTests.java | 2 -
.../util/xml/TransformerUtilsTests.java | 4 +-
.../expression/ExpressionException.java | 72 +-
.../springframework/expression/spel/CodeFlow.java | 840 +++
.../spel/CompilablePropertyAccessor.java | 52 +
.../expression/spel/CompiledExpression.java | 38 +
.../expression/spel/InternalParseException.java | 2 -
.../expression/spel/SpelCompilerMode.java | 47 +
.../expression/spel/SpelMessage.java | 5 +-
.../springframework/expression/spel/SpelNode.java | 26 +-
.../expression/spel/SpelParserConfiguration.java | 71 +-
.../expression/spel/ast/Assign.java | 6 +-
.../expression/spel/ast/AstUtils.java | 23 +-
.../expression/spel/ast/BeanReference.java | 33 +-
.../expression/spel/ast/BooleanLiteral.java | 21 +-
.../expression/spel/ast/CompoundExpression.java | 38 +-
.../expression/spel/ast/ConstructorReference.java | 128 +-
.../springframework/expression/spel/ast/Elvis.java | 74 +-
.../expression/spel/ast/FloatLiteral.java | 17 +-
.../expression/spel/ast/FormatHelper.java | 15 +-
.../expression/spel/ast/FunctionReference.java | 82 +-
.../expression/spel/ast/Identifier.java | 4 +-
.../expression/spel/ast/Indexer.java | 305 +-
.../expression/spel/ast/InlineList.java | 90 +-
.../expression/spel/ast/InlineMap.java | 162 +
.../expression/spel/ast/IntLiteral.java | 27 +-
.../expression/spel/ast/Literal.java | 19 +-
.../expression/spel/ast/LongLiteral.java | 17 +-
.../expression/spel/ast/MethodReference.java | 114 +-
.../expression/spel/ast/NullLiteral.java | 16 +-
.../springframework/expression/spel/ast/OpAnd.java | 36 +-
.../springframework/expression/spel/ast/OpDec.java | 45 +-
.../expression/spel/ast/OpDivide.java | 89 +-
.../springframework/expression/spel/ast/OpEQ.java | 108 +
.../springframework/expression/spel/ast/OpGE.java | 52 +-
.../springframework/expression/spel/ast/OpGT.java | 47 +-
.../springframework/expression/spel/ast/OpInc.java | 49 +-
.../springframework/expression/spel/ast/OpLE.java | 54 +-
.../springframework/expression/spel/ast/OpLT.java | 47 +-
.../expression/spel/ast/OpMinus.java | 186 +-
.../expression/spel/ast/OpModulus.java | 92 +-
.../expression/spel/ast/OpMultiply.java | 106 +-
.../springframework/expression/spel/ast/OpNE.java | 80 +
.../springframework/expression/spel/ast/OpOr.java | 36 +-
.../expression/spel/ast/OpPlus.java | 190 +-
.../expression/spel/ast/Operator.java | 185 +-
.../expression/spel/ast/OperatorBetween.java | 15 +-
.../expression/spel/ast/OperatorInstanceof.java | 34 +-
.../expression/spel/ast/OperatorMatches.java | 53 +-
.../expression/spel/ast/OperatorNot.java | 33 +-
.../expression/spel/ast/OperatorPower.java | 22 +-
.../expression/spel/ast/Projection.java | 17 +-
.../spel/ast/PropertyOrFieldReference.java | 204 +-
.../expression/spel/ast/QualifiedIdentifier.java | 6 +-
.../expression/spel/ast/RealLiteral.java | 17 +-
.../expression/spel/ast/Selection.java | 66 +-
.../expression/spel/ast/SpelNodeImpl.java | 143 +-
.../expression/spel/ast/StringLiteral.java | 17 +-
.../expression/spel/ast/Ternary.java | 85 +-
.../expression/spel/ast/TypeCode.java | 10 +-
.../expression/spel/ast/TypeReference.java | 80 +-
.../expression/spel/ast/ValueRef.java | 16 +-
.../expression/spel/ast/VariableReference.java | 40 +-
.../standard/InternalSpelExpressionParser.java | 256 +-
.../expression/spel/standard/SpelCompiler.java | 280 +
.../expression/spel/standard/SpelExpression.java | 368 +-
.../spel/standard/SpelExpressionParser.java | 16 +-
.../expression/spel/standard/Token.java | 38 +-
.../expression/spel/standard/TokenKind.java | 11 +-
.../expression/spel/standard/Tokenizer.java | 17 +-
.../expression/spel/support/ReflectionHelper.java | 156 +-
.../support/ReflectiveConstructorExecutor.java | 8 +-
.../support/ReflectiveConstructorResolver.java | 8 +-
.../spel/support/ReflectiveMethodExecutor.java | 56 +-
.../spel/support/ReflectiveMethodResolver.java | 44 +-
.../spel/support/ReflectivePropertyAccessor.java | 146 +-
.../spel/support/StandardEvaluationContext.java | 7 +-
.../spel/support/StandardTypeComparator.java | 36 +-
.../expression/spel/AbstractExpressionTests.java | 318 +-
.../expression/spel/ArrayConstructorTests.java | 1 +
.../expression/spel/BooleanExpressionTests.java | 1 +
.../expression/spel/CachedMethodExecutorTests.java | 1 +
.../spel/DefaultComparatorUnitTests.java | 6 +-
.../expression/spel/EvaluationTests.java | 48 +-
.../spel/ExpressionLanguageScenarioTests.java | 6 +-
.../expression/spel/ExpressionStateTests.java | 8 +-
.../spel/ExpressionWithConversionTests.java | 8 +-
.../expression/spel/InProgressTests.java | 5 +-
.../expression/spel/IndexingTests.java | 34 +-
.../expression/spel/LiteralExpressionTests.java | 7 +-
.../expression/spel/LiteralTests.java | 5 +-
.../expression/spel/MapAccessTests.java | 13 +-
.../springframework/expression/spel/MapTests.java | 139 +
.../expression/spel/MethodInvocationTests.java | 212 +-
.../expression/spel/OperatorOverloaderTests.java | 7 +-
.../expression/spel/OperatorTests.java | 26 +-
.../expression/spel/ParsingTests.java | 50 +-
.../expression/spel/PerformanceTests.java | 8 +-
.../expression/spel/PropertyAccessTests.java | 9 +-
.../spel/ScenariosForSpringSecurity.java | 7 +-
.../spel/SelectionAndProjectionTests.java | 16 +-
.../expression/spel/SetValueTests.java | 65 +-
.../spel/SpelCompilationCoverageTests.java | 4478 ++++++++++++++++
.../spel/SpelCompilationPerformanceTests.java | 610 +++
.../expression/spel/SpelDocumentationTests.java | 15 +-
.../expression/spel/SpelReproTests.java | 36 +-
.../expression/spel/StandardTypeLocatorTests.java | 8 +-
.../expression/spel/TestScenarioCreator.java | 44 +-
.../expression/spel/VariableAndFunctionTests.java | 5 +-
.../standard/PropertiesConversionSpelTests.java | 5 +-
.../expression/spel/standard/SpelParserTests.java | 12 +-
.../spel/support/ReflectionHelperTests.java | 12 -
.../spel/testdata/PersonInOtherPackage.java | 38 +
.../jdbc/config/DatabasePopulatorConfigUtils.java | 3 +-
.../springframework/jdbc/config/package-info.java | 2 -
.../jdbc/core/BatchUpdateUtils.java | 2 +-
.../jdbc/core/BeanPropertyRowMapper.java | 4 +-
.../springframework/jdbc/core/JdbcOperations.java | 2 +-
.../springframework/jdbc/core/JdbcTemplate.java | 32 +-
.../jdbc/core/PreparedStatementCreatorFactory.java | 16 +-
.../jdbc/core/RowCountCallbackHandler.java | 4 +-
.../jdbc/core/SingleColumnRowMapper.java | 15 +-
.../springframework/jdbc/core/SqlParameter.java | 5 +-
.../jdbc/core/SqlRowSetResultSetExtractor.java | 2 +
.../jdbc/core/StatementCreatorUtils.java | 46 +-
.../jdbc/core/metadata/CallMetaDataContext.java | 116 +-
.../core/metadata/CallMetaDataProviderFactory.java | 20 +-
.../metadata/GenericTableMetaDataProvider.java | 28 +-
.../metadata/PostgresCallMetaDataProvider.java | 8 +-
.../jdbc/core/metadata/TableMetaDataContext.java | 37 +-
.../metadata/TableMetaDataProviderFactory.java | 5 +-
.../jdbc/core/metadata/package-info.java | 4 -
.../core/namedparam/MapSqlParameterSource.java | 10 +-
.../namedparam/NamedParameterBatchUpdateUtils.java | 2 +-
.../core/namedparam/SqlParameterSourceUtils.java | 1 +
.../jdbc/core/namedparam/package-info.java | 3 -
.../springframework/jdbc/core/package-info.java | 4 -
.../jdbc/core/simple/AbstractJdbcCall.java | 6 +-
.../jdbc/core/simple/AbstractJdbcInsert.java | 51 +-
.../simple/ParameterizedBeanPropertyRowMapper.java | 6 +-
.../jdbc/core/simple/ParameterizedRowMapper.java | 3 +
.../simple/ParameterizedSingleColumnRowMapper.java | 9 +-
.../jdbc/core/simple/SimpleJdbcCall.java | 23 +-
.../jdbc/core/simple/SimpleJdbcInsert.java | 10 +-
.../core/simple/SimpleJdbcInsertOperations.java | 10 +-
.../jdbc/core/simple/package-info.java | 8 -
.../core/support/JdbcBeanDefinitionReader.java | 1 -
.../jdbc/core/support/JdbcDaoSupport.java | 1 -
.../jdbc/core/support/package-info.java | 3 -
.../datasource/DataSourceTransactionManager.java | 8 +-
.../jdbc/datasource/DataSourceUtils.java | 6 +-
.../jdbc/datasource/DriverManagerDataSource.java | 4 +-
.../datasource/JdbcTransactionObjectSupport.java | 20 +-
.../jdbc/datasource/SimpleDriverDataSource.java | 8 +-
.../jdbc/datasource/SmartDataSource.java | 1 -
.../AbstractEmbeddedDatabaseConfigurer.java | 22 +-
.../embedded/EmbeddedDatabaseBuilder.java | 2 -
.../embedded/SimpleDriverDataSourceFactory.java | 1 -
.../jdbc/datasource/embedded/package-info.java | 4 -
.../init/CompositeDatabasePopulator.java | 1 -
.../jdbc/datasource/init/DatabasePopulator.java | 2 +-
.../datasource/init/DatabasePopulatorUtils.java | 1 -
.../datasource/init/ResourceDatabasePopulator.java | 109 +-
.../jdbc/datasource/init/ScriptException.java | 2 +-
.../init/ScriptStatementFailedException.java | 12 +-
.../jdbc/datasource/init/ScriptUtils.java | 67 +-
.../jdbc/datasource/init/package-info.java | 2 -
.../jdbc/datasource/lookup/package-info.java | 4 -
.../jdbc/datasource/package-info.java | 4 -
.../jdbc/object/GenericSqlQuery.java | 2 +-
.../jdbc/object/RdbmsOperation.java | 6 +-
.../org/springframework/jdbc/object/SqlQuery.java | 1 -
.../jdbc/object/UpdatableSqlQuery.java | 1 -
.../springframework/jdbc/object/package-info.java | 3 -
.../org/springframework/jdbc/package-info.java | 4 -
.../support/CustomSQLErrorCodesTranslation.java | 4 +-
.../jdbc/support/DatabaseStartupValidator.java | 1 -
.../springframework/jdbc/support/JdbcUtils.java | 84 +-
.../jdbc/support/SQLErrorCodes.java | 26 +-
.../support/SQLStateSQLExceptionTranslator.java | 12 +-
.../AbstractIdentityColumnMaxValueIncrementer.java | 163 +
.../AbstractSequenceMaxValueIncrementer.java | 1 -
.../incrementer/DerbyMaxValueIncrementer.java | 63 +-
.../incrementer/HsqlMaxValueIncrementer.java | 67 +-
.../incrementer/MySQLMaxValueIncrementer.java | 1 -
.../incrementer/SqlServerMaxValueIncrementer.java | 71 +-
.../SybaseAnywhereMaxValueIncrementer.java | 3 +-
.../incrementer/SybaseMaxValueIncrementer.java | 74 +-
.../jdbc/support/incrementer/package-info.java | 4 -
.../jdbc/support/lob/DefaultLobHandler.java | 46 +-
.../jdbc/support/lob/package-info.java | 4 -
.../nativejdbc/CommonsDbcpNativeJdbcExtractor.java | 4 +-
.../support/nativejdbc/NativeJdbcExtractor.java | 4 +-
.../nativejdbc/SimpleNativeJdbcExtractor.java | 15 +-
.../jdbc/support/nativejdbc/package-info.java | 4 -
.../springframework/jdbc/support/package-info.java | 4 -
.../support/rowset/ResultSetWrappingSqlRowSet.java | 44 +
.../jdbc/support/rowset/SqlRowSet.java | 42 +
.../jdbc/support/rowset/package-info.java | 4 -
.../jdbc/support/xml/Jdbc4SqlXmlHandler.java | 26 +-
.../jdbc/support/xml/SqlXmlHandler.java | 11 +-
.../jdbc/support/xml/XmlBinaryStreamProvider.java | 2 +-
.../support/xml/XmlCharacterStreamProvider.java | 2 +-
.../jdbc/support/xml/package-info.java | 4 -
.../src/main/resources/META-INF/spring.schemas | 3 +-
.../jdbc/config/spring-jdbc-4.1.xsd | 182 +
.../jdbc/support/sql-error-codes.xml | 40 +
.../config/InitializeDatabaseIntegrationTests.java | 15 +-
.../jdbc/config/JdbcNamespaceIntegrationTests.java | 1 +
.../jdbc/core/BeanPropertyRowMapperTests.java | 5 +-
.../jdbc/core/JdbcTemplateQueryTests.java | 56 +-
.../jdbc/core/JdbcTemplateTests.java | 6 +-
.../springframework/jdbc/core/RowMapperTests.java | 2 +-
.../jdbc/core/StatementCreatorUtilsTests.java | 21 +-
.../BeanPropertySqlParameterSourceTests.java | 3 +-
.../namedparam/MapSqlParameterSourceTests.java | 3 +-
.../NamedParameterJdbcTemplateTests.java | 2 +-
.../core/namedparam/NamedParameterQueryTests.java | 16 +-
.../jdbc/core/simple/CallMetaDataContextTests.java | 2 +-
.../ParameterizedBeanPropertyRowMapperTests.java | 8 +-
.../jdbc/core/simple/SimpleJdbcCallTests.java | 18 +-
.../jdbc/core/simple/SimpleJdbcInsertTests.java | 2 +-
.../jdbc/core/simple/SimpleJdbcTemplateTests.java | 2 +-
.../core/simple/TableMetaDataContextTests.java | 2 +-
.../support/JdbcBeanDefinitionReaderTests.java | 2 +-
.../jdbc/core/support/JdbcDaoSupportTests.java | 2 +-
.../jdbc/core/support/LobSupportTests.java | 17 +-
.../jdbc/core/support/SqlLobValueTests.java | 1 +
.../datasource/DataSourceJtaTransactionTests.java | 2 +-
.../DataSourceTransactionManagerTests.java | 14 +-
.../jdbc/datasource/DelegatingDataSourceTests.java | 1 -
.../UserCredentialsDataSourceAdapterTests.java | 1 -
.../embedded/EmbeddedDatabaseBuilderTests.java | 1 +
.../embedded/EmbeddedDatabaseFactoryBeanTests.java | 1 +
.../init/AbstractDatabaseInitializationTests.java | 1 +
.../init/AbstractDatabasePopulatorTests.java | 21 +-
.../init/ResourceDatabasePopulatorTests.java | 107 +
.../init/ScriptUtilsIntegrationTests.java | 3 +-
.../jdbc/datasource/init/ScriptUtilsUnitTests.java | 3 +-
.../lookup/BeanFactoryDataSourceLookupTests.java | 1 +
.../lookup/JndiDataSourceLookupTests.java | 14 +-
.../lookup/MapDataSourceLookupTests.java | 11 +-
.../jdbc/object/BatchSqlUpdateTests.java | 22 +-
.../jdbc/object/CustomerMapper.java | 6 +-
.../jdbc/object/GenericSqlQueryTests.java | 18 +-
.../jdbc/object/GenericStoredProcedureTests.java | 16 +-
.../jdbc/object/RdbmsOperationTests.java | 16 +-
.../springframework/jdbc/object/SqlQueryTests.java | 9 +-
.../jdbc/object/SqlUpdateTests.java | 2 +-
.../jdbc/object/StoredProcedureTests.java | 2 +-
...CustomSQLExceptionTranslatorRegistrarTests.java | 1 +
.../jdbc/support/CustomSqlExceptionTranslator.java | 4 +-
.../support/DataFieldMaxValueIncrementerTests.java | 48 +-
.../jdbc/support/DefaultLobHandlerTests.java | 29 +-
.../jdbc/support/KeyHolderTests.java | 39 +-
.../jdbc/support/NativeJdbcExtractorTests.java | 1 +
.../SQLErrorCodeSQLExceptionTranslatorTests.java | 4 +-
.../jdbc/support/SQLErrorCodesFactoryTests.java | 27 +-
.../support/SQLExceptionCustomTranslatorTests.java | 10 +-
.../SQLStateSQLExceptionTranslatorTests.java | 5 +-
.../rowset/ResultSetWrappingRowSetTests.java | 37 +-
.../springframework/jms/annotation/EnableJms.java | 261 +
.../jms/annotation/JmsBootstrapConfiguration.java | 54 +
.../jms/annotation/JmsListener.java | 121 +
.../JmsListenerAnnotationBeanPostProcessor.java | 345 ++
.../jms/annotation/JmsListenerConfigurer.java | 49 +
.../jms/annotation/package-info.java | 4 +
.../AbstractJmsListenerContainerFactory.java | 199 +
.../jms/config/AbstractJmsListenerEndpoint.java | 212 +
.../config/AbstractListenerContainerParser.java | 153 +-
.../AnnotationDrivenJmsBeanDefinitionParser.java | 102 +
.../config/DefaultJcaListenerContainerFactory.java | 122 +
.../config/DefaultJmsListenerContainerFactory.java | 163 +
.../jms/config/JcaListenerContainerParser.java | 108 +-
.../jms/config/JmsListenerConfigUtils.java | 39 +
.../jms/config/JmsListenerContainerFactory.java | 38 +
.../jms/config/JmsListenerContainerParser.java | 121 +-
.../jms/config/JmsListenerEndpoint.java | 48 +
.../jms/config/JmsListenerEndpointRegistrar.java | 186 +
.../jms/config/JmsListenerEndpointRegistry.java | 218 +
.../jms/config/JmsNamespaceHandler.java | 4 +-
.../jms/config/MethodJmsListenerEndpoint.java | 150 +
.../config/SimpleJmsListenerContainerFactory.java | 36 +
.../jms/config/SimpleJmsListenerEndpoint.java | 63 +
.../springframework/jms/config/package-info.java | 6 +-
.../jms/connection/CachedMessageProducer.java | 4 +-
.../jms/connection/CachingConnectionFactory.java | 4 +-
.../jms/connection/JmsTransactionManager.java | 4 -
.../jms/connection/SingleConnectionFactory.java | 243 +-
.../TransactionAwareConnectionFactoryProxy.java | 4 +-
.../jms/connection/package-info.java | 4 -
.../jms/core/JmsMessageOperations.java | 184 +
.../jms/core/JmsMessagingTemplate.java | 445 ++
.../springframework/jms/core/JmsOperations.java | 77 +-
.../org/springframework/jms/core/JmsTemplate.java | 149 +-
.../springframework/jms/core/ProducerCallback.java | 7 +-
.../org/springframework/jms/core/package-info.java | 4 -
.../jms/core/support/JmsGatewaySupport.java | 2 -
.../jms/core/support/package-info.java | 3 -
.../listener/AbstractMessageListenerContainer.java | 325 +-
.../AbstractPollingMessageListenerContainer.java | 75 +-
.../listener/DefaultMessageListenerContainer.java | 88 +-
.../jms/listener/MessageListenerContainer.java | 57 +
.../listener/SimpleMessageListenerContainer.java | 59 +-
.../adapter/AbstractAdaptableMessageListener.java | 433 ++
.../listener/adapter/MessageListenerAdapter.java | 343 +-
.../adapter/MessagingMessageListenerAdapter.java | 110 +
.../listener/adapter/ReplyFailureException.java | 33 +
.../jms/listener/adapter/package-info.java | 4 -
.../listener/endpoint/JmsActivationSpecConfig.java | 52 +-
.../endpoint/JmsMessageEndpointFactory.java | 10 +-
.../endpoint/JmsMessageEndpointManager.java | 63 +-
.../endpoint/StandardJmsActivationSpecFactory.java | 18 +-
.../jms/listener/endpoint/package-info.java | 4 -
.../springframework/jms/listener/package-info.java | 4 -
.../java/org/springframework/jms/package-info.java | 4 -
.../jms/remoting/JmsInvokerClientInterceptor.java | 48 +-
.../springframework/jms/remoting/package-info.java | 4 -
.../springframework/jms/support/JmsAccessor.java | 9 +-
.../jms/support/JmsHeaderMapper.java | 38 +
.../springframework/jms/support/JmsHeaders.java | 112 +
.../jms/support/JmsMessageHeaderAccessor.java | 134 +
.../jms/support/SimpleJmsHeaderMapper.java | 255 +
.../converter/MappingJackson2MessageConverter.java | 16 +-
.../converter/MappingJacksonMessageConverter.java | 383 --
.../converter/MessagingMessageConverter.java | 122 +
.../support/converter/SimpleMessageConverter.java | 1 -
.../jms/support/converter/package-info.java | 4 -
.../destination/DynamicDestinationResolver.java | 29 +-
.../destination/JmsDestinationAccessor.java | 8 +-
.../jms/support/destination/package-info.java | 4 -
.../springframework/jms/support/package-info.java | 4 -
.../src/main/resources/META-INF/spring.schemas | 3 +-
.../springframework/jms/config/spring-jms-4.1.xsd | 610 +++
.../org/springframework/jms/StubTextMessage.java | 263 +
.../AbstractJmsAnnotationDrivenTests.java | 242 +
.../annotation/AnnotationDrivenNamespaceTests.java | 112 +
.../jms/annotation/EnableJmsTests.java | 243 +
...msListenerAnnotationBeanPostProcessorTests.java | 220 +
...msListenerContainerFactoryIntegrationTests.java | 142 +
.../config/JmsListenerContainerFactoryTests.java | 194 +
.../config/JmsListenerContainerTestFactory.java | 42 +
.../config/JmsListenerEndpointRegistrarTests.java | 103 +
.../config/JmsListenerEndpointRegistryTests.java | 69 +
.../jms/config/JmsListenerEndpointTests.java | 116 +
.../jms/config/JmsNamespaceHandlerTests.java | 172 +-
.../jms/config/MessageListenerTestContainer.java | 142 +
.../jms/config/MethodJmsListenerEndpointTests.java | 542 ++
.../jms/config/SimpleJmsListenerEndpointTests.java | 43 +
.../jms/config/jmsNamespaceHandlerTests.xml | 72 -
.../jms/connection/JmsTransactionManagerTests.java | 50 +-
.../connection/SingleConnectionFactoryTests.java | 225 +-
.../jms/core/JmsMessagingTemplateTests.java | 619 +++
.../springframework/jms/core/JmsTemplateTests.java | 130 +-
.../jms/core/JmsTemplateTransactedTests.java | 22 +-
.../jms/core/support/JmsGatewaySupportTests.java | 8 +-
.../DefaultMessageListenerContainerTests.java | 144 +
.../SimpleMessageListenerContainerTests.java | 13 +-
.../listener/adapter/MessageContentsDelegate.java | 4 +-
.../adapter/MessageListenerAdapterTests.java | 20 +-
.../MessagingMessageListenerAdapterTests.java | 149 +
.../adapter/ResponsiveMessageDelegate.java | 5 +-
.../DefaultJmsActivationSpecFactoryTests.java | 6 +-
.../endpoint/JmsMessageEndpointManagerTests.java | 70 +
.../jms/remoting/JmsInvokerTests.java | 2 +-
.../jms/support/JmsAccessorTests.java | 4 +-
.../jms/support/JmsMessageHeaderAccessorTests.java | 74 +
.../jms/support/SimpleJmsHeaderMapperTests.java | 563 ++
.../jms/support/SimpleMessageConverterTests.java | 12 +-
.../MappingJackson2MessageConverterTests.java | 70 +-
.../MappingJacksonMessageConverterTests.java | 147 -
.../MarshallingMessageConverterTests.java | 1 +
.../converter/MessagingMessageConverterTests.java | 99 +
.../destination/JndiDestinationResolverTests.java | 15 +-
.../annotation-driven-custom-container-factory.xml | 17 +
...tation-driven-custom-handler-method-factory.xml | 23 +
.../annotation-driven-custom-registry.xml | 26 +
...annotation-driven-default-container-factory.xml | 18 +
.../annotation/annotation-driven-full-config.xml | 17 +
.../annotation-driven-full-configurable-config.xml | 22 +
.../annotation/annotation-driven-sample-config.xml | 18 +
.../jms/annotation/jms-listener.properties | 6 +
.../jms/config/jmsNamespaceHandlerTests.xml | 88 +
.../messaging/MessageHandlingException.java | 2 +-
.../springframework/messaging/MessageHeaders.java | 121 +-
.../messaging/MessagingException.java | 10 +-
.../converter/AbstractMessageConverter.java | 104 +-
.../converter/ByteArrayMessageConverter.java | 2 +-
.../converter/CompositeMessageConverter.java | 2 +-
.../messaging/converter/ContentTypeResolver.java | 2 +-
.../converter/GenericMessageConverter.java | 77 +
.../converter/MappingJackson2MessageConverter.java | 53 +-
.../converter/MessageConversionException.java | 4 +
.../messaging/converter/MessageConverter.java | 26 +-
.../converter/SimpleMessageConverter.java | 14 +-
.../converter/StringMessageConverter.java | 2 +-
.../messaging/converter/package-info.java | 2 +-
.../core/AbstractMessageReceivingTemplate.java | 87 +
.../core/AbstractMessageSendingTemplate.java | 29 +-
.../messaging/core/AbstractMessagingTemplate.java | 58 +-
.../core/CachingDestinationResolverProxy.java | 94 +
.../messaging/core/GenericMessagingTemplate.java | 6 +
.../messaging/core/MessageReceivingOperations.java | 5 +-
.../core/MessageRequestReplyOperations.java | 5 +-
.../messaging/core/MessageSendingOperations.java | 7 +-
.../messaging/core/package-info.java | 2 +-
.../DestinationPatternsMessageCondition.java | 17 +-
.../messaging/handler/HandlerMethod.java | 69 +-
.../messaging/handler/HandlerMethodSelector.java | 6 +-
.../messaging/handler/MessageCondition.java | 5 +-
.../messaging/handler/annotation/Payload.java | 9 +-
.../messaging/handler/annotation/SendTo.java | 10 +-
.../AbstractMethodArgumentResolutionException.java | 16 +-
.../AbstractNamedValueMethodArgumentResolver.java | 33 +-
.../AnnotationExceptionHandlerMethodResolver.java | 4 +-
.../DefaultMessageHandlerMethodFactory.java | 171 +
.../support/HeaderMethodArgumentResolver.java | 2 +-
.../support/HeadersMethodArgumentResolver.java | 23 +-
.../support/MessageHandlerMethodFactory.java | 44 +
.../support/MessageMethodArgumentResolver.java | 27 +-
.../support/MethodArgumentNotValidException.java | 13 +-
.../MethodArgumentTypeMismatchException.java | 9 +-
.../support/PayloadArgumentResolver.java | 36 +-
.../AbstractExceptionHandlerMethodResolver.java | 13 +-
.../invocation/AbstractMethodMessageHandler.java | 157 +-
.../invocation/HandlerMethodArgumentResolver.java | 16 +-
.../HandlerMethodArgumentResolverComposite.java | 6 +-
.../HandlerMethodReturnValueHandler.java | 2 +-
.../HandlerMethodReturnValueHandlerComposite.java | 11 +-
.../handler/invocation/InvocableHandlerMethod.java | 35 +-
.../messaging/simp/SimpAttributes.java | 200 +
.../simp/SimpAttributesContextHolder.java | 89 +
.../messaging/simp/SimpMessageHeaderAccessor.java | 174 +-
.../messaging/simp/SimpMessageMappingInfo.java | 2 +-
.../simp/SimpMessageSendingOperations.java | 71 +-
.../messaging/simp/SimpMessageType.java | 4 +-
.../simp/SimpMessageTypeMessageCondition.java | 19 +-
.../messaging/simp/SimpMessagingTemplate.java | 152 +-
.../messaging/simp/SimpSessionScope.java | 81 +
.../messaging/simp/annotation/SendToUser.java | 33 +-
.../support/MissingSessionUserException.java | 2 +-
.../support/PrincipalMethodArgumentResolver.java | 5 +-
.../support/SendToMethodReturnValueHandler.java | 127 +-
.../SimpAnnotationMethodMessageHandler.java | 173 +-
.../SubscriptionMethodReturnValueHandler.java | 111 +-
.../simp/broker/AbstractBrokerMessageHandler.java | 156 +-
.../simp/broker/AbstractSubscriptionRegistry.java | 105 +-
.../simp/broker/BrokerAvailabilityEvent.java | 4 +-
.../simp/broker/DefaultSubscriptionRegistry.java | 108 +-
.../simp/broker/SimpleBrokerMessageHandler.java | 176 +-
.../simp/broker/SubscriptionRegistry.java | 10 +-
.../simp/config/AbstractBrokerRegistration.java | 2 +-
.../config/AbstractMessageBrokerConfiguration.java | 153 +-
.../messaging/simp/config/ChannelRegistration.java | 14 +-
.../simp/config/MessageBrokerRegistry.java | 35 +-
.../simp/config/SimpleBrokerRegistration.java | 2 +-
.../simp/config/StompBrokerRelayRegistration.java | 2 +-
.../simp/config/TaskExecutorRegistration.java | 14 +-
.../simp/stomp/BufferingStompDecoder.java | 33 +-
.../messaging/simp/stomp/Reactor11StompCodec.java | 10 +-
.../simp/stomp/StompBrokerRelayMessageHandler.java | 444 +-
.../messaging/simp/stomp/StompCodec.java | 68 -
.../messaging/simp/stomp/StompCommand.java | 24 +-
.../simp/stomp/StompConversionException.java | 2 +
.../messaging/simp/stomp/StompDecoder.java | 147 +-
.../messaging/simp/stomp/StompEncoder.java | 80 +-
.../messaging/simp/stomp/StompHeaderAccessor.java | 408 +-
.../simp/user/DefaultUserDestinationResolver.java | 105 +-
.../simp/user/DefaultUserSessionRegistry.java | 6 +-
.../simp/user/UserDestinationMessageHandler.java | 59 +-
.../simp/user/UserDestinationResolver.java | 4 +-
.../messaging/simp/user/UserDestinationResult.java | 16 +-
.../messaging/simp/user/package-info.java | 4 +-
.../messaging/support/AbstractHeaderMapper.java | 108 +
.../messaging/support/AbstractMessageChannel.java | 176 +-
.../support/AbstractSubscribableChannel.java | 12 +-
.../messaging/support/ChannelInterceptor.java | 23 +-
.../support/ChannelInterceptorAdapter.java | 12 +
.../messaging/support/ChannelInterceptorChain.java | 116 -
.../messaging/support/ErrorMessage.java | 16 +-
.../support/ExecutorChannelInterceptor.java | 60 +
.../support/ExecutorSubscribableChannel.java | 136 +-
.../messaging/support/GenericMessage.java | 27 +-
.../messaging/support/HeaderMapper.java | 46 +
.../IdTimestampMessageHeaderInitializer.java | 96 +
.../ImmutableMessageChannelInterceptor.java | 44 +
.../messaging/support/InterceptableChannel.java | 61 +
.../messaging/support/MessageBuilder.java | 77 +-
.../messaging/support/MessageHandlingRunnable.java | 41 +
.../messaging/support/MessageHeaderAccessor.java | 521 +-
.../support/MessageHeaderInitializer.java | 33 +
.../support/NativeMessageHeaderAccessor.java | 173 +-
.../messaging/support/package-info.java | 2 +-
.../tcp/FixedIntervalReconnectStrategy.java | 2 +-
.../messaging/tcp/ReconnectStrategy.java | 2 +-
.../messaging/tcp/TcpConnection.java | 12 +-
.../messaging/tcp/TcpConnectionHandler.java | 9 +-
.../messaging/tcp/TcpOperations.java | 7 +-
.../AbstractPromiseToListenableFutureAdapter.java | 37 +-
...assThroughPromiseToListenableFutureAdapter.java | 4 +-
.../messaging/tcp/reactor/Reactor11TcpClient.java | 38 +-
.../tcp/reactor/Reactor11TcpConnection.java | 19 +-
.../messaging/tcp/reactor/ReactorTcpClient.java | 247 -
.../tcp/reactor/ReactorTcpConnection.java | 55 -
.../messaging/MessageHeadersTests.java | 60 +-
.../messaging/StubMessageChannel.java | 2 +-
.../converter/AbstractMessageConverterTests.java | 136 +
.../converter/DefaultContentTypeResolverTests.java | 4 +-
.../converter/GenericMessageConverterTests.java | 65 +
.../MappingJackson2MessageConverterTests.java | 60 +-
.../messaging/converter/MessageConverterTests.java | 44 +-
.../converter/SimpleMessageConverterTests.java | 72 +
.../converter/StringMessageConverterTests.java | 3 +-
.../core/CachingDestinationResolverTests.java | 61 +
...DestinationResolvingMessagingTemplateTests.java | 2 +-
.../core/GenericMessagingTemplateTests.java | 33 +-
.../core/MessageReceivingTemplateTests.java | 48 +-
.../core/MessageRequestReplyTemplateTests.java | 12 +-
.../core/MessageSendingTemplateTests.java | 27 +-
.../DestinationPatternsMessageConditionTests.java | 10 +
...otationExceptionHandlerMethodResolverTests.java | 1 +
.../DefaultMessageHandlerMethodFactoryTests.java | 243 +
.../support/HeaderMethodArgumentResolverTests.java | 6 +-
.../HeadersMethodArgumentResolverTests.java | 3 +-
.../MessageMethodArgumentResolverTests.java | 7 +-
.../support/PayloadArgumentResolverTests.java | 28 +-
.../invocation/MethodMessageHandlerTests.java | 25 +-
.../simp/SimpAttributesContextHolderTests.java | 139 +
.../messaging/simp/SimpAttributesTests.java | 138 +
.../simp/SimpMessageHeaderAccessorTests.java | 66 +
.../simp/SimpMessageTypeMessageConditionTests.java | 6 +-
.../messaging/simp/SimpMessagingTemplateTests.java | 146 +-
.../messaging/simp/SimpSessionScopeTests.java | 105 +
.../messaging/simp/TestPrincipal.java | 2 +-
.../SendToMethodReturnValueHandlerTests.java | 247 +-
.../SimpAnnotationMethodMessageHandlerTests.java | 132 +-
.../SubscriptionMethodReturnValueHandlerTests.java | 75 +-
.../simp/broker/BrokerMessageHandlerTests.java | 21 +-
.../broker/DefaultSubscriptionRegistryTests.java | 168 +-
.../broker/SimpleBrokerMessageHandlerTests.java | 64 +-
.../config/MessageBrokerConfigurationTests.java | 162 +-
.../config/StompBrokerRelayRegistrationTests.java | 10 +-
.../simp/stomp/BufferingStompDecoderTests.java | 47 +-
...pBrokerRelayMessageHandlerIntegrationTests.java | 95 +-
.../stomp/StompBrokerRelayMessageHandlerTests.java | 65 +-
.../messaging/simp/stomp/StompCodecTests.java | 93 +-
.../simp/stomp/StompHeaderAccessorTests.java | 105 +-
.../user/DefaultUserDestinationResolverTests.java | 61 +-
.../simp/user/DefaultUserSessionRegistryTests.java | 3 +-
.../user/UserDestinationMessageHandlerTests.java | 26 +-
.../messaging/support/ChannelInterceptorTests.java | 165 +-
.../support/ExecutorSubscribableChannelTests.java | 254 +
.../messaging/support/MessageBuilderTests.java | 74 +-
.../support/MessageHeaderAccessorTests.java | 375 +-
.../support/NativeMessageHeaderAccessorTests.java | 208 +-
.../support/PublishSubscribeChannelTests.java | 139 -
.../src/test/resources/log4j.properties | 3 +
.../hibernate4/HibernateTransactionManager.java | 59 +-
.../orm/hibernate4/LocalSessionFactoryBean.java | 22 +
.../orm/hibernate4/LocalSessionFactoryBuilder.java | 69 +-
.../orm/hibernate4/SessionFactoryUtils.java | 6 +-
.../orm/hibernate4/SpringSessionContext.java | 46 +-
.../hibernate4/SpringSessionSynchronization.java | 37 +-
.../orm/hibernate4/package-info.java | 3 -
.../support/AsyncRequestInterceptor.java | 7 +-
.../support/OpenSessionInViewFilter.java | 5 +-
.../orm/hibernate4/support/package-info.java | 20 -
.../SpringHibernateJpaPersistenceProvider.java | 63 +
.../orm/hibernate4/HibernateTemplateTests.java | 1 +
.../HibernateTransactionManagerTests.java | 111 +-
.../jpa21/PersistenceContextTransactionTests.java | 323 ++
.../BeanValidationPostProcessorTests.java | 161 +
.../hibernatevalidator5/MethodValidationTests.java | 143 +
.../hibernatevalidator5/ValidatorFactoryTests.java | 390 ++
.../hibernate3/LocalTransactionManagerLookup.java | 1 -
.../orm/hibernate3/package-info.java | 3 -
.../orm/hibernate3/support/AbstractLobType.java | 3 +-
.../support/AsyncRequestInterceptor.java | 7 +-
.../orm/hibernate3/support/BlobByteArrayType.java | 1 -
.../hibernate3/support/BlobSerializableType.java | 1 -
.../orm/hibernate3/support/BlobStringType.java | 1 -
.../orm/hibernate3/support/ClobStringType.java | 1 -
.../support/IdTransferringMergeEventListener.java | 2 +-
.../support/OpenSessionInViewFilter.java | 5 +-
.../orm/hibernate3/support/package-info.java | 3 -
.../org/springframework/orm/jdo/package-info.java | 4 -
.../OpenPersistenceManagerInViewFilter.java | 23 +-
.../orm/jdo/support/package-info.java | 2 -
.../orm/jpa/EntityManagerFactoryUtils.java | 2 +-
.../orm/jpa/JpaTransactionManager.java | 22 +-
.../springframework/orm/jpa/JpaVendorAdapter.java | 1 -
.../LocalContainerEntityManagerFactoryBean.java | 5 +
.../orm/jpa/SharedEntityManagerCreator.java | 3 +-
.../org/springframework/orm/jpa/package-info.java | 4 -
.../ClassFileTransformerAdapter.java | 1 -
.../DefaultPersistenceUnitManager.java | 15 +-
.../MutablePersistenceUnitInfo.java | 44 +-
.../persistenceunit/SmartPersistenceUnitInfo.java | 11 +-
.../orm/jpa/persistenceunit/package-info.java | 4 -
.../orm/jpa/support/AsyncRequestInterceptor.java | 9 +-
.../jpa/support/OpenEntityManagerInViewFilter.java | 13 +-
.../OpenEntityManagerInViewInterceptor.java | 10 +-
.../PersistenceAnnotationBeanPostProcessor.java | 87 +-
.../orm/jpa/support/package-info.java | 3 -
.../orm/jpa/vendor/EclipseLinkJpaDialect.java | 86 +-
.../jpa/vendor/EclipseLinkJpaVendorAdapter.java | 20 +-
.../orm/jpa/vendor/HibernateJpaDialect.java | 127 +-
.../orm/jpa/vendor/HibernateJpaVendorAdapter.java | 61 +-
.../orm/jpa/vendor/OpenJpaDialect.java | 37 +-
.../orm/jpa/vendor/OpenJpaVendorAdapter.java | 18 +-
.../SpringHibernateEjbPersistenceProvider.java | 54 +
.../orm/jpa/vendor/package-info.java | 4 -
.../java/org/springframework/orm/package-info.java | 4 -
.../orm/hibernate3/HibernateInterceptorTests.java | 1 +
.../hibernate3/HibernateJtaTransactionTests.java | 2 +-
.../orm/hibernate3/HibernateTemplateTests.java | 1 +
.../HibernateTransactionManagerTests.java | 49 +-
.../hibernate3/LocalSessionFactoryBeanTests.java | 4 +-
.../support/HibernateDaoSupportTests.java | 1 +
.../orm/hibernate3/support/LobTypeTests.java | 2 +-
.../jdo/LocalPersistenceManagerFactoryTests.java | 2 +-
.../support/OpenPersistenceManagerInViewTests.java | 2 +-
...tainerEntityManagerFactoryIntegrationTests.java | 86 +-
.../jpa/AbstractEntityManagerFactoryBeanTests.java | 1 +
...stractEntityManagerFactoryIntegrationTests.java | 1 +
...cationManagedEntityManagerIntegrationTests.java | 11 +-
...tainerManagedEntityManagerIntegrationTests.java | 34 +-
.../orm/jpa/DefaultJpaDialectTests.java | 1 +
.../orm/jpa/EntityManagerFactoryUtilsTests.java | 1 +
.../orm/jpa/JpaTransactionManagerTests.java | 3 +-
.../orm/jpa/SharedEntityManagerCreatorTests.java | 2 +-
.../orm/jpa/domain/ContextualPerson.java | 104 -
.../org/springframework/orm/jpa/domain/Person.java | 17 +-
.../orm/jpa/domain/persistence-context.xml | 8 +-
.../orm/jpa/domain/persistence-multi.xml | 9 +-
.../springframework/orm/jpa/domain/persistence.xml | 7 +-
...seLinkEntityManagerFactoryIntegrationTests.java | 3 +-
...ernateEntityManagerFactoryIntegrationTests.java | 38 +-
...eMultiEntityManagerFactoryIntegrationTests.java | 3 +-
.../orm/jpa/hibernate/hibernate-manager.xml | 35 +-
...penJpaEntityManagerFactoryIntegrationTests.java | 4 +-
...rFactoryWithAspectJWeavingIntegrationTests.java | 8 +-
.../jpa/support/OpenEntityManagerInViewTests.java | 14 +-
.../PersistenceInjectionIntegrationTests.java | 3 +-
.../support/SharedEntityManagerFactoryTests.java | 1 +
...tractDependencyInjectionSpringContextTests.java | 4 +-
.../test/AbstractSingleSpringContextTests.java | 4 +-
.../test/AbstractSpringContextTests.java | 4 +-
...tTransactionalDataSourceSpringContextTests.java | 7 +-
.../AbstractTransactionalSpringContextTests.java | 6 +-
.../springframework/test/ConditionalTestCase.java | 6 +-
.../AbstractAnnotationAwareTransactionalTests.java | 223 +-
.../test/annotation/DirtiesContext.java | 51 -
.../test/annotation/ExpectedException.java | 40 -
.../test/annotation/IfProfileValue.java | 102 -
.../test/annotation/NotTransactional.java | 37 -
.../test/annotation/ProfileValueSource.java | 52 -
.../ProfileValueSourceConfiguration.java | 56 -
.../test/annotation/ProfileValueUtils.java | 213 -
.../springframework/test/annotation/Repeat.java | 43 -
.../springframework/test/annotation/Rollback.java | 47 -
.../test/annotation/SystemProfileValueSource.java | 59 -
.../org/springframework/test/annotation/Timed.java | 57 -
.../springframework/test/jdbc/JdbcTestUtils.java | 8 +-
.../springframework/test/jpa/AbstractJpaTests.java | 16 +-
spring-oxm/oxm.gradle | 8 +-
.../springframework/oxm/castor/package-info.java | 8 +-
.../springframework/oxm/config/package-info.java | 6 +-
.../oxm/jaxb/ClassPathJaxb2TypeScanner.java | 1 -
.../springframework/oxm/jaxb/Jaxb2Marshaller.java | 34 +-
.../org/springframework/oxm/jaxb/package-info.java | 7 +-
.../springframework/oxm/jibx/JibxMarshaller.java | 4 +-
.../org/springframework/oxm/jibx/package-info.java | 8 +-
.../java/org/springframework/oxm/package-info.java | 7 +-
.../oxm/support/AbstractMarshaller.java | 59 +-
.../oxm/xmlbeans/XmlOptionsFactoryBean.java | 9 +-
.../springframework/oxm/xmlbeans/package-info.java | 7 +-
.../springframework/oxm/xstream/package-info.java | 7 +-
.../src/main/resources/META-INF/spring.schemas | 3 +-
.../springframework/oxm/config/spring-oxm-4.1.xsd | 168 +
.../oxm/AbstractMarshallerTests.java | 5 +-
.../oxm/AbstractUnmarshallerTests.java | 3 +-
.../oxm/castor/CastorMarshallerTests.java | 114 +-
.../oxm/castor/CastorUnmarshallerTests.java | 80 +-
.../org/springframework/oxm/jaxb/Airplane.java | 2 +-
.../oxm/jaxb/Jaxb2MarshallerTests.java | 36 +-
.../oxm/jaxb/Jaxb2UnmarshallerTests.java | 6 +-
.../oxm/jibx/JibxUnmarshallerTests.java | 5 +-
.../oxm/xmlbeans/XmlBeansMarshallerTests.java | 4 +-
.../oxm/xmlbeans/XmlBeansUnmarshallerTests.java | 3 +-
.../oxm/xmlbeans/XmlOptionsFactoryBeanTests.java | 3 +-
.../oxm/xstream/XStreamMarshallerTests.java | 3 +-
.../oxm/xstream/XStreamUnmarshallerTests.java | 6 +-
.../http/client/MockAsyncClientHttpRequest.java | 54 +
.../mock/http/client/package-info.java | 19 +-
.../springframework/mock/http/package-info.java | 17 -
.../mock/jndi/SimpleNamingContextBuilder.java | 4 +-
.../springframework/mock/jndi/package-info.java | 4 -
.../mock/web/MockExpressionEvaluator.java | 18 +-
.../springframework/mock/web/MockFilterChain.java | 3 -
.../mock/web/MockHttpServletRequest.java | 80 +-
.../mock/web/MockHttpServletResponse.java | 7 +-
.../mock/web/MockServletContext.java | 67 +-
.../org/springframework/mock/web/package-info.java | 6 +-
.../mock/web/portlet/package-info.java | 6 +-
.../org/springframework/test/AssertThrows.java | 117 +-
.../test/annotation/DirtiesContext.java | 14 +-
.../test/annotation/ProfileValueUtils.java | 1 +
.../test/annotation/package-info.java | 2 -
.../test/context/ActiveProfiles.java | 16 +-
.../test/context/ActiveProfilesResolver.java | 2 +-
.../test/context/BootstrapContext.java | 42 +
.../test/context/BootstrapUtils.java | 93 +
.../test/context/BootstrapWith.java | 50 +
.../context/CacheAwareContextLoaderDelegate.java | 122 +-
.../springframework/test/context/ContextCache.java | 15 +-
.../test/context/ContextConfiguration.java | 123 +-
.../context/ContextConfigurationAttributes.java | 26 +-
.../test/context/ContextHierarchy.java | 3 +-
.../test/context/ContextLoader.java | 11 +-
.../test/context/ContextLoaderUtils.java | 807 ---
.../test/context/DefaultBootstrapContext.java | 68 +
.../DefaultCacheAwareContextLoaderDelegate.java | 119 +
.../test/context/DefaultTestContext.java | 54 +-
.../test/context/MergedContextConfiguration.java | 333 +-
.../test/context/MetaAnnotationUtils.java | 384 --
.../test/context/TestContextBootstrapper.java | 112 +
.../test/context/TestContextManager.java | 169 +-
.../test/context/TestExecutionListener.java | 47 +-
.../test/context/TestExecutionListeners.java | 88 +-
.../test/context/TestPropertySource.java | 253 +
.../test/context/jdbc/MergedSqlConfig.java | 203 +
.../org/springframework/test/context/jdbc/Sql.java | 146 +
.../test/context/jdbc/SqlConfig.java | 301 ++
.../test/context/jdbc/SqlGroup.java | 50 +
.../jdbc/SqlScriptsTestExecutionListener.java | 317 ++
.../test/context/jdbc/package-info.java | 5 +
.../junit4/AbstractJUnit4SpringContextTests.java | 18 +-
...tractTransactionalJUnit4SpringContextTests.java | 24 +-
.../context/junit4/SpringJUnit4ClassRunner.java | 297 +-
.../test/context/junit4/package-info.java | 5 +-
.../statements/RunAfterTestClassCallbacks.java | 44 +-
.../statements/RunAfterTestMethodCallbacks.java | 52 +-
.../statements/RunBeforeTestClassCallbacks.java | 24 +-
.../statements/RunBeforeTestMethodCallbacks.java | 27 +-
.../junit4/statements/SpringFailOnTimeout.java | 45 +-
.../context/junit4/statements/SpringRepeat.java | 24 +-
.../context/junit4/statements/package-info.java | 5 +-
.../springframework/test/context/package-info.java | 6 +-
.../context/support/AbstractContextLoader.java | 187 +-
.../AbstractDelegatingSmartContextLoader.java | 77 +-
.../support/AbstractTestContextBootstrapper.java | 479 ++
.../support/AbstractTestExecutionListener.java | 17 +-
.../test/context/support/ActiveProfilesUtils.java | 153 +
.../support/AnnotationConfigContextLoader.java | 3 +
.../AnnotationConfigContextLoaderUtils.java | 6 +-
.../ApplicationContextInitializerUtils.java | 95 +
.../test/context/support/ContextLoaderUtils.java | 295 ++
.../support/DefaultActiveProfilesResolver.java | 112 +
.../support/DefaultTestContextBootstrapper.java | 40 +
.../support/DelegatingSmartContextLoader.java | 38 +-
.../DependencyInjectionTestExecutionListener.java | 12 +-
.../DirtiesContextTestExecutionListener.java | 37 +-
.../support/GenericGroovyXmlContextLoader.java | 89 +
.../context/support/GenericXmlContextLoader.java | 14 +-
.../context/support/MergedTestPropertySources.java | 78 +
.../support/TestPropertySourceAttributes.java | 210 +
.../context/support/TestPropertySourceUtils.java | 287 +
.../test/context/support/package-info.java | 4 +-
.../testng/AbstractTestNGSpringContextTests.java | 27 +-
...tractTransactionalTestNGSpringContextTests.java | 22 +-
.../test/context/testng/package-info.java | 6 +-
.../test/context/transaction/AfterTransaction.java | 14 +-
.../context/transaction/BeforeTransaction.java | 14 +-
.../transaction/TestContextTransactionUtils.java | 235 +
.../test/context/transaction/TestTransaction.java | 148 +
.../transaction/TransactionConfiguration.java | 27 +-
.../context/transaction/TransactionContext.java | 141 +
.../transaction/TransactionContextHolder.java | 49 +
.../TransactionalTestExecutionListener.java | 294 +-
.../test/context/transaction/package-info.java | 5 +-
.../context/util/TestContextResourceUtils.java | 107 +
.../test/context/util/package-info.java | 4 +
.../web/AbstractGenericWebContextLoader.java | 1 +
.../web/AnnotationConfigWebContextLoader.java | 3 +
.../web/GenericGroovyXmlWebContextLoader.java | 90 +
.../context/web/GenericXmlWebContextLoader.java | 14 +-
.../context/web/ServletTestExecutionListener.java | 9 +
.../test/context/web/WebAppConfiguration.java | 5 +-
.../web/WebDelegatingSmartContextLoader.java | 37 +-
.../context/web/WebMergedContextConfiguration.java | 152 +-
.../context/web/WebTestContextBootstrapper.java | 74 +
.../test/context/web/package-info.java | 2 -
.../springframework/test/jdbc/JdbcTestUtils.java | 13 +-
.../springframework/test/jdbc/package-info.java | 2 -
.../org/springframework/test/package-info.java | 7 +-
.../test/util/JsonExpectationsHelper.java | 57 +
.../test/util/JsonPathExpectationsHelper.java | 68 +-
.../test/util/MatcherAssertionErrors.java | 8 +-
.../test/util/MetaAnnotationUtils.java | 353 ++
.../test/util/ReflectionTestUtils.java | 1 +
.../test/util/XpathExpectationsHelper.java | 32 +-
.../springframework/test/util/package-info.java | 3 +-
.../test/web/ModelAndViewAssert.java | 4 +-
.../client/MockMvcClientHttpRequestFactory.java | 8 +-
.../test/web/client/MockRestServiceServer.java | 29 +-
.../test/web/client/RequestMatcher.java | 4 +-
.../client/RequestMatcherClientHttpRequest.java | 15 +-
.../test/web/client/ResponseActions.java | 3 +-
.../test/web/client/ResponseCreator.java | 3 +-
.../web/client/match/ContentRequestMatchers.java | 11 +-
.../web/client/match/JsonPathRequestMatchers.java | 1 +
.../web/client/match/MockRestRequestMatchers.java | 8 +-
.../web/client/match/XpathRequestMatchers.java | 4 +-
.../test/web/client/match/package-info.java | 16 -
.../test/web/client/package-info.java | 16 -
.../test/web/client/response/package-info.java | 16 -
.../org/springframework/test/web/package-info.java | 2 -
.../springframework/test/web/servlet/MockMvc.java | 5 +-
.../test/web/servlet/MockMvcBuilderSupport.java | 1 -
.../test/web/servlet/RequestBuilder.java | 15 +
.../test/web/servlet/SmartRequestBuilder.java | 40 +
.../test/web/servlet/TestDispatcherServlet.java | 7 +-
.../test/web/servlet/package-info.java | 16 -
.../request/ConfigurableSmartRequestBuilder.java | 36 +
.../request/MockHttpServletRequestBuilder.java | 47 +-
.../servlet/request/MockMvcRequestBuilders.java | 36 +-
.../test/web/servlet/request/package-info.java | 16 -
.../web/servlet/result/ContentResultMatchers.java | 39 +-
.../web/servlet/result/CookieResultMatchers.java | 8 +-
.../result/FlashAttributeResultMatchers.java | 7 +-
.../web/servlet/result/HandlerResultMatchers.java | 8 +-
.../web/servlet/result/HeaderResultMatchers.java | 1 +
.../web/servlet/result/JsonPathResultMatchers.java | 46 +-
.../web/servlet/result/MockMvcResultHandlers.java | 13 +-
.../web/servlet/result/MockMvcResultMatchers.java | 74 +-
.../web/servlet/result/ModelResultMatchers.java | 58 +-
.../web/servlet/result/PrintingResultHandler.java | 13 +-
.../web/servlet/result/RequestResultMatchers.java | 8 +-
.../web/servlet/result/StatusResultMatchers.java | 45 +-
.../web/servlet/result/ViewResultMatchers.java | 7 +-
.../web/servlet/result/XpathResultMatchers.java | 4 +-
.../test/web/servlet/result/package-info.java | 16 -
.../web/servlet/setup/AbstractMockMvcBuilder.java | 122 +-
.../servlet/setup/ConfigurableMockMvcBuilder.java | 127 +
.../web/servlet/setup/DefaultMockMvcBuilder.java | 36 +-
.../test/web/servlet/setup/MockMvcConfigurer.java | 54 +
.../servlet/setup/MockMvcConfigurerAdapter.java | 39 +
.../servlet/setup/PatternMappingFilterProxy.java | 2 +-
.../servlet/setup/StandaloneMockMvcBuilder.java | 16 +-
.../servlet/setup/StubWebApplicationContext.java | 60 +-
.../test/web/servlet/setup/package-info.java | 16 -
.../src/main/resources/META-INF/spring.factories | 8 +
.../mock/web/MockFilterChainTests.java | 3 +-
.../mock/web/MockHttpServletRequestTests.java | 136 +-
.../mock/web/MockHttpServletResponseTests.java | 20 +-
.../mock/web/MockHttpSessionTests.java | 4 +-
.../web/MockMultipartHttpServletRequestTests.java | 1 +
.../mock/web/MockPageContextTests.java | 4 +-
.../mock/web/MockServletContextTests.java | 57 +-
.../context/AbstractContextLoaderUtilsTests.java | 176 -
.../test/context/BootstrapTestUtils.java | 41 +
.../context/ClassLevelDirtiesContextTests.java | 6 +-
.../test/context/ContextCacheTests.java | 53 +-
.../ContextHierarchyDirtiesContextTests.java | 1 +
.../ContextLoaderUtilsActiveProfilesTests.java | 343 --
...extLoaderUtilsConfigurationAttributesTests.java | 168 -
.../ContextLoaderUtilsContextHierarchyTests.java | 603 ---
.../ContextLoaderUtilsContextInitializerTests.java | 123 -
.../ContextLoaderUtilsMergedConfigTests.java | 143 -
.../context/MergedContextConfigurationTests.java | 244 +-
.../test/context/MetaAnnotationUtilsTests.java | 549 --
.../OverriddenMetaAnnotationAttributesTests.java | 155 -
.../context/SpringRunnerContextCacheTests.java | 45 +-
.../test/context/TestContextManagerTests.java | 6 +-
.../test/context/TestContextTestUtils.java | 39 +
.../test/context/TestExecutionListenersTests.java | 225 +-
...ExtendingPropertiesAndInheritedLoaderTests.java | 8 +-
...tionWithPropertiesExtendingPropertiesTests.java | 8 +-
...rridePropertiesFileTestPropertySourceTests.java | 65 +
...ropertiesFileTestPropertySourceTests.properties | 1 +
...ertiesFileDetectionTestPropertySourceTests.java | 65 +
...FileDetectionTestPropertySourceTests.properties | 1 +
...licitPropertiesFileTestPropertySourceTests.java | 62 +
...ertiesFileDetectionTestPropertySourceTests.java | 42 +
...FileDetectionTestPropertySourceTests.properties | 1 +
...ePathPropertiesFileTestPropertySourceTests.java | 34 +
.../InlinedPropertiesTestPropertySourceTests.java | 88 +
...ByInlinedPropertiesTestPropertySourceTests.java | 49 +
...rgedPropertiesFilesTestPropertySourceTests.java | 41 +
...rridePropertiesFileTestPropertySourceTests.java | 75 +
...ropertiesFileTestPropertySourceTests.properties | 1 +
.../test/context/env/explicit.properties | 1 +
.../test/context/env/extended.properties | 1 +
...ePathPropertiesFileTestPropertySourceTests.java | 35 +
.../expression/ExpressionUsageTests-context.xml | 2 +-
.../context/expression/ExpressionUsageTests.java | 5 +-
.../AbsolutePathGroovySpringContextTests.java | 35 +
...ultScriptDetectionGroovySpringContextTests.java | 64 +
...DetectionGroovySpringContextTestsContext.groovy | 40 +
...lSupersedesGroovySpringContextTests-context.xml | 9 +
...ctionXmlSupersedesGroovySpringContextTests.java | 48 +
...upersedesGroovySpringContextTestsContext.groovy | 30 +
.../context/groovy/GroovyControlGroupTests.java | 64 +
.../context/groovy/GroovySpringContextTests.java | 123 +
.../MixedXmlAndGroovySpringContextTests.java | 67 +
.../RelativePathGroovySpringContextTests.java | 35 +
.../test/context/groovy/context.groovy | 40 +
.../test/context/groovy/contextA.groovy | 30 +
.../test/context/groovy/contextB.xml | 19 +
.../meta/MetaContextHierarchyConfig.java | 18 +-
.../meta/MetaHierarchyLevelOneTests.java | 3 +-
.../meta/MetaHierarchyLevelTwoTests.java | 3 +-
.../meta/MetaMetaContextHierarchyConfig.java | 2 +-
...lassHierarchyWithMergedConfigLevelOneTests.java | 5 +-
...lassHierarchyWithMergedConfigLevelTwoTests.java | 5 +-
...HierarchyWithOverriddenConfigLevelTwoTests.java | 5 +-
.../DirtiesContextWithContextHierarchyTests.java | 1 +
...tClassWithSingleLevelContextHierarchyTests.java | 5 +-
...elContextHierarchyAndMixedConfigTypesTests.java | 5 +-
...TestClassWithTwoLevelContextHierarchyTests.java | 5 +-
...ithBareContextConfigurationInSubclassTests.java | 5 +-
...hBareContextConfigurationInSuperclassTests.java | 5 +-
...velOneWithSingleLevelContextHierarchyTests.java | 5 +-
...ithBareContextConfigurationInSubclassTests.java | 5 +-
...hBareContextConfigurationInSuperclassTests.java | 5 +-
...elContextHierarchyAndMixedConfigTypesTests.java | 5 +-
...velTwoWithSingleLevelContextHierarchyTests.java | 5 +-
.../web/ControllerIntegrationTests.java | 3 +-
.../web/DispatcherWacRootWacEarTests.java | 3 +-
.../test/context/hierarchies/web/EarTests.java | 3 +-
.../context/hierarchies/web/RootWacEarTests.java | 3 +-
.../jdbc/CustomScriptSyntaxSqlScriptsTests.java | 50 +
.../jdbc/DataSourceOnlySqlScriptsTests.java | 93 +
.../DefaultScriptDetectionSqlScriptsTests.java | 53 +
...tScriptDetectionSqlScriptsTests.methodLevel.sql | 10 +
.../jdbc/DefaultScriptDetectionSqlScriptsTests.sql | 9 +
.../test/context/jdbc/EmptyDatabaseConfig.java | 48 +
.../GlobalCustomScriptSyntaxSqlScriptsTests.java | 50 +
.../jdbc/InferredDataSourceSqlScriptsTests.java | 116 +
...rredDataSourceTransactionalSqlScriptsTests.java | 119 +
.../test/context/jdbc/MergedSqlConfigTests.java | 177 +
.../jdbc/MetaAnnotationSqlScriptsTests.java | 72 +
...urcesAndTransactionManagersSqlScriptsTests.java | 116 +
...actionManagersTransactionalSqlScriptsTests.java | 117 +
.../jdbc/NonTransactionalSqlScriptsTests.java | 75 +
.../jdbc/PopulatedSchemaDatabaseConfig.java | 50 +
...opulatedSchemaTransactionalSqlScriptsTests.java | 56 +
.../RepeatableSqlAnnotationSqlScriptsTests.java | 65 +
.../RequiresNewTransactionSqlScriptsTests.java | 61 +
.../jdbc/SqlScriptsTestExecutionListenerTests.java | 148 +
...ransactionalAfterTestMethodSqlScriptsTests.java | 85 +
.../context/jdbc/TransactionalSqlScriptsTests.java | 79 +
.../test/context/jdbc/data-add-catbert.sql | 1 +
.../test/context/jdbc/data-add-dogbert.sql | 1 +
.../data-add-users-with-custom-script-syntax.sql | 22 +
.../org/springframework/test/context/jdbc/data.sql | 1 +
.../test/context/jdbc/drop-schema.sql | 1 +
.../springframework/test/context/jdbc/schema.sql | 4 +
...lutePathSpringJUnit4ClassRunnerAppCtxTests.java | 1 +
.../AbstractTransactionalSpringRunnerTests.java | 25 +-
.../BeforeAndAfterTransactionAnnotationTests.java | 50 +-
.../ClassLevelDisabledSpringRunnerTests.java | 5 +-
.../ClassLevelTransactionalSpringRunnerTests.java | 46 +-
...ansactionalJUnit4SpringContextTests-context.xml | 3 +-
...creteTransactionalJUnit4SpringContextTests.java | 15 +-
...DefaultContextLoaderClassSpringRunnerTests.java | 37 +-
...ollbackFalseTransactionalSpringRunnerTests.java | 34 +-
...RollbackTrueTransactionalSpringRunnerTests.java | 32 +-
.../junit4/EnabledAndIgnoredSpringRunnerTests.java | 6 +-
.../junit4/ExpectedExceptionSpringRunnerTests.java | 5 +-
.../FailingBeforeAndAfterMethodsJUnitTests.java | 5 +-
.../FailingBeforeAndAfterMethodsTestNGTests.java | 13 +-
...rdCodedProfileValueSourceSpringRunnerTests.java | 1 +
.../MethodLevelTransactionalSpringRunnerTests.java | 48 +-
...esourcesSpringJUnit4ClassRunnerAppCtxTests.java | 5 +-
.../ParameterizedDependencyInjectionTests.java | 10 +-
...iesBasedSpringJUnit4ClassRunnerAppCtxTests.java | 7 +-
.../context/junit4/RepeatedSpringRunnerTests.java | 5 +-
...ollbackFalseTransactionalSpringRunnerTests.java | 34 +-
...RollbackTrueTransactionalSpringRunnerTests.java | 32 +-
.../junit4/SpringJUnit47ClassRunnerRuleTests.java | 5 +-
.../junit4/SpringJUnit4ClassRunnerAppCtxTests.java | 13 +-
.../junit4/SpringJUnit4ClassRunnerTests.java | 1 +
.../test/context/junit4/SpringJUnit4TestSuite.java | 1 +
.../junit4/StandardJUnit4FeaturesTests.java | 8 +-
.../context/junit4/TimedSpringRunnerTests.java | 1 +
.../TimedTransactionalSpringRunnerTests.java | 5 +-
.../test/context/junit4/aci/AciTestSuite.java | 1 +
.../MergedInitializersAnnotationConfigTests.java | 5 +-
.../MultipleInitializersAnnotationConfigTests.java | 5 +-
.../OrderedInitializersAnnotationConfigTests.java | 7 +-
...verriddenInitializersAnnotationConfigTests.java | 5 +-
.../PropertySourcesInitializerTests.java | 90 +
.../SingleInitializerAnnotationConfigTests.java | 5 +-
.../xml/MultipleInitializersXmlConfigTests.java | 5 +-
...erridingDefaultConfigClassesInheritedTests.java | 8 +-
...rridingExplicitConfigClassesInheritedTests.java | 6 +-
.../annotation/DefaultConfigClassesBaseTests.java | 8 +-
.../DefaultConfigClassesInheritedTests.java | 8 +-
...erridingDefaultConfigClassesInheritedTests.java | 8 +-
...rridingExplicitConfigClassesInheritedTests.java | 6 +-
...DefaultLoaderDefaultConfigClassesBaseTests.java | 8 +-
...ltLoaderDefaultConfigClassesInheritedTests.java | 8 +-
...efaultLoaderExplicitConfigClassesBaseTests.java | 8 +-
...tLoaderExplicitConfigClassesInheritedTests.java | 8 +-
.../annotation/ExplicitConfigClassesBaseTests.java | 8 +-
.../ExplicitConfigClassesInheritedTests.java | 8 +-
.../junit4/annotation/PojoAndStringConfig.java | 4 +-
...rofileResolverWithCustomDefaultsMetaConfig.java | 2 +-
...eResolverWithCustomDefaultsMetaConfigTests.java | 3 +-
...CustomDefaultsMetaConfigWithOverridesTests.java | 3 +-
.../meta/ConfigClassesAndProfilesMetaConfig.java | 2 +-
.../ConfigClassesAndProfilesMetaConfigTests.java | 3 +-
...sesAndProfilesWithCustomDefaultsMetaConfig.java | 2 +-
...dProfilesWithCustomDefaultsMetaConfigTests.java | 3 +-
...CustomDefaultsMetaConfigWithOverridesTests.java | 3 +-
.../junit4/annotation/meta/MetaMetaConfig.java | 2 +-
.../meta/MetaMetaConfigDefaultsTests.java | 3 +-
.../context/junit4/hybrid/HybridContextLoader.java | 2 +-
.../junit4/hybrid/HybridContextLoaderTests.java | 3 +-
.../orm/HibernateSessionFlushingTests-context.xml | 6 +-
.../junit4/orm/HibernateSessionFlushingTests.java | 8 +-
.../hibernate/HibernatePersonRepository.java | 1 +
.../DefaultProfileAnnotationConfigTests.java | 11 +-
.../profile/annotation/DefaultProfileConfig.java | 2 +-
.../DevProfileAnnotationConfigTests.java | 6 +-
.../profile/annotation/DevProfileConfig.java | 2 +-
.../DefaultProfileAnnotationConfigTests.java | 11 +-
.../importresource/DefaultProfileConfig.java | 2 +-
.../ClassNameActiveProfilesResolverTests.java | 1 +
.../profile/xml/DefaultProfileXmlConfigTests.java | 11 +-
.../profile/xml/DevProfileXmlConfigTests.java | 6 +-
...anOverridingDefaultLocationsInheritedTests.java | 6 +-
...nOverridingExplicitLocationsInheritedTests.java | 6 +-
.../junit4/spr3896/DefaultLocationsBaseTests.java | 8 +-
.../spr3896/DefaultLocationsInheritedTests.java | 8 +-
.../junit4/spr3896/ExplicitLocationsBaseTests.java | 8 +-
.../spr3896/ExplicitLocationsInheritedTests.java | 8 +-
.../junit4/spr4868/Jsr250LifecycleTests.java | 5 +-
.../junit4/spr6128/AutowiredQualifierTests.java | 7 +-
.../test/context/junit4/spr8849/TestClass1.java | 1 +
.../test/context/junit4/spr8849/TestClass2.java | 1 +
...ractTransactionalAnnotatedConfigClassTests.java | 11 +-
...edConfigClassesWithoutAtConfigurationTests.java | 5 +-
.../junit4/spr9051/AtBeanLiteModeScopeTests.java | 9 +-
...notatedConfigClassWithAtConfigurationTests.java | 7 +-
...edConfigClassesWithoutAtConfigurationTests.java | 8 +-
...MgrViaTransactionManagementConfigurerTests.java | 5 +-
.../spr9645/LookUpNonexistentTxMgrTests.java | 5 +-
.../LookUpTxMgrByTypeAndDefaultNameTests.java | 5 +-
.../spr9645/LookUpTxMgrByTypeAndNameTests.java | 5 +-
...UpTxMgrByTypeAndQualifierAtClassLevelTests.java | 5 +-
...pTxMgrByTypeAndQualifierAtMethodLevelTests.java | 5 +-
.../junit4/spr9645/LookUpTxMgrByTypeTests.java | 5 +-
.../spr9799/Spr9799AnnotationConfigTests.java | 1 +
.../junit4/spr9799/Spr9799XmlConfigTests.java | 1 +
...gurationUtilsTests$BareAnnotations-context.xml} | 0
.../AbstractContextConfigurationUtilsTests.java | 212 +
.../context/support/ActiveProfilesUtilsTests.java | 384 ++
.../AnnotationConfigContextLoaderTests.java | 2 +-
.../AnnotationConfigContextLoaderUtilsTests.java | 89 +
.../BootstrapTestUtilsContextInitializerTests.java | 128 +
.../BootstrapTestUtilsMergedConfigTests.java | 203 +
...extLoaderUtilsConfigurationAttributesTests.java | 171 +
.../ContextLoaderUtilsContextHierarchyTests.java | 607 +++
.../CustomizedGenericXmlContextLoaderTests.java | 5 +-
.../support/DelegatingSmartContextLoaderTests.java | 47 +-
.../DirtiesContextTestExecutionListenerTests.java | 47 +-
.../GenericPropertiesContextLoaderTests.java | 3 +-
...ericXmlContextLoaderResourceLocationsTests.java | 9 +-
.../support/GenericXmlContextLoaderTests.java | 3 +-
.../support/TestPropertySourceUtilsTests.java | 248 +
...onfigTransactionalTestNGSpringContextTests.java | 23 +-
...creteTransactionalTestNGSpringContextTests.java | 25 +-
...ntextTransactionalTestNGSpringContextTests.java | 9 +-
...TimedTransactionalTestNGSpringContextTests.java | 5 +-
.../ejb/AbstractEjbTxDaoTestNGTests.java | 9 +-
.../ejb/CommitForRequiredEjbTxDaoTestNGTests.java | 5 +-
.../CommitForRequiresNewEjbTxDaoTestNGTests.java | 5 +-
.../RollbackForRequiredEjbTxDaoTestNGTests.java | 5 +-
.../RollbackForRequiresNewEjbTxDaoTestNGTests.java | 5 +-
.../ProgrammaticTxMgmtTestNGTests.java | 278 +
...estExecutionListenerTestNGIntegrationTests.java | 3 +-
.../testng/web/TestNGSpringContextWebTests.java | 6 +-
.../TransactionalTestExecutionListenerTests.java | 55 +-
.../transaction/ejb/AbstractEjbTxDaoTests.java | 3 +-
.../ejb/CommitForRequiredEjbTxDaoTests.java | 2 +-
.../ejb/CommitForRequiresNewEjbTxDaoTests.java | 2 +-
.../ejb/RollbackForRequiredEjbTxDaoTests.java | 3 +-
.../ejb/RollbackForRequiresNewEjbTxDaoTests.java | 2 +-
.../ejb/dao/AbstractEjbTxTestEntityDao.java | 2 +-
.../ejb/dao/RequiredEjbTxTestEntityDao.java | 2 +-
.../ejb/dao/RequiresNewEjbTxTestEntityDao.java | 2 +-
.../context/transaction/ejb/dao/TestEntityDao.java | 2 +-
.../context/transaction/ejb/model/TestEntity.java | 2 +-
.../programmatic/ProgrammaticTxMgmtTests.java | 273 +
.../test/context/web/AbstractBasicWacTests.java | 6 +-
.../web/AnnotationConfigWebContextLoaderTests.java | 3 +-
.../context/web/BasicAnnotationConfigWacTests.java | 1 +
.../test/context/web/BasicGroovyWacTests.java | 39 +
.../context/web/BasicGroovyWacTestsContext.groovy | 3 +
.../test/context/web/BasicXmlWacTests.java | 5 +-
.../web/GenericXmlWebContextLoaderTests.java | 3 +-
.../context/web/JUnit4SpringContextWebTests.java | 4 +-
.../context/web/MetaAnnotationConfigWacTests.java | 1 +
.../web/RequestAndSessionScopedBeansWacTests.java | 7 +-
.../test/context/web/ServletContextAwareBean.java | 2 +-
.../web/ServletContextAwareBeanWacTests.java | 1 +
...TestExecutionListenerJUnitIntegrationTests.java | 1 +
.../web/ServletTestExecutionListenerTests.java | 31 +-
.../context/web/WebContextLoaderTestSuite.java | 1 +
.../test/context/web/WebTestConfiguration.java | 2 +-
.../test/jdbc/JdbcTestUtilsIntegrationTests.java | 1 +
.../test/jdbc/JdbcTestUtilsTests.java | 1 +
.../test/util/JsonPathExpectationsHelperTests.java | 7 +-
.../test/util/MetaAnnotationUtilsTests.java | 549 ++
.../OverriddenMetaAnnotationAttributesTests.java | 156 +
.../test/util/ReflectionTestUtilsTests.java | 160 +-
.../client/match/ContentRequestMatchersTests.java | 7 +-
.../client/match/JsonPathRequestMatchersTests.java | 2 +-
.../web/client/match/RequestMatchersTests.java | 6 +-
.../client/match/XpathRequestMatchersTests.java | 2 +-
.../web/client/response/ResponseCreatorsTests.java | 10 +-
.../MockMvcClientHttpRequestFactoryTests.java | 7 +-
.../test/web/client/samples/SampleAsyncTests.java | 138 +
.../test/web/client/samples/SampleTests.java | 15 +-
.../matchers/ContentRequestMatcherTests.java | 11 +-
.../matchers/HeaderRequestMatcherTests.java | 10 +-
.../matchers/JsonPathRequestMatcherTests.java | 16 +-
.../matchers/XmlContentRequestMatcherTests.java | 11 +-
.../samples/matchers/XpathRequestMatcherTests.java | 15 +-
.../test/web/servlet/DefaultMvcResultTests.java | 3 +-
.../test/web/servlet/StubMvcResult.java | 1 -
.../MockHttpServletRequestBuilderTests.java | 81 +-
...ockMultipartHttpServletRequestBuilderTests.java | 2 +-
.../servlet/result/ContentResultMatchersTests.java | 14 +-
.../result/FlashAttributeResultMatchersTests.java | 2 +-
.../result/JsonPathResultMatchersTests.java | 2 +-
.../servlet/result/MockMvcResultMatchersTests.java | 1 +
.../servlet/result/ModelResultMatchersTests.java | 31 +-
.../servlet/result/PrintingResultHandlerTests.java | 8 +-
.../servlet/result/StatusResultMatchersTests.java | 5 +-
.../servlet/result/XpathResultMatchersTests.java | 2 +-
.../servlet/samples/context/JavaConfigTests.java | 70 +-
.../servlet/samples/context/PersonController.java | 2 +-
.../web/servlet/samples/context/PersonDao.java | 2 +-
.../samples/context/WebAppResourceTests.java | 12 +-
.../servlet/samples/context/XmlConfigTests.java | 6 +-
.../web/servlet/samples/spr/EncodedUriTests.java | 23 +-
.../spr/MockMvcBuilderMethodChainTests.java | 5 +-
.../web/servlet/samples/standalone/AsyncTests.java | 93 +-
.../samples/standalone/ExceptionHandlerTests.java | 10 +-
.../servlet/samples/standalone/FilterTests.java | 22 +-
.../standalone/FrameworkExtensionTests.java | 148 +
.../servlet/samples/standalone/RedirectTests.java | 13 +-
.../samples/standalone/RequestBuilderTests.java | 111 -
.../samples/standalone/RequestParameterTests.java | 11 +-
.../samples/standalone/ResponseBodyTests.java | 18 +-
.../samples/standalone/ViewResolutionTests.java | 17 +-
.../resultmatchers/ContentAssertionTests.java | 13 +-
.../resultmatchers/CookieAssertionTests.java | 13 +-
.../FlashAttributeAssertionTests.java | 19 +-
.../resultmatchers/HandlerAssertionTests.java | 14 +-
.../resultmatchers/HeaderAssertionTests.java | 1 +
.../resultmatchers/JsonPathAssertionTests.java | 17 +-
.../resultmatchers/ModelAssertionTests.java | 19 +-
.../RequestAttributeAssertionTests.java | 13 +-
.../SessionAttributeAssertionTests.java | 14 +-
.../resultmatchers/StatusAssertionTests.java | 12 +-
.../resultmatchers/UrlAssertionTests.java | 12 +-
.../resultmatchers/ViewNameAssertionTests.java | 13 +-
.../resultmatchers/XmlContentAssertionTests.java | 22 +-
.../resultmatchers/XpathAssertionTests.java | 10 +-
.../ConditionalDelegatingFilterProxyTests.java | 11 +-
.../servlet/setup/DefaultMockMvcBuilderTests.java | 129 +-
.../setup/StandaloneMockMvcBuilderTests.java | 88 +-
.../src/test/resources/META-INF/spring.factories | 2 +
spring-test/src/test/resources/log4j.properties | 3 +-
...ateDefaultXmlAndConfigClassTestCase-context.xml | 3 +-
.../test/context/web/BasicXmlWacTests-context.xml | 4 +-
.../dao/annotation/package-info.java | 4 -
.../java/org/springframework/dao/package-info.java | 4 -
.../support/PersistenceExceptionTranslator.java | 12 +-
.../springframework/dao/support/package-info.java | 4 -
.../cci/connection/SingleConnectionFactory.java | 1 -
.../TransactionAwareConnectionFactoryProxy.java | 1 -
.../jca/cci/connection/package-info.java | 4 -
.../jca/cci/core/ConnectionCallback.java | 1 -
.../jca/cci/core/InteractionCallback.java | 1 -
.../jca/cci/core/RecordExtractor.java | 1 -
.../springframework/jca/cci/core/package-info.java | 4 -
.../jca/cci/core/support/CommAreaRecord.java | 1 -
.../jca/cci/core/support/package-info.java | 3 -
.../jca/cci/object/MappingCommAreaOperation.java | 1 -
.../jca/cci/object/MappingRecordOperation.java | 1 -
.../jca/cci/object/package-info.java | 3 -
.../org/springframework/jca/cci/package-info.java | 3 -
.../springframework/jca/context/package-info.java | 4 -
.../springframework/jca/endpoint/package-info.java | 4 -
.../jca/support/SimpleBootstrapContext.java | 1 -
.../springframework/jca/support/package-info.java | 4 -
.../jca/work/glassfish/package-info.java | 4 -
.../jca/work/jboss/package-info.java | 4 -
.../org/springframework/jca/work/package-info.java | 4 -
.../transaction/SavepointManager.java | 22 +-
.../transaction/TransactionDefinition.java | 10 +-
...AbstractTransactionManagementConfiguration.java | 14 +-
.../annotation/JtaTransactionAnnotationParser.java | 2 +-
.../transaction/annotation/Propagation.java | 20 +-
.../ProxyTransactionManagementConfiguration.java | 8 +-
.../SpringTransactionAnnotationParser.java | 2 +-
.../TransactionManagementConfigurer.java | 37 +-
.../transaction/annotation/package-info.java | 6 +-
.../JtaTransactionManagerBeanDefinitionParser.java | 37 +-
.../config/JtaTransactionManagerFactoryBean.java | 98 +
.../transaction/config/package-info.java | 4 -
...AbstractFallbackTransactionAttributeSource.java | 6 +-
.../interceptor/TransactionAspectSupport.java | 83 +-
.../TransactionAttributeSourcePointcut.java | 5 +-
.../interceptor/TransactionInterceptor.java | 19 +-
.../interceptor/TransactionProxyFactoryBean.java | 2 +-
.../interceptor/TransactionalProxy.java | 33 +
.../transaction/interceptor/package-info.java | 4 -
.../jta/WebSphereUowTransactionManager.java | 4 +-
.../transaction/jta/package-info.java | 4 -
.../springframework/transaction/package-info.java | 4 -
.../AbstractPlatformTransactionManager.java | 4 +-
.../support/AbstractTransactionStatus.java | 12 +-
.../transaction/support/package-info.java | 4 -
.../src/main/resources/META-INF/spring.schemas | 3 +-
.../transaction/config/spring-tx-4.1.xsd | 247 +
...ersistenceExceptionTranslationAdvisorTests.java | 2 +-
.../dao/support/DataAccessUtilsTests.java | 46 +-
.../jca/cci/CciLocalTransactionTests.java | 7 +-
.../springframework/jca/cci/CciTemplateTests.java | 2 +-
.../springframework/jca/cci/EisOperationTests.java | 1 +
.../MockCallbackPreferringTransactionManager.java | 4 +-
.../transaction/TxNamespaceHandlerTests.java | 4 +-
...AnnotationTransactionNamespaceHandlerTests.java | 1 -
.../EnableTransactionManagementTests.java | 3 +-
.../AbstractTransactionAspectTests.java | 62 +-
.../interceptor/BeanFactoryTransactionTests.java | 29 +-
.../interceptor/MapTransactionAttributeSource.java | 6 +-
.../transaction/interceptor/RollbackRuleTests.java | 10 +-
.../RuleBasedTransactionAttributeTests.java | 5 +-
.../TransactionAttributeEditorTests.java | 5 +-
.../TransactionAttributeSourceAdvisorTests.java | 4 +-
.../TransactionAttributeSourceTests.java | 5 +-
.../interceptor/TransactionInterceptorTests.java | 198 +-
.../transaction/jta/MockUOWManager.java | 7 +-
.../jta/WebSphereUowTransactionManagerTests.java | 81 +-
.../java/org/springframework/http/HttpEntity.java | 9 +-
.../java/org/springframework/http/HttpHeaders.java | 325 +-
.../org/springframework/http/HttpInputMessage.java | 7 +-
.../java/org/springframework/http/HttpMessage.java | 8 +-
.../java/org/springframework/http/HttpMethod.java | 4 +-
.../springframework/http/HttpOutputMessage.java | 7 +-
.../java/org/springframework/http/HttpStatus.java | 117 +-
.../java/org/springframework/http/MediaType.java | 8 +-
.../org/springframework/http/RequestEntity.java | 404 ++
.../org/springframework/http/ResponseEntity.java | 299 +-
.../http/StreamingHttpOutputMessage.java | 18 +-
.../AbstractClientHttpRequestFactoryWrapper.java | 15 +-
.../client/BufferingClientHttpRequestFactory.java | 24 +-
.../client/BufferingClientHttpRequestWrapper.java | 4 +-
.../client/BufferingClientHttpResponseWrapper.java | 6 +-
.../HttpComponentsAsyncClientHttpRequest.java | 17 +
...ttpComponentsAsyncClientHttpRequestFactory.java | 10 +-
.../HttpComponentsAsyncClientHttpResponse.java | 6 +-
.../client/HttpComponentsClientHttpRequest.java | 2 +-
.../HttpComponentsClientHttpRequestFactory.java | 140 +-
.../client/HttpComponentsClientHttpResponse.java | 5 +-
.../http/client/InterceptingClientHttpRequest.java | 27 +-
.../InterceptingClientHttpRequestFactory.java | 14 +-
.../http/client/Netty4ClientHttpRequest.java | 183 +
.../client/Netty4ClientHttpRequestFactory.java | 185 +
.../http/client/Netty4ClientHttpResponse.java | 91 +
.../SimpleBufferingAsyncClientHttpRequest.java | 4 +
.../client/SimpleBufferingClientHttpRequest.java | 8 +-
.../client/SimpleClientHttpRequestFactory.java | 25 +-
.../springframework/http/client/package-info.java | 8 +-
.../http/client/support/AsyncHttpAccessor.java | 1 +
.../http/client/support/HttpAccessor.java | 2 +-
.../http/client/support/HttpRequestWrapper.java | 24 +-
.../http/client/support/ProxyFactoryBean.java | 30 +-
.../http/client/support/package-info.java | 4 -
.../http/converter/FormHttpMessageConverter.java | 44 +-
.../converter/GenericHttpMessageConverter.java | 7 +-
.../converter/HttpMessageConversionException.java | 6 +-
.../converter/HttpMessageNotReadableException.java | 7 +-
.../converter/HttpMessageNotWritableException.java | 10 +-
.../converter/ResourceHttpMessageConverter.java | 21 +-
.../feed/AbstractWireFeedHttpMessageConverter.java | 13 +-
.../feed/AtomFeedHttpMessageConverter.java | 7 +-
.../feed/RssChannelHttpMessageConverter.java | 7 +-
.../http/converter/feed/package-info.java | 5 +-
.../json/AbstractJackson2HttpMessageConverter.java | 314 ++
.../http/converter/json/GsonBuilderUtils.java | 78 +
.../http/converter/json/GsonFactoryBean.java | 150 +
.../converter/json/GsonHttpMessageConverter.java | 212 +
.../json/Jackson2ObjectMapperBuilder.java | 710 +++
.../json/Jackson2ObjectMapperFactoryBean.java | 331 +-
.../json/JacksonObjectMapperFactoryBean.java | 258 -
.../json/MappingJackson2HttpMessageConverter.java | 246 +-
.../json/MappingJacksonHttpMessageConverter.java | 256 -
.../http/converter/json/MappingJacksonValue.java | 98 +
.../converter/json/SpringHandlerInstantiator.java | 88 +
.../http/converter/json/package-info.java | 19 -
.../http/converter/package-info.java | 20 -
.../protobuf/ExtensionRegistryInitializer.java | 40 +
.../protobuf/ProtobufHttpMessageConverter.java | 214 +
.../AllEncompassingFormHttpMessageConverter.java | 8 -
.../xml/Jaxb2CollectionHttpMessageConverter.java | 1 +
.../xml/Jaxb2RootElementHttpMessageConverter.java | 33 +-
.../MappingJackson2XmlHttpMessageConverter.java | 74 +
.../xml/MarshallingHttpMessageConverter.java | 1 -
.../converter/xml/SourceHttpMessageConverter.java | 40 +-
.../http/converter/xml/package-info.java | 20 -
.../org/springframework/http/package-info.java | 3 -
.../ServletServerHttpAsyncRequestControl.java | 1 -
.../http/server/ServletServerHttpRequest.java | 34 +-
.../http/server/ServletServerHttpResponse.java | 10 +-
.../springframework/http/server/package-info.java | 8 +-
.../remoting/caucho/BurlapServiceExporter.java | 1 -
.../remoting/caucho/HessianExporter.java | 2 +-
.../caucho/SimpleBurlapServiceExporter.java | 4 +-
.../caucho/SimpleHessianServiceExporter.java | 4 +-
.../remoting/caucho/package-info.java | 14 +-
.../HttpComponentsHttpInvokerRequestExecutor.java | 125 +-
.../httpinvoker/HttpInvokerRequestExecutor.java | 10 +-
.../SimpleHttpInvokerRequestExecutor.java | 7 +-
.../SimpleHttpInvokerServiceExporter.java | 4 +-
.../remoting/httpinvoker/package-info.java | 4 -
.../jaxws/AbstractJaxWsServiceExporter.java | 4 +-
.../remoting/jaxws/LocalJaxWsServiceFactory.java | 4 +-
.../SimpleHttpServerJaxWsServiceExporter.java | 5 +-
.../remoting/jaxws/package-info.java | 4 -
.../springframework/web/HttpRequestHandler.java | 7 +-
.../AbstractMappingContentNegotiationStrategy.java | 21 +-
.../web/accept/ContentNegotiationManager.java | 8 +
.../ContentNegotiationManagerFactoryBean.java | 64 +-
.../accept/FixedContentNegotiationStrategy.java | 1 +
.../MappingMediaTypeFileExtensionResolver.java | 53 +-
.../ParameterContentNegotiationStrategy.java | 8 +-
.../PathExtensionContentNegotiationStrategy.java | 38 +-
...letPathExtensionContentNegotiationStrategy.java | 8 +-
.../springframework/web/accept/package-info.java | 2 -
.../web/bind/annotation/ControllerAdvice.java | 12 +-
.../web/bind/annotation/ExceptionHandler.java | 15 +-
.../web/bind/annotation/MatrixVariable.java | 11 +-
.../web/bind/annotation/PathVariable.java | 6 +-
.../web/bind/annotation/RequestBody.java | 5 +-
.../web/bind/annotation/RequestHeader.java | 7 +-
.../web/bind/annotation/RequestMapping.java | 35 +-
.../web/bind/annotation/RequestMethod.java | 14 +-
.../web/bind/annotation/package-info.java | 4 -
.../annotation/support/HandlerMethodInvoker.java | 23 +-
.../web/bind/annotation/support/package-info.java | 4 -
.../org/springframework/web/bind/package-info.java | 4 -
.../web/bind/support/DefaultDataBinderFactory.java | 11 +-
.../web/bind/support/package-info.java | 4 -
.../web/client/AsyncRestTemplate.java | 33 +-
.../web/client/HttpMessageConverterExtractor.java | 57 +-
.../MessageBodyClientHttpResponseWrapper.java | 139 +
.../springframework/web/client/RestOperations.java | 35 +
.../springframework/web/client/RestTemplate.java | 187 +-
.../springframework/web/client/package-info.java | 4 -
.../web/client/support/package-info.java | 3 -
.../context/ConfigurableWebApplicationContext.java | 4 +-
.../springframework/web/context/ContextLoader.java | 67 +-
.../web/context/ContextLoaderListener.java | 10 +-
.../springframework/web/context/package-info.java | 4 -
.../DestructionCallbackBindingListener.java | 6 +-
.../Log4jNestedDiagnosticContextInterceptor.java | 1 +
.../context/request/RequestContextListener.java | 4 +-
.../context/request/ServletRequestAttributes.java | 52 +-
.../web/context/request/ServletWebRequest.java | 30 +-
.../request/async/CallableInterceptorChain.java | 4 +-
.../async/CallableProcessingInterceptor.java | 13 +-
.../CallableProcessingInterceptorAdapter.java | 3 +-
.../web/context/request/async/DeferredResult.java | 104 +-
.../async/DeferredResultInterceptorChain.java | 4 +-
...DeferredResultProcessingInterceptorAdapter.java | 3 +-
.../request/async/NoSupportAsyncWebRequest.java | 4 +-
.../async/StandardServletAsyncWebRequest.java | 13 +-
.../TimeoutCallableProcessingInterceptor.java | 6 +-
...TimeoutDeferredResultProcessingInterceptor.java | 5 +-
.../web/context/request/async/WebAsyncUtils.java | 44 +-
.../web/context/request/async/package-info.java | 6 -
.../web/context/request/package-info.java | 4 -
.../AnnotationConfigWebApplicationContext.java | 56 +-
.../support/ContextExposingHttpServletRequest.java | 1 -
.../support/GenericWebApplicationContext.java | 4 +-
.../support/GroovyWebApplicationContext.java | 182 +
.../context/support/HttpRequestHandlerServlet.java | 1 -
...ervletContextPropertyPlaceholderConfigurer.java | 1 -
.../ServletContextResourcePatternResolver.java | 6 +-
.../support/ServletRequestHandledEvent.java | 43 +-
.../support/StaticWebApplicationContext.java | 4 +-
.../support/WebApplicationContextUtils.java | 28 +-
.../support/WebApplicationObjectSupport.java | 8 +-
.../context/support/XmlWebApplicationContext.java | 6 +-
.../web/context/support/package-info.java | 3 -
.../web/filter/AbstractRequestLoggingFilter.java | 124 +-
.../web/filter/CharacterEncodingFilter.java | 19 +-
.../web/filter/CommonsRequestLoggingFilter.java | 16 +-
.../web/filter/DelegatingFilterProxy.java | 14 +-
.../web/filter/GenericFilterBean.java | 4 +-
.../web/filter/HttpPutFormContentFilter.java | 1 -
.../web/filter/OncePerRequestFilter.java | 10 +-
.../web/filter/RequestContextFilter.java | 8 +-
.../web/filter/ShallowEtagHeaderFilter.java | 192 +-
.../springframework/web/filter/package-info.java | 4 -
.../springframework/web/jsf/el/package-info.java | 6 +-
.../org/springframework/web/jsf/package-info.java | 6 +-
.../web/method/ControllerAdviceBean.java | 36 +-
.../springframework/web/method/HandlerMethod.java | 60 +-
.../AbstractNamedValueMethodArgumentResolver.java | 11 +-
.../annotation/ModelAttributeMethodProcessor.java | 87 +-
.../web/method/annotation/ModelFactory.java | 199 +-
.../RequestParamMethodArgumentResolver.java | 37 +-
.../web/method/annotation/package-info.java | 4 -
.../springframework/web/method/package-info.java | 3 -
.../support/CompositeUriComponentsContributor.java | 47 +-
.../HandlerMethodArgumentResolverComposite.java | 9 +-
.../web/method/support/InvocableHandlerMethod.java | 27 +-
.../web/method/support/ModelAndViewContainer.java | 101 +-
.../web/method/support/package-info.java | 4 -
.../multipart/MaxUploadSizeExceededException.java | 4 +-
.../web/multipart/MultipartFile.java | 5 +-
.../web/multipart/MultipartResolver.java | 43 +-
.../commons/CommonsFileUploadSupport.java | 4 +-
.../multipart/commons/CommonsMultipartFile.java | 24 +-
.../commons/CommonsMultipartResolver.java | 6 +-
.../web/multipart/commons/package-info.java | 6 +-
.../web/multipart/package-info.java | 4 -
.../web/multipart/support/MultipartFilter.java | 4 +-
.../RequestPartServletServerHttpRequest.java | 1 -
.../StandardMultipartHttpServletRequest.java | 6 +-
.../web/multipart/support/package-info.java | 8 +-
.../java/org/springframework/web/package-info.java | 4 -
.../web/util/ContentCachingRequestWrapper.java | 187 +
.../web/util/ContentCachingResponseWrapper.java | 228 +
.../web/util/HierarchicalUriComponents.java | 20 +-
.../web/util/HtmlCharacterEntityReferences.java | 40 +-
.../org/springframework/web/util/HtmlUtils.java | 76 +-
.../web/util/HttpSessionMutexListener.java | 9 +-
.../web/util/IntrospectorCleanupListener.java | 1 -
.../web/util/UriComponentsBuilder.java | 199 +-
.../org/springframework/web/util/UriTemplate.java | 10 +-
.../springframework/web/util/UrlPathHelper.java | 2 +-
.../org/springframework/web/util/WebUtils.java | 104 +-
.../org/springframework/web/util/package-info.java | 6 +-
.../org/springframework/http/HttpEntityTests.java | 44 +-
.../org/springframework/http/HttpHeadersTests.java | 14 +-
.../org/springframework/http/HttpStatusTests.java | 8 +-
.../org/springframework/http/MediaTypeTests.java | 1 +
.../http/MockHttpOutputMessage.java | 8 +-
.../springframework/http/RequestEntityTests.java | 151 +
.../springframework/http/ResponseEntityTests.java | 192 +
.../AbstractAsyncHttpRequestFactoryTestCase.java | 84 +-
.../client/AbstractHttpRequestFactoryTestCase.java | 49 +-
.../http/client/AbstractJettyServerTestCase.java | 58 +-
.../BufferedSimpleHttpRequestFactoryTests.java | 56 +-
...ttpComponentsClientHttpRequestFactoryTests.java | 77 +-
.../InterceptingClientHttpRequestFactoryTests.java | 1 +
.../Netty4AsyncClientHttpRequestFactoryTests.java | 56 +
.../Netty4ClientHttpRequestFactoryTests.java | 56 +
.../StreamingSimpleHttpRequestFactoryTests.java | 8 +-
.../http/client/support/ProxyFactoryBeanTests.java | 3 +-
.../BufferedImageHttpMessageConverterTests.java | 3 +-
.../ByteArrayHttpMessageConverterTests.java | 3 +-
.../converter/FormHttpMessageConverterTests.java | 41 +-
.../http/converter/HttpMessageConverterTests.java | 8 +-
.../ObjectToStringHttpMessageConverterTests.java | 10 +-
.../ResourceHttpMessageConverterTests.java | 1 +
.../converter/StringHttpMessageConverterTests.java | 3 +-
.../feed/AtomFeedHttpMessageConverterTests.java | 4 +-
.../feed/RssChannelHttpMessageConverterTests.java | 4 +-
...actMappingJacksonHttpMessageConverterTests.java | 226 -
.../http/converter/json/GsonFactoryBeanTests.java | 212 +
.../json/GsonHttpMessageConverterTests.java | 288 +
.../json/Jackson2ObjectMapperBuilderTests.java | 439 ++
.../json/Jackson2ObjectMapperFactoryBeanTests.java | 211 +-
.../json/JacksonObjectMapperFactoryBeanTests.java | 158 -
.../MappingJackson2HttpMessageConverterTests.java | 290 +-
.../MappingJacksonHttpMessageConverterTests.java | 144 -
.../json/SpringHandlerInstantiatorTests.java | 286 +
.../ProtobufHttpMessageConverterTests.java | 136 +
.../Jaxb2CollectionHttpMessageConverterTests.java | 65 +-
.../Jaxb2RootElementHttpMessageConverterTests.java | 58 +-
...appingJackson2XmlHttpMessageConverterTests.java | 309 ++
.../xml/MarshallingHttpMessageConverterTests.java | 22 +-
.../xml/SourceHttpMessageConverterTests.java | 135 +-
.../server/ServletServerHttpResponseTests.java | 18 +-
.../mock/web/test/MockFilterChain.java | 1 -
.../mock/web/test/MockHttpServletRequest.java | 5 +-
.../mock/web/test/MockHttpServletResponse.java | 23 +-
.../mock/web/test/MockMultipartFile.java | 1 +
.../mock/web/test/MockPageContext.java | 1 -
.../springframework/mock/web/test/MockPart.java | 1 -
.../java/org/springframework/protobuf/Msg.java | 636 +++
.../org/springframework/protobuf/MsgOrBuilder.java | 37 +
.../org/springframework/protobuf/OuterSample.java | 62 +
.../org/springframework/protobuf/SecondMsg.java | 388 ++
.../protobuf/SecondMsgOrBuilder.java | 18 +
.../remoting/caucho/CauchoRemotingTests.java | 2 +-
...pComponentsHttpInvokerRequestExecutorTests.java | 133 +
.../HttpInvokerFactoryBeanIntegrationTests.java | 151 +
.../remoting/httpinvoker/HttpInvokerTests.java | 4 +-
.../remoting/jaxws/JaxWsSupportTests.java | 2 +-
.../ContentNegotiationManagerFactoryBeanTests.java | 140 +-
.../HeaderContentNegotiationStrategyTests.java | 5 +-
.../MappingContentNegotiationStrategyTests.java | 13 +-
...MappingMediaTypeFileExtensionResolverTests.java | 22 +-
...thExtensionContentNegotiationStrategyTests.java | 72 +-
.../web/bind/ServletRequestDataBinderTests.java | 9 +-
.../web/bind/ServletRequestUtilsTests.java | 5 +-
.../WebRequestDataBinderIntegrationTests.java | 2 +-
.../bind/support/WebRequestDataBinderTests.java | 31 +-
.../web/client/AbstractJettyServerTestCase.java | 51 +-
.../client/AsyncRestTemplateIntegrationTests.java | 129 +-
.../client/DefaultResponseErrorHandlerTests.java | 1 +
.../client/HttpMessageConverterExtractorTests.java | 48 +-
.../web/client/HttpStatusCodeExceptionTests.java | 2 +-
.../web/client/RestTemplateIntegrationTests.java | 88 +-
.../web/client/RestTemplateTests.java | 33 +-
.../web/context/ContextLoaderInitializerTests.java | 1 -
.../request/RequestAndSessionScopedBeanTests.java | 5 +-
.../web/context/request/RequestScopeTests.java | 4 +-
.../context/request/RequestScopedProxyTests.java | 11 +-
.../request/ServletRequestAttributesTests.java | 49 +-
.../context/request/ServletWebRequestTests.java | 16 +-
.../web/context/request/SessionScopeTests.java | 4 +-
.../request/WebApplicationContextScopeTests.java | 5 +-
.../context/request/async/DeferredResultTests.java | 1 +
.../async/StandardServletAsyncWebRequestTests.java | 1 +
.../request/async/WebAsyncManagerTests.java | 2 +-
.../request/async/WebAsyncManagerTimeoutTests.java | 2 +-
...AnnotationConfigWebApplicationContextTests.java | 2 -
.../web/context/support/ResourceTests.java | 5 +-
.../web/context/support/Spr8510Tests.java | 6 +-
.../support/StandardServletEnvironmentTests.java | 15 +-
.../web/filter/CompositeFilterTests.java | 8 +-
.../web/filter/DelegatingFilterProxyTests.java | 5 +-
.../web/filter/HiddenHttpMethodFilterTests.java | 2 +-
.../web/filter/HttpPutFormContentFilterTests.java | 9 +-
.../web/filter/RequestContextFilterTests.java | 1 -
.../web/filter/ShallowEtagHeaderFilterTests.java | 13 +-
.../springframework/web/jsf/MockFacesContext.java | 9 +-
.../web/method/ControllerAdviceBeanTests.java | 5 +-
.../CookieValueMethodArgumentResolverTests.java | 10 +-
.../ErrorsMethodHandlerArgumentResolverTests.java | 6 +-
.../ExceptionHandlerMethodResolverTests.java | 7 +-
...ExpressionValueMethodArgumentResolverTests.java | 8 +-
.../InitBinderDataBinderFactoryTests.java | 10 +-
.../method/annotation/MapMethodProcessorTests.java | 8 +-
.../ModelAttributeMethodProcessorTests.java | 3 +-
.../annotation/ModelFactoryOrderingTests.java | 337 ++
.../web/method/annotation/ModelFactoryTests.java | 172 +-
.../annotation/ModelMethodProcessorTests.java | 8 +-
...equestHeaderMapMethodArgumentResolverTests.java | 8 +-
.../RequestHeaderMethodArgumentResolverTests.java | 1 +
...RequestParamMapMethodArgumentResolverTests.java | 8 +-
.../RequestParamMethodArgumentResolverTests.java | 29 +-
.../annotation/SessionAttributesHandlerTests.java | 13 +-
.../WebArgumentResolverAdapterTests.java | 1 +
.../CompositeUriComponentsContributorTests.java | 64 +
...andlerMethodArgumentResolverCompositeTests.java | 7 +-
...dlerMethodReturnValueHandlerCompositeTests.java | 8 +-
.../support/InvocableHandlerMethodTests.java | 9 +-
.../method/support/ModelAndViewContainerTests.java | 36 +-
.../commons/CommonsMultipartResolverTests.java | 28 +-
.../util/ContentCachingRequestWrapperTests.java | 83 +
.../util/HtmlCharacterEntityReferencesTests.java | 22 +-
.../springframework/web/util/HtmlUtilsTests.java | 22 +
.../web/util/JavaScriptUtilsTests.java | 6 +-
.../web/util/Log4jWebConfigurerTests.java | 6 +-
.../web/util/MockLog4jAppender.java | 4 +-
.../springframework/web/util/TagUtilsTests.java | 3 +-
.../web/util/UriComponentsBuilderTests.java | 248 +-
.../web/util/UriComponentsTests.java | 21 +-
.../springframework/web/util/UriUtilsTests.java | 3 +-
.../web/util/UrlPathHelperTests.java | 1 +
.../springframework/web/util/WebUtilsTests.java | 64 +-
spring-web/src/test/proto/sample.proto | 12 +
.../web/portlet/DispatcherPortlet.java | 38 +-
.../web/portlet/FrameworkPortlet.java | 2 +-
.../web/portlet/GenericPortletBean.java | 2 +-
.../web/portlet/HandlerInterceptor.java | 75 +-
.../web/portlet/bind/annotation/package-info.java | 4 -
.../web/portlet/bind/package-info.java | 6 +-
.../ConfigurablePortletApplicationContext.java | 4 +-
.../context/PortletApplicationContextUtils.java | 27 +-
.../context/PortletApplicationObjectSupport.java | 1 -
.../PortletContextResourcePatternResolver.java | 1 -
.../portlet/context/PortletRequestAttributes.java | 22 +-
.../web/portlet/context/PortletWebRequest.java | 15 +-
.../context/StaticPortletApplicationContext.java | 4 +-
.../web/portlet/context/package-info.java | 4 -
.../handler/AbstractHandlerExceptionResolver.java | 6 +-
.../web/portlet/handler/package-info.java | 4 -
.../multipart/CommonsPortletMultipartResolver.java | 4 +-
.../multipart/PortletMultipartResolver.java | 25 +-
.../web/portlet/multipart/package-info.java | 4 -
.../web/portlet/mvc/AbstractController.java | 118 +-
.../portlet/mvc/ParameterizableViewController.java | 51 +-
.../annotation/AnnotationMethodHandlerAdapter.java | 13 +-
.../AnnotationMethodHandlerExceptionResolver.java | 12 +-
.../DefaultAnnotationHandlerMapping.java | 1 -
.../web/portlet/mvc/annotation/package-info.java | 4 -
.../web/portlet/mvc/package-info.java | 31 +-
.../springframework/web/portlet/package-info.java | 6 +-
.../web/portlet/util/PortletUtils.java | 1 -
.../web/portlet/util/package-info.java | 6 +-
.../org/springframework/context/ACATester.java | 5 -
.../context/BeanThatBroadcasts.java | 3 -
.../springframework/context/BeanThatListens.java | 6 +-
.../org/springframework/context/TestListener.java | 21 +-
.../mock/web/portlet/MockPortletRequest.java | 6 +-
.../mock/web/portlet/MockPortletSession.java | 1 -
.../portlet/ComplexPortletApplicationContext.java | 18 +-
.../web/portlet/DispatcherPortletTests.java | 46 +-
.../bind/PortletRequestDataBinderTests.java | 10 +-
...PortletRequestParameterPropertyValuesTests.java | 4 +-
.../web/portlet/bind/PortletRequestUtilsTests.java | 3 +-
.../AbstractXmlWebApplicationContextTests.java | 2 +-
.../PortletApplicationContextScopeTests.java | 7 +-
.../context/PortletRequestAttributesTests.java | 2 +-
.../portlet/context/PortletWebRequestTests.java | 20 +-
.../context/XmlPortletApplicationContextTests.java | 3 +-
.../mvc/PortletWrappingControllerTests.java | 6 +-
...otationMethodHandlerExceptionResolverTests.java | 8 +-
.../Portlet20AnnotationControllerTests.java | 27 +-
.../PortletAnnotationControllerTests.java | 18 +-
.../web/portlet/util/PortletUtilsTests.java | 9 +-
.../view/tiles2/AbstractSpringPreparerFactory.java | 64 +
.../view/tiles2/SimpleSpringPreparerFactory.java | 0
.../view/tiles2/SpringBeanPreparerFactory.java | 0
.../servlet/view/tiles2/SpringLocaleResolver.java | 0
...ringWildcardServletTilesApplicationContext.java | 0
.../web/servlet/view/tiles2/TilesConfigurer.java | 0
.../web/servlet/view/tiles2/TilesView.java | 110 +
.../web/servlet/view/tiles2/TilesViewResolver.java | 81 +
.../web/servlet/view/tiles2/package-info.java | 7 +
.../servlet/view/tiles2/TilesConfigurerTests.java | 53 +
.../src/test/resources/jasperreports.properties | 1 +
.../src/test/resources/log4j.properties | 10 +
.../web/servlet/view/tiles2/tiles-definitions.xml | 0
.../view/tiles3/AbstractSpringPreparerFactory.java | 64 -
.../view/tiles3/SimpleSpringPreparerFactory.java | 70 -
.../servlet/view/tiles3/SpringLocaleResolver.java | 53 -
.../web/servlet/view/tiles3/TilesView.java | 133 -
.../web/servlet/view/tiles3/TilesViewResolver.java | 69 -
.../web/servlet/view/tiles3/package-info.java | 11 -
.../view/tiles3/TilesViewResolverTests.java | 66 -
.../web/servlet/view/tiles3/TilesViewTests.java | 83 -
.../src/test/resources/log4j.properties | 8 -
.../web/servlet/DispatcherServlet.java | 166 +-
.../org/springframework/web/servlet/FlashMap.java | 23 +
.../web/servlet/FrameworkServlet.java | 35 +-
.../web/servlet/HandlerInterceptor.java | 10 +-
.../web/servlet/HttpServletBean.java | 2 +-
.../web/servlet/LocaleResolver.java | 1 -
.../web/servlet/NoHandlerFoundException.java | 12 +-
.../web/servlet/ResourceServlet.java | 1 -
.../java/org/springframework/web/servlet/View.java | 1 -
.../web/servlet/ViewRendererServlet.java | 1 -
.../AnnotationDrivenBeanDefinitionParser.java | 267 +-
.../FreeMarkerConfigurerBeanDefinitionParser.java | 67 +
...GroovyMarkupConfigurerBeanDefinitionParser.java | 52 +
.../config/InterceptorsBeanDefinitionParser.java | 2 +-
.../web/servlet/config/MvcNamespaceHandler.java | 9 +-
.../web/servlet/config/MvcNamespaceUtils.java | 58 +-
.../config/ResourcesBeanDefinitionParser.java | 216 +-
.../TilesConfigurerBeanDefinitionParser.java | 70 +
.../VelocityConfigurerBeanDefinitionParser.java | 59 +
.../config/ViewControllerBeanDefinitionParser.java | 111 +-
.../config/ViewResolversBeanDefinitionParser.java | 208 +
.../config/annotation/AsyncSupportConfigurer.java | 2 +-
.../annotation/BeanTypeNotPresentCondition.java | 67 +
.../annotation/ContentNegotiationConfigurer.java | 57 +-
.../DefaultServletHandlerConfigurer.java | 1 -
.../annotation/DelegatingWebMvcConfiguration.java | 14 +-
.../servlet/config/annotation/EnableWebMvc.java | 28 +-
.../config/annotation/InterceptorRegistration.java | 23 +-
.../config/annotation/PathMatchConfigurer.java | 13 +-
.../RedirectViewControllerRegistration.java | 98 +
.../annotation/ResourceChainRegistration.java | 118 +
.../annotation/ResourceHandlerRegistration.java | 77 +-
.../config/annotation/ResourceHandlerRegistry.java | 31 +-
.../UrlBasedViewResolverRegistration.java | 118 +
.../annotation/ViewControllerRegistration.java | 55 +-
.../config/annotation/ViewControllerRegistry.java | 77 +-
.../config/annotation/ViewResolverRegistry.java | 327 ++
.../annotation/WebMvcConfigurationSupport.java | 194 +-
.../config/annotation/WebMvcConfigurer.java | 50 +-
.../config/annotation/WebMvcConfigurerAdapter.java | 16 +
.../annotation/WebMvcConfigurerComposite.java | 14 +
.../servlet/config/annotation/package-info.java | 4 -
.../web/servlet/config/package-info.java | 4 -
.../handler/AbstractHandlerMethodMapping.java | 69 +-
.../servlet/handler/AbstractUrlHandlerMapping.java | 1 -
.../handler/HandlerExceptionResolverComposite.java | 1 -
.../HandlerMethodMappingNamingStrategy.java | 50 +
.../web/servlet/handler/MappedInterceptor.java | 12 +-
.../servlet/handler/SimpleUrlHandlerMapping.java | 15 +-
.../web/servlet/handler/package-info.java | 4 -
.../web/servlet/i18n/package-info.java | 4 -
.../web/servlet/mvc/AbstractController.java | 108 +-
.../web/servlet/mvc/Controller.java | 41 +-
.../servlet/mvc/ParameterizableViewController.java | 156 +-
.../web/servlet/mvc/UrlFilenameViewController.java | 13 +-
.../annotation/AnnotationMethodHandlerAdapter.java | 54 +-
.../AnnotationMethodHandlerExceptionResolver.java | 15 +-
.../DefaultAnnotationHandlerMapping.java | 1 -
.../mvc/annotation/ModelAndViewResolver.java | 37 +-
.../ResponseStatusExceptionResolver.java | 30 +-
.../web/servlet/mvc/annotation/package-info.java | 4 -
.../mvc/condition/AbstractMediaTypeExpression.java | 27 +-
.../mvc/condition/AbstractNameValueExpression.java | 10 +-
.../mvc/condition/AbstractRequestCondition.java | 16 +-
.../mvc/condition/HeadersRequestCondition.java | 13 +-
.../mvc/condition/ParamsRequestCondition.java | 5 +
.../mvc/condition/PatternsRequestCondition.java | 7 +-
.../servlet/mvc/condition/RequestCondition.java | 5 +-
.../web/servlet/mvc/condition/package-info.java | 4 -
.../web/servlet/mvc/method/RequestMappingInfo.java | 112 +-
.../method/RequestMappingInfoHandlerMapping.java | 5 +
...pingInfoHandlerMethodMappingNamingStrategy.java | 58 +
.../AbstractJsonpResponseBodyAdvice.java | 114 +
.../AbstractMappingJacksonResponseBodyAdvice.java | 67 +
...ractMessageConverterMethodArgumentResolver.java | 51 +-
.../AbstractMessageConverterMethodProcessor.java | 187 +-
.../ExceptionHandlerExceptionResolver.java | 83 +-
.../ExtendedServletRequestDataBinder.java | 1 -
.../annotation/HttpEntityMethodProcessor.java | 62 +-
.../annotation/HttpHeadersReturnValueHandler.java | 2 +
.../annotation/JsonViewResponseBodyAdvice.java | 66 +
.../ListenableFutureReturnValueHandler.java | 67 +
.../ModelAndViewMethodReturnValueHandler.java | 42 +-
.../method/annotation/MvcUriComponentsBuilder.java | 166 +-
.../PathVariableMethodArgumentResolver.java | 19 +-
.../annotation/RequestMappingHandlerAdapter.java | 107 +-
.../annotation/RequestMappingHandlerMapping.java | 7 +-
.../RequestPartMethodArgumentResolver.java | 92 +-
.../RequestResponseBodyMethodProcessor.java | 156 +-
.../mvc/method/annotation/ResponseBodyAdvice.java | 64 +
.../method/annotation/ResponseBodyAdviceChain.java | 78 +
.../annotation/ResponseEntityExceptionHandler.java | 1 +
.../annotation/ServletInvocableHandlerMethod.java | 101 +-
.../ServletModelAttributeMethodProcessor.java | 26 +-
.../ServletRequestMethodArgumentResolver.java | 2 +
.../ViewNameMethodReturnValueHandler.java | 30 +
.../web/servlet/mvc/method/package-info.java | 3 -
.../NoSuchRequestHandlingMethodException.java | 1 -
.../multiaction/ParameterMethodNameResolver.java | 1 -
.../web/servlet/mvc/multiaction/package-info.java | 4 -
.../web/servlet/mvc/package-info.java | 4 -
.../support/DefaultHandlerExceptionResolver.java | 2 +-
.../web/servlet/mvc/support/package-info.java | 4 -
.../springframework/web/servlet/package-info.java | 4 -
.../servlet/resource/AbstractResourceResolver.java | 67 +
.../servlet/resource/AbstractVersionStrategy.java | 147 +
.../resource/AppCacheManifestTransformer.java | 225 +
.../servlet/resource/CachingResourceResolver.java | 126 +
.../resource/CachingResourceTransformer.java | 86 +
.../servlet/resource/ContentVersionStrategy.java | 52 +
.../resource/CssLinkResourceTransformer.java | 269 +
.../resource/DefaultResourceResolverChain.java | 91 +
.../resource/DefaultResourceTransformerChain.java | 86 +
.../resource/DefaultServletHttpRequestHandler.java | 4 +-
.../web/servlet/resource/EncodedResource.java | 43 +
.../web/servlet/resource/FixedVersionStrategy.java | 54 +
.../web/servlet/resource/GzipResourceResolver.java | 143 +
.../web/servlet/resource/PathResourceResolver.java | 206 +
.../resource/ResourceHttpRequestHandler.java | 259 +-
.../web/servlet/resource/ResourceResolver.java | 63 +
.../servlet/resource/ResourceResolverChain.java | 56 +
.../web/servlet/resource/ResourceTransformer.java | 44 +
.../servlet/resource/ResourceTransformerChain.java | 49 +
.../resource/ResourceTransformerSupport.java | 97 +
.../resource/ResourceUrlEncodingFilter.java | 100 +
.../web/servlet/resource/ResourceUrlProvider.java | 239 +
.../ResourceUrlProviderExposingInterceptor.java | 56 +
.../web/servlet/resource/TransformedResource.java | 63 +
.../web/servlet/resource/VersionPathStrategy.java | 52 +
.../servlet/resource/VersionResourceResolver.java | 221 +
.../web/servlet/resource/VersionStrategy.java | 39 +
.../web/servlet/resource/package-info.java | 2 -
.../AbstractDispatcherServletInitializer.java | 12 +-
.../web/servlet/support/RequestContext.java | 29 +-
.../servlet/support/RequestDataValueProcessor.java | 1 -
.../support/ServletUriComponentsBuilder.java | 128 +-
.../web/servlet/support/package-info.java | 4 -
.../web/servlet/tags/ArgumentAware.java | 3 +-
.../web/servlet/tags/ArgumentTag.java | 44 +-
.../web/servlet/tags/EditorAwareTag.java | 1 -
.../web/servlet/tags/EscapeBodyTag.java | 5 +-
.../springframework/web/servlet/tags/EvalTag.java | 6 +-
.../web/servlet/tags/HtmlEscapingAwareTag.java | 43 +-
.../web/servlet/tags/MessageTag.java | 6 +-
.../springframework/web/servlet/tags/ParamTag.java | 56 +-
.../web/servlet/tags/TransformTag.java | 2 +-
.../springframework/web/servlet/tags/UrlTag.java | 19 +-
.../tags/form/AbstractHtmlElementBodyTag.java | 1 -
.../tags/form/AbstractMultiCheckedElementTag.java | 1 -
.../web/servlet/tags/form/CheckboxTag.java | 1 -
.../web/servlet/tags/form/FormTag.java | 14 +-
.../web/servlet/tags/form/OptionWriter.java | 2 +-
.../web/servlet/tags/form/OptionsTag.java | 1 +
.../web/servlet/tags/form/TagWriter.java | 1 -
.../web/servlet/tags/form/package-info.java | 3 -
.../web/servlet/tags/package-info.java | 3 -
.../web/servlet/theme/package-info.java | 15 +-
.../web/servlet/view/AbstractTemplateView.java | 8 +-
.../web/servlet/view/AbstractView.java | 64 +-
.../view/ContentNegotiatingViewResolver.java | 86 +-
.../web/servlet/view/InternalResourceView.java | 72 +-
.../servlet/view/InternalResourceViewResolver.java | 33 -
.../web/servlet/view/RedirectView.java | 62 +-
.../web/servlet/view/UrlBasedViewResolver.java | 43 +
.../web/servlet/view/ViewResolverComposite.java | 114 +
.../servlet/view/document/AbstractExcelView.java | 10 +-
.../view/document/AbstractPdfStamperView.java | 1 -
.../web/servlet/view/document/package-info.java | 4 -
.../servlet/view/feed/AbstractAtomFeedView.java | 11 +-
.../web/servlet/view/feed/AbstractFeedView.java | 13 +-
.../web/servlet/view/feed/AbstractRssFeedView.java | 11 +-
.../web/servlet/view/feed/package-info.java | 5 +-
.../servlet/view/freemarker/FreeMarkerConfig.java | 2 +-
.../servlet/view/freemarker/FreeMarkerView.java | 3 +-
.../web/servlet/view/freemarker/package-info.java | 4 -
.../servlet/view/groovy/GroovyMarkupConfig.java | 40 +
.../view/groovy/GroovyMarkupConfigurer.java | 223 +
.../web/servlet/view/groovy/GroovyMarkupView.java | 133 +
.../view/groovy/GroovyMarkupViewResolver.java | 58 +
.../web/servlet/view/groovy/package-info.java | 7 +
.../AbstractJasperReportsSingleFormatView.java | 26 +-
.../jasperreports/AbstractJasperReportsView.java | 37 +-
.../ConfigurableJasperReportsView.java | 27 +-
.../view/jasperreports/JasperReportsCsvView.java | 10 +-
.../view/jasperreports/JasperReportsHtmlView.java | 14 +-
.../JasperReportsMultiFormatView.java | 4 +-
.../view/jasperreports/JasperReportsPdfView.java | 10 +-
.../view/jasperreports/JasperReportsXlsView.java | 10 +-
.../servlet/view/jasperreports/package-info.java | 4 -
.../servlet/view/json/AbstractJackson2View.java | 245 +
.../servlet/view/json/MappingJackson2JsonView.java | 249 +-
.../servlet/view/json/MappingJacksonJsonView.java | 306 --
.../web/servlet/view/json/package-info.java | 19 -
.../web/servlet/view/package-info.java | 4 -
.../view/tiles2/AbstractSpringPreparerFactory.java | 63 -
.../web/servlet/view/tiles2/TilesView.java | 91 -
.../web/servlet/view/tiles2/TilesViewResolver.java | 54 -
.../web/servlet/view/tiles2/package-info.java | 11 -
.../view/tiles3/AbstractSpringPreparerFactory.java | 64 +
.../view/tiles3/SimpleSpringPreparerFactory.java | 71 +
.../view/tiles3/SpringBeanPreparerFactory.java | 0
.../servlet/view/tiles3/SpringLocaleResolver.java | 55 +
...ringWildcardServletTilesApplicationContext.java | 0
.../web/servlet/view/tiles3/TilesConfigurer.java | 0
.../web/servlet/view/tiles3/TilesView.java | 151 +
.../web/servlet/view/tiles3/TilesViewResolver.java | 86 +
.../web/servlet/view/tiles3/package-info.java | 7 +
.../servlet/view/velocity/VelocityConfigurer.java | 1 -
.../web/servlet/view/velocity/package-info.java | 4 -
.../web/servlet/view/velocity/spring.vm | 18 +-
.../servlet/view/xml/MappingJackson2XmlView.java | 99 +
.../web/servlet/view/xml/MarshallingView.java | 42 +-
.../web/servlet/view/xml/package-info.java | 4 -
.../web/servlet/view/xslt/package-info.java | 4 -
.../src/main/resources/META-INF/spring-form.tld | 30 +-
.../src/main/resources/META-INF/spring.schemas | 3 +-
.../src/main/resources/META-INF/spring.tld | 7 +
.../web/servlet/config/spring-mvc-4.1.xsd | 1114 ++++
.../org/springframework/context/ACATester.java | 5 -
.../context/BeanThatBroadcasts.java | 3 -
.../org/springframework/context/TestListener.java | 3 -
.../web/context/XmlWebApplicationContextTests.java | 4 +-
.../context/support/HttpRequestHandlerTests.java | 6 +-
.../support/ServletContextSupportTests.java | 10 +-
.../support/WebApplicationObjectSupportTests.java | 5 +-
.../springframework/web/servlet/FlashMapTests.java | 7 +-
.../web/servlet/SimpleWebApplicationContext.java | 3 +-
.../AnnotationDrivenBeanDefinitionParserTests.java | 34 +-
.../web/servlet/config/MvcNamespaceTests.java | 437 +-
.../ContentNegotiationConfigurerTests.java | 16 +-
.../DefaultServletHandlerConfigurerTests.java | 7 +-
.../DelegatingWebMvcConfigurationTests.java | 14 +-
.../annotation/InterceptorRegistryTests.java | 87 +-
.../annotation/ResourceHandlerRegistryTests.java | 129 +-
.../annotation/ViewControllerRegistryTests.java | 114 +-
.../annotation/ViewResolutionIntegrationTests.java | 273 +
.../annotation/ViewResolverRegistryTests.java | 228 +
.../WebMvcConfigurationSupportExtensionTests.java | 172 +-
.../WebMvcConfigurationSupportTests.java | 176 +-
.../servlet/handler/HandlerMethodMappingTests.java | 6 +-
.../servlet/handler/MappedInterceptorTests.java | 7 +-
.../PathMatchingUrlHandlerMappingTests.java | 5 +-
.../SimpleMappingExceptionResolverTests.java | 7 +-
.../handler/SimpleUrlHandlerMappingTests.java | 7 +-
.../web/servlet/handler/resources/js/bar.js | 1 -
.../web/servlet/handler/resources/js/foo.js | 1 -
.../web/servlet/mvc/ControllerTests.java | 1 -
.../mvc/ParameterizableViewControllerTests.java | 7 +-
.../servlet/mvc/WebContentInterceptorTests.java | 7 +-
...otationMethodHandlerExceptionResolverTests.java | 3 +-
.../CgLibProxyServletAnnotationTests.java | 3 +-
.../annotation/JdkProxyServletAnnotationTests.java | 3 +-
.../MethodNameDispatchingController.java | 1 -
.../RequestSpecificMappingInfoComparatorTests.java | 3 +-
.../ResponseStatusExceptionResolverTests.java | 4 +-
.../ServletAnnotationControllerTests.java | 39 +-
.../ServletAnnotationMappingUtilsTests.java | 3 +-
.../web/servlet/mvc/annotation/Spr7766Tests.java | 1 +
.../web/servlet/mvc/annotation/Spr7839Tests.java | 5 +-
...riTemplateServletAnnotationControllerTests.java | 4 +-
.../condition/CompositeRequestConditionTests.java | 7 +-
.../condition/ConsumesRequestConditionTests.java | 10 +-
.../condition/HeadersRequestConditionTests.java | 10 +-
.../mvc/condition/ParamsRequestConditionTests.java | 10 +-
.../condition/PatternsRequestConditionTests.java | 2 +-
.../condition/ProducesRequestConditionTests.java | 9 +-
.../mvc/condition/RequestConditionHolderTests.java | 7 +-
.../RequestMethodsRequestConditionTests.java | 4 +-
.../RequestMappingInfoHandlerMappingTests.java | 2 +-
...nfoHandlerMethodMappingNamingStrategyTests.java | 73 +
.../AbstractServletHandlerMethodTests.java | 5 +-
.../ExceptionHandlerExceptionResolverTests.java | 9 +-
.../ExtendedServletRequestDataBinderTests.java | 7 +-
.../HandlerMethodAnnotationDetectionTests.java | 6 +-
.../HttpEntityMethodProcessorMockTests.java | 91 +-
.../annotation/HttpEntityMethodProcessorTests.java | 47 +-
...rixVariablesMapMethodArgumentResolverTests.java | 7 +-
...MatrixVariablesMethodArgumentResolverTests.java | 7 +-
.../ModelAndViewMethodReturnValueHandlerTests.java | 32 +-
...dViewResolverMethodReturnValueHandlerTests.java | 12 +-
.../annotation/MvcUriComponentsBuilderTests.java | 9 +-
...PathVariableMapMethodArgumentResolverTests.java | 7 +-
.../PathVariableMethodArgumentResolverTests.java | 10 +-
...questMappingHandlerAdapterIntegrationTests.java | 13 +-
.../RequestMappingHandlerAdapterTests.java | 126 +-
.../annotation/RequestPartIntegrationTests.java | 2 +-
.../RequestPartMethodArgumentResolverTests.java | 2 +-
...equestResponseBodyMethodProcessorMockTests.java | 30 +-
.../RequestResponseBodyMethodProcessorTests.java | 241 +-
.../annotation/ResponseBodyAdviceChainTests.java | 161 +
.../ResponseEntityExceptionHandlerTests.java | 8 +-
.../SerlvetModelAttributeMethodProcessorTests.java | 152 -
...vletAnnotationControllerHandlerMethodTests.java | 143 +-
...vletCookieValueMethodArgumentResolverTests.java | 7 +-
.../ServletInvocableHandlerMethodTests.java | 147 +-
.../ServletModelAttributeMethodProcessorTests.java | 225 +
...ServletResponseMethodArgumentResolverTests.java | 1 -
...mponentsBuilderMethodArgumentResolverTests.java | 9 +-
...vletAnnotationControllerHandlerMethodTests.java | 7 +-
.../ViewMethodReturnValueHandlerTests.java | 7 +-
.../ViewNameMethodReturnValueHandlerTests.java | 53 +-
.../multiaction/MultiActionControllerTests.java | 3 +-
.../DefaultHandlerExceptionResolverTests.java | 12 +-
.../ParameterizableViewControllerTests.java | 125 +
.../support/RedirectAttributesModelMapTests.java | 7 +-
.../resource/AppCacheManifestTransformerTests.java | 113 +
.../resource/CachingResourceResolverTests.java | 150 +
.../resource/ContentBasedVersionStrategyTests.java | 77 +
.../resource/CssLinkResourceTransformerTests.java | 123 +
.../resource/FixedVersionStrategyTests.java | 71 +
.../resource/GzipResourceResolverTests.java | 169 +
.../resource/PathResourceResolverTests.java | 135 +
.../resource/ResourceHttpRequestHandlerTests.java | 326 +-
.../resource/ResourceTransformerSupportTests.java | 119 +
.../resource/ResourceUrlEncodingFilterTests.java | 118 +
.../ResourceUrlProviderJavaConfigTests.java | 130 +
.../servlet/resource/ResourceUrlProviderTests.java | 151 +
.../resource/VersionResourceResolverTests.java | 166 +
.../support/DispatcherServletInitializerTests.java | 3 +-
.../servlet/support/MockFilterRegistration.java | 1 -
.../servlet/support/MockServletRegistration.java | 1 -
.../support/RequestDataValueProcessorWrapper.java | 1 -
.../support/ServletUriComponentsBuilderTests.java | 144 +-
.../web/servlet/tags/EvalTagTests.java | 1 -
.../web/servlet/tags/MessageTagTests.java | 27 +-
.../web/servlet/tags/ThemeTagTests.java | 1 -
.../web/servlet/tags/UrlTagTests.java | 43 +-
.../servlet/tags/form/AbstractFormTagTests.java | 2 +-
.../tags/form/AbstractHtmlElementTagTests.java | 1 -
.../web/servlet/tags/form/ButtonTagTests.java | 1 -
.../web/servlet/tags/form/CheckboxTagTests.java | 3 +-
.../web/servlet/tags/form/CheckboxesTagTests.java | 7 +-
.../web/servlet/tags/form/ErrorsTagTests.java | 2 +-
.../web/servlet/tags/form/FormTagTests.java | 1 -
.../web/servlet/tags/form/InputTagTests.java | 1 -
.../web/servlet/tags/form/LabelTagTests.java | 2 +-
.../servlet/tags/form/PasswordInputTagTests.java | 1 -
.../web/servlet/tags/form/RadioButtonTagTests.java | 1 -
.../servlet/tags/form/RadioButtonsTagTests.java | 4 +-
.../web/servlet/tags/form/TagIdGeneratorTests.java | 4 +-
.../web/servlet/view/BaseViewTests.java | 2 +-
.../DefaultRequestToViewNameTranslatorTests.java | 3 +-
.../web/servlet/view/RedirectViewTests.java | 14 +-
.../servlet/view/RedirectViewUriTemplateTests.java | 5 +-
.../view/ResourceBundleViewResolverTests.java | 1 -
.../web/servlet/view/ViewResolverTests.java | 6 +-
.../web/servlet/view/document/ExcelViewTests.java | 20 +-
.../web/servlet/view/feed/AtomFeedViewTests.java | 6 +-
.../web/servlet/view/feed/RssFeedViewTests.java | 6 +-
.../view/groovy/GroovyMarkupConfigurerTests.java | 169 +
.../view/groovy/GroovyMarkupViewResolverTests.java | 50 +
.../servlet/view/groovy/GroovyMarkupViewTests.java | 216 +
...AbstractConfigurableJasperReportsViewTests.java | 1 +
.../jasperreports/AbstractJasperReportsTests.java | 19 +-
.../AbstractJasperReportsViewTests.java | 76 +-
.../view/jasperreports/ExporterParameterTests.java | 91 +-
.../jasperreports/JasperReportsHtmlViewTests.java | 2 +-
.../JasperReportsMultiFormatViewTests.java | 15 +-
.../view/json/MappingJackson2JsonViewTests.java | 107 +-
.../view/json/MappingJacksonJsonViewTests.java | 346 --
.../servlet/view/tiles2/TilesConfigurerTests.java | 52 -
.../servlet/view/tiles3/TilesConfigurerTests.java | 0
.../view/tiles3/TilesViewResolverTests.java | 67 +
.../web/servlet/view/tiles3/TilesViewTests.java | 98 +
.../view/velocity/VelocityConfigurerTests.java | 8 +-
.../servlet/view/velocity/VelocityMacroTests.java | 63 +
.../servlet/view/velocity/VelocityRenderTests.java | 7 +-
.../view/velocity/VelocityToolboxViewTests.java | 8 +-
.../view/velocity/VelocityViewResolverTests.java | 6 +-
.../servlet/view/velocity/VelocityViewTests.java | 2 +-
.../web/servlet/view/velocity/test-spr5172.vm | 30 +
.../view/xml/MappingJackson2XmlViewTests.java | 348 ++
.../web/servlet/view/xml/MarshallingViewTests.java | 22 +
.../servlet/view/xslt/XsltViewResolverTests.java | 5 +-
.../web/servlet/view/xslt/XsltViewTests.java | 4 +-
.../web/util/NestedServletExceptionTests.java | 5 +-
.../servlet/config/annotation/WEB-INF/index.ftl | 1 +
.../servlet/config/annotation/WEB-INF/index.jsp | 12 +
.../servlet/config/annotation/WEB-INF/index.tpl | 1 +
.../web/servlet/config/annotation/WEB-INF/index.vm | 1 +
.../servlet/config/annotation/WEB-INF/tiles.xml | 7 +
.../config/mvc-config-argument-resolvers.xml | 3 +
.../mvc-config-content-negotiation-manager.xml | 16 +-
.../config/mvc-config-path-matching-mappings.xml | 22 +
.../config/mvc-config-resources-chain-no-auto.xml | 34 +
.../servlet/config/mvc-config-resources-chain.xml | 39 +
.../config/mvc-config-return-value-handlers.xml | 5 +-
.../config/mvc-config-view-controllers-minimal.xml | 10 +-
.../servlet/config/mvc-config-view-controllers.xml | 11 +-
...-config-view-resolution-content-negotiation.xml | 44 +
.../mvc-config-view-resolution-custom-order.xml | 14 +
.../servlet/config/mvc-config-view-resolution.xml | 37 +
.../web/servlet/resource/test/appcache.manifest | 17 +
.../web/servlet/resource/test/bar.min.css} | 0
.../web/servlet/resource/test/error.manifest | 4 +
.../web/servlet/resource/test/external.css | 3 +
.../web/servlet/resource/test/foo-bar/foo-bar.css} | 0
.../test/foo-e36d2e05253c6c7085a91522ce43a0b4.css} | 0
.../web/servlet/resource/test/images/image.png | Bin 0 -> 155 bytes
.../web/servlet/resource/test/main.css | 9 +
.../web/servlet/resource/tiles/tiles1.xml | 20 +
.../web/servlet/resource/tiles/tiles2.xml | 20 +
.../web/servlet/view/groovy/content.tpl | 3 +
.../web/servlet/view/groovy/i18n.tpl | 1 +
.../web/servlet/view/groovy/i18n_de_DE.tpl | 2 +
.../web/servlet/view/groovy/i18n_es.tpl | 2 +
.../web/servlet/view/groovy/i18n_fr.tpl | 1 +
.../web/servlet/view/groovy/includes/include.tpl | 1 +
.../servlet/view/groovy/includes/include_de_DE.tpl | 1 +
.../web/servlet/view/groovy/layout-main.tpl | 8 +
.../web/servlet/view/groovy/test.tpl | 13 +
.../web/servlet/view/tiles3/tiles-definitions.xml | 0
.../web/socket/SubProtocolCapable.java | 2 +-
.../web/socket/WebSocketExtension.java | 4 +-
.../web/socket/WebSocketHandler.java | 2 +-
.../web/socket/WebSocketHttpHeaders.java | 2 +-
.../web/socket/WebSocketSession.java | 22 +-
.../socket/adapter/AbstractWebSocketSession.java | 12 +-
.../web/socket/adapter/NativeWebSocketSession.java | 2 +-
.../jetty/JettyWebSocketHandlerAdapter.java | 43 +-
.../adapter/jetty/JettyWebSocketSession.java | 74 +-
.../web/socket/adapter/jetty/package-info.java | 17 -
.../web/socket/adapter/package-info.java | 17 -
.../standard/ConvertingEncoderDecoderSupport.java | 8 +-
.../StandardToWebSocketExtensionAdapter.java | 23 +-
.../standard/StandardWebSocketHandlerAdapter.java | 38 +-
.../adapter/standard/StandardWebSocketSession.java | 76 +-
.../WebSocketToStandardExtensionAdapter.java | 12 +-
.../web/socket/adapter/standard/package-info.java | 17 -
.../web/socket/client/AbstractWebSocketClient.java | 20 +-
.../socket/client/ConnectionManagerSupport.java | 17 +-
.../web/socket/client/WebSocketClient.java | 2 +-
.../socket/client/WebSocketConnectionManager.java | 13 +-
.../socket/client/jetty/JettyWebSocketClient.java | 58 +-
.../web/socket/client/jetty/package-info.java | 17 -
.../web/socket/client/package-info.java | 17 -
.../AnnotatedEndpointConnectionManager.java | 2 +-
.../client/standard/EndpointConnectionManager.java | 3 +-
.../client/standard/StandardWebSocketClient.java | 10 +-
.../web/socket/client/standard/package-info.java | 17 -
.../config/HandlersBeanDefinitionParser.java | 145 +-
.../config/MessageBrokerBeanDefinitionParser.java | 559 +-
.../socket/config/WebSocketMessageBrokerStats.java | 196 +
.../web/socket/config/WebSocketNamespaceUtils.java | 94 +-
.../AbstractWebSocketHandlerRegistration.java | 69 +-
.../AbstractWebSocketMessageBrokerConfigurer.java | 16 +-
.../DelegatingWebSocketConfiguration.java | 2 +-
...egatingWebSocketMessageBrokerConfiguration.java | 56 +-
.../socket/config/annotation/EnableWebSocket.java | 2 +-
.../annotation/EnableWebSocketMessageBroker.java | 2 +-
.../ServletWebSocketHandlerRegistration.java | 4 +-
.../ServletWebSocketHandlerRegistry.java | 36 +-
.../annotation/SockJsServiceRegistration.java | 55 +-
.../config/annotation/StompEndpointRegistry.java | 2 +-
.../StompWebSocketEndpointRegistration.java | 29 +-
.../annotation/WebMvcStompEndpointRegistry.java | 23 +-
.../WebMvcStompWebSocketEndpointRegistration.java | 68 +-
.../annotation/WebSocketConfigurationSupport.java | 10 +-
.../config/annotation/WebSocketConfigurer.java | 2 +-
.../annotation/WebSocketHandlerRegistration.java | 29 +-
.../annotation/WebSocketHandlerRegistry.java | 2 +-
...WebSocketMessageBrokerConfigurationSupport.java | 70 +-
.../WebSocketMessageBrokerConfigurer.java | 22 +
.../annotation/WebSocketTransportRegistration.java | 42 +-
.../web/socket/config/annotation/package-info.java | 17 -
.../web/socket/config/package-info.java | 17 -
.../socket/handler/AbstractWebSocketHandler.java | 2 +-
.../handler/BeanCreatingHandlerProvider.java | 2 +-
.../web/socket/handler/BinaryWebSocketHandler.java | 2 +-
.../ConcurrentWebSocketSessionDecorator.java | 23 +-
.../ExceptionWebSocketHandlerDecorator.java | 46 +-
.../handler/LoggingWebSocketHandlerDecorator.java | 17 +-
.../handler/PerConnectionWebSocketHandler.java | 48 +-
.../handler/SessionLimitExceededException.java | 2 +-
.../web/socket/handler/TextWebSocketHandler.java | 2 +-
.../socket/handler/WebSocketHandlerDecorator.java | 2 +-
.../handler/WebSocketHandlerDecoratorFactory.java | 42 +
.../socket/handler/WebSocketSessionDecorator.java | 16 +-
.../web/socket/handler/package-info.java | 17 -
.../socket/messaging/AbstractSubProtocolEvent.java | 68 +
.../web/socket/messaging/SessionConnectEvent.java | 39 +-
.../socket/messaging/SessionConnectedEvent.java | 26 +-
.../socket/messaging/SessionDisconnectEvent.java | 14 +-
.../socket/messaging/SessionSubscribeEvent.java | 37 +
.../socket/messaging/SessionUnsubscribeEvent.java | 37 +
.../socket/messaging/StompSubProtocolHandler.java | 389 +-
.../web/socket/messaging/SubProtocolHandler.java | 2 +-
.../messaging/SubProtocolWebSocketHandler.java | 348 +-
.../web/socket/messaging/package-info.java | 17 -
.../springframework/web/socket/package-info.java | 17 -
.../socket/server/HandshakeFailureException.java | 18 +-
.../web/socket/server/HandshakeHandler.java | 8 +-
.../web/socket/server/HandshakeInterceptor.java | 11 +-
.../web/socket/server/RequestUpgradeStrategy.java | 11 +-
.../server/jetty/JettyRequestUpgradeStrategy.java | 22 +-
.../web/socket/server/jetty/package-info.java | 19 +-
.../web/socket/server/package-info.java | 17 -
.../standard/AbstractStandardUpgradeStrategy.java | 10 +-
.../AbstractTyrusRequestUpgradeStrategy.java | 303 ++
.../standard/GlassFishRequestUpgradeStrategy.java | 204 +-
.../server/standard/ServerEndpointExporter.java | 10 +-
.../standard/TomcatRequestUpgradeStrategy.java | 30 +-
.../standard/UndertowRequestUpgradeStrategy.java | 151 +-
.../standard/WebLogicRequestUpgradeStrategy.java | 198 +
.../web/socket/server/standard/package-info.java | 19 +-
.../server/support/DefaultHandshakeHandler.java | 164 +-
.../server/support/HandshakeInterceptorChain.java | 15 +-
.../support/HttpSessionHandshakeInterceptor.java | 124 +-
.../server/support/OriginHandshakeInterceptor.java | 109 +
.../support/WebSocketHttpRequestHandler.java | 33 +-
.../web/socket/server/support/package-info.java | 21 +-
.../web/socket/sockjs/SockJsException.java | 19 +-
.../sockjs/SockJsMessageDeliveryException.java | 2 +-
.../web/socket/sockjs/SockJsService.java | 2 +-
.../sockjs/SockJsTransportFailureException.java | 26 +-
.../sockjs/client/AbstractClientSockJsSession.java | 339 ++
.../socket/sockjs/client/AbstractXhrTransport.java | 183 +
.../sockjs/client/DefaultTransportRequest.java | 236 +
.../web/socket/sockjs/client/InfoReceiver.java | 39 +
.../socket/sockjs/client/JettyXhrTransport.java | 283 +
.../sockjs/client/RestTemplateXhrTransport.java | 258 +
.../web/socket/sockjs/client/SockJsClient.java | 322 ++
.../web/socket/sockjs/client/SockJsUrlInfo.java | 115 +
.../web/socket/sockjs/client/Transport.java | 49 +
.../web/socket/sockjs/client/TransportRequest.java | 51 +
.../socket/sockjs/client/UndertowXhrTransport.java | 469 ++
.../client/WebSocketClientSockJsSession.java | 136 +
.../socket/sockjs/client/WebSocketTransport.java | 176 +
.../sockjs/client/XhrClientSockJsSession.java | 111 +
.../web/socket/sockjs/client/XhrTransport.java | 51 +
.../web/socket/sockjs/client/package-info.java | 5 +
.../sockjs/frame/AbstractSockJsMessageCodec.java | 2 +-
.../sockjs/frame/DefaultSockJsFrameFormat.java | 13 +-
.../sockjs/frame/Jackson2SockJsMessageCodec.java | 16 +-
.../web/socket/sockjs/frame/SockJsFrame.java | 95 +-
.../web/socket/sockjs/frame/SockJsFrameFormat.java | 13 +-
.../web/socket/sockjs/frame/SockJsFrameType.java | 29 +
.../socket/sockjs/frame/SockJsMessageCodec.java | 2 +-
.../web/socket/sockjs/frame/package-info.java | 17 -
.../web/socket/sockjs/package-info.java | 17 -
.../sockjs/support/AbstractSockJsService.java | 224 +-
.../sockjs/support/SockJsHttpRequestHandler.java | 12 +-
.../web/socket/sockjs/support/package-info.java | 17 -
.../web/socket/sockjs/transport/SockJsSession.java | 11 +-
.../sockjs/transport/SockJsSessionFactory.java | 2 +-
.../transport/TransportHandlingSockJsService.java | 85 +-
.../web/socket/sockjs/transport/TransportType.java | 43 +-
.../AbstractHttpReceivingTransportHandler.java | 6 +-
.../AbstractHttpSendingTransportHandler.java | 43 +-
.../handler/AbstractTransportHandler.java | 5 +-
.../transport/handler/DefaultSockJsService.java | 4 +-
.../handler/EventSourceTransportHandler.java | 10 +-
.../handler/HtmlFileTransportHandler.java | 37 +-
.../handler/JsonpPollingTransportHandler.java | 14 +-
.../handler/JsonpReceivingTransportHandler.java | 2 +-
.../transport/handler/SockJsWebSocketHandler.java | 25 +-
.../handler/WebSocketTransportHandler.java | 15 +-
.../handler/XhrPollingTransportHandler.java | 6 +-
.../handler/XhrStreamingTransportHandler.java | 13 +-
.../sockjs/transport/handler/package-info.java | 17 -
.../web/socket/sockjs/transport/package-info.java | 21 +-
.../session/AbstractHttpSockJsSession.java | 7 +-
.../transport/session/AbstractSockJsSession.java | 348 +-
.../transport/session/PollingSockJsSession.java | 4 -
.../session/WebSocketServerSockJsSession.java | 22 +-
.../sockjs/transport/session/package-info.java | 17 -
.../src/main/resources/META-INF/spring.schemas | 3 +-
.../web/socket/config/spring-websocket-4.0.xsd | 770 +--
.../web/socket/config/spring-websocket-4.1.xsd | 877 +++
.../web/socket/AbstractHttpRequestTests.java | 10 +-
.../socket/AbstractWebSocketIntegrationTests.java | 25 +-
.../web/socket/ContextLoaderTestUtils.java | 4 +-
.../web/socket/JettyWebSocketTestServer.java | 29 +-
.../web/socket/TomcatWebSocketTestServer.java | 38 +-
.../web/socket/UndertowTestServer.java | 74 +-
.../web/socket/WebSocketIntegrationTests.java | 82 +-
.../web/socket/WebSocketTestServer.java | 8 +-
.../jetty/JettyWebSocketHandlerAdapterTests.java | 11 +-
.../adapter/jetty/JettyWebSocketSessionTests.java | 42 +-
.../ConvertingEncoderDecoderSupportTests.java | 5 +-
.../StandardWebSocketHandlerAdapterTests.java | 11 +-
.../standard/StandardWebSocketSessionTests.java | 27 +-
.../client/WebSocketConnectionManagerTests.java | 71 +-
.../client/jetty/JettyWebSocketClientTests.java | 5 +-
.../standard/StandardWebSocketClientTests.java | 4 +-
.../config/HandlersBeanDefinitionParserTests.java | 280 +-
.../MessageBrokerBeanDefinitionParserTests.java | 196 +-
.../WebMvcStompEndpointRegistrationTests.java | 124 -
.../WebMvcStompEndpointRegistryTests.java | 31 +-
...MvcStompWebSocketEndpointRegistrationTests.java | 261 +
.../annotation/WebSocketConfigurationTests.java | 22 +-
.../WebSocketHandlerRegistrationTests.java | 128 +-
...cketMessageBrokerConfigurationSupportTests.java | 166 +-
.../handler/BeanCreatingHandlerProviderTests.java | 3 +-
.../ConcurrentWebSocketSessionDecoratorTests.java | 18 +-
.../ExceptionWebSocketHandlerDecoratorTests.java | 23 +-
.../PerConnectionWebSocketHandlerTests.java | 3 +-
.../web/socket/handler/TestPrincipal.java | 2 +-
.../web/socket/handler/TestWebSocketSession.java | 2 +-
.../handler/WebSocketHandlerDecoratorTests.java | 2 +-
.../socket/handler/WebSocketHttpHeadersTests.java | 3 +-
.../messaging/StompSubProtocolHandlerTests.java | 200 +-
.../socket/messaging/StompTextMessageBuilder.java | 2 +-
.../messaging/StompWebSocketIntegrationTests.java | 169 +-
.../SubProtocolWebSocketHandlerTests.java | 40 +-
.../server/DefaultHandshakeHandlerTests.java | 42 +-
.../standard/ServerEndpointExporterTests.java | 6 +
.../standard/ServerEndpointRegistrationTests.java | 3 +-
.../server/standard/SpringConfiguratorTests.java | 3 +-
.../support/HandshakeInterceptorChainTests.java | 15 +-
.../HttpSessionHandshakeInterceptorTests.java | 58 +-
.../support/OriginHandshakeInterceptorTests.java | 132 +
.../client/AbstractSockJsIntegrationTests.java | 408 ++
.../sockjs/client/ClientSockJsSessionTests.java | 280 +
.../client/DefaultTransportRequestTests.java | 134 +
.../sockjs/client/JettySockJsIntegrationTests.java | 65 +
.../client/RestTemplateXhrTransportTests.java | 227 +
.../socket/sockjs/client/SockJsClientTests.java | 136 +
.../socket/sockjs/client/SockJsUrlInfoTests.java | 88 +
.../web/socket/sockjs/client/TestTransport.java | 121 +
.../client/UndertowSockJsIntegrationTests.java | 66 +
.../socket/sockjs/client/XhrTransportTests.java | 150 +
.../web/socket/sockjs/frame/SockJsFrameTests.java | 98 +
.../socket/sockjs/support/SockJsServiceTests.java | 158 +-
.../sockjs/transport/TransportTypeTests.java | 3 +-
.../handler/DefaultSockJsServiceTests.java | 151 +-
.../HttpReceivingTransportHandlerTests.java | 27 +-
.../handler/HttpSendingTransportHandlerTests.java | 82 +-
.../handler/SockJsWebSocketHandlerTests.java | 65 +
.../session/AbstractSockJsSessionTests.java | 4 +-
.../transport/session/HttpSockJsSessionTests.java | 4 +-
.../transport/session/SockJsSessionTests.java | 16 +-
.../transport/session/StubSockJsServiceConfig.java | 4 +-
.../transport/session/TestHttpSockJsSession.java | 4 +-
.../transport/session/TestSockJsSession.java | 4 +-
.../session/WebSocketServerSockJsSessionTests.java | 6 +-
.../src/test/resources/log4j.properties | 7 +-
...ocket-config-broker-converters-defaults-off.xml | 22 +-
.../config/websocket-config-broker-converters.xml | 22 +-
...oker-custom-argument-and-return-value-types.xml | 30 +
...nfig-broker-customchannels-default-executor.xml | 48 +-
.../websocket-config-broker-customchannels.xml | 56 +-
.../config/websocket-config-broker-relay.xml | 30 +-
.../config/websocket-config-broker-simple.xml | 67 +-
.../websocket-config-handlers-attributes.xml | 34 +-
...websocket-config-handlers-sockjs-attributes.xml | 43 +-
.../config/websocket-config-handlers-sockjs.xml | 29 +-
.../socket/config/websocket-config-handlers.xml | 24 +-
src/asciidoc/appendix.adoc | 24 +-
src/asciidoc/index.adoc | 5558 ++++++++++++++++----
src/dist/license.txt | 2 +-
src/eclipse/org.eclipse.jdt.ui.prefs | 2 +-
src/test/resources/log4j.properties | 6 -
3470 files changed, 133217 insertions(+), 41241 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