[libspring-java] branch master updated (bdd208b -> e9c3ab8)
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Sat Apr 2 22:47:29 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a change to branch master
in repository libspring-java.
from bdd208b Upload to unstable
adds da46d30 Imported Upstream version 4.0.9
new 8c1de25 Merge tag 'upstream/4.0.9'
new bc8b713 Refreshed the patches
new cf807f5 Standards-Version updated to 3.9.7
new e480dfb Use secure Vcs-* URLs
new 9bed4cb Updated the dependencies
new e30d29d Ignore the new websocket and messaging modules
new a3ec196 Added a lintian overide for the warnings about Spring.js
new e9c3ab8 Upload to unstable
The 8 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitignore | 4 +
.mailmap | 14 -
CONTRIBUTING-DOCUMENTATION.adoc | 51 +
CONTRIBUTING.md | 152 +-
README.md | 89 +-
build.gradle | 643 +-
debian/changelog | 21 +
debian/control | 27 +-
debian/maven.ignoreRules | 4 +-
debian/maven.rules | 27 +-
debian/patches/0003_no_ibm_websphere.diff | 4 +-
debian/patches/0005_commonj.diff | 9 +-
.../0007_remove_backport_util_concurrent.patch | 68 -
debian/patches/0010_velocity_17.diff | 20 -
.../0022-ignore-docbook-reference-plugin.patch | 21 +-
debian/patches/0026-derby-compatibility.patch | 21 -
debian/patches/0027-disable-jcache-support.patch | 2 +-
debian/patches/0028-disable-jdiff-report.patch | 6 +-
debian/patches/0030-tomcat7-compatibility.patch | 39 +-
debian/patches/0032-missing-tiles-dependency.patch | 13 -
.../patches/0033-missing-taglibs-dependency.patch | 14 -
.../0034-velocity-tools-compatibility.patch | 14 +
.../patches/0035-ignore-asciidoctor-plugin.patch | 32 +
.../patches/0036-ignore-compilation-warnings.patch | 14 +
debian/patches/series | 8 +-
debian/rules | 6 +-
debian/source/lintian-overrides | 4 +
gradle.properties | 2 +-
gradle/ide.gradle | 6 +
gradle/publish-maven.gradle | 16 +-
import-into-eclipse.bat | 2 +-
import-into-eclipse.sh | 2 +-
import-into-idea.md | 5 +-
settings.gradle | 5 +-
.../java/org/springframework/aop/TargetSource.java | 1 +
.../org/springframework/aop/TrueClassFilter.java | 3 +-
.../org/springframework/aop/TrueMethodMatcher.java | 7 +-
.../java/org/springframework/aop/TruePointcut.java | 2 +
.../aop/aspectj/AbstractAspectJAdvice.java | 15 +-
.../AspectJAdviceParameterNameDiscoverer.java | 17 +-
.../aop/aspectj/AspectJAfterAdvice.java | 3 +
.../aop/aspectj/AspectJAfterReturningAdvice.java | 33 +-
.../aop/aspectj/AspectJAfterThrowingAdvice.java | 8 +-
.../aop/aspectj/AspectJAroundAdvice.java | 5 +-
.../aop/aspectj/AspectJExpressionPointcut.java | 24 +
.../aspectj/AspectJExpressionPointcutAdvisor.java | 1 +
.../aop/aspectj/AspectJMethodBeforeAdvice.java | 5 +-
.../aop/aspectj/AspectJPointcutAdvisor.java | 6 +-
.../aop/aspectj/AspectJWeaverMessageHandler.java | 4 +
.../aop/aspectj/DeclareParentsAdvisor.java | 6 +
.../MethodInvocationProceedingJoinPoint.java | 50 +-
.../aop/aspectj/RuntimeTestWalker.java | 9 +
.../aop/aspectj/SimpleAspectInstanceFactory.java | 9 +-
.../aspectj/SingletonAspectInstanceFactory.java | 3 +
.../aop/aspectj/TypePatternClassFilter.java | 3 +-
.../annotation/AbstractAspectJAdvisorFactory.java | 39 +-
.../aspectj/annotation/AspectJProxyFactory.java | 14 +-
.../aop/aspectj/annotation/AspectMetadata.java | 10 +-
.../BeanFactoryAspectInstanceFactory.java | 6 +-
.../BeanFactoryAspectJAdvisorsBuilder.java | 4 +-
...InstantiationModelAwarePointcutAdvisorImpl.java | 15 +-
...azySingletonAspectInstanceFactoryDecorator.java | 6 +-
.../ReflectiveAspectJAdvisorFactory.java | 9 +-
.../SimpleMetadataAwareAspectInstanceFactory.java | 3 +-
...ingletonMetadataAwareAspectInstanceFactory.java | 1 +
.../AspectJAwareAdvisorAutoProxyCreator.java | 6 +-
.../autoproxy/AspectJPrecedenceComparator.java | 19 +-
...ctInterceptorDrivenBeanDefinitionDecorator.java | 1 +
.../aop/config/AdvisorComponentDefinition.java | 2 +
.../springframework/aop/config/AopConfigUtils.java | 8 +-
.../aop/config/AopNamespaceHandler.java | 1 +
.../aop/config/AopNamespaceUtils.java | 24 +-
.../AspectJAutoProxyBeanDefinitionParser.java | 1 +
.../aop/config/ConfigBeanDefinitionParser.java | 3 +-
.../aop/config/MethodLocatingFactoryBean.java | 8 +-
.../aop/config/PointcutComponentDefinition.java | 4 +-
.../config/ScopedProxyBeanDefinitionDecorator.java | 1 +
...impleBeanFactoryAwareAspectInstanceFactory.java | 6 +-
.../SpringConfiguredBeanDefinitionParser.java | 3 +-
.../AbstractAdvisingBeanPostProcessor.java | 4 +
.../AbstractSingletonProxyFactoryBean.java | 7 +-
.../aop/framework/AdvisedSupport.java | 50 +-
.../aop/framework/AdvisorChainFactory.java | 8 +-
.../aop/framework/AopProxyUtils.java | 16 +-
.../aop/framework/CglibAopProxy.java | 50 +-
.../aop/framework/DefaultAdvisorChainFactory.java | 22 +-
.../aop/framework/DefaultAopProxyFactory.java | 23 +-
.../aop/framework/JdkDynamicAopProxy.java | 3 +
.../aop/framework/ObjenesisCglibAopProxy.java | 70 +
.../aop/framework/ProxyFactoryBean.java | 7 +
.../aop/framework/ReflectiveMethodInvocation.java | 17 +-
.../adapter/AdvisorAdapterRegistrationManager.java | 4 +-
.../adapter/AfterReturningAdviceAdapter.java | 2 +
.../adapter/AfterReturningAdviceInterceptor.java | 1 +
.../adapter/DefaultAdvisorAdapterRegistry.java | 3 +
.../adapter/MethodBeforeAdviceAdapter.java | 2 +
.../adapter/MethodBeforeAdviceInterceptor.java | 1 +
.../aop/framework/adapter/ThrowsAdviceAdapter.java | 2 +
.../framework/adapter/ThrowsAdviceInterceptor.java | 5 +-
.../autoproxy/AbstractAdvisorAutoProxyCreator.java | 8 +-
.../autoproxy/AbstractAutoProxyCreator.java | 101 +-
.../autoproxy/DefaultAdvisorAutoProxyCreator.java | 1 +
...bstractBeanFactoryBasedTargetSourceCreator.java | 3 +
.../autoproxy/target/QuickTargetSourceCreator.java | 2 +-
.../interceptor/AbstractMonitoringInterceptor.java | 2 +-
.../aop/interceptor/AbstractTraceInterceptor.java | 3 +-
.../interceptor/AsyncExecutionAspectSupport.java | 1 +
.../aop/interceptor/AsyncExecutionInterceptor.java | 3 +
.../ConcurrencyThrottleInterceptor.java | 1 +
.../aop/interceptor/ExposeBeanNameAdvisors.java | 2 +
.../interceptor/ExposeInvocationInterceptor.java | 2 +
.../aop/scope/DefaultScopedObject.java | 2 +
.../aop/scope/ScopedProxyFactoryBean.java | 4 +
.../aop/scope/ScopedProxyUtils.java | 2 +-
.../AbstractBeanFactoryPointcutAdvisor.java | 2 +
.../aop/support/AbstractExpressionPointcut.java | 1 +
.../support/AbstractGenericPointcutAdvisor.java | 1 +
.../aop/support/AbstractPointcutAdvisor.java | 2 +
.../aop/support/AbstractRegexpMethodPointcut.java | 1 +
.../org/springframework/aop/support/AopUtils.java | 2 +-
.../springframework/aop/support/ClassFilters.java | 2 +
.../aop/support/ComposablePointcut.java | 2 +
.../aop/support/ControlFlowPointcut.java | 18 +-
.../support/DefaultBeanFactoryPointcutAdvisor.java | 1 +
.../aop/support/DefaultIntroductionAdvisor.java | 8 +-
.../aop/support/DefaultPointcutAdvisor.java | 1 +
...gatePerTargetObjectIntroductionInterceptor.java | 9 +-
.../support/DelegatingIntroductionInterceptor.java | 1 +
.../aop/support/DynamicMethodMatcher.java | 2 +
.../aop/support/DynamicMethodMatcherPointcut.java | 2 +
.../aop/support/IntroductionInfoSupport.java | 3 +-
.../aop/support/MethodMatchers.java | 8 +
.../support/NameMatchMethodPointcutAdvisor.java | 1 +
.../org/springframework/aop/support/Pointcuts.java | 8 +-
.../aop/support/RegexpMethodPointcutAdvisor.java | 1 +
.../aop/support/RootClassFilter.java | 9 +-
.../aop/support/StaticMethodMatcher.java | 2 +
.../aop/support/StaticMethodMatcherPointcut.java | 4 +-
.../StaticMethodMatcherPointcutAdvisor.java | 6 +-
.../support/annotation/AnnotationClassFilter.java | 1 +
.../annotation/AnnotationMatchingPointcut.java | 2 +
.../annotation/AnnotationMethodMatcher.java | 3 +-
.../AbstractBeanFactoryBasedTargetSource.java | 4 +
.../target/AbstractLazyCreationTargetSource.java | 4 +
.../aop/target/AbstractPoolingTargetSource.java | 2 +
.../aop/target/CommonsPoolTargetSource.java | 12 +-
.../aop/target/EmptyTargetSource.java | 12 +-
.../aop/target/HotSwappableTargetSource.java | 6 +-
.../aop/target/LazyInitTargetSource.java | 1 +
.../aop/target/PrototypeTargetSource.java | 1 +
.../aop/target/SimpleBeanTargetSource.java | 1 +
.../aop/target/SingletonTargetSource.java | 4 +
.../aop/target/ThreadLocalTargetSource.java | 5 +
.../dynamic/AbstractRefreshableTargetSource.java | 7 +
.../src/main/resources/META-INF/spring.schemas | 3 +-
.../springframework/aop/config/spring-aop-4.0.xsd | 410 +
...AdviceParameterNameDiscoverAnnotationTests.java | 1 -
.../TigerAspectJExpressionPointcutTests.java | 1 -
.../AbstractAspectJAdvisorFactoryTests.java | 16 +-
.../annotation/AspectJPointcutAdvisorTests.java | 1 -
.../aspectj/annotation/AspectMetadataTests.java | 1 -
.../aop/framework/ClassWithConstructor.java | 28 +
.../aop/framework/MethodInvocationTests.java | 1 +
.../adapter/ThrowsAdviceInterceptorTests.java | 1 -
.../support/AbstractRegexpMethodPointcutTests.java | 8 +-
.../springframework/aop/support/AopUtilsTests.java | 1 -
.../aop/support/ControlFlowPointcutTests.java | 1 -
.../DelegatingIntroductionInterceptorTests.java | 1 +
.../aop/support/NameMatchMethodPointcutTests.java | 1 -
...egexpMethodPointcutAdvisorIntegrationTests.java | 1 -
.../aop/target/HotSwappableTargetSourceTests.java | 2 -
.../aop/target/PrototypeTargetSourceTests.java | 1 -
.../aop/target/ThreadLocalTargetSourceTests.java | 1 -
.../tests/aop/advice/MethodCounter.java | 2 +
.../tests/aop/advice/MyThrowsHandler.java | 1 -
.../aop/advice/TimestampIntroductionAdvisor.java | 1 -
.../tests/aop/interceptor/NopInterceptor.java | 7 +
.../interceptor/SerializableNopInterceptor.java | 1 -
.../tests/sample/beans/SerializablePerson.java | 10 +
spring-aop/src/test/resources/log4j.properties | 10 +
spring-aop/src/test/resources/log4j.xml | 28 -
.../aspectj/AbstractDependencyInjectionAspect.aj | 6 +-
.../aspectj/AnnotationBeanConfigurerAspect.aj | 2 +-
...ericInterfaceDrivenDependencyInjectionAspect.aj | 2 +-
.../staticmock/AbstractMethodMockingControl.aj | 108 +-
.../AnnotationDrivenStaticEntityMockingControl.aj | 55 +-
.../aspectj/AbstractBeanConfigurerTests.java | 7 +
.../cache/aspectj/AspectJAnnotationTests.java | 2 +-
.../config/AnnotatedClassCacheableService.java | 36 +
.../cache/config/CacheableService.java | 4 +
.../cache/config/DefaultCacheableService.java | 13 +
.../cache/config/SomeKeyGenerator.java | 4 +-
.../springframework/cache/config/TestEntity.java | 56 +
...ationDrivenStaticEntityMockingControlTests.java | 184 +-
.../aspectj/TransactionAspectTests.java | 7 +
spring-aspects/src/test/resources/log4j.properties | 9 +
spring-aspects/src/test/resources/log4j.xml | 28 -
.../groovy/GroovyDynamicElementReader.groovy | 125 +
.../factory/groovy/GroovyBeanDefinitionReader.java | 818 +
.../groovy/GroovyBeanDefinitionWrapper.java | 241 +
.../beans/factory/groovy/package-info.java | 8 +
.../beans/AbstractPropertyAccessor.java | 11 +-
.../beans/BeanInstantiationException.java | 13 +-
.../beans/BeanMetadataAttribute.java | 1 +
.../beans/BeanMetadataAttributeAccessor.java | 1 +
.../org/springframework/beans/BeanWrapperImpl.java | 27 +-
.../beans/CachedIntrospectionResults.java | 29 +-
.../beans/ConversionNotSupportedException.java | 5 +-
.../springframework/beans/DirectFieldAccessor.java | 4 +
.../springframework/beans/ExtendedBeanInfo.java | 10 +
.../beans/ExtendedBeanInfoFactory.java | 2 +
.../beans/GenericTypeAwarePropertyDescriptor.java | 28 +-
.../beans/InvalidPropertyException.java | 8 +-
.../beans/MethodInvocationException.java | 1 +
.../beans/MutablePropertyValues.java | 18 +
.../beans/NotReadablePropertyException.java | 18 +-
.../beans/NotWritablePropertyException.java | 8 +-
.../beans/NullValueInNestedPathException.java | 4 +-
.../springframework/beans/PropertyAccessor.java | 2 +-
.../beans/PropertyBatchUpdateException.java | 2 +-
.../beans/PropertyEditorRegistrySupport.java | 52 +-
.../beans/TypeConverterDelegate.java | 31 +-
.../beans/TypeConverterSupport.java | 3 +
.../beans/TypeMismatchException.java | 13 +-
.../beans/factory/BeanCreationException.java | 2 +-
.../beans/factory/BeanIsNotAFactoryException.java | 2 +-
.../factory/BeanNotOfRequiredTypeException.java | 10 +-
.../beans/factory/ListableBeanFactory.java | 29 +-
.../factory/UnsatisfiedDependencyException.java | 4 +-
.../access/SingletonBeanFactoryLocator.java | 3 +
.../annotation/AnnotatedGenericBeanDefinition.java | 1 +
.../AnnotationBeanWiringInfoResolver.java | 3 +-
.../AutowiredAnnotationBeanPostProcessor.java | 70 +-
.../annotation/CustomAutowireConfigurer.java | 15 +-
.../InitDestroyAnnotationBeanPostProcessor.java | 7 +-
...alifierAnnotationAutowireCandidateResolver.java | 60 +-
.../RequiredAnnotationBeanPostProcessor.java | 25 +-
.../beans/factory/config/AbstractFactoryBean.java | 16 +-
.../factory/config/AutowireCapableBeanFactory.java | 12 +-
.../beans/factory/config/BeanDefinition.java | 8 +-
.../beans/factory/config/BeanDefinitionHolder.java | 7 +-
.../factory/config/BeanReferenceFactoryBean.java | 10 +-
.../factory/config/CommonsLogFactoryBean.java | 4 +
.../factory/config/ConstructorArgumentValues.java | 1 +
.../factory/config/CustomEditorConfigurer.java | 117 +-
.../factory/config/CustomScopeConfigurer.java | 10 +-
.../beans/factory/config/DependencyDescriptor.java | 58 +-
.../beans/factory/config/DeprecatedBeanWarner.java | 1 +
.../factory/config/FieldRetrievingFactoryBean.java | 14 +-
...InstantiationAwareBeanPostProcessorAdapter.java | 10 +-
.../beans/factory/config/ListFactoryBean.java | 23 +-
.../beans/factory/config/MapFactoryBean.java | 25 +-
.../beans/factory/config/MethodInvokingBean.java | 132 +
.../factory/config/MethodInvokingFactoryBean.java | 114 +-
.../config/ObjectFactoryCreatingFactoryBean.java | 9 +-
.../config/PlaceholderConfigurerSupport.java | 2 +
.../config/PreferencesPlaceholderConfigurer.java | 1 +
.../factory/config/PropertiesFactoryBean.java | 21 +-
.../factory/config/PropertyOverrideConfigurer.java | 14 +-
.../factory/config/PropertyPathFactoryBean.java | 9 +-
.../config/PropertyPlaceholderConfigurer.java | 2 +
.../factory/config/PropertyResourceConfigurer.java | 4 +-
.../config/ProviderCreatingFactoryBean.java | 9 +-
.../factory/config/RuntimeBeanNameReference.java | 2 +
.../beans/factory/config/RuntimeBeanReference.java | 2 +
.../factory/config/ServiceLocatorFactoryBean.java | 50 +-
.../beans/factory/config/SetFactoryBean.java | 23 +-
.../beans/factory/config/TypedStringValue.java | 5 +-
.../parsing/AbstractComponentDefinition.java | 6 +-
.../beans/factory/parsing/AliasDefinition.java | 1 +
.../factory/parsing/BeanComponentDefinition.java | 5 +
.../parsing/CompositeComponentDefinition.java | 4 +-
.../factory/parsing/EmptyReaderEventListener.java | 6 +-
.../factory/parsing/FailFastProblemReporter.java | 3 +
.../beans/factory/parsing/ImportDefinition.java | 1 +
.../beans/factory/parsing/NullSourceExtractor.java | 1 +
.../beans/factory/parsing/ParseState.java | 9 +-
.../parsing/PassThroughSourceExtractor.java | 1 +
.../AbstractServiceLoaderBasedFactoryBean.java | 10 +-
.../factory/serviceloader/ServiceFactoryBean.java | 6 +-
.../serviceloader/ServiceListFactoryBean.java | 4 +-
.../serviceloader/ServiceLoaderFactoryBean.java | 4 +-
.../AbstractAutowireCapableBeanFactory.java | 86 +-
.../factory/support/AbstractBeanDefinition.java | 77 +-
.../support/AbstractBeanDefinitionReader.java | 8 +
.../beans/factory/support/AbstractBeanFactory.java | 64 +-
.../support/AutowireCandidateQualifier.java | 4 +-
.../factory/support/AutowireCandidateResolver.java | 15 +-
.../beans/factory/support/AutowireUtils.java | 3 +
.../factory/support/BeanDefinitionBuilder.java | 53 +-
.../factory/support/BeanDefinitionResource.java | 2 +
.../CglibSubclassingInstantiationStrategy.java | 215 +-
.../beans/factory/support/ChildBeanDefinition.java | 5 +-
.../beans/factory/support/ConstructorResolver.java | 14 +-
.../factory/support/DefaultBeanNameGenerator.java | 3 +-
.../support/DefaultListableBeanFactory.java | 171 +-
.../support/DefaultSingletonBeanRegistry.java | 76 +-
.../factory/support/DisposableBeanAdapter.java | 22 +
.../support/FactoryBeanRegistrySupport.java | 2 +
.../factory/support/GenericBeanDefinition.java | 2 +
.../GenericTypeAwareAutowireCandidateResolver.java | 170 +
.../beans/factory/support/LookupOverride.java | 2 +-
.../beans/factory/support/ManagedArray.java | 2 +-
.../beans/factory/support/ManagedList.java | 5 +-
.../beans/factory/support/ManagedMap.java | 5 +-
.../beans/factory/support/ManagedProperties.java | 3 +
.../beans/factory/support/ManagedSet.java | 5 +-
.../beans/factory/support/MethodOverride.java | 1 +
.../support/PropertiesBeanDefinitionReader.java | 15 +-
.../beans/factory/support/ReplaceOverride.java | 3 +-
.../beans/factory/support/RootBeanDefinition.java | 62 +-
.../support/SimpleAutowireCandidateResolver.java | 10 +-
.../support/SimpleBeanDefinitionRegistry.java | 7 +
.../support/SimpleInstantiationStrategy.java | 8 +-
.../support/SimpleSecurityContextProvider.java | 1 +
.../factory/support/StaticListableBeanFactory.java | 34 +-
.../factory/wiring/BeanConfigurerSupport.java | 3 +
.../wiring/ClassNameBeanWiringInfoResolver.java | 3 +-
.../factory/xml/AbstractBeanDefinitionParser.java | 1 +
.../factory/xml/BeanDefinitionParserDelegate.java | 26 +-
.../beans/factory/xml/BeansDtdResolver.java | 1 +
.../xml/DefaultBeanDefinitionDocumentReader.java | 16 +-
.../beans/factory/xml/DefaultDocumentLoader.java | 4 +-
.../xml/DefaultNamespaceHandlerResolver.java | 1 +
.../factory/xml/DelegatingEntityResolver.java | 1 +
.../factory/xml/DocumentDefaultsDefinition.java | 1 +
.../beans/factory/xml/NamespaceHandler.java | 2 +-
.../beans/factory/xml/NamespaceHandlerSupport.java | 4 +-
.../beans/factory/xml/PluggableSchemaResolver.java | 1 +
.../beans/factory/xml/ResourceEntityResolver.java | 2 +-
.../xml/SimpleConstructorNamespaceHandler.java | 3 +
.../xml/SimplePropertyNamespaceHandler.java | 3 +
.../beans/factory/xml/UtilNamespaceHandler.java | 19 +-
.../beans/factory/xml/XmlBeanDefinitionReader.java | 35 +-
.../beans/factory/xml/XmlReaderContext.java | 18 +-
.../beans/propertyeditors/ClassArrayEditor.java | 4 +-
.../beans/propertyeditors/ClassEditor.java | 2 +-
.../beans/propertyeditors/CustomBooleanEditor.java | 4 +-
.../propertyeditors/CustomCollectionEditor.java | 29 +-
.../beans/propertyeditors/CustomDateEditor.java | 4 +-
.../beans/propertyeditors/CustomMapEditor.java | 24 +-
.../beans/propertyeditors/CustomNumberEditor.java | 4 +-
.../beans/propertyeditors/PropertiesEditor.java | 2 +-
.../beans/propertyeditors/StringTrimmerEditor.java | 1 -
.../beans/propertyeditors/TimeZoneEditor.java | 18 +-
.../beans/propertyeditors/ZoneIdEditor.java | 44 +
.../support/ArgumentConvertingMethodInvoker.java | 4 +-
.../beans/support/MutableSortDefinition.java | 5 +-
.../beans/support/PropertyComparator.java | 15 +-
.../beans/support/ResourceEditorRegistrar.java | 1 +
.../src/main/resources/META-INF/spring.schemas | 9 +-
.../beans/factory/xml/spring-beans-4.0.xsd | 1185 +
.../beans/factory/xml/spring-beans.dtd | 606 -
.../{spring-tool-3.1.xsd => spring-tool-4.0.xsd} | 0
.../beans/factory/xml/spring-util-4.0.xsd | 212 +
.../beans/BeanWrapperGenericsTests.java | 28 +-
.../beans/DirectFieldAccessorTests.java | 18 +-
.../beans/ExtendedBeanInfoTests.java | 5 +
.../beans/MutablePropertyValuesTests.java | 1 -
.../beans/factory/BeanFactoryUtilsTests.java | 1 -
.../factory/DefaultListableBeanFactoryTests.java | 84 +-
.../beans/factory/SharedBeanRegistryTests.java | 86 -
.../AutowiredAnnotationBeanPostProcessorTests.java | 1360 +-
.../annotation/CustomAutowireConfigurerTests.java | 12 +-
.../RequiredAnnotationBeanPostProcessorTests.java | 185 +-
.../config/CustomEditorConfigurerTests.java | 86 +-
.../config/FieldRetrievingFactoryBeanTests.java | 1 -
.../config/MethodInvokingFactoryBeanTests.java | 59 +-
.../config/PropertyPathFactoryBeanTests.java | 1 -
.../config/PropertyPlaceholderConfigurerTests.java | 2 -
.../config/PropertyResourceConfigurerTests.java | 1 -
.../config/ServiceLocatorFactoryBeanTests.java | 3 +-
.../beans/factory/config/SimpleScopeTests.java | 1 -
.../support/BeanDefinitionBuilderTests.java | 1 -
.../beans/factory/support/BeanDefinitionTests.java | 1 -
.../factory/support/BeanFactoryGenericsTests.java | 40 +
.../support/DefaultSingletonBeanRegistryTests.java | 104 +
.../DefinitionMetadataEqualsHashCodeTests.java | 2 +-
.../PropertiesBeanDefinitionReaderTests.java | 1 -
.../support/security/CallbacksSecurityTests.java | 2 +
.../factory/wiring/BeanConfigurerSupportTests.java | 1 -
.../factory/xml/AbstractBeanFactoryTests.java | 1 -
.../xml/AbstractListableBeanFactoryTests.java | 1 -
.../factory/xml/AutowireWithExclusionTests.java | 1 -
.../beans/factory/xml/CollectionMergingTests.java | 1 -
.../xml/CollectionsWithDefaultTypesTests.java | 1 -
.../factory/xml/ConstructorDependenciesBean.java | 1 -
.../beans/factory/xml/CountingFactory.java | 1 -
.../beans/factory/xml/DuplicateBeanIdTests.java | 2 -
.../beans/factory/xml/FactoryMethods.java | 1 -
.../NestedBeansElementAttributeRecursionTests.java | 1 -
.../beans/factory/xml/SchemaValidationTests.java | 1 -
.../SimpleConstructorNamespaceHandlerTests.java | 1 -
.../xml/SimplePropertyNamespaceHandlerTests.java | 1 -
.../beans/factory/xml/XmlBeanCollectionTests.java | 1 -
.../factory/xml/XmlListableBeanFactoryTests.java | 1 -
.../CustomCollectionEditorTests.java | 3 +-
.../beans/propertyeditors/CustomEditorTests.java | 1 -
.../beans/propertyeditors/ZoneIdEditorTests.java | 63 +
.../beans/support/PagedListHolderTests.java | 2 +
.../tests/beans/CollectingReaderEventListener.java | 1 -
.../springframework/tests/sample/beans/Colour.java | 26 +-
.../tests/sample/beans/CustomEnum.java | 1 +
.../tests/sample/beans/DummyFactory.java | 1 -
.../sample/beans/GenericSetOfIntegerBean.java | 1 -
.../tests/sample/beans/NestedTestBean.java | 3 +
.../springframework/tests/sample/beans/Pet.java | 3 +
.../tests/sample/beans/TestBean.java | 5 +
.../tests/sample/beans/factory/DummyFactory.java | 1 -
spring-beans/src/test/resources/log4j.properties | 9 +
spring-beans/src/test/resources/log4j.xml | 24 -
.../cache/ehcache/EhCacheCache.java | 23 +-
.../cache/ehcache/EhCacheCacheManager.java | 14 +-
.../cache/ehcache/EhCacheFactoryBean.java | 174 +-
.../cache/ehcache/EhCacheManagerFactoryBean.java | 121 +-
.../springframework/cache/guava/GuavaCache.java | 146 +
.../cache/guava/GuavaCacheManager.java | 229 +
.../springframework/cache/guava/package-info.java | 6 +
.../springframework/cache/jcache/JCacheCache.java | 39 +-
.../cache/jcache/JCacheCacheManager.java | 38 +-
.../cache/jcache/JCacheManagerFactoryBean.java | 45 +-
.../TransactionAwareCacheDecorator.java | 13 +-
.../TransactionAwareCacheManagerProxy.java | 3 +
.../springframework/mail/SimpleMailMessage.java | 11 +
.../mail/javamail/ConfigurableMimeFileTypeMap.java | 1 +
.../mail/javamail/JavaMailSenderImpl.java | 8 +
.../mail/javamail/MimeMailMessage.java | 13 +-
.../mail/javamail/MimeMessageHelper.java | 4 +
.../commonj/DelegatingTimerListener.java | 3 +-
.../scheduling/commonj/DelegatingWork.java | 5 +-
.../scheduling/commonj/TimerManagerAccessor.java | 5 +
.../commonj/TimerManagerFactoryBean.java | 6 +-
.../commonj/TimerManagerTaskScheduler.java | 23 +-
.../commonj/WorkManagerTaskExecutor.java | 43 +-
.../scheduling/quartz/AdaptableJobFactory.java | 6 +-
.../scheduling/quartz/CronTriggerBean.java | 11 +-
.../scheduling/quartz/CronTriggerFactoryBean.java | 5 +
.../scheduling/quartz/DelegatingJob.java | 3 +-
.../scheduling/quartz/JobDetailBean.java | 5 +
.../scheduling/quartz/JobDetailFactoryBean.java | 6 +
.../scheduling/quartz/LocalDataSourceJobStore.java | 4 +
.../quartz/LocalTaskExecutorThreadPool.java | 7 +
.../quartz/MethodInvokingJobDetailFactoryBean.java | 12 +-
.../scheduling/quartz/QuartzJobBean.java | 4 +-
.../quartz/ResourceLoaderClassLoadHelper.java | 7 +-
.../scheduling/quartz/SchedulerAccessor.java | 42 +-
.../scheduling/quartz/SchedulerAccessorBean.java | 5 +-
.../scheduling/quartz/SchedulerFactoryBean.java | 16 +-
.../quartz/SimpleThreadPoolTaskExecutor.java | 28 +-
.../scheduling/quartz/SimpleTriggerBean.java | 12 +-
.../quartz/SimpleTriggerFactoryBean.java | 5 +
.../scheduling/quartz/SpringBeanJobFactory.java | 4 +-
.../freemarker/FreeMarkerConfigurationFactory.java | 17 -
.../FreeMarkerConfigurationFactoryBean.java | 6 +-
.../ui/freemarker/SpringTemplateLoader.java | 4 +
.../ui/jasperreports/JasperReportsUtils.java | 2 +-
.../ui/velocity/CommonsLoggingLogSystem.java | 63 -
.../ui/velocity/VelocityEngineFactory.java | 32 +-
.../ui/velocity/VelocityEngineFactoryBean.java | 6 +-
.../ui/velocity/VelocityEngineUtils.java | 39 +-
.../cache/ehcache/EhCacheCacheTests.java | 16 +-
.../cache/ehcache/EhCacheSupportTests.java | 84 +-
.../cache/guava/GuavaCacheManagerTests.java | 158 +
.../TransactionAwareCacheDecoratorTests.java | 121 +
.../scheduling/quartz/QuartzSupportTests.java | 62 +-
.../ui/jasperreports/JasperReportsUtilsTests.java | 31 +-
.../src/test/resources/log4j.properties | 10 +
.../src/test/resources/log4j.xml | 28 -
.../scheduling/quartz/job-scheduling-data.xml | 23 +-
.../scheduling/quartz/quartz-hsql.sql | 24 +-
.../main/java/org/springframework/cache/Cache.java | 24 +-
.../annotation/AbstractCachingConfiguration.java | 6 +
.../annotation/CachingConfigurationSelector.java | 1 +
.../cache/annotation/EnableCaching.java | 4 +-
.../cache/concurrent/ConcurrentMapCache.java | 33 +-
.../concurrent/ConcurrentMapCacheFactoryBean.java | 7 +-
.../concurrent/ConcurrentMapCacheManager.java | 48 +-
.../AnnotationDrivenCacheBeanDefinitionParser.java | 1 +
.../cache/config/CacheAdviceParser.java | 136 +-
.../cache/config/CacheNamespaceHandler.java | 4 +-
.../AbstractFallbackCacheOperationSource.java | 1 +
.../BeanFactoryCacheOperationSourceAdvisor.java | 1 +
.../cache/interceptor/CacheAspectSupport.java | 400 +-
.../cache/interceptor/CacheEvictOperation.java | 1 +
.../interceptor/CacheExpressionRootObject.java | 9 +-
.../cache/interceptor/CacheInterceptor.java | 22 +-
.../cache/interceptor/CacheOperation.java | 36 +
.../interceptor/CacheOperationSourcePointcut.java | 1 +
.../cache/interceptor/CacheProxyFactoryBean.java | 7 +-
.../interceptor/CompositeCacheOperationSource.java | 4 +-
.../cache/interceptor/DefaultKeyGenerator.java | 11 +
.../cache/interceptor/ExpressionEvaluator.java | 86 +-
.../cache/interceptor/KeyGenerator.java | 10 +-
.../LazyParamAwareEvaluationContext.java | 20 +-
.../cache/interceptor/MethodCacheKey.java | 62 +
.../interceptor/NameMatchCacheOperationSource.java | 5 +-
.../cache/interceptor/SimpleKey.java | 67 +
.../cache/interceptor/SimpleKeyGenerator.java | 54 +
.../cache/support/AbstractCacheManager.java | 3 +
.../cache/support/CompositeCacheManager.java | 4 +-
.../cache/support/NoOpCacheManager.java | 15 +-
.../cache/support/SimpleCacheManager.java | 1 +
.../cache/support/SimpleValueWrapper.java | 1 +
.../context/ConfigurableApplicationContext.java | 2 +
.../access/ContextBeanFactoryReference.java | 2 +
.../access/ContextJndiBeanFactoryLocator.java | 1 +
.../annotation/AdviceModeImportSelector.java | 9 +-
.../annotation/AnnotatedBeanDefinitionReader.java | 33 +-
.../annotation/AnnotationBeanNameGenerator.java | 3 +-
.../AnnotationConfigApplicationContext.java | 13 +-
.../AnnotationConfigBeanDefinitionParser.java | 3 +-
.../context/annotation/AnnotationConfigUtils.java | 97 +-
.../AnnotationScopeMetadataResolver.java | 5 +-
.../annotation/AspectJAutoProxyRegistrar.java | 9 +-
.../context/annotation/AutoProxyRegistrar.java | 3 +-
.../annotation/ClassPathBeanDefinitionScanner.java | 12 +-
...lassPathScanningCandidateComponentProvider.java | 43 +-
.../CommonAnnotationBeanPostProcessor.java | 10 +-
.../context/annotation/ComponentScan.java | 11 +-
.../annotation/ComponentScanAnnotationParser.java | 30 +-
.../ComponentScanBeanDefinitionParser.java | 1 +
.../context/annotation/Condition.java | 53 +
.../context/annotation/ConditionContext.java | 68 +
.../context/annotation/ConditionEvaluator.java | 191 +
.../context/annotation/Conditional.java | 61 +
.../context/annotation/ConfigurationClass.java | 86 +-
.../ConfigurationClassBeanDefinitionReader.java | 172 +-
.../annotation/ConfigurationClassEnhancer.java | 265 +-
.../annotation/ConfigurationClassParser.java | 637 +-
.../ConfigurationClassPostProcessor.java | 113 +-
.../annotation/ConfigurationClassUtils.java | 24 +-
.../context/annotation/ConfigurationCondition.java | 61 +
...ContextAnnotationAutowireCandidateResolver.java | 97 +
.../context/annotation/DeferredImportSelector.java | 33 +
.../context/annotation/Description.java | 43 +
.../context/annotation/EnableLoadTimeWeaving.java | 10 +-
.../context/annotation/FilterType.java | 12 +
.../annotation/ImportBeanDefinitionRegistrar.java | 3 +-
.../context/annotation/ImportResource.java | 1 -
.../context/annotation/ImportSelector.java | 18 +-
.../annotation/Jsr330ScopeMetadataResolver.java | 5 +-
.../springframework/context/annotation/Lazy.java | 11 +-
.../annotation/LoadTimeWeavingConfiguration.java | 24 +-
.../annotation/MBeanExportConfiguration.java | 29 +-
.../context/annotation/MetadataUtils.java | 49 -
.../context/annotation/Profile.java | 9 +-
.../context/annotation/ProfileCondition.java | 49 +
.../context/annotation/PropertySource.java | 15 +-
.../context/annotation/PropertySources.java | 44 +
.../annotation/ScannedGenericBeanDefinition.java | 1 +
.../context/annotation/ScopedProxyMode.java | 12 +-
.../context/config/ContextNamespaceHandler.java | 1 +
.../PropertyOverrideBeanDefinitionParser.java | 2 +-
.../SpringConfiguredBeanDefinitionParser.java | 3 +-
.../event/AbstractApplicationEventMulticaster.java | 101 +-
.../context/event/ApplicationEventMulticaster.java | 4 +-
.../context/event/EventPublicationInterceptor.java | 9 +-
.../event/GenericApplicationListenerAdapter.java | 27 +-
.../event/SimpleApplicationEventMulticaster.java | 4 +-
.../context/event/SourceFilteringListener.java | 6 +-
.../expression/BeanExpressionContextAccessor.java | 11 +-
.../context/expression/BeanFactoryAccessor.java | 4 +
.../context/expression/BeanFactoryResolver.java | 3 +-
.../context/expression/EnvironmentAccessor.java | 5 +
.../context/expression/MapAccessor.java | 11 +-
.../expression/StandardBeanExpressionResolver.java | 4 +
.../context/i18n/LocaleContext.java | 7 +-
.../context/i18n/LocaleContextHolder.java | 121 +-
.../context/i18n/SimpleLocaleContext.java | 13 +-
.../i18n/SimpleTimeZoneAwareLocaleContext.java | 62 +
.../context/i18n/TimeZoneAwareLocaleContext.java | 42 +
.../support/AbstractApplicationContext.java | 363 +-
.../context/support/AbstractMessageSource.java | 5 +
.../AbstractRefreshableApplicationContext.java | 11 +-
...bstractRefreshableConfigApplicationContext.java | 2 +
.../support/ApplicationContextAwareProcessor.java | 4 +
.../context/support/ApplicationObjectSupport.java | 3 +-
.../support/ClassPathXmlApplicationContext.java | 6 +-
.../support/ContextTypeMatchClassLoader.java | 9 +-
.../support/ConversionServiceFactoryBean.java | 4 +
.../context/support/DefaultLifecycleProcessor.java | 8 +
.../support/DefaultMessageSourceResolvable.java | 3 +
.../context/support/DelegatingMessageSource.java | 7 +-
.../context/support/GenericApplicationContext.java | 13 +-
.../support/GenericGroovyApplicationContext.java | 247 +
.../support/GenericXmlApplicationContext.java | 9 +
.../context/support/LiveBeansView.java | 2 +
.../support/PostProcessorRegistrationDelegate.java | 380 +
.../PropertySourcesPlaceholderConfigurer.java | 18 +
.../ReloadableResourceBundleMessageSource.java | 5 +-
.../support/ResourceBundleMessageSource.java | 35 +-
.../context/support/SimpleThreadScope.java | 5 +
.../context/support/StaticApplicationContext.java | 18 +-
.../context/weaving/AspectJWeavingEnabler.java | 12 +-
.../weaving/DefaultContextLoadTimeWeaver.java | 31 +-
.../weaving/LoadTimeWeaverAwareProcessor.java | 3 +
.../AbstractRemoteSlsbInvokerInterceptor.java | 4 +-
.../ejb/access/AbstractSlsbInvokerInterceptor.java | 1 +
.../LocalStatelessSessionProxyFactoryBean.java | 10 +-
.../access/SimpleRemoteSlsbInvokerInterceptor.java | 1 +
...mpleRemoteStatelessSessionProxyFactoryBean.java | 10 +-
.../ejb/config/JeeNamespaceHandler.java | 1 +
.../ejb/config/JndiLookupBeanDefinitionParser.java | 2 +-
.../ejb/support/AbstractEnterpriseBean.java | 195 -
.../ejb/support/AbstractJmsMessageDrivenBean.java | 35 -
.../ejb/support/AbstractMessageDrivenBean.java | 94 -
.../ejb/support/AbstractSessionBean.java | 57 -
.../ejb/support/AbstractStatefulSessionBean.java | 78 -
.../ejb/support/AbstractStatelessSessionBean.java | 100 -
.../ejb/support/SmartSessionBean.java | 46 -
.../springframework/ejb/support/package-info.java | 25 -
.../springframework/format/FormatterRegistry.java | 10 +-
.../format/datetime/DateFormatter.java | 2 +
.../format/datetime/DateFormatterRegistrar.java | 7 +
.../DateTimeFormatAnnotationFormatterFactory.java | 4 +
.../joda/DateTimeFormatterFactoryBean.java | 4 +
.../format/datetime/joda/DateTimeParser.java | 7 +-
...daDateTimeFormatAnnotationFormatterFactory.java | 22 +-
.../format/datetime/joda/JodaTimeContext.java | 20 +
.../format/datetime/joda/JodaTimeConverters.java | 63 +-
.../datetime/joda/JodaTimeFormatterRegistrar.java | 9 +-
.../format/datetime/joda/LocalDateParser.java | 53 +
.../format/datetime/joda/LocalDateTimeParser.java | 53 +
.../format/datetime/joda/LocalTimeParser.java | 53 +
.../datetime/joda/MillisecondInstantPrinter.java | 7 +-
.../datetime/joda/ReadableInstantPrinter.java | 8 +-
.../datetime/joda/ReadablePartialPrinter.java | 7 +-
.../format/datetime/standard/DateTimeContext.java | 104 +
.../datetime/standard/DateTimeContextHolder.java | 79 +
.../datetime/standard/DateTimeConverters.java | 267 +
.../standard/DateTimeFormatterFactory.java | 211 +
.../standard/DateTimeFormatterFactoryBean.java | 62 +
.../standard/DateTimeFormatterRegistrar.java | 204 +
.../format/datetime/standard/InstantFormatter.java | 46 +
...10DateTimeFormatAnnotationFormatterFactory.java | 108 +
.../datetime/standard/TemporalAccessorParser.java | 91 +
.../datetime/standard/TemporalAccessorPrinter.java | 53 +
.../format/datetime/standard/package-info.java | 4 +
.../format/number/AbstractNumberFormatter.java | 2 +
.../format/number/CurrencyFormatter.java | 4 +-
.../NumberFormatAnnotationFormatterFactory.java | 4 +
.../format/number/NumberFormatter.java | 3 +-
.../format/number/PercentFormatter.java | 3 +-
.../DefaultFormattingConversionService.java | 17 +-
.../support/FormattingConversionService.java | 17 +
.../FormattingConversionServiceFactoryBean.java | 5 +
.../InstrumentationLoadTimeWeaver.java | 4 +
.../classloading/ReflectiveLoadTimeWeaver.java | 7 +-
.../ResourceOverridingShadowingClassLoader.java | 2 +
.../classloading/ShadowingClassLoader.java | 8 +-
.../classloading/SimpleLoadTimeWeaver.java | 3 +
.../glassfish/ClassTransformerAdapter.java | 54 -
.../glassfish/GlassFishClassLoaderAdapter.java | 128 -
.../glassfish/GlassFishLoadTimeWeaver.java | 88 +-
.../classloading/glassfish/package-info.java | 2 +-
.../classloading/jboss/JBossLoadTimeWeaver.java | 15 +-
.../classloading/jboss/JBossMCAdapter.java | 108 +-
.../jboss/JBossMCTranslatorAdapter.java | 39 +-
.../classloading/jboss/JBossModulesAdapter.java | 53 +-
.../classloading/jboss/package-info.java | 2 +-
.../classloading/oc4j/OC4JClassLoaderAdapter.java | 88 -
.../oc4j/OC4JClassPreprocessorAdapter.java | 95 -
.../classloading/oc4j/OC4JLoadTimeWeaver.java | 79 -
.../instrument/classloading/oc4j/package-info.java | 8 -
.../classloading/tomcat/TomcatLoadTimeWeaver.java | 116 +
.../classloading/tomcat/package-info.java | 5 +
.../weblogic/WebLogicClassLoaderAdapter.java | 8 +-
.../weblogic/WebLogicClassPreProcessorAdapter.java | 2 +
.../weblogic/WebLogicLoadTimeWeaver.java | 3 +
.../websphere/WebSphereClassLoaderAdapter.java | 2 +-
.../websphere/WebSphereClassPreDefinePlugin.java | 1 +
.../websphere/WebSphereLoadTimeWeaver.java | 3 +
.../jmx/access/MBeanClientInterceptor.java | 22 +-
.../jmx/access/MBeanProxyFactoryBean.java | 7 +-
.../jmx/access/NotificationListenerRegistrar.java | 2 +
.../springframework/jmx/export/MBeanExporter.java | 15 +-
.../jmx/export/NotificationListenerBean.java | 3 +-
.../annotation/AnnotationJmxAttributeSource.java | 14 +-
.../AbstractConfigurableMBeanInfoAssembler.java | 2 +-
.../assembler/AbstractMBeanInfoAssembler.java | 3 +-
.../AbstractReflectiveMBeanInfoAssembler.java | 6 +-
.../InterfaceBasedMBeanInfoAssembler.java | 26 +-
.../assembler/MetadataMBeanInfoAssembler.java | 2 +
.../MethodNameBasedMBeanInfoAssembler.java | 2 +-
.../jmx/export/naming/IdentityNamingStrategy.java | 3 +-
.../jmx/export/naming/KeyNamingStrategy.java | 2 +
.../jmx/export/naming/MetadataNamingStrategy.java | 4 +-
.../ModelMBeanNotificationPublisher.java | 1 +
.../jmx/support/ConnectorServerFactoryBean.java | 5 +
.../org/springframework/jmx/support/JmxUtils.java | 39 +-
.../support/MBeanServerConnectionFactoryBean.java | 6 +
.../jmx/support/MBeanServerFactoryBean.java | 5 +
.../support/WebSphereMBeanServerFactoryBean.java | 14 +-
.../jndi/JndiObjectFactoryBean.java | 4 +
.../springframework/jndi/JndiObjectLocator.java | 3 +-
.../jndi/JndiObjectTargetSource.java | 8 +-
.../org/springframework/jndi/JndiTemplate.java | 8 +-
.../jndi/TypeMismatchNamingException.java | 10 +-
.../jndi/support/SimpleJndiBeanFactory.java | 10 +
.../rmi/CodebaseAwareObjectInputStream.java | 2 +-
.../remoting/rmi/JndiRmiClientInterceptor.java | 7 +-
.../remoting/rmi/JndiRmiProxyFactoryBean.java | 4 +
.../remoting/rmi/JndiRmiServiceExporter.java | 2 +
.../rmi/RemoteInvocationSerializingExporter.java | 1 +
.../remoting/rmi/RmiClientInterceptor.java | 1 +
.../remoting/rmi/RmiClientInterceptorUtils.java | 48 +-
.../remoting/rmi/RmiInvocationWrapper.java | 4 +-
.../remoting/rmi/RmiProxyFactoryBean.java | 3 +
.../remoting/rmi/RmiRegistryFactoryBean.java | 9 +-
.../remoting/rmi/RmiServiceExporter.java | 2 +
.../support/DefaultRemoteInvocationExecutor.java | 3 +-
.../support/DefaultRemoteInvocationFactory.java | 3 +-
.../remoting/support/RemoteAccessor.java | 6 +-
.../remoting/support/RemoteExporter.java | 8 +-
.../remoting/support/RemoteInvocation.java | 33 +-
.../remoting/support/RemoteInvocationResult.java | 38 +-
.../support/RemoteInvocationTraceInterceptor.java | 3 +-
.../remoting/support/RemotingSupport.java | 1 +
.../support/SimpleHttpServerFactoryBean.java | 7 +-
.../remoting/support/UrlBasedRemoteAccessor.java | 3 +-
.../scheduling/SchedulingTaskExecutor.java | 9 +-
.../springframework/scheduling/TaskScheduler.java | 12 +-
.../annotation/AbstractAsyncConfiguration.java | 1 +
.../annotation/AsyncAnnotationAdvisor.java | 3 +
.../AsyncAnnotationBeanPostProcessor.java | 1 +
.../annotation/AsyncConfigurationSelector.java | 1 +
.../scheduling/annotation/AsyncResult.java | 5 +
.../scheduling/annotation/Scheduled.java | 14 +
.../ScheduledAnnotationBeanPostProcessor.java | 37 +-
.../scheduling/annotation/Schedules.java | 44 +
.../annotation/SchedulingConfiguration.java | 4 +-
.../backportconcurrent/ConcurrentTaskExecutor.java | 138 -
.../CustomizableThreadFactory.java | 61 -
.../backportconcurrent/ThreadPoolTaskExecutor.java | 385 -
.../backportconcurrent/package-info.java | 11 -
.../concurrent/ConcurrentTaskExecutor.java | 152 +-
.../concurrent/ConcurrentTaskScheduler.java | 156 +-
.../concurrent/CustomizableThreadFactory.java | 7 +-
.../DefaultManagedAwareThreadFactory.java | 117 +
.../concurrent/DefaultManagedTaskExecutor.java | 91 +
.../concurrent/DefaultManagedTaskScheduler.java | 93 +
.../concurrent/ExecutorConfigurationSupport.java | 12 +
.../concurrent/ForkJoinPoolFactoryBean.java | 67 +-
.../concurrent/ReschedulingRunnable.java | 17 +-
.../concurrent/ScheduledExecutorFactoryBean.java | 35 +-
.../concurrent/ScheduledExecutorTask.java | 8 +-
.../concurrent/ThreadPoolExecutorFactoryBean.java | 12 +-
.../concurrent/ThreadPoolTaskExecutor.java | 86 +-
.../concurrent/ThreadPoolTaskScheduler.java | 157 +-
.../scheduling/concurrent/package-info.java | 4 +-
.../AnnotationDrivenBeanDefinitionParser.java | 8 +-
.../ContextLifecycleScheduledTaskRegistrar.java | 2 +
.../scheduling/config/ScheduledTaskRegistrar.java | 2 +
.../scheduling/config/TaskExecutorFactoryBean.java | 25 +-
.../scheduling/config/TaskNamespaceHandler.java | 1 +
.../scheduling/support/CronTrigger.java | 1 +
.../support/DelegatingErrorHandlingRunnable.java | 3 +-
.../scheduling/support/MethodInvokingRunnable.java | 8 +-
.../scheduling/support/PeriodicTrigger.java | 1 +
.../support/ScheduledMethodRunnable.java | 3 +-
.../scheduling/support/SimpleTriggerContext.java | 24 +-
.../scheduling/support/TaskUtils.java | 27 +-
.../scheduling/timer/DelegatingTimerTask.java | 78 -
.../timer/MethodInvokingTimerTaskFactoryBean.java | 68 -
.../scheduling/timer/ScheduledTimerTask.java | 226 -
.../scheduling/timer/TimerFactoryBean.java | 169 -
.../scheduling/timer/TimerTaskExecutor.java | 184 -
.../scheduling/timer/package-info.java | 10 -
.../springframework/scripting/ScriptEvaluator.java | 54 +
.../scripting/bsh/BshScriptEvaluator.java | 89 +
.../scripting/bsh/BshScriptFactory.java | 10 +-
.../scripting/bsh/BshScriptUtils.java | 6 +-
.../scripting/bsh/package-info.java | 1 +
.../scripting/config/LangNamespaceHandler.java | 1 +
.../config/ScriptBeanDefinitionParser.java | 4 +-
.../scripting/config/ScriptingDefaultsParser.java | 1 +
.../scripting/groovy/GroovyScriptEvaluator.java | 75 +
.../scripting/groovy/GroovyScriptFactory.java | 10 +
.../scripting/jruby/JRubyScriptFactory.java | 9 +
.../scripting/jruby/JRubyScriptUtils.java | 18 +-
.../scripting/support/ResourceScriptSource.java | 32 +-
.../support/ScriptFactoryPostProcessor.java | 2 +-
.../scripting/support/StandardScriptEvaluator.java | 135 +
.../scripting/support/StaticScriptSource.java | 3 +
.../org/springframework/ui/ExtendedModelMap.java | 1 +
.../main/java/org/springframework/ui/ModelMap.java | 37 +-
.../ui/context/support/DelegatingThemeSource.java | 5 +-
.../context/support/ResourceBundleThemeSource.java | 3 +
.../ui/context/support/SimpleTheme.java | 4 +-
.../validation/AbstractBindingResult.java | 23 +-
.../springframework/validation/AbstractErrors.java | 22 +
.../springframework/validation/BindException.java | 39 +
.../springframework/validation/BindingResult.java | 1 -
.../org/springframework/validation/DataBinder.java | 26 +-
.../validation/DefaultBindingErrorProcessor.java | 2 +
.../validation/DefaultMessageCodesResolver.java | 4 +
.../BeanValidationPostProcessor.java | 5 +-
.../beanvalidation/CustomValidatorBean.java | 3 +-
.../beanvalidation/LocalValidatorFactoryBean.java | 135 +-
.../LocaleContextMessageInterpolator.java | 4 +-
.../MessageSourceResourceBundleLocator.java | 7 +-
.../MethodValidationInterceptor.java | 109 +-
.../MethodValidationPostProcessor.java | 15 +-
.../OptionalValidatorFactoryBean.java | 47 +
.../SpringConstraintValidatorFactory.java | 7 +-
.../beanvalidation/SpringValidatorAdapter.java | 38 +-
.../validation/support/BindingAwareModelMap.java | 2 +-
.../src/main/resources/META-INF/spring.schemas | 15 +-
.../cache/config/spring-cache-4.0.xsd | 261 +
.../context/config/spring-context-2.5.xsd | 6 +-
.../context/config/spring-context-3.0.xsd | 16 +-
.../context/config/spring-context-4.0.xsd | 520 +
.../springframework/ejb/config/spring-jee-4.0.xsd | 267 +
.../scheduling/config/spring-task-4.0.xsd | 297 +
.../scripting/config/spring-lang-4.0.xsd | 233 +
...plicationContextDynamicBeanPropertyTests.groovy | 49 +
.../groovy/GroovyBeanDefinitionReaderTests.groovy | 1017 +
.../example/scannable/CustomAspectStereotype.java | 39 +
.../java/example/scannable/FooServiceImpl.java | 5 +-
.../scannable/ServiceInvocationCounter.java | 4 +-
.../aop/aspectj/BeanNamePointcutAtAspectTests.java | 6 +-
.../aspectj/DeclarationOrderIndependenceTests.java | 22 +-
.../aop/aspectj/DeclareParentsTests.java | 5 -
.../autoproxy/AtAspectJAnnotationBindingTests.java | 1 -
.../aop/aspectj/autoproxy/_TestTypes.java | 1 -
.../aspectj/autoproxy/spr3064/SPR3064Tests.java | 1 -
.../aop/framework/AbstractAopProxyTests.java | 21 +-
.../aop/framework/CglibProxyTests.java | 138 +-
.../aop/framework/ClassWithComplexConstructor.java | 44 +
.../springframework/aop/framework/Dependency.java | 32 +
.../aop/framework/JdkDynamicProxyTests.java | 4 +
.../aop/framework/ObjenesisProxyTests-context.xml | 21 +
.../aop/framework/ObjenesisProxyTests.java | 47 +
.../autoproxy/AdvisorAutoProxyCreatorTests.java | 4 +-
.../framework/autoproxy/AutoProxyCreatorTests.java | 95 +-
.../factory/xml/QualifierAnnotationTests.java | 43 +-
.../XmlBeanFactoryTests-delegationOverrides.xml | 2 +-
.../factory/xml/XmlBeanFactoryTests-overrides.xml | 8 +-
.../xml/XmlBeanFactoryTests-recursiveImport.xml | 2 +-
.../factory/xml/XmlBeanFactoryTests-resource.xml | 10 +-
.../beans/factory/xml/XmlBeanFactoryTests.java | 155 +-
.../cache/NoOpCacheManagerTests.java | 3 +-
.../cache/concurrent/ConcurrentCacheTests.java | 15 +-
.../concurrent/ConcurrentMapCacheManagerTests.java | 50 +-
.../cache/config/AbstractAnnotationTests.java | 40 +-
.../config/AnnotatedClassCacheableService.java | 14 +
.../cache/config/CacheableService.java | 4 +
.../cache/config/DefaultCacheableService.java | 13 +
.../config/ExpressionCachingIntegrationTests.java | 118 +
.../cache/config/SomeKeyGenerator.java | 4 +-
.../springframework/cache/config/TestEntity.java | 56 +
.../interceptor/ExpressionEvaluatorTests.java | 34 +-
.../cache/interceptor/SimpleKeyGeneratorTests.java | 119 +
.../AnnotationBeanNameGeneratorTests.java | 83 +-
.../AnnotationProcessorPerformanceTests.java | 17 +-
.../AnnotationScopeMetadataResolverTests.java | 59 +-
.../AsmCircularImportDetectionTests.java | 2 +-
.../context/annotation/BeanAge.java | 1 -
.../annotation/BeanMethodPolymorphismTests.java | 104 +-
...athScanningCandidateComponentProviderTests.java | 87 +-
.../ComponentScanAnnotationIntegrationTests.java | 113 +-
.../annotation/ComponentScanParserTests.java | 95 +-
.../ConfigurationClassPostProcessorTests.java | 754 +-
.../annotation/ConfigurationClassSpr8954Tests.java | 3 +-
.../ConfigurationClassWithConditionTests.java | 263 +
...igurationWithFactoryBeanAndParametersTests.java | 68 +-
.../annotation/FooServiceDependentConverter.java | 1 +
.../context/annotation/ImportAwareTests.java | 7 +-
.../ImportBeanDefinitionRegistrarTests.java | 19 +-
.../context/annotation/ImportSelectorTests.java | 263 +
.../InvalidConfigurationClassDefinitionTests.java | 1 -
...yAutowiredAnnotationBeanPostProcessorTests.java | 254 +
.../annotation/PropertySourceAnnotationTests.java | 137 +-
.../ReflectionUtilsIntegrationTests.java | 6 +-
.../RoleAndDescriptionAnnotationTests.java | 93 +
.../context/annotation/RoleAnnotationTests.java | 85 -
.../context/annotation/Spr11202Tests.java | 149 +
.../componentscan/simple/SimpleComponent.java | 8 +-
.../BeanMethodQualificationTests.java | 40 +
.../ConfigurationClassAspectIntegrationTests.java | 1 -
.../ConfigurationClassProcessingTests.java | 1 +
.../ImportAnnotationDetectionTests.java | 16 +
.../configuration/ImportResourceTests.java | 8 +-
.../annotation/configuration/ImportTests.java | 1 -
.../configuration/ImportWithConditionTests.java | 115 +
.../configuration/ImportXmlConfig-context.xml | 3 +
.../annotation/configuration/ScopingTests.java | 141 +-
.../annotation/configuration/Spr10668Tests.java | 78 +
.../annotation/configuration/Spr10744Tests.java | 8 +-
.../configuration/spr8955/Spr8955Tests.java | 1 -
...onUsedForBothComponentScanAndQualifierTests.xml | 2 +-
.../context/annotation/customTypeFilterTests.xml | 2 +-
.../context/annotation/p3.properties | 1 +
.../context/annotation/p4.properties | 1 +
.../context/annotation/role/ComponentWithRole.java | 4 +-
.../annotation/spr10546/ImportedConfig.java | 1 -
.../context/annotation/spr10546/ParentConfig.java | 1 -
.../spr10546/ParentWithComponentScanConfig.java | 1 -
.../spr10546/ParentWithImportConfig.java | 1 -
.../spr10546/ParentWithImportResourceConfig.java | 1 -
.../spr10546/ParentWithParentConfig.java | 1 -
.../context/annotation/spr10546/Spr10546Tests.java | 1 -
.../spr10546/scanpackage/AEnclosingConfig.java | 1 -
.../event/ApplicationContextEventTests.java | 47 +-
.../ApplicationContextExpressionTests.java | 20 +-
.../EnvironmentAccessorIntegrationTests.java | 1 -
.../groovy/GroovyApplicationContextTests.java | 71 +
.../context/groovy/applicationContext.groovy | 6 +
.../context/groovy/applicationContext2.groovy | 5 +
.../org/springframework/context/groovy/test.xml | 10 +
.../context/i18n/LocaleContextHolderTests.java | 155 +
.../springframework/context/support/Assembler.java | 1 +
.../support/BeanFactoryPostProcessorTests.java | 70 +-
.../ClassPathXmlApplicationContextTests.java | 1 -
.../org/springframework/context/support/Logic.java | 11 +-
.../PropertySourcesPlaceholderConfigurerTests.java | 50 +-
.../context/support/SimpleThreadScopeTest.java | 74 -
.../context/support/SimpleThreadScopeTests.java | 71 +
.../context/support/placeholder.properties | 1 +
.../DateTimeFormatterFactoryBeanTests.java | 60 +
.../standard/DateTimeFormatterFactoryTests.java | 104 +
.../datetime/standard/DateTimeFormattingTests.java | 457 +
.../glassfish/GlassFishLoadTimeWeaverTests.java | 150 -
.../jmx/export/CustomDateEditorRegistrar.java | 36 +
.../jmx/export/TestDynamicMBean.java | 2 +
.../EnableMBeanExportConfigurationTests.java | 46 +-
.../jmx/export/customConfigurer.xml | 31 +-
.../MBeanServerConnectionFactoryBeanTests.java | 26 +-
.../remoting/rmi/RmiSupportTests.java | 18 +-
.../ScheduledAnnotationBeanPostProcessorTests.java | 205 +-
.../ConcurrentTaskExecutorTests.java | 49 -
.../support/CronSequenceGeneratorTests.java | 1 +
.../scheduling/timer/TimerSupportTests.java | 133 -
.../scheduling/timer/TimerTaskExecutorTests.java | 190 -
.../scripting/bsh/BshScriptEvaluatorTests.java | 60 +
.../scripting/bsh/BshScriptFactoryTests.java | 7 +-
.../org/springframework/scripting/bsh/simple.bsh | 1 +
.../groovy/GroovyScriptEvaluatorTests.java | 87 +
.../springframework/scripting/groovy/simple.groovy | 1 +
.../support/ResourceScriptSourceTests.java | 9 -
.../java/org/springframework/ui/ModelMapTests.java | 1 +
.../beanvalidation/MethodValidationTests.java | 9 +-
.../src/test/java/test/mixin/LockMixin.java | 1 -
spring-context/src/test/resources/log4j.properties | 9 +
spring-context/src/test/resources/log4j.xml | 24 -
.../springframework/cache/config/cache-advice.xml | 4 +
.../org/springframework/asm/AnnotationVisitor.java | 169 +
.../org/springframework/asm/AnnotationWriter.java | 371 +
.../java/org/springframework/asm/Attribute.java | 255 +
.../java/org/springframework/asm/ByteVector.java | 339 +
.../java/org/springframework/asm/ClassReader.java | 2511 +
.../java/org/springframework/asm/ClassVisitor.java | 322 +
.../java/org/springframework/asm/ClassWriter.java | 1776 +
.../main/java/org/springframework/asm/Context.java | 145 +
.../main/java/org/springframework/asm/Edge.java | 75 +
.../java/org/springframework/asm/FieldVisitor.java | 152 +
.../java/org/springframework/asm/FieldWriter.java | 329 +
.../main/java/org/springframework/asm/Frame.java | 1462 +
.../main/java/org/springframework/asm/Handle.java | 170 +
.../main/java/org/springframework/asm/Handler.java | 121 +
.../main/java/org/springframework/asm/Item.java | 314 +
.../main/java/org/springframework/asm/Label.java | 565 +
.../org/springframework/asm/MethodVisitor.java | 890 +
.../java/org/springframework/asm/MethodWriter.java | 2913 ++
.../main/java/org/springframework/asm/Opcodes.java | 361 +
.../main/java/org/springframework/asm/Type.java | 896 +
.../java/org/springframework/asm/TypePath.java | 196 +
.../org/springframework/asm/TypeReference.java | 452 +
.../asm/util/TraceClassVisitor.java | 37 -
.../org/springframework/asm/util/package-info.java | 22 -
.../org/springframework/cglib/SpringCglibInfo.java | 8 +-
.../org/springframework/cglib/package-info.java | 30 +-
.../MemorySafeUndeclaredThrowableStrategy.java | 3 +
.../core/AttributeAccessorSupport.java | 5 +
.../springframework/core/BridgeMethodResolver.java | 60 +-
.../springframework/core/CollectionFactory.java | 173 +-
.../org/springframework/core/ConcurrentMap.java | 46 -
.../core/ConfigurableObjectInputStream.java | 10 +-
.../java/org/springframework/core/ControlFlow.java | 4 +-
.../springframework/core/ControlFlowFactory.java | 9 +-
.../java/org/springframework/core/Conventions.java | 46 +-
.../core/DefaultParameterNameDiscoverer.java | 45 +
.../core/ExceptionDepthComparator.java | 5 +-
.../core/GenericCollectionTypeResolver.java | 273 +-
.../springframework/core/GenericTypeResolver.java | 374 +-
.../java/org/springframework/core/JdkVersion.java | 81 +-
.../LocalVariableTableParameterNameDiscoverer.java | 2 +
.../org/springframework/core/MethodParameter.java | 191 +-
.../core/NestedCheckedException.java | 2 +-
.../springframework/core/NestedIOException.java | 5 +-
.../core/NestedRuntimeException.java | 2 +-
.../org/springframework/core/OrderComparator.java | 20 +-
.../core/OverridingClassLoader.java | 8 +-
.../core/ParameterizedTypeReference.java | 2 +-
.../core/PrioritizedParameterNameDiscoverer.java | 4 +-
.../org/springframework/core/ResolvableType.java | 1365 +
.../core/SerializableTypeWrapper.java | 408 +
.../springframework/core/SimpleAliasRegistry.java | 4 +
.../org/springframework/core/SmartClassLoader.java | 2 +-
.../StandardReflectionParameterNameDiscoverer.java | 61 +
.../core/annotation/AnnotatedElementUtils.java | 253 +
.../core/annotation/AnnotationAttributes.java | 67 +-
.../annotation/AnnotationAwareOrderComparator.java | 19 +-
.../core/annotation/AnnotationUtils.java | 466 +-
.../core/convert/AbstractDescriptor.java | 128 -
.../core/convert/BeanPropertyDescriptor.java | 82 -
.../core/convert/ClassDescriptor.java | 62 -
.../core/convert/FieldDescriptor.java | 82 -
.../core/convert/ParameterDescriptor.java | 77 -
.../core/convert/TypeDescriptor.java | 740 +-
.../convert/converter/ConvertingComparator.java | 4 +
.../convert/support/ArrayToArrayConverter.java | 3 +
.../support/ArrayToCollectionConverter.java | 4 +-
.../convert/support/ArrayToObjectConverter.java | 3 +
.../convert/support/ArrayToStringConverter.java | 3 +
.../core/convert/support/ByteBufferConverter.java | 115 +
.../convert/support/CharacterToNumberFactory.java | 4 +-
.../support/CollectionToArrayConverter.java | 5 +-
.../support/CollectionToCollectionConverter.java | 4 +-
.../support/CollectionToObjectConverter.java | 5 +-
.../support/CollectionToStringConverter.java | 5 +-
.../convert/support/DefaultConversionService.java | 55 +-
.../convert/support/EnumToStringConverter.java | 2 +
.../support/FallbackObjectToStringConverter.java | 16 +-
.../convert/support/GenericConversionService.java | 75 +-
.../core/convert/support/IdToEntityConverter.java | 3 +
.../core/convert/support/MapToMapConverter.java | 3 +
.../support/NumberToCharacterConverter.java | 3 +-
.../support/NumberToNumberConverterFactory.java | 3 +
.../convert/support/ObjectToArrayConverter.java | 3 +
.../support/ObjectToCollectionConverter.java | 4 +-
.../convert/support/ObjectToObjectConverter.java | 68 +-
.../convert/support/ObjectToStringConverter.java | 1 +
.../support/PropertiesToStringConverter.java | 1 +
.../convert/support/StringToArrayConverter.java | 5 +-
.../convert/support/StringToBooleanConverter.java | 3 +-
.../support/StringToCharacterConverter.java | 3 +-
.../support/StringToCollectionConverter.java | 4 +-
.../support/StringToEnumConverterFactory.java | 2 +
.../convert/support/StringToLocaleConverter.java | 3 +-
.../support/StringToNumberConverterFactory.java | 4 +-
.../support/StringToPropertiesConverter.java | 3 +-
.../convert/support/StringToUUIDConverter.java | 1 +
.../convert/support/ZoneIdToTimeZoneConverter.java | 44 +
.../support/ZonedDateTimeToCalendarConverter.java | 45 +
.../enums/AbstractCachingLabeledEnumResolver.java | 139 -
.../core/enums/AbstractGenericLabeledEnum.java | 55 -
.../core/enums/AbstractLabeledEnum.java | 77 -
.../springframework/core/enums/LabeledEnum.java | 96 -
.../core/enums/LabeledEnumResolver.java | 71 -
.../core/enums/LetterCodedLabeledEnum.java | 66 -
.../core/enums/ShortCodedLabeledEnum.java | 62 -
.../core/enums/StaticLabeledEnum.java | 103 -
.../core/enums/StaticLabeledEnumResolver.java | 75 -
.../core/enums/StringCodedLabeledEnum.java | 67 -
.../springframework/core/enums/package-info.java | 9 -
.../core/env/AbstractEnvironment.java | 27 +
.../core/env/AbstractPropertyResolver.java | 15 +
.../core/env/CommandLinePropertySource.java | 2 +-
.../core/env/EnumerablePropertySource.java | 1 +
.../core/env/JOptCommandLinePropertySource.java | 17 +-
.../core/env/MutablePropertySources.java | 41 +-
.../core/env/PropertiesPropertySource.java | 9 +-
.../core/env/ReadOnlySystemAttributesMap.java | 12 +
.../core/env/SimpleCommandLineArgsParser.java | 14 +-
.../core/env/SimpleCommandLinePropertySource.java | 10 +-
.../springframework/core/io/AbstractResource.java | 10 +
.../springframework/core/io/ByteArrayResource.java | 2 +
.../springframework/core/io/ClassPathResource.java | 2 +
.../core/io/ClassRelativeResourceLoader.java | 10 +-
.../core/io/DefaultResourceLoader.java | 12 +-
.../core/io/DescriptiveResource.java | 2 +
.../core/io/FileSystemResource.java | 4 +
.../core/io/FileSystemResourceLoader.java | 3 +-
.../core/io/InputStreamResource.java | 2 +
.../org/springframework/core/io/PathResource.java | 252 +
.../java/org/springframework/core/io/Resource.java | 1 +
.../org/springframework/core/io/UrlResource.java | 2 +
.../org/springframework/core/io/VfsResource.java | 17 +-
.../java/org/springframework/core/io/VfsUtils.java | 101 +-
.../core/io/support/EncodedResource.java | 4 +-
.../PathMatchingResourcePatternResolver.java | 5 +
.../core/io/support/ResourcePropertySource.java | 26 +-
.../core/io/support/VfsPatternUtils.java | 5 +-
.../core/serializer/DefaultDeserializer.java | 1 +
.../core/serializer/DefaultSerializer.java | 1 +
.../serializer/support/DeserializingConverter.java | 3 +-
.../serializer/support/SerializingConverter.java | 1 +
.../core/style/DefaultToStringStyler.java | 5 +
.../core/style/DefaultValueStyler.java | 23 +-
.../core/task/AsyncListenableTaskExecutor.java | 52 +
.../core/task/SimpleAsyncTaskExecutor.java | 23 +-
.../core/task/SyncTaskExecutor.java | 1 +
.../springframework/core/task/TaskExecutor.java | 1 +
.../task/support/ConcurrentExecutorAdapter.java | 3 +-
.../core/task/support/ExecutorServiceAdapter.java | 6 +
.../core/task/support/TaskExecutorAdapter.java | 36 +-
.../core/type/AnnotatedTypeMetadata.java | 100 +
.../core/type/AnnotationMetadata.java | 65 +-
.../springframework/core/type/MethodMetadata.java | 27 +-
.../core/type/StandardAnnotationMetadata.java | 131 +-
.../core/type/StandardClassMetadata.java | 24 +-
.../core/type/StandardMethodMetadata.java | 57 +-
.../AbstractRecursiveAnnotationVisitor.java | 95 +
.../AnnotationAttributesReadingVisitor.java | 244 +-
.../AnnotationMetadataReadingVisitor.java | 101 +-
.../AnnotationReadingVisitorUtils.java | 164 +
.../classreading/ClassMetadataReadingVisitor.java | 66 +-
.../classreading/MethodMetadataReadingVisitor.java | 60 +-
.../RecursiveAnnotationArrayVisitor.java | 85 +
.../RecursiveAnnotationAttributesVisitor.java | 90 +
.../type/classreading/SimpleMetadataReader.java | 3 +
.../classreading/SimpleMetadataReaderFactory.java | 2 +
.../filter/AbstractClassTestingTypeFilter.java | 1 +
.../AbstractTypeHierarchyTraversingFilter.java | 74 +-
.../core/type/filter/AspectJTypeFilter.java | 1 +
.../util/AlternativeJdkIdGenerator.java | 64 +
.../org/springframework/util/AntPathMatcher.java | 369 +-
.../main/java/org/springframework/util/Assert.java | 8 +-
.../springframework/util/AutoPopulatingList.java | 28 +-
.../springframework/util/CachingMapDecorator.java | 311 -
.../java/org/springframework/util/ClassUtils.java | 74 +-
.../org/springframework/util/CollectionUtils.java | 82 +-
.../springframework/util/CompositeIterator.java | 3 +
.../util/ConcurrentReferenceHashMap.java | 16 +
.../util/CustomizableThreadCreator.java | 19 +-
.../util/DefaultPropertiesPersister.java | 162 +-
.../java/org/springframework/util/IdGenerator.java | 35 +
.../util/InvalidMimeTypeException.java | 52 +
.../springframework/util/LinkedMultiValueMap.java | 19 +-
.../java/org/springframework/util/MimeType.java | 510 +
.../org/springframework/util/MimeTypeUtils.java | 328 +
.../java/org/springframework/util/NumberUtils.java | 20 +-
.../util/PropertyPlaceholderHelper.java | 1 +
.../org/springframework/util/ReflectionUtils.java | 6 +
.../util/ResizableByteArrayOutputStream.java | 91 +
.../org/springframework/util/ResourceUtils.java | 11 +-
.../java/org/springframework/util/SocketUtils.java | 304 +
.../java/org/springframework/util/StreamUtils.java | 1 -
.../java/org/springframework/util/StringUtils.java | 17 +
.../springframework/util/SystemPropertyUtils.java | 1 +
.../springframework/util/WeakReferenceMonitor.java | 11 +-
.../util/comparator/BooleanComparator.java | 1 +
.../util/comparator/ComparableComparator.java | 1 +
.../util/comparator/CompoundComparator.java | 33 +-
.../util/comparator/InstanceComparator.java | 1 +
.../util/comparator/InvertibleComparator.java | 1 +
.../util/comparator/NullSafeComparator.java | 3 +-
.../util/concurrent/FutureAdapter.java | 125 +
.../util/concurrent/ListenableFuture.java | 40 +
.../util/concurrent/ListenableFutureAdapter.java | 67 +
.../util/concurrent/ListenableFutureCallback.java | 40 +
.../ListenableFutureCallbackRegistry.java | 99 +
.../util/concurrent/ListenableFutureTask.java | 84 +
.../util/concurrent/package-info.java | 8 +
.../util/xml/AbstractStaxContentHandler.java | 175 -
.../util/xml/AbstractStaxHandler.java | 273 +
.../util/xml/AbstractStaxXMLReader.java | 6 +
.../util/xml/AbstractXMLReader.java | 12 +
.../util/xml/AbstractXMLStreamReader.java | 21 +
.../util/xml/DomContentHandler.java | 11 +
.../util/xml/SimpleNamespaceContext.java | 9 +-
.../util/xml/SimpleSaxErrorHandler.java | 3 +
.../util/xml/SimpleTransformErrorListener.java | 3 +
.../util/xml/StaxEventContentHandler.java | 192 -
.../springframework/util/xml/StaxEventHandler.java | 196 +
.../util/xml/StaxEventXMLReader.java | 17 +-
.../org/springframework/util/xml/StaxResult.java | 42 +-
.../util/xml/StaxStreamContentHandler.java | 113 -
.../util/xml/StaxStreamHandler.java | 139 +
.../util/xml/StaxStreamXMLReader.java | 6 +
.../org/springframework/util/xml/StaxUtils.java | 293 +-
.../util/xml/XMLEventStreamReader.java | 24 +
.../util/xml/XMLEventStreamWriter.java | 32 +
.../core/AbstractControlFlowTests.java | 90 -
.../core/AbstractGenericsTests.java | 51 -
.../core/AttributeAccessorSupportTests.java | 39 +-
.../core/BridgeMethodResolverTests.java | 148 +-
.../core/CollectionFactoryTests.java | 74 -
.../org/springframework/core/ControlFlowTests.java | 76 +
.../core/DefaultControlFlowTests.java | 38 -
.../core/GenericCollectionTypeResolverTests.java | 130 +-
.../core/GenericTypeResolverTests.java | 48 +-
.../core/Jdk14ControlFlowTests.java | 38 -
.../springframework/core/ResolvableTypeTests.java | 1487 +
.../core/SerializableTypeWrapperTests.java | 170 +
...andardReflectionParameterNameDiscoverTests.java | 50 +
.../annotation/AnnotatedElementUtilsTests.java | 228 +
.../core/annotation/AnnotationUtilsTests.java | 235 +-
.../subpackage/NonPublicAnnotatedClass.java | 28 +
.../annotation/subpackage/NonPublicAnnotation.java | 32 +
.../core/convert/TypeDescriptorTests.java | 72 +-
.../convert/support/ByteBufferConverterTests.java | 109 +
.../convert/support/DefaultConversionTests.java | 11 +
.../support/GenericConversionServiceTests.java | 14 +-
.../convert/support/MapToMapConverterTests.java | 34 +-
.../core/enums/LabeledEnumTests.java | 192 -
.../core/enums/StandAloneStaticLabeledEnum.java | 36 -
.../springframework/core/env/DummyEnvironment.java | 13 +
.../env/JOptCommandLinePropertySourceTests.java | 7 +-
.../core/env/MutablePropertySourcesTests.java | 32 +-
.../env/SimpleCommandLinePropertySourceTests.java | 13 +-
.../springframework/core/io/PathResourceTests.java | 287 +
.../core/style/ToStringCreatorTests.java | 4 +
.../core/type/AnnotationMetadataTests.java | 347 +-
.../core/type/CachingMetadataReaderLeakTest.java | 82 -
.../core/type/CachingMetadataReaderLeakTests.java | 78 +
.../java/org/springframework/tests/Assume.java | 39 +-
.../java/org/springframework/tests/BuildTests.java | 2 +-
.../java/org/springframework/tests/TestGroup.java | 15 +-
.../org/springframework/tests/TestGroupTests.java | 26 +-
.../tests/sample/objects/GenericObject.java | 1 -
.../tests/sample/objects/TestObject.java | 6 +
.../springframework/util/AntPathMatcherTests.java | 47 +-
.../util/CachingMapDecoratorTests.java | 116 -
.../springframework/util/CollectionUtilsTests.java | 2 +
.../org/springframework/util/MimeTypeTests.java | 298 +
.../org/springframework/util/NumberUtilsTests.java | 146 +-
.../util/ResizableByteArrayOutputStreamTests.java | 89 +
.../org/springframework/util/SocketUtilsTests.java | 179 +
.../util/concurrent/FutureAdapterTests.java | 88 +
.../util/concurrent/ListenableFutureTaskTests.java | 77 +
.../xml/AbstractStaxContentHandlerTestCase.java | 66 -
.../util/xml/AbstractStaxHandlerTestCase.java | 134 +
.../util/xml/AbstractStaxXMLReaderTestCase.java | 6 +
.../util/xml/DomContentHandlerTest.java | 95 -
.../util/xml/DomContentHandlerTests.java | 99 +
.../util/xml/StaxEventContentHandlerTests.java | 30 -
.../util/xml/StaxEventHandlerTests.java | 37 +
.../springframework/util/xml/StaxResultTests.java | 10 +-
.../springframework/util/xml/StaxSourceTests.java | 12 +-
.../util/xml/StaxStreamContentHandlerTests.java | 30 -
.../util/xml/StaxStreamHandlerTests.java | 37 +
.../springframework/util/xml/StaxUtilsTest.java | 93 -
.../springframework/util/xml/StaxUtilsTests.java | 97 +
.../util/xml/XMLEventStreamReaderTests.java | 7 +-
spring-core/src/test/resources/log4j.properties | 11 +
spring-core/src/test/resources/log4j.xml | 28 -
.../expression/ConstructorExecutor.java | 24 +-
.../expression/ConstructorResolver.java | 13 +-
.../org/springframework/expression/Expression.java | 17 +-
.../expression/ExpressionException.java | 36 +-
.../ExpressionInvocationTargetException.java | 11 +-
.../expression/ExpressionParser.java | 4 +-
.../springframework/expression/MethodFilter.java | 24 +-
.../org/springframework/expression/Operation.java | 17 +-
.../expression/OperatorOverloader.java | 18 +-
.../springframework/expression/ParserContext.java | 31 +-
.../org/springframework/expression/TypedValue.java | 42 +-
.../common/CompositeStringExpression.java | 58 +-
.../expression/common/ExpressionUtils.java | 49 +-
.../expression/common/LiteralExpression.java | 54 +-
.../common/TemplateAwareExpressionParser.java | 230 +-
.../expression/common/TemplateParserContext.java | 9 +-
.../expression/spel/InternalParseException.java | 1 +
.../expression/spel/SpelEvaluationException.java | 25 +-
.../expression/spel/SpelMessage.java | 289 +-
.../springframework/expression/spel/SpelNode.java | 19 +-
.../expression/spel/SpelParseException.java | 47 +-
.../expression/spel/SpelParserConfiguration.java | 2 +-
.../expression/spel/ast/Assign.java | 13 +-
.../expression/spel/ast/AstUtils.java | 18 +-
.../expression/spel/ast/BeanReference.java | 27 +-
.../expression/spel/ast/BooleanLiteral.java | 4 +-
.../expression/spel/ast/CompoundExpression.java | 42 +-
.../expression/spel/ast/ConstructorReference.java | 23 +-
.../springframework/expression/spel/ast/Elvis.java | 27 +-
.../expression/spel/ast/FloatLiteral.java | 5 +-
.../expression/spel/ast/FormatHelper.java | 7 +-
.../expression/spel/ast/FunctionReference.java | 43 +-
.../expression/spel/ast/Identifier.java | 6 +-
.../expression/spel/ast/Indexer.java | 540 +-
.../expression/spel/ast/InlineList.java | 22 +-
.../expression/spel/ast/IntLiteral.java | 4 +-
.../expression/spel/ast/LongLiteral.java | 4 +-
.../expression/spel/ast/NullLiteral.java | 5 +-
.../springframework/expression/spel/ast/OpAnd.java | 9 +-
.../springframework/expression/spel/ast/OpDec.java | 67 +-
.../expression/spel/ast/OpDivide.java | 50 +-
.../springframework/expression/spel/ast/OpEQ.java | 23 +-
.../springframework/expression/spel/ast/OpGE.java | 28 +-
.../springframework/expression/spel/ast/OpGT.java | 35 +-
.../springframework/expression/spel/ast/OpInc.java | 82 +-
.../springframework/expression/spel/ast/OpLE.java | 33 +-
.../springframework/expression/spel/ast/OpLT.java | 34 +-
.../expression/spel/ast/OpMinus.java | 100 +-
.../expression/spel/ast/OpModulus.java | 48 +-
.../expression/spel/ast/OpMultiply.java | 55 +-
.../springframework/expression/spel/ast/OpNE.java | 22 +-
.../springframework/expression/spel/ast/OpOr.java | 3 +-
.../expression/spel/ast/OpPlus.java | 118 +-
.../expression/spel/ast/Operator.java | 70 +-
.../expression/spel/ast/OperatorBetween.java | 20 +-
.../expression/spel/ast/OperatorInstanceof.java | 14 +-
.../expression/spel/ast/OperatorMatches.java | 14 +-
.../expression/spel/ast/OperatorNot.java | 11 +-
.../expression/spel/ast/OperatorPower.java | 60 +-
.../expression/spel/ast/Projection.java | 34 +-
.../expression/spel/ast/QualifiedIdentifier.java | 12 +-
.../expression/spel/ast/RealLiteral.java | 6 +-
.../expression/spel/ast/Selection.java | 96 +-
.../expression/spel/ast/SpelNodeImpl.java | 79 +-
.../expression/spel/ast/StringLiteral.java | 6 +-
.../expression/spel/ast/Ternary.java | 18 +-
.../expression/spel/ast/TypeCode.java | 31 +-
.../expression/spel/ast/TypeReference.java | 20 +-
.../expression/spel/ast/ValueRef.java | 53 +-
.../expression/spel/ast/VariableReference.java | 76 +-
.../standard/InternalSpelExpressionParser.java | 2 +-
.../expression/spel/standard/SpelExpression.java | 101 +-
.../expression/spel/standard/Token.java | 35 +-
.../expression/spel/standard/TokenKind.java | 124 +-
.../expression/spel/standard/Tokenizer.java | 699 +-
.../expression/spel/support/BooleanTypedValue.java | 9 +-
.../expression/spel/support/ReflectionHelper.java | 126 +-
.../support/ReflectiveConstructorExecutor.java | 18 +-
.../support/ReflectiveConstructorResolver.java | 12 +-
.../spel/support/ReflectiveMethodExecutor.java | 20 +-
.../spel/support/ReflectiveMethodResolver.java | 10 +-
.../spel/support/ReflectivePropertyAccessor.java | 11 +
.../spel/support/StandardEvaluationContext.java | 11 +
.../spel/support/StandardOperatorOverloader.java | 4 +-
.../spel/support/StandardTypeComparator.java | 13 +-
.../spel/support/StandardTypeConverter.java | 2 +
.../spel/support/StandardTypeLocator.java | 1 +
.../expression/spel/AbstractExpressionTests.java | 441 +
.../expression/spel/ArrayConstructorTests.java | 68 +-
.../expression/spel/BooleanExpressionTests.java | 2 +-
.../expression/spel/CachedMethodExecutorTests.java | 8 +-
.../spel/ConstructorInvocationTests.java | 131 +-
.../spel/DefaultComparatorUnitTests.java | 34 +-
.../expression/spel/EvaluationTests.java | 34 +-
.../spel/ExpressionLanguageScenarioTests.java | 2 +-
.../expression/spel/ExpressionStateTests.java | 2 +-
.../expression/spel/ExpressionTestCase.java | 422 -
.../spel/ExpressionWithConversionTests.java | 2 +-
.../expression/spel/InProgressTests.java | 2 +-
.../springframework/expression/spel/ListTests.java | 44 +-
.../expression/spel/LiteralTests.java | 2 +-
.../expression/spel/MapAccessTests.java | 27 +-
.../expression/spel/MethodInvocationTests.java | 73 +-
.../expression/spel/OperatorOverloaderTests.java | 2 +-
.../expression/spel/OperatorTests.java | 382 +-
.../expression/spel/ParserErrorMessagesTests.java | 2 +-
.../expression/spel/PropertyAccessTests.java | 2 +-
.../spel/ScenariosForSpringSecurity.java | 2 +-
.../expression/spel/SetValueTests.java | 3 +-
.../expression/spel/SpelDocumentationTests.java | 2 +-
.../expression/spel/SpelReproTests.java | 183 +-
.../spel/TemplateExpressionParsingTests.java | 14 +-
.../expression/spel/VariableAndFunctionTests.java | 3 +-
.../expression/spel/spr10210/A.java | 1 +
.../expression/spel/spr10210/D.java | 1 +
.../expression/spel/spr10210/comp/B.java | 1 +
.../expression/spel/standard/SpelParserTests.java | 11 +-
.../spel/support/ReflectionHelperTests.java | 217 +-
.../spel/support/StandardComponentsTests.java | 30 +-
.../expression/spel/testresources/Fruit.java | 1 +
.../spel/testresources/PlaceOfBirth.java | 2 +
.../src/test/resources/log4j.properties | 10 +
spring-expression/src/test/resources/log4j.xml | 28 -
.../tomcat/TomcatInstrumentableClassLoader.java | 14 +-
.../classloading/tomcat/package-info.java | 8 -
.../src/test/resources/log4j.properties | 10 +
.../src/test/resources/log4j.xml | 28 -
.../instrument/InstrumentationSavingAgent.java | 14 +-
.../src/test/resources/log4j.properties | 10 +
spring-instrument/src/test/resources/log4j.xml | 28 -
.../jdbc/CannotGetJdbcConnectionException.java | 14 +-
.../jdbc/config/JdbcNamespaceHandler.java | 3 +-
.../jdbc/config/SortedResourcesFactoryBean.java | 2 +
.../jdbc/core/ArgumentPreparedStatementSetter.java | 2 +
.../core/ArgumentTypePreparedStatementSetter.java | 4 +-
.../jdbc/core/BatchUpdateUtils.java | 4 +-
.../jdbc/core/BeanPropertyRowMapper.java | 1 +
.../jdbc/core/CallableStatementCreatorFactory.java | 3 +
.../jdbc/core/ColumnMapRowMapper.java | 1 +
.../springframework/jdbc/core/JdbcTemplate.java | 118 +-
.../jdbc/core/PreparedStatementCreatorFactory.java | 4 +
.../jdbc/core/ResultSetSupportingSqlParameter.java | 12 +-
.../jdbc/core/RowCountCallbackHandler.java | 1 +
.../jdbc/core/RowMapperResultSetExtractor.java | 1 +
.../jdbc/core/SingleColumnRowMapper.java | 9 +-
.../jdbc/core/SqlInOutParameter.java | 4 +-
.../springframework/jdbc/core/SqlOutParameter.java | 4 +-
.../jdbc/core/SqlReturnResultSet.java | 4 +-
.../jdbc/core/SqlRowSetResultSetExtractor.java | 25 +-
.../jdbc/core/StatementCreatorUtils.java | 11 +-
.../jdbc/core/metadata/CallMetaDataProvider.java | 2 +-
.../core/metadata/CallMetaDataProviderFactory.java | 7 +-
.../core/metadata/GenericCallMetaDataProvider.java | 20 +
.../metadata/GenericTableMetaDataProvider.java | 14 +
.../metadata/TableMetaDataProviderFactory.java | 3 +-
.../namedparam/AbstractSqlParameterSource.java | 2 +
.../namedparam/BeanPropertySqlParameterSource.java | 6 +-
.../core/namedparam/EmptySqlParameterSource.java | 4 +
.../core/namedparam/MapSqlParameterSource.java | 2 +
.../namedparam/NamedParameterBatchUpdateUtils.java | 4 +-
.../namedparam/NamedParameterJdbcTemplate.java | 35 +
.../jdbc/core/namedparam/NamedParameterUtils.java | 6 +-
.../jdbc/core/namedparam/ParsedSql.java | 10 +-
.../core/namedparam/SqlParameterSourceUtils.java | 18 +-
.../jdbc/core/simple/AbstractJdbcCall.java | 15 +-
.../jdbc/core/simple/AbstractJdbcInsert.java | 4 +
.../jdbc/core/simple/SimpleJdbcCall.java | 29 +-
.../jdbc/core/simple/SimpleJdbcCallOperations.java | 13 +-
.../jdbc/core/simple/SimpleJdbcInsert.java | 16 +
.../jdbc/core/simple/SimpleJdbcTemplate.java | 43 +-
...tInterruptibleBatchPreparedStatementSetter.java | 3 +
...stractLobCreatingPreparedStatementCallback.java | 1 +
.../AbstractLobStreamingResultSetExtractor.java | 5 +-
.../jdbc/core/support/AbstractSqlTypeValue.java | 1 +
.../core/support/JdbcBeanDefinitionReader.java | 1 +
.../jdbc/core/support/SqlLobValue.java | 2 +
.../jdbc/datasource/AbstractDataSource.java | 7 +
.../datasource/AbstractDriverBasedDataSource.java | 2 +
.../jdbc/datasource/ConnectionHandle.java | 5 +-
.../datasource/DataSourceTransactionManager.java | 3 +
.../jdbc/datasource/DelegatingDataSource.java | 10 +
.../jdbc/datasource/DriverManagerDataSource.java | 22 +-
.../datasource/JdbcTransactionObjectSupport.java | 6 +-
.../datasource/LazyConnectionDataSourceProxy.java | 9 +-
.../jdbc/datasource/SimpleConnectionHandle.java | 4 +-
.../datasource/SingleConnectionDataSource.java | 33 +-
.../TransactionAwareDataSourceProxy.java | 7 +-
.../datasource/WebSphereDataSourceAdapter.java | 18 +-
.../AbstractEmbeddedDatabaseConfigurer.java | 3 +-
.../datasource/embedded/ConnectionProperties.java | 18 +-
.../datasource/embedded/DataSourceFactory.java | 22 +-
.../embedded/DerbyEmbeddedDatabaseConfigurer.java | 46 +-
.../jdbc/datasource/embedded/EmbeddedDatabase.java | 11 +-
.../embedded/EmbeddedDatabaseBuilder.java | 181 +-
.../embedded/EmbeddedDatabaseConfigurer.java | 17 +-
.../EmbeddedDatabaseConfigurerFactory.java | 8 +-
.../embedded/EmbeddedDatabaseFactory.java | 10 +
.../embedded/EmbeddedDatabaseFactoryBean.java | 35 +-
.../embedded/H2EmbeddedDatabaseConfigurer.java | 24 +-
.../embedded/HsqlEmbeddedDatabaseConfigurer.java | 19 +-
.../datasource/embedded/OutputStreamFactory.java | 3 +-
.../embedded/SimpleDriverDataSourceFactory.java | 6 +
.../datasource/init/CannotReadScriptException.java | 8 +-
.../init/CompositeDatabasePopulator.java | 16 +-
.../datasource/init/DataSourceInitializer.java | 56 +-
.../jdbc/datasource/init/DatabasePopulator.java | 25 +-
.../datasource/init/DatabasePopulatorUtils.java | 22 +-
.../datasource/init/ResourceDatabasePopulator.java | 362 +-
.../jdbc/datasource/init/ScriptException.java | 48 +
.../jdbc/datasource/init/ScriptParseException.java | 54 +
.../init/ScriptStatementFailedException.java | 12 +-
.../jdbc/datasource/init/ScriptUtils.java | 503 +
.../init/UncategorizedScriptException.java | 47 +
.../jdbc/datasource/init/package-info.java | 2 -
.../lookup/AbstractRoutingDataSource.java | 5 +-
.../lookup/BeanFactoryDataSourceLookup.java | 2 +
.../lookup/IsolationLevelDataSourceRouter.java | 6 +-
.../datasource/lookup/JndiDataSourceLookup.java | 1 +
.../datasource/lookup/MapDataSourceLookup.java | 1 +
.../datasource/lookup/SingleDataSourceLookup.java | 3 +-
.../jdbc/object/BatchSqlUpdate.java | 2 +
.../jdbc/object/GenericSqlQuery.java | 16 +-
.../jdbc/object/MappingSqlQuery.java | 2 +-
.../jdbc/object/MappingSqlQueryWithParameters.java | 9 +-
.../jdbc/object/RdbmsOperation.java | 1 +
.../org/springframework/jdbc/object/SqlQuery.java | 28 +-
.../jdbc/object/StoredProcedure.java | 4 +-
.../jdbc/object/UpdatableSqlQuery.java | 9 +-
.../org/springframework/jdbc/package-info.java | 2 +-
.../AbstractFallbackSQLExceptionTranslator.java | 1 +
.../support/CustomSQLErrorCodesTranslation.java | 6 +-
.../CustomSQLExceptionTranslatorRegistrar.java | 1 +
.../jdbc/support/DatabaseStartupValidator.java | 3 +-
.../jdbc/support/GeneratedKeyHolder.java | 5 +-
.../springframework/jdbc/support/JdbcAccessor.java | 1 +
.../springframework/jdbc/support/JdbcUtils.java | 3 +-
.../SQLErrorCodeSQLExceptionTranslator.java | 28 +-
.../support/SQLExceptionSubclassTranslator.java | 5 +-
.../AbstractColumnMaxValueIncrementer.java | 4 +-
.../AbstractDataFieldMaxValueIncrementer.java | 4 +
.../jdbc/support/lob/AbstractLobHandler.java | 5 +
.../jdbc/support/lob/DefaultLobHandler.java | 13 +
.../support/lob/JtaLobCreatorSynchronization.java | 2 +
.../jdbc/support/lob/LobCreator.java | 1 +
.../jdbc/support/lob/OracleLobHandler.java | 31 +-
.../jdbc/support/lob/PassThroughBlob.java | 13 +-
.../jdbc/support/lob/PassThroughClob.java | 15 +-
.../jdbc/support/lob/TemporaryLobCreator.java | 6 +
.../nativejdbc/C3P0NativeJdbcExtractor.java | 2 +-
.../nativejdbc/CommonsDbcpNativeJdbcExtractor.java | 2 +-
.../nativejdbc/JBossNativeJdbcExtractor.java | 6 +-
.../nativejdbc/NativeJdbcExtractorAdapter.java | 9 +
.../nativejdbc/SimpleNativeJdbcExtractor.java | 14 +-
.../nativejdbc/WebLogicNativeJdbcExtractor.java | 2 +-
.../nativejdbc/WebSphereNativeJdbcExtractor.java | 6 +-
.../support/rowset/ResultSetWrappingSqlRowSet.java | 50 +
.../rowset/ResultSetWrappingSqlRowSetMetaData.java | 16 +
.../jdbc/support/xml/Jdbc4SqlXmlHandler.java | 33 +-
.../jdbc/support/xml/SqlXmlHandler.java | 7 +-
.../src/main/resources/META-INF/spring.schemas | 3 +-
.../jdbc/config/spring-jdbc-3.0.xsd | 17 +-
.../jdbc/config/spring-jdbc-3.1.xsd | 17 +-
.../jdbc/config/spring-jdbc-3.2.xsd | 17 +-
.../jdbc/config/spring-jdbc-4.0.xsd | 182 +
.../java/org/springframework/jdbc/Customer.java | 1 +
.../jdbc/config/JdbcNamespaceIntegrationTests.java | 97 +-
.../jdbc/core/JdbcTemplateTests.java | 19 +
.../springframework/jdbc/core/RowMapperTests.java | 1 +
.../jdbc/core/StatementCreatorUtilsTests.java | 2 +-
.../jdbc/datasource/DelegatingDataSourceTest.java | 125 -
.../jdbc/datasource/DelegatingDataSourceTests.java | 118 +
.../embedded/EmbeddedDatabaseBuilderTests.java | 151 +-
.../embedded/EmbeddedDatabaseFactoryBeanTests.java | 40 +-
.../embedded/EmbeddedDatabaseFactoryTests.java | 28 +-
.../init/AbstractDatabaseInitializationTests.java | 84 +
.../init/AbstractDatabasePopulatorTests.java | 202 +
.../datasource/init/DatabasePopulatorTests.java | 280 -
.../datasource/init/H2DatabasePopulatorTests.java | 31 +
.../init/HsqlDatabasePopulatorTests.java | 31 +
.../init/ScriptUtilsIntegrationTests.java | 47 +
.../jdbc/datasource/init/ScriptUtilsUnitTests.java | 172 +
spring-jdbc/src/test/resources/log4j.properties | 10 +
spring-jdbc/src/test/resources/log4j.xml | 28 -
.../jdbc/config/jdbc-destroy-nested-config-h2.xml | 14 +
.../embedded/db-schema-block-comments.sql | 9 +
.../embedded/db-schema-custom-comments.sql | 5 +
.../embedded/db-schema-derby-with-drop.sql | 3 +
.../jdbc/datasource/embedded/db-schema-derby.sql | 1 -
.../jdbc/datasource/init/drop-users-schema.sql | 1 +
.../test-data-with-comments-and-leading-tabs.sql | 9 +
.../datasource/init}/test-data-with-comments.sql | 0
.../init/test-data-with-multi-line-comments.sql | 17 +
.../init/users-data-without-separator.sql | 3 +
.../init/users-schema-without-separator.sql | 5 +
.../jdbc/datasource/init/users-schema.sql | 2 +-
.../java/org/springframework/jms/JmsException.java | 1 +
.../config/AbstractListenerContainerParser.java | 19 +-
.../jms/config/JcaListenerContainerParser.java | 1 +
.../jms/config/JmsListenerContainerParser.java | 29 +-
.../jms/config/JmsNamespaceHandler.java | 1 +
.../jms/connection/CachedMessageConsumer.java | 13 +-
.../jms/connection/CachedMessageProducer.java | 138 +-
.../jms/connection/CachingConnectionFactory.java | 97 +-
.../jms/connection/ChainedExceptionListener.java | 3 +-
.../jms/connection/ConnectionFactoryUtils.java | 18 +
.../connection/DelegatingConnectionFactory.java | 8 +
.../jms/connection/JmsTransactionManager.java | 13 +
.../jms/connection/JmsTransactionManager102.java | 151 -
.../jms/connection/SingleConnectionFactory.java | 27 +-
.../jms/connection/SingleConnectionFactory102.java | 131 -
.../TransactionAwareConnectionFactoryProxy.java | 16 +-
.../UserCredentialsConnectionFactoryAdapter.java | 8 +
.../org/springframework/jms/core/JmsTemplate.java | 82 +-
.../springframework/jms/core/JmsTemplate102.java | 257 -
.../jms/core/support/JmsGatewaySupport.java | 4 +-
.../listener/AbstractJmsListeningContainer.java | 8 +
.../AbstractPollingMessageListenerContainer.java | 7 +-
.../listener/DefaultMessageListenerContainer.java | 25 +-
.../DefaultMessageListenerContainer102.java | 117 -
.../listener/SimpleMessageListenerContainer.java | 4 +
.../SimpleMessageListenerContainer102.java | 99 -
.../listener/adapter/MessageListenerAdapter.java | 5 +-
.../adapter/MessageListenerAdapter102.java | 100 -
.../endpoint/DefaultJmsActivationSpecFactory.java | 3 +
.../endpoint/JmsMessageEndpointFactory.java | 3 +
.../endpoint/JmsMessageEndpointManager.java | 14 +-
.../endpoint/StandardJmsActivationSpecFactory.java | 1 +
.../jms/remoting/JmsInvokerClientInterceptor.java | 2 +
.../jms/remoting/JmsInvokerProxyFactoryBean.java | 9 +-
.../jms/remoting/JmsInvokerServiceExporter.java | 2 +
.../springframework/jms/support/JmsAccessor.java | 1 +
.../converter/MappingJackson2MessageConverter.java | 7 +-
.../converter/MappingJacksonMessageConverter.java | 13 +-
.../converter/MarshallingMessageConverter.java | 3 +
.../support/converter/SimpleMessageConverter.java | 14 +-
.../converter/SimpleMessageConverter102.java | 66 -
.../BeanFactoryDestinationResolver.java | 2 +
.../destination/DynamicDestinationResolver.java | 1 +
.../destination/JndiDestinationResolver.java | 5 +-
.../src/main/resources/META-INF/spring.schemas | 3 +-
.../springframework/jms/config/spring-jms-2.5.xsd | 1 -
.../springframework/jms/config/spring-jms-3.0.xsd | 1 -
.../springframework/jms/config/spring-jms-3.1.xsd | 1 -
.../springframework/jms/config/spring-jms-3.2.xsd | 1 -
.../springframework/jms/config/spring-jms-4.0.xsd | 487 +
.../jms/config/JmsNamespaceHandlerTests.java | 54 +-
.../jms/config/jmsNamespaceHandlerTests.xml | 6 +-
.../jms/connection/JmsTransactionManagerTests.java | 61 +-
.../connection/SingleConnectionFactoryTests.java | 44 -
.../jms/core/JmsTemplate102JtaTests.java | 35 -
.../jms/core/JmsTemplate102Tests.java | 987 -
.../jms/core/JmsTemplate102TransactedTests.java | 35 -
.../adapter/MessageListenerAdapter102Tests.java | 308 -
.../adapter/StubMessageListenerAdapter102.java | 43 -
.../support/SimpleMessageConverter102Tests.java | 66 -
.../MappingJackson2MessageConverterTests.java | 18 +-
.../MappingJacksonMessageConverterTests.java | 1 +
spring-jms/src/test/resources/log4j.properties | 11 +
spring-jms/src/test/resources/log4j.xml | 28 -
.../org/springframework/messaging/Message.java | 39 +
.../springframework/messaging/MessageChannel.java | 55 +
.../messaging/MessageDeliveryException.java | 48 +
.../springframework/messaging/MessageHandler.java | 34 +
.../messaging/MessageHandlingException.java | 44 +
.../springframework/messaging/MessageHeaders.java | 251 +
.../messaging/MessagingException.java | 67 +
.../springframework/messaging/PollableChannel.java | 42 +
.../messaging/SubscribableChannel.java | 42 +
.../converter/AbstractMessageConverter.java | 248 +
.../converter/ByteArrayMessageConverter.java | 53 +
.../converter/CompositeMessageConverter.java | 79 +
.../messaging/converter/ContentTypeResolver.java | 43 +
.../converter/DefaultContentTypeResolver.java | 78 +
.../converter/MappingJackson2MessageConverter.java | 230 +
.../converter/MessageConversionException.java | 43 +
.../messaging/converter/MessageConverter.java | 61 +
.../converter/SimpleMessageConverter.java | 50 +
.../converter/StringMessageConverter.java | 77 +
.../messaging/converter/package-info.java | 4 +
...tractDestinationResolvingMessagingTemplate.java | 145 +
.../core/AbstractMessageSendingTemplate.java | 158 +
.../messaging/core/AbstractMessagingTemplate.java | 129 +
...anFactoryMessageChannelDestinationResolver.java | 76 +
.../core/DestinationResolutionException.java | 39 +
.../messaging/core/DestinationResolver.java | 37 +
...inationResolvingMessageReceivingOperations.java | 47 +
...tionResolvingMessageRequestReplyOperations.java | 111 +
...stinationResolvingMessageSendingOperations.java | 92 +
.../messaging/core/GenericMessagingTemplate.java | 247 +
.../messaging/core/MessagePostProcessor.java | 41 +
.../messaging/core/MessageReceivingOperations.java | 68 +
.../core/MessageRequestReplyOperations.java | 140 +
.../messaging/core/MessageSendingOperations.java | 110 +
.../messaging/core/package-info.java | 4 +
.../handler/AbstractMessageCondition.java | 75 +
.../DestinationPatternsMessageCondition.java | 211 +
.../messaging/handler/HandlerMethod.java | 286 +
.../messaging/handler/HandlerMethodSelector.java | 72 +
.../messaging/handler/MessageCondition.java | 60 +
.../handler/annotation/DestinationVariable.java | 49 +
.../messaging/handler/annotation/Header.java | 54 +
.../messaging/handler/annotation/Headers.java | 38 +
.../annotation/MessageExceptionHandler.java | 44 +
.../handler/annotation/MessageMapping.java | 96 +
.../messaging/handler/annotation/Payload.java | 56 +
.../messaging/handler/annotation/SendTo.java | 44 +
.../handler/annotation/ValueConstants.java | 36 +
.../messaging/handler/annotation/package-info.java | 4 +
.../AbstractMethodArgumentResolutionException.java | 68 +
.../AbstractNamedValueMethodArgumentResolver.java | 235 +
.../AnnotationExceptionHandlerMethodResolver.java | 86 +
.../DestinationVariableMethodArgumentResolver.java | 80 +
.../support/HeaderMethodArgumentResolver.java | 111 +
.../support/HeadersMethodArgumentResolver.java | 76 +
.../support/MessageMethodArgumentResolver.java | 71 +
.../support/MethodArgumentNotValidException.java | 81 +
.../MethodArgumentTypeMismatchException.java | 40 +
.../support/PayloadArgumentResolver.java | 170 +
.../handler/annotation/support/package-info.java | 4 +
.../AbstractExceptionHandlerMethodResolver.java | 111 +
.../invocation/AbstractMethodMessageHandler.java | 547 +
.../invocation/HandlerMethodArgumentResolver.java | 52 +
.../HandlerMethodArgumentResolverComposite.java | 121 +
.../HandlerMethodReturnValueHandler.java | 52 +
.../HandlerMethodReturnValueHandlerComposite.java | 100 +
.../handler/invocation/InvocableHandlerMethod.java | 249 +
.../messaging/handler/invocation/package-info.java | 4 +
.../messaging/handler/package-info.java | 4 +
.../springframework/messaging/package-info.java | 4 +
.../messaging/simp/SimpMessageHeaderAccessor.java | 149 +
.../messaging/simp/SimpMessageMappingInfo.java | 120 +
.../simp/SimpMessageSendingOperations.java | 73 +
.../messaging/simp/SimpMessageType.java | 44 +
.../simp/SimpMessageTypeMessageCondition.java | 100 +
.../messaging/simp/SimpMessagingTemplate.java | 192 +
.../messaging/simp/annotation/SendToUser.java | 51 +
.../simp/annotation/SubscribeMapping.java | 60 +
.../messaging/simp/annotation/package-info.java | 4 +
.../support/MissingSessionUserException.java | 33 +
.../support/PrincipalMethodArgumentResolver.java | 48 +
.../support/SendToMethodReturnValueHandler.java | 188 +
.../SimpAnnotationMethodMessageHandler.java | 366 +
.../SubscriptionMethodReturnValueHandler.java | 108 +
.../simp/annotation/support/package-info.java | 5 +
.../simp/broker/AbstractBrokerMessageHandler.java | 212 +
.../simp/broker/AbstractSubscriptionRegistry.java | 121 +
.../simp/broker/BrokerAvailabilityEvent.java | 56 +
.../simp/broker/DefaultSubscriptionRegistry.java | 351 +
.../simp/broker/SimpleBrokerMessageHandler.java | 172 +
.../simp/broker/SubscriptionRegistry.java | 54 +
.../messaging/simp/broker/package-info.java | 5 +
.../simp/config/AbstractBrokerRegistration.java | 72 +
.../config/AbstractMessageBrokerConfiguration.java | 379 +
.../messaging/simp/config/ChannelRegistration.java | 79 +
.../simp/config/MessageBrokerRegistry.java | 154 +
.../simp/config/SimpleBrokerRegistration.java | 41 +
.../simp/config/StompBrokerRelayRegistration.java | 198 +
.../simp/config/TaskExecutorRegistration.java | 104 +
.../messaging/simp/config/package-info.java | 4 +
.../messaging/simp/package-info.java | 4 +
.../simp/stomp/BufferingStompDecoder.java | 164 +
.../messaging/simp/stomp/Reactor11StompCodec.java | 102 +
.../simp/stomp/StompBrokerRelayMessageHandler.java | 821 +
.../messaging/simp/stomp/StompCodec.java | 68 +
.../messaging/simp/stomp/StompCommand.java | 90 +
.../simp/stomp/StompConversionException.java | 36 +
.../messaging/simp/stomp/StompDecoder.java | 298 +
.../messaging/simp/stomp/StompEncoder.java | 146 +
.../messaging/simp/stomp/StompHeaderAccessor.java | 391 +
.../messaging/simp/stomp/package-info.java | 4 +
.../simp/user/DefaultUserDestinationResolver.java | 234 +
.../simp/user/DefaultUserSessionRegistry.java | 75 +
.../simp/user/DestinationUserNameProvider.java | 20 +
.../simp/user/UserDestinationMessageHandler.java | 170 +
.../simp/user/UserDestinationResolver.java | 60 +
.../messaging/simp/user/UserDestinationResult.java | 96 +
.../messaging/simp/user/UserSessionRegistry.java | 38 +
.../messaging/simp/user/package-info.java | 9 +
.../messaging/support/AbstractMessageChannel.java | 137 +
.../support/AbstractSubscribableChannel.java | 67 +
.../messaging/support/ChannelInterceptor.java | 60 +
.../support/ChannelInterceptorAdapter.java | 46 +
.../messaging/support/ChannelInterceptorChain.java | 116 +
.../messaging/support/ErrorMessage.java | 51 +
.../support/ExecutorSubscribableChannel.java | 78 +
.../messaging/support/GenericMessage.java | 104 +
.../messaging/support/MessageBuilder.java | 170 +
.../messaging/support/MessageHeaderAccessor.java | 272 +
.../support/NativeMessageHeaderAccessor.java | 155 +
.../messaging/support/package-info.java | 7 +
.../tcp/FixedIntervalReconnectStrategy.java | 43 +
.../messaging/tcp/ReconnectStrategy.java | 35 +
.../messaging/tcp/TcpConnection.java | 59 +
.../messaging/tcp/TcpConnectionHandler.java | 61 +
.../messaging/tcp/TcpOperations.java | 55 +
.../messaging/tcp/package-info.java | 9 +
.../AbstractPromiseToListenableFutureAdapter.java | 109 +
...assThroughPromiseToListenableFutureAdapter.java | 41 +
.../messaging/tcp/reactor/Reactor11TcpClient.java | 218 +
.../tcp/reactor/Reactor11TcpConnection.java | 67 +
.../messaging/tcp/reactor/ReactorTcpClient.java | 247 +
.../tcp/reactor/ReactorTcpConnection.java | 55 +
.../messaging/tcp/reactor/package-info.java | 4 +
spring-messaging/src/main/java/overview.html | 7 +
.../messaging/MessageHeadersTests.java | 154 +
.../messaging/StubMessageChannel.java | 63 +
.../converter/DefaultContentTypeResolverTests.java | 96 +
.../MappingJackson2MessageConverterTests.java | 213 +
.../messaging/converter/MessageConverterTests.java | 154 +
.../converter/StringMessageConverterTests.java | 111 +
...DestinationResolvingMessagingTemplateTests.java | 256 +
.../core/GenericMessagingTemplateTests.java | 117 +
.../core/MessageReceivingTemplateTests.java | 122 +
.../core/MessageRequestReplyTemplateTests.java | 190 +
.../core/MessageSendingTemplateTests.java | 193 +
.../DestinationPatternsMessageConditionTests.java | 141 +
...otationExceptionHandlerMethodResolverTests.java | 143 +
...inationVariableMethodArgumentResolverTests.java | 103 +
.../support/HeaderMethodArgumentResolverTests.java | 154 +
.../HeadersMethodArgumentResolverTests.java | 145 +
.../MessageMethodArgumentResolverTests.java | 157 +
.../support/PayloadArgumentResolverTests.java | 224 +
.../invocation/MethodMessageHandlerTests.java | 284 +
.../simp/SimpMessageTypeMessageConditionTests.java | 84 +
.../messaging/simp/SimpMessagingTemplateTests.java | 103 +
.../messaging/simp/TestPrincipal.java | 56 +
.../SendToMethodReturnValueHandlerTests.java | 296 +
.../SimpAnnotationMethodMessageHandlerTests.java | 221 +
.../SubscriptionMethodReturnValueHandlerTests.java | 149 +
.../simp/broker/BrokerMessageHandlerTests.java | 152 +
.../broker/DefaultSubscriptionRegistryTests.java | 357 +
.../broker/SimpleBrokerMessageHandlerTests.java | 182 +
.../config/MessageBrokerConfigurationTests.java | 503 +
.../config/StompBrokerRelayRegistrationTests.java | 73 +
.../simp/stomp/BufferingStompDecoderTests.java | 192 +
...pBrokerRelayMessageHandlerIntegrationTests.java | 549 +
.../stomp/StompBrokerRelayMessageHandlerTests.java | 208 +
.../messaging/simp/stomp/StompCodecTests.java | 307 +
.../simp/stomp/StompHeaderAccessorTests.java | 191 +
.../user/DefaultUserDestinationResolverTests.java | 163 +
.../simp/user/DefaultUserSessionRegistryTests.java | 83 +
.../user/UserDestinationMessageHandlerTests.java | 142 +
.../messaging/support/ChannelInterceptorTests.java | 153 +
.../messaging/support/MessageBuilderTests.java | 168 +
.../support/MessageHeaderAccessorTests.java | 86 +
.../support/NativeMessageHeaderAccessorTests.java | 126 +
.../support/PublishSubscribeChannelTests.java | 139 +
.../src/test/resources/log4j.properties | 13 +
.../orm/hibernate4/ConfigurableJtaPlatform.java | 118 +-
.../orm/hibernate4/HibernateCallback.java | 52 +
.../hibernate4/HibernateExceptionTranslator.java | 1 +
.../orm/hibernate4/HibernateOperations.java | 795 +
...HibernateOptimisticLockingFailureException.java | 10 +-
.../orm/hibernate4/HibernateTemplate.java | 1270 +
.../hibernate4/HibernateTransactionManager.java | 6 +-
.../orm/hibernate4/LocalSessionFactoryBean.java | 103 +-
.../orm/hibernate4/LocalSessionFactoryBuilder.java | 127 +-
.../orm/hibernate4/SessionFactoryUtils.java | 41 +-
.../orm/hibernate4/SpringFlushSynchronization.java | 4 +-
.../orm/hibernate4/SpringSessionContext.java | 23 +-
.../hibernate4/SpringSessionSynchronization.java | 12 +-
.../hibernate4/support/HibernateDaoSupport.java | 132 +
.../support/OpenSessionInViewFilter.java | 1 +
.../support/OpenSessionInViewInterceptor.java | 5 +
.../hibernate4/support/OpenSessionInterceptor.java | 116 +
.../orm/hibernate4/HibernateTemplateTests.java | 1188 +
.../HibernateTransactionManagerTests.java | 45 +-
.../src/test/resources/log4j.properties | 10 +
.../ObjectOptimisticLockingFailureException.java | 12 +-
.../orm/ObjectRetrievalFailureException.java | 10 +-
.../orm/hibernate3/AbstractSessionFactoryBean.java | 5 +
.../hibernate3/FilterDefinitionFactoryBean.java | 44 +-
.../orm/hibernate3/HibernateAccessor.java | 2 +
.../hibernate3/HibernateExceptionTranslator.java | 3 +-
.../orm/hibernate3/HibernateInterceptor.java | 15 +-
.../orm/hibernate3/HibernateOperations.java | 64 +-
...HibernateOptimisticLockingFailureException.java | 10 +-
.../orm/hibernate3/HibernateTemplate.java | 218 +-
.../hibernate3/HibernateTransactionManager.java | 8 +-
.../orm/hibernate3/LocalCacheProviderProxy.java | 73 -
.../LocalDataSourceConnectionProvider.java | 5 +
.../orm/hibernate3/LocalRegionFactoryProxy.java | 25 +-
.../orm/hibernate3/LocalSessionFactoryBean.java | 104 +-
.../hibernate3/LocalTransactionManagerLookup.java | 3 +
.../orm/hibernate3/SessionFactoryUtils.java | 18 +
.../orm/hibernate3/SpringSessionContext.java | 1 +
.../hibernate3/SpringSessionSynchronization.java | 10 +-
.../orm/hibernate3/SpringTransactionFactory.java | 8 +-
.../orm/hibernate3/TypeDefinitionBean.java | 6 +-
.../annotation/AnnotationSessionFactoryBean.java | 71 +-
.../orm/hibernate3/annotation/package-info.java | 8 +-
.../orm/hibernate3/support/AbstractLobType.java | 11 +
.../orm/hibernate3/support/BlobByteArrayType.java | 4 +-
.../hibernate3/support/BlobSerializableType.java | 4 +-
.../orm/hibernate3/support/BlobStringType.java | 4 +-
.../orm/hibernate3/support/ClobStringType.java | 4 +-
.../support/IdTransferringMergeEventListener.java | 2 +-
.../support/OpenSessionInViewFilter.java | 2 +-
.../support/OpenSessionInViewInterceptor.java | 6 +-
.../hibernate3/support/OpenSessionInterceptor.java | 120 +
.../hibernate3/support/ScopedBeanInterceptor.java | 2 +-
.../orm/ibatis/SqlMapClientCallback.java | 65 -
.../orm/ibatis/SqlMapClientFactoryBean.java | 420 -
.../orm/ibatis/SqlMapClientOperations.java | 184 -
.../orm/ibatis/SqlMapClientTemplate.java | 422 -
.../springframework/orm/ibatis/package-info.java | 13 -
.../orm/ibatis/support/AbstractLobTypeHandler.java | 198 -
.../ibatis/support/BlobByteArrayTypeHandler.java | 77 -
.../support/BlobSerializableTypeHandler.java | 113 -
.../orm/ibatis/support/ClobStringTypeHandler.java | 80 -
.../orm/ibatis/support/SqlMapClientDaoSupport.java | 116 -
.../orm/ibatis/support/package-info.java | 8 -
.../springframework/orm/jdo/DefaultJdoDialect.java | 52 +-
.../org/springframework/orm/jdo/JdoAccessor.java | 172 -
.../org/springframework/orm/jdo/JdoCallback.java | 73 -
.../org/springframework/orm/jdo/JdoDialect.java | 21 +-
.../springframework/orm/jdo/JdoInterceptor.java | 128 -
.../org/springframework/orm/jdo/JdoOperations.java | 420 -
.../org/springframework/orm/jdo/JdoTemplate.java | 618 -
.../orm/jdo/JdoTransactionManager.java | 4 +
.../jdo/LocalPersistenceManagerFactoryBean.java | 28 +-
.../orm/jdo/PersistenceManagerFactoryUtils.java | 33 +-
...sactionAwarePersistenceManagerFactoryProxy.java | 17 +-
.../orm/jdo/support/JdoDaoSupport.java | 175 -
.../OpenPersistenceManagerInViewFilter.java | 1 -
.../OpenPersistenceManagerInViewInterceptor.java | 10 +-
.../support/SpringPersistenceManagerProxyBean.java | 18 +-
.../StandardPersistenceManagerProxyBean.java | 11 +-
.../orm/jdo/support/package-info.java | 1 -
.../orm/jpa/AbstractEntityManagerFactoryBean.java | 66 +-
.../springframework/orm/jpa/DefaultJpaDialect.java | 39 +-
.../orm/jpa/EntityManagerFactoryAccessor.java | 10 +-
.../orm/jpa/EntityManagerFactoryPlus.java | 32 -
.../jpa/EntityManagerFactoryPlusOperations.java | 35 -
.../orm/jpa/EntityManagerFactoryUtils.java | 211 +-
.../springframework/orm/jpa/EntityManagerPlus.java | 32 -
.../orm/jpa/EntityManagerPlusOperations.java | 35 -
.../orm/jpa/ExtendedEntityManagerCreator.java | 283 +-
.../org/springframework/orm/jpa/JpaAccessor.java | 158 -
.../org/springframework/orm/jpa/JpaCallback.java | 61 -
.../org/springframework/orm/jpa/JpaDialect.java | 87 +-
.../springframework/orm/jpa/JpaInterceptor.java | 123 -
.../org/springframework/orm/jpa/JpaOperations.java | 88 -
.../orm/jpa/JpaSystemException.java | 4 +
.../org/springframework/orm/jpa/JpaTemplate.java | 442 -
.../orm/jpa/JpaTransactionManager.java | 11 +-
.../LocalContainerEntityManagerFactoryBean.java | 47 +
.../orm/jpa/LocalEntityManagerFactoryBean.java | 6 +-
.../orm/jpa/SharedEntityManagerCreator.java | 170 +-
.../ClassFileTransformerAdapter.java | 1 +
.../DefaultPersistenceUnitManager.java | 201 +-
.../MutablePersistenceUnitInfo.java | 44 +-
.../jpa/persistenceunit/PersistenceUnitReader.java | 6 +-
.../persistenceunit/SpringPersistenceUnitInfo.java | 31 +-
.../orm/jpa/support/JpaDaoSupport.java | 127 -
.../jpa/support/OpenEntityManagerInViewFilter.java | 7 +-
.../OpenEntityManagerInViewInterceptor.java | 16 +-
.../PersistenceAnnotationBeanPostProcessor.java | 44 +-
.../orm/jpa/support/SharedEntityManagerBean.java | 32 +-
.../orm/jpa/support/package-info.java | 1 -
.../orm/jpa/vendor/AbstractJpaVendorAdapter.java | 6 +
.../orm/jpa/vendor/EclipseLinkJpaDialect.java | 34 +-
.../jpa/vendor/EclipseLinkJpaVendorAdapter.java | 18 +-
.../orm/jpa/vendor/HibernateJpaDialect.java | 172 +-
.../jpa/vendor/HibernateJpaSessionFactoryBean.java | 18 +-
.../orm/jpa/vendor/HibernateJpaVendorAdapter.java | 65 +-
.../orm/jpa/vendor/OpenJpaDialect.java | 21 +-
.../orm/jpa/vendor/OpenJpaVendorAdapter.java | 9 +-
.../orm/jpa/vendor/TopLinkJpaDialect.java | 114 -
.../orm/jpa/vendor/TopLinkJpaVendorAdapter.java | 120 -
.../orm/hibernate3/HibernateTemplateTests.java | 18 +-
.../HibernateTransactionManagerTests.java | 6 +-
.../hibernate3/LocalSessionFactoryBeanTests.java | 41 +-
.../hibernate3/support/OpenSessionInViewTests.java | 178 +-
.../orm/ibatis/SqlMapClientTests.java | 358 -
.../orm/ibatis/support/LobTypeHandlerTests.java | 205 -
.../orm/jdo/JdoInterceptorTests.java | 150 -
.../springframework/orm/jdo/JdoTemplateTests.java | 534 -
.../orm/jdo/JdoTransactionManagerTests.java | 261 +-
.../orm/jdo/support/JdoDaoSupportTests.java | 71 -
...tainerEntityManagerFactoryIntegrationTests.java | 15 +-
...stractEntityManagerFactoryIntegrationTests.java | 28 +-
...cationManagedEntityManagerIntegrationTests.java | 16 +-
...tainerManagedEntityManagerIntegrationTests.java | 33 +-
.../orm/jpa/JpaInterceptorTests.java | 267 -
.../springframework/orm/jpa/JpaTemplateTests.java | 412 -
.../orm/jpa/JpaTransactionManagerTests.java | 225 +-
...ocalContainerEntityManagerFactoryBeanTests.java | 18 +-
.../jpa/LocalEntityManagerFactoryBeanTests.java | 17 +-
.../orm/jpa/SharedEntityManagerCreatorTests.java | 86 +
.../orm/jpa/domain/ContextualPerson.java | 1 -
.../org/springframework/orm/jpa/domain/Person.java | 1 -
...seLinkEntityManagerFactoryIntegrationTests.java | 6 +-
.../java/org/springframework/orm/jpa/inject.xml | 16 +-
.../orm/jpa/support/JpaDaoSupportTests.java | 101 -
.../jpa/support/OpenEntityManagerInViewTests.java | 114 +-
.../PersistenceContextTransactionTests.java | 170 +
.../PersistenceInjectionIntegrationTests.java | 5 -
.../orm/jpa/support/PersistenceInjectionTests.java | 47 +-
...opLinkEntityManagerFactoryIntegrationTests.java | 52 -
...kMultiEntityManagerFactoryIntegrationTests.java | 70 -
.../orm/jpa/toplink/toplink-manager-multi.xml | 16 -
.../orm/jpa/toplink/toplink-manager.xml | 18 -
...tTransactionalDataSourceSpringContextTests.java | 13 +-
spring-orm/src/test/resources/log4j.properties | 10 +
spring-orm/src/test/resources/log4j.xml | 28 -
spring-oxm/oxm.gradle | 32 +-
.../oxm/castor/CastorMarshaller.java | 86 +-
.../CastorMarshallerBeanDefinitionParser.java | 7 +-
.../Jaxb2MarshallerBeanDefinitionParser.java | 21 +-
.../config/JibxMarshallerBeanDefinitionParser.java | 6 +-
.../oxm/config/OxmNamespaceHandler.java | 1 +
.../XmlBeansMarshallerBeanDefinitionParser.java | 6 +-
.../springframework/oxm/jaxb/Jaxb2Marshaller.java | 14 +-
.../springframework/oxm/jibx/JibxMarshaller.java | 2 +
.../org/springframework/oxm/mime/package-info.java | 5 -
.../oxm/support/AbstractMarshaller.java | 54 +-
.../oxm/support/MarshallingSource.java | 14 +
.../springframework/oxm/support/package-info.java | 10 +-
.../oxm/xmlbeans/XmlBeansMarshaller.java | 38 +-
.../oxm/xmlbeans/XmlOptionsFactoryBean.java | 3 +
.../oxm/xstream/CatchAllConverter.java | 24 +-
.../oxm/xstream/XStreamMarshaller.java | 657 +-
.../src/main/resources/META-INF/spring.schemas | 3 +-
.../springframework/oxm/config/spring-oxm-1.5.xsd | 146 -
.../springframework/oxm/config/spring-oxm-4.0.xsd | 168 +
.../oxm/castor/CastorMarshallerTests.java | 80 +-
.../oxm/castor/CastorUnmarshallerTests.java | 1 +
.../oxm/jaxb/Jaxb2MarshallerTests.java | 8 +-
.../java/org/springframework/oxm/jibx/Flights.java | 7 +-
.../oxm/jibx/JibxMarshallerTests.java | 13 +-
.../oxm/jibx/JibxUnmarshallerTests.java | 10 +-
.../oxm/xstream/XStreamMarshallerTests.java | 39 +-
.../oxm/xstream/XStreamUnmarshallerTests.java | 13 +-
spring-oxm/src/test/resources/log4j.properties | 12 +-
.../oxm/config/oxmNamespaceHandlerTest.xml | 21 +-
.../view/tiles/ComponentControllerSupport.java | 180 -
.../web/servlet/view/tiles/TilesConfigurer.java | 149 -
.../web/servlet/view/tiles/TilesJstlView.java | 53 -
.../web/servlet/view/tiles/TilesView.java | 209 -
.../web/servlet/view/tiles/package-info.java | 8 -
.../web/struts/ActionServletAwareProcessor.java | 72 -
.../springframework/web/struts/ActionSupport.java | 150 -
.../web/struts/AutowiringRequestProcessor.java | 187 -
.../struts/AutowiringTilesRequestProcessor.java | 169 -
.../web/struts/ContextLoaderPlugIn.java | 396 -
.../web/struts/DelegatingActionProxy.java | 170 -
.../web/struts/DelegatingActionUtils.java | 212 -
.../web/struts/DelegatingRequestProcessor.java | 201 -
.../struts/DelegatingTilesRequestProcessor.java | 147 -
.../web/struts/DispatchActionSupport.java | 150 -
.../web/struts/LookupDispatchActionSupport.java | 149 -
.../web/struts/MappingDispatchActionSupport.java | 149 -
.../web/struts/SpringBindingActionForm.java | 289 -
.../springframework/web/struts/package-info.java | 28 -
.../view/tiles/TestComponentController.java | 37 -
.../web/servlet/view/tiles/TilesViewTests.java | 182 -
.../web/struts/StrutsSupportTests.java | 340 -
.../org/springframework/web/struts/TestAction.java | 49 -
spring-struts/src/test/resources/log4j.xml | 28 -
.../servlet/view/tiles/context-messages.properties | 6 -
.../view/tiles/context-messages_en_GB.properties | 2 -
.../view/tiles/context-messages_en_US.properties | 5 -
.../web/servlet/view/tiles/tiles-test.xml | 17 -
.../web/struts/WEB-INF/action-servlet.xml | 10 -
.../test/util/XpathExpectationsHelper.java | 221 -
.../client/MockMvcClientHttpRequestFactory.java | 93 -
.../test/web/client/MockRestServiceServer.java | 199 -
.../client/RequestMatcherClientHttpRequest.java | 79 -
.../web/client/match/ContentRequestMatchers.java | 196 -
.../web/client/match/JsonPathRequestMatchers.java | 134 -
.../web/client/match/MockRestRequestMatchers.java | 226 -
.../web/client/match/XpathRequestMatchers.java | 202 -
.../client/response/DefaultResponseCreator.java | 132 -
.../test/web/servlet/DefaultMvcResult.java | 145 -
.../springframework/test/web/servlet/MockMvc.java | 174 -
.../test/web/servlet/MockMvcBuilderSupport.java | 75 -
.../test/web/servlet/MvcResult.java | 97 -
.../test/web/servlet/ResultActions.java | 70 -
.../test/web/servlet/ResultHandler.java | 47 -
.../test/web/servlet/ResultMatcher.java | 48 -
.../test/web/servlet/TestDispatcherServlet.java | 120 -
.../test/web/servlet/request/MockAsyncContext.java | 132 -
.../request/MockHttpServletRequestBuilder.java | 666 -
.../MockMultipartHttpServletRequestBuilder.java | 119 -
.../servlet/request/MockMvcRequestBuilders.java | 145 -
.../request/Servlet3MockHttpServletRequest.java | 103 -
.../Servlet3MockMultipartHttpServletRequest.java | 98 -
.../web/servlet/result/ContentResultMatchers.java | 204 -
.../web/servlet/result/CookieResultMatchers.java | 229 -
.../result/FlashAttributeResultMatchers.java | 90 -
.../web/servlet/result/HandlerResultMatchers.java | 120 -
.../web/servlet/result/HeaderResultMatchers.java | 76 -
.../web/servlet/result/JsonPathResultMatchers.java | 105 -
.../web/servlet/result/MockMvcResultHandlers.java | 66 -
.../web/servlet/result/MockMvcResultMatchers.java | 185 -
.../web/servlet/result/ModelResultMatchers.java | 244 -
.../web/servlet/result/PrintingResultHandler.java | 235 -
.../web/servlet/result/RequestResultMatchers.java | 160 -
.../web/servlet/result/StatusResultMatchers.java | 554 -
.../web/servlet/result/ViewResultMatchers.java | 67 -
.../web/servlet/result/XpathResultMatchers.java | 184 -
.../web/servlet/setup/DefaultMockMvcBuilder.java | 219 -
.../test/web/servlet/setup/MockMvcBuilders.java | 74 -
.../servlet/setup/PatternMappingFilterProxy.java | 130 -
.../servlet/setup/StandaloneMockMvcBuilder.java | 427 -
.../servlet/setup/StubWebApplicationContext.java | 343 -
.../test/util/JsonPathExpectationsHelperTests.java | 45 -
.../matchers/ContentRequestMatcherTests.java | 103 -
.../matchers/HeaderRequestMatcherTests.java | 85 -
.../matchers/JsonPathRequestMatcherTests.java | 150 -
.../matchers/XmlContentRequestMatcherTests.java | 133 -
.../test/web/servlet/DefaultMvcResultTests.java | 113 -
.../test/web/servlet/Spr10025Tests.java | 94 -
.../test/web/servlet/Spr10093Tests.java | 94 -
.../test/web/servlet/StubMvcResult.java | 140 -
.../MockHttpServletRequestBuilderTests.java | 414 -
...ockMultipartHttpServletRequestBuilderTests.java | 51 -
.../servlet/result/PrintingResultHandlerTests.java | 250 -
.../servlet/result/StatusResultMatchersTests.java | 82 -
.../servlet/samples/context/JavaConfigTests.java | 149 -
.../web/servlet/samples/standalone/AsyncTests.java | 126 -
.../standalone/FileUploadControllerTests.java | 57 -
.../samples/standalone/ViewResolutionTests.java | 160 -
.../resulthandlers/PrintingResultHandlerTests.java | 49 -
.../resultmatchers/HeaderAssertionTests.java | 102 -
.../resultmatchers/UrlAssertionTests.java | 68 -
.../resultmatchers/XpathAssertionTests.java | 206 -
.../servlet/setup/DefaultMockMvcBuilderTests.java | 82 -
.../test/web/servlet/setup/Spr10277Tests.java | 43 -
.../src/test/resources/log4j.properties | 7 -
spring-test/.springBeans | 5 +-
.../mock/http/MockHttpInputMessage.java | 3 +-
.../mock/http/MockHttpOutputMessage.java | 2 +
.../mock/http/client/MockClientHttpRequest.java | 3 +
.../mock/http/client/MockClientHttpResponse.java | 4 +
.../mock/jndi/ExpectedLookupTemplate.java | 1 +
.../mock/jndi/SimpleNamingContext.java | 36 +
.../mock/jndi/SimpleNamingContextBuilder.java | 2 +
.../mock/web/DelegatingServletInputStream.java | 2 +
.../mock/web/DelegatingServletOutputStream.java | 3 +
.../springframework/mock/web/MockAsyncContext.java | 154 +
.../springframework/mock/web/MockBodyContent.java | 30 +-
.../mock/web/MockExpressionEvaluator.java | 28 +-
.../springframework/mock/web/MockFilterChain.java | 4 +
.../springframework/mock/web/MockFilterConfig.java | 6 +-
.../mock/web/MockHttpServletRequest.java | 186 +-
.../mock/web/MockHttpServletResponse.java | 70 +-
.../springframework/mock/web/MockHttpSession.java | 60 +-
.../springframework/mock/web/MockJspWriter.java | 28 +-
.../mock/web/MockMultipartFile.java | 10 +-
.../mock/web/MockMultipartHttpServletRequest.java | 29 +-
.../springframework/mock/web/MockPageContext.java | 34 +-
.../mock/web/MockRequestDispatcher.java | 2 +
.../mock/web/MockServletConfig.java | 6 +-
.../mock/web/MockServletContext.java | 215 +-
.../mock/web/MockSessionCookieConfig.java | 115 +
.../mock/web/PassThroughFilterChain.java | 3 +-
.../org/springframework/mock/web/package-info.java | 9 +-
.../mock/web/portlet/MockActionResponse.java | 9 +-
.../mock/web/portlet/MockBaseURL.java | 11 +-
.../mock/web/portlet/MockCacheControl.java | 10 +-
.../mock/web/portlet/MockClientDataRequest.java | 9 +-
.../mock/web/portlet/MockEvent.java | 5 +-
.../mock/web/portlet/MockEventRequest.java | 4 +-
.../mock/web/portlet/MockEventResponse.java | 3 +-
.../mock/web/portlet/MockMimeResponse.java | 16 +
.../web/portlet/MockMultipartActionRequest.java | 8 +-
.../mock/web/portlet/MockPortalContext.java | 7 +-
.../mock/web/portlet/MockPortletConfig.java | 11 +
.../mock/web/portlet/MockPortletContext.java | 20 +
.../mock/web/portlet/MockPortletPreferences.java | 11 +-
.../mock/web/portlet/MockPortletRequest.java | 38 +
.../web/portlet/MockPortletRequestDispatcher.java | 5 +-
.../mock/web/portlet/MockPortletResponse.java | 9 +-
.../mock/web/portlet/MockPortletSession.java | 18 +
.../mock/web/portlet/MockPortletURL.java | 8 +-
.../mock/web/portlet/MockRenderRequest.java | 3 +-
.../mock/web/portlet/MockRenderResponse.java | 4 +-
.../mock/web/portlet/MockResourceRequest.java | 6 +-
.../mock/web/portlet/MockResourceResponse.java | 3 +-
.../mock/web/portlet/MockResourceURL.java | 6 +-
.../mock/web/portlet/MockStateAwareResponse.java | 13 +-
.../web/portlet/ServletWrappingPortletContext.java | 25 +-
...tractDependencyInjectionSpringContextTests.java | 294 -
.../test/AbstractSingleSpringContextTests.java | 362 -
.../test/AbstractSpringContextTests.java | 171 -
...tTransactionalDataSourceSpringContextTests.java | 199 -
.../AbstractTransactionalSpringContextTests.java | 359 -
.../org/springframework/test/AssertThrows.java | 10 +-
.../springframework/test/ConditionalTestCase.java | 99 -
.../AbstractAnnotationAwareTransactionalTests.java | 313 -
.../test/annotation/DirtiesContext.java | 28 +-
.../test/annotation/ExpectedException.java | 43 -
.../test/annotation/IfProfileValue.java | 35 +-
.../test/annotation/NotTransactional.java | 43 -
.../ProfileValueSourceConfiguration.java | 13 +-
.../test/annotation/ProfileValueUtils.java | 12 +-
.../springframework/test/annotation/Repeat.java | 19 +-
.../springframework/test/annotation/Rollback.java | 20 +-
.../test/annotation/SystemProfileValueSource.java | 3 +-
.../org/springframework/test/annotation/Timed.java | 31 +-
.../test/context/ActiveProfiles.java | 27 +-
.../test/context/ActiveProfilesResolver.java | 49 +
.../test/context/ContextConfiguration.java | 27 +-
.../context/ContextConfigurationAttributes.java | 26 +-
.../test/context/ContextHierarchy.java | 11 +-
.../test/context/ContextLoaderUtils.java | 246 +-
.../test/context/DefaultTestContext.java | 144 +
.../test/context/MergedContextConfiguration.java | 40 +
.../test/context/MetaAnnotationUtils.java | 384 +
.../springframework/test/context/TestContext.java | 156 +-
.../test/context/TestContextManager.java | 34 +-
.../test/context/TestExecutionListeners.java | 3 +
.../junit38/AbstractJUnit38SpringContextTests.java | 399 -
...ractTransactionalJUnit38SpringContextTests.java | 158 -
.../test/context/junit38/package-info.java | 7 -
.../junit4/AbstractJUnit4SpringContextTests.java | 1 +
...tractTransactionalJUnit4SpringContextTests.java | 74 +-
.../context/junit4/SpringJUnit4ClassRunner.java | 92 +-
.../statements/RunAfterTestClassCallbacks.java | 4 +-
.../statements/RunAfterTestMethodCallbacks.java | 4 +-
.../context/support/AbstractContextLoader.java | 6 +-
.../AbstractDelegatingSmartContextLoader.java | 4 +
.../support/AbstractGenericContextLoader.java | 22 +-
.../support/AbstractTestExecutionListener.java | 5 +
.../support/AnnotationConfigContextLoader.java | 26 +-
.../AnnotationConfigContextLoaderUtils.java | 49 +-
.../support/DelegatingSmartContextLoader.java | 2 +
.../DirtiesContextTestExecutionListener.java | 59 +-
.../support/GenericPropertiesContextLoader.java | 24 +-
.../context/support/GenericXmlContextLoader.java | 24 +-
.../testng/AbstractTestNGSpringContextTests.java | 2 +
...tractTransactionalTestNGSpringContextTests.java | 74 +-
.../test/context/transaction/AfterTransaction.java | 21 +-
.../context/transaction/BeforeTransaction.java | 23 +-
.../transaction/TransactionConfiguration.java | 5 +-
.../TransactionalTestExecutionListener.java | 128 +-
.../web/AbstractGenericWebContextLoader.java | 25 +-
.../web/AnnotationConfigWebContextLoader.java | 28 +-
.../context/web/GenericXmlWebContextLoader.java | 23 +-
.../context/web/ServletTestExecutionListener.java | 5 +-
.../test/context/web/WebAppConfiguration.java | 3 +
.../web/WebDelegatingSmartContextLoader.java | 2 +
.../springframework/test/jdbc/JdbcTestUtils.java | 215 +-
.../test/jdbc/SimpleJdbcTestUtils.java | 187 -
.../test/jpa/AbstractAspectjJpaTests.java | 61 -
.../springframework/test/jpa/AbstractJpaTests.java | 386 -
.../jpa/OrmXmlOverridingShadowingClassLoader.java | 55 -
.../org/springframework/test/jpa/package-info.java | 9 -
.../springframework/test/util/AssertionErrors.java | 6 +-
.../test/util/JsonPathExpectationsHelper.java | 0
.../test/util/MatcherAssertionErrors.java | 0
.../test/util/XmlExpectationsHelper.java | 0
.../test/util/XpathExpectationsHelper.java | 225 +
.../test/web/AbstractModelAndViewTests.java | 169 -
.../client/MockMvcClientHttpRequestFactory.java | 94 +
.../test/web/client/MockRestServiceServer.java | 200 +
.../test/web/client/RequestMatcher.java | 0
.../client/RequestMatcherClientHttpRequest.java | 82 +
.../test/web/client/ResponseActions.java | 0
.../test/web/client/ResponseCreator.java | 0
.../web/client/match/ContentRequestMatchers.java | 202 +
.../web/client/match/JsonPathRequestMatchers.java | 135 +
.../web/client/match/MockRestRequestMatchers.java | 234 +
.../web/client/match/XpathRequestMatchers.java | 203 +
.../test/web/client/match/package-info.java | 0
.../test/web/client/package-info.java | 0
.../client/response/DefaultResponseCreator.java | 133 +
.../client/response/MockRestResponseCreators.java | 0
.../test/web/client/response/package-info.java | 0
.../test/web/servlet/DefaultMvcResult.java | 150 +
.../springframework/test/web/servlet/MockMvc.java | 177 +
.../test/web/servlet/MockMvcBuilder.java | 0
.../test/web/servlet/MockMvcBuilderSupport.java | 76 +
.../test/web/servlet/MvcResult.java | 99 +
.../test/web/servlet/RequestBuilder.java | 0
.../test/web/servlet/ResultActions.java | 70 +
.../test/web/servlet/ResultHandler.java | 47 +
.../test/web/servlet/ResultMatcher.java | 48 +
.../test/web/servlet/TestDispatcherServlet.java | 119 +
.../test/web/servlet/package-info.java | 0
.../request/MockHttpServletRequestBuilder.java | 693 +
.../MockMultipartHttpServletRequestBuilder.java | 117 +
.../servlet/request/MockMvcRequestBuilders.java | 216 +
.../web/servlet/request/RequestPostProcessor.java | 0
.../test/web/servlet/request/package-info.java | 0
.../web/servlet/result/ContentResultMatchers.java | 213 +
.../web/servlet/result/CookieResultMatchers.java | 244 +
.../result/FlashAttributeResultMatchers.java | 94 +
.../web/servlet/result/HandlerResultMatchers.java | 124 +
.../web/servlet/result/HeaderResultMatchers.java | 103 +
.../web/servlet/result/JsonPathResultMatchers.java | 110 +
.../web/servlet/result/MockMvcResultHandlers.java | 68 +
.../web/servlet/result/MockMvcResultMatchers.java | 235 +
.../web/servlet/result/ModelResultMatchers.java | 255 +
.../web/servlet/result/PrintingResultHandler.java | 228 +
.../web/servlet/result/RequestResultMatchers.java | 168 +
.../web/servlet/result/StatusResultMatchers.java | 631 +
.../web/servlet/result/ViewResultMatchers.java | 69 +
.../web/servlet/result/XpathResultMatchers.java | 194 +
.../test/web/servlet/result/package-info.java | 0
.../web/servlet/setup/AbstractMockMvcBuilder.java | 203 +
.../web/servlet/setup/DefaultMockMvcBuilder.java | 51 +
.../test/web/servlet/setup/MockMvcBuilders.java | 74 +
.../servlet/setup/PatternMappingFilterProxy.java | 137 +
.../servlet/setup/StandaloneMockMvcBuilder.java | 491 +
.../servlet/setup/StubWebApplicationContext.java | 400 +
.../test/web/servlet/setup/package-info.java | 0
.../mock/web/MockHttpServletRequestTests.java | 40 +
.../mock/web/MockHttpServletResponseTests.java | 24 +-
.../mock/web/MockHttpSessionTests.java | 103 +-
.../web/MockMultipartHttpServletRequestTests.java | 94 +
.../mock/web/MockServletContextTests.java | 16 +-
.../AbstractSpr3350SingleSpringContextTests.java | 79 -
...3350SingleSpringContextTests-context.properties | 2 -
...ertiesBasedSpr3350SingleSpringContextTests.java | 60 -
...r3264DependencyInjectionSpringContextTests.java | 67 -
.../test/Spr3264SingleSpringContextTests.java | 55 -
...asedSpr3350SingleSpringContextTests-context.xml | 9 -
.../XmlBasedSpr3350SingleSpringContextTests.java | 45 -
...ueAnnotationAwareTransactionalTests-context.xml | 12 -
...fileValueAnnotationAwareTransactionalTests.java | 147 -
.../test/annotation/ProfileValueUtilsTests.java | 99 +-
...xtLoaderUtilsTests$BareAnnotations-context.xml} | 0
.../context/AbstractContextLoaderUtilsTests.java | 176 +
.../test/context/ContextCacheTests.java | 53 +-
.../ContextHierarchyDirtiesContextTests.java | 20 +-
.../ContextLoaderUtilsActiveProfilesTests.java | 343 +
...extLoaderUtilsConfigurationAttributesTests.java | 168 +
.../ContextLoaderUtilsContextHierarchyTests.java | 603 +
.../ContextLoaderUtilsContextInitializerTests.java | 123 +
.../ContextLoaderUtilsMergedConfigTests.java | 143 +
.../test/context/ContextLoaderUtilsTests.java | 911 -
.../test/context/MetaAnnotationUtilsTests.java | 549 +
.../OverriddenMetaAnnotationAttributesTests.java | 155 +
.../test/context/TestExecutionListenersTests.java | 160 +-
.../meta/MetaContextHierarchyConfig.java | 62 +
.../meta/MetaHierarchyLevelOneTests.java | 43 +
.../meta/MetaHierarchyLevelTwoTests.java | 68 +
.../meta/MetaMetaContextHierarchyConfig.java | 36 +
.../DirtiesContextWithContextHierarchyTests.java | 2 +-
.../web/DispatcherWacRootWacEarTests.java | 3 +
.../context/hierarchies/web/RootWacEarTests.java | 2 +
...nsactionalJUnit38SpringContextTests-context.xml | 33 -
...reteTransactionalJUnit38SpringContextTests.java | 231 -
.../FailingBeforeAndAfterMethodsTests-context.xml | 12 -
.../junit38/FailingBeforeAndAfterMethodsTests.java | 156 -
.../ProfileValueJUnit38SpringContextTests.java | 212 -
.../junit38/RepeatedJUnit38SpringContextTests.java | 95 -
.../AbstractTransactionalSpringRunnerTests.java | 5 +-
.../ClassLevelTransactionalSpringRunnerTests.java | 9 +-
...creteTransactionalJUnit4SpringContextTests.java | 87 +-
.../junit4/ExpectedExceptionSpringRunnerTests.java | 25 +-
.../FailingBeforeAndAfterMethodsJUnitTests.java | 202 +
.../FailingBeforeAndAfterMethodsTestNGTests.java | 259 +
.../junit4/FailingBeforeAndAfterMethodsTests.java | 202 -
.../context/junit4/RepeatedSpringRunnerTests.java | 17 +
.../junit4/SpringJUnit4ClassRunnerTests.java | 58 +-
.../test/context/junit4/SpringJUnit4TestSuite.java | 4 +
.../context/junit4/TimedSpringRunnerTests.java | 47 +-
.../TimedTransactionalSpringRunnerTests.java | 15 +-
.../test/context/junit4/aci/AciTestSuite.java | 4 +-
...InitializerWithoutConfigFilesOrClassesTest.java | 62 -
...nitializerWithoutConfigFilesOrClassesTests.java | 62 +
.../MultipleInitializersXmlConfigTests-context.xml | 2 +-
...rofileResolverWithCustomDefaultsMetaConfig.java | 89 +
...eResolverWithCustomDefaultsMetaConfigTests.java | 45 +
...CustomDefaultsMetaConfigWithOverridesTests.java | 71 +
.../meta/ConfigClassesAndProfilesMetaConfig.java | 45 +
.../ConfigClassesAndProfilesMetaConfigTests.java | 70 +
...sesAndProfilesWithCustomDefaultsMetaConfig.java | 69 +
...dProfilesWithCustomDefaultsMetaConfigTests.java | 45 +
...CustomDefaultsMetaConfigWithOverridesTests.java | 67 +
.../junit4/annotation/meta/MetaMetaConfig.java | 41 +
.../meta/MetaMetaConfigDefaultsTests.java | 46 +
.../context/junit4/hybrid/HybridContextLoader.java | 77 +
.../hybrid/HybridContextLoaderTests-context.xml | 9 +
.../junit4/hybrid/HybridContextLoaderTests.java | 80 +
.../junit4/orm/HibernateSessionFlushingTests.java | 3 +-
.../test/context/junit4/orm/db-schema.sql | 4 +-
.../DevProfileResolverAnnotationConfigTests.java | 34 +
.../ProfileAnnotationConfigTestSuite.java | 5 +-
.../DevProfileResolverAnnotationConfigTests.java | 34 +
.../resolver/ClassNameActiveProfilesResolver.java | 31 +
.../ClassNameActiveProfilesResolverTests.java | 57 +
.../xml/DevProfileResolverXmlConfigTests.java | 34 +
.../profile/xml/ProfileXmlConfigTestSuite.java | 5 +-
.../test/context/junit4/spr8849/Spr8849Tests.java | 2 +-
.../test/context/junit4/spr8849/spr8849-schema.sql | 2 +-
...ractTransactionalAnnotatedConfigClassTests.java | 2 +-
...edConfigClassesWithoutAtConfigurationTests.java | 2 +-
...MgrViaTransactionManagementConfigurerTests.java | 2 +-
.../spr9645/LookUpNonexistentTxMgrTests.java | 2 +-
.../LookUpTxMgrByTypeAndDefaultNameTests.java | 2 +-
.../spr9645/LookUpTxMgrByTypeAndNameTests.java | 2 +-
...UpTxMgrByTypeAndQualifierAtClassLevelTests.java | 2 +-
...pTxMgrByTypeAndQualifierAtMethodLevelTests.java | 2 +-
.../junit4/spr9645/LookUpTxMgrByTypeTests.java | 2 +-
.../spr9799/Spr9799AnnotationConfigTests.java | 2 +-
.../junit4/spr9799/Spr9799XmlConfigTests.java | 2 +-
.../AnnotationConfigContextLoaderTests.java | 31 +-
.../DirtiesContextTestExecutionListenerTests.java | 251 +
.../GenericPropertiesContextLoaderTests.java | 51 +
.../support/GenericXmlContextLoaderTests.java | 52 +
...onfigTransactionalTestNGSpringContextTests.java | 10 +-
...creteTransactionalTestNGSpringContextTests.java | 22 +-
...ntextTransactionalTestNGSpringContextTests.java | 7 +-
.../testng/FailingBeforeAndAfterMethodsTests.java | 257 -
.../ejb/AbstractEjbTxDaoTestNGTests.java | 85 +
.../ejb/CommitForRequiredEjbTxDaoTestNGTests.java | 41 +
.../CommitForRequiresNewEjbTxDaoTestNGTests.java | 41 +
.../RollbackForRequiredEjbTxDaoTestNGTests.java | 60 +
.../RollbackForRequiresNewEjbTxDaoTestNGTests.java | 44 +
.../testng/transaction/ejb/testng-package.xml | 9 +
.../transaction/ejb/testng-test-separate.xml | 24 +
.../transaction/ejb/testng-test-together.xml | 12 +
.../TransactionalTestExecutionListenerTests.java | 488 +
.../transaction/ejb/AbstractEjbTxDaoTests.java | 88 +
.../ejb/CommitForRequiredEjbTxDaoTests.java | 39 +
.../ejb/CommitForRequiresNewEjbTxDaoTests.java | 39 +
.../ejb/RollbackForRequiredEjbTxDaoTests.java | 80 +
.../ejb/RollbackForRequiresNewEjbTxDaoTests.java | 42 +
.../ejb/dao/AbstractEjbTxTestEntityDao.java | 63 +
.../ejb/dao/RequiredEjbTxTestEntityDao.java | 50 +
.../ejb/dao/RequiresNewEjbTxTestEntityDao.java | 50 +
.../context/transaction/ejb/dao/TestEntityDao.java | 32 +
.../context/transaction/ejb/model/TestEntity.java | 68 +
.../web/AnnotationConfigWebContextLoaderTests.java | 52 +
.../context/web/BasicAnnotationConfigWacTests.java | 20 +-
.../web/GenericXmlWebContextLoaderTests.java | 50 +
.../context/web/MetaAnnotationConfigWacTests.java | 74 +
.../test/context/web/ServletContextAwareBean.java | 38 +
.../web/ServletContextAwareBeanWacTests.java | 49 +
.../test/context/web/WebTestConfiguration.java | 46 +
.../test/jdbc/JdbcTestUtilsIntegrationTests.java | 63 +
.../test/jdbc/JdbcTestUtilsTests.java | 96 +-
.../test/util/JsonPathExpectationsHelperTests.java | 44 +
.../test/util/ReflectionTestUtilsTests.java | 2 +-
.../test/util/subpackage/LegacyEntity.java | 2 +
.../test/util/subpackage/Person.java | 1 +
.../java/org/springframework/test/web/Person.java | 0
.../client/MockClientHttpRequestFactoryTests.java | 0
.../client/match/ContentRequestMatchersTests.java | 0
.../client/match/JsonPathRequestMatchersTests.java | 0
.../web/client/match/RequestMatchersTests.java | 0
.../client/match/XpathRequestMatchersTests.java | 0
.../web/client/response/ResponseCreatorsTests.java | 0
.../MockMvcClientHttpRequestFactoryTests.java | 0
.../test/web/client/samples/SampleTests.java | 0
.../matchers/ContentRequestMatcherTests.java | 103 +
.../matchers/HeaderRequestMatcherTests.java | 85 +
.../matchers/JsonPathRequestMatcherTests.java | 152 +
.../matchers/XmlContentRequestMatcherTests.java | 132 +
.../samples/matchers/XpathRequestMatcherTests.java | 0
.../test/web/servlet/DefaultMvcResultTests.java | 50 +
.../test/web/servlet/StubMvcResult.java | 140 +
.../MockHttpServletRequestBuilderTests.java | 433 +
...ockMultipartHttpServletRequestBuilderTests.java | 46 +
.../servlet/result/ContentResultMatchersTests.java | 0
.../result/FlashAttributeResultMatchersTests.java | 0
.../result/JsonPathResultMatchersTests.java | 0
.../servlet/result/MockMvcResultMatchersTests.java | 77 +
.../servlet/result/ModelResultMatchersTests.java | 0
.../servlet/result/PrintingResultHandlerTests.java | 251 +
.../servlet/result/StatusResultMatchersTests.java | 121 +
.../servlet/result/XpathResultMatchersTests.java | 0
.../servlet/samples/context/JavaConfigTests.java | 148 +
.../servlet/samples/context/PersonController.java | 0
.../web/servlet/samples/context/PersonDao.java | 0
.../samples/context/WebAppResourceTests.java | 0
.../servlet/samples/context/XmlConfigTests.java | 0
.../web/servlet/samples/spr/EncodedUriTests.java | 133 +
.../web/servlet/samples/spr/HttpOptionsTests.java | 99 +
.../spr/MockMvcBuilderMethodChainTests.java | 59 +
.../samples/spr/RequestContextHolderTests.java | 98 +
.../web/servlet/samples/standalone/AsyncTests.java | 141 +
.../samples/standalone/ExceptionHandlerTests.java | 0
.../standalone/FileUploadControllerTests.java | 60 +
.../servlet/samples/standalone/FilterTests.java | 0
.../servlet/samples/standalone/RedirectTests.java | 0
.../samples/standalone/RequestBuilderTests.java | 0
.../samples/standalone/RequestParameterTests.java | 0
.../samples/standalone/ResponseBodyTests.java | 0
.../samples/standalone/ViewResolutionTests.java | 160 +
.../resulthandlers/PrintingResultHandlerTests.java | 54 +
.../resultmatchers/ContentAssertionTests.java | 0
.../resultmatchers/CookieAssertionTests.java | 0
.../FlashAttributeAssertionTests.java | 0
.../resultmatchers/HandlerAssertionTests.java | 0
.../resultmatchers/HeaderAssertionTests.java | 200 +
.../resultmatchers/JsonPathAssertionTests.java | 0
.../resultmatchers/ModelAssertionTests.java | 0
.../RequestAttributeAssertionTests.java | 0
.../SessionAttributeAssertionTests.java | 0
.../resultmatchers/StatusAssertionTests.java | 0
.../resultmatchers/UrlAssertionTests.java | 79 +
.../resultmatchers/ViewNameAssertionTests.java | 0
.../resultmatchers/XmlContentAssertionTests.java | 0
.../resultmatchers/XpathAssertionTests.java | 232 +
.../ConditionalDelegatingFilterProxyTests.java | 0
.../servlet/setup/DefaultMockMvcBuilderTests.java | 82 +
.../setup/StandaloneMockMvcBuilderTests.java | 77 +
.../MockMultipartHttpServletRequestTests.java | 97 -
.../WEB-INF/layouts/standardLayout.jsp | 0
.../web-resources/WEB-INF/layouts/tiles.xml | 0
.../META-INF/web-resources/WEB-INF/views/home.jsp | 0
.../META-INF/web-resources/WEB-INF/views/tiles.xml | 0
.../META-INF/web-resources/resources/Spring.js | 0
spring-test/src/test/resources/log4j.properties | 25 +
spring-test/src/test/resources/log4j.xml | 63 -
.../test/context/transaction/ejb/common-config.xml | 33 +
.../context/transaction/ejb/required-tx-config.xml | 9 +
.../transaction/ejb/requires-new-tx-config.xml | 9 +
.../org/springframework/test/jdbc}/data.sql | 0
.../org/springframework/test/jdbc}/schema.sql | 0
.../test/web/client/samples/ludwig.json | 0
.../web/servlet/samples/context/root-context.xml | 0
.../test/web/servlet/samples/context/security.xml | 0
.../servlet/samples/context/servlet-context.xml | 0
.../src/test/webapp/WEB-INF/layouts/main.jsp | 0
.../src/test/webapp/WEB-INF/layouts/tiles.xml | 0
.../src/test/webapp/WEB-INF/readme.txt | 0
.../src/test/webapp/WEB-INF/views/tiles.xml | 0
.../src/test/webapp/resources/Spring.js | 0
.../PersistenceExceptionTranslationAdvisor.java | 2 +
...rsistenceExceptionTranslationPostProcessor.java | 1 +
.../ChainedPersistenceExceptionTranslator.java | 1 +
.../springframework/dao/support/DaoSupport.java | 2 +-
.../dao/support/DataAccessUtils.java | 4 +-
...PersistenceExceptionTranslationInterceptor.java | 63 +-
.../cci/connection/CciLocalTransactionManager.java | 2 +
.../connection/DelegatingConnectionFactory.java | 7 +
.../cci/connection/NotSupportedRecordFactory.java | 2 +
.../cci/connection/SingleConnectionFactory.java | 4 +-
.../TransactionAwareConnectionFactoryProxy.java | 3 +-
.../springframework/jca/cci/core/CciTemplate.java | 10 +
.../jca/cci/core/support/CommAreaRecord.java | 6 +
.../jca/cci/object/EisOperation.java | 3 +-
.../jca/cci/object/MappingRecordOperation.java | 4 +-
.../context/BootstrapContextAwareProcessor.java | 4 +-
.../context/ResourceAdapterApplicationContext.java | 3 +-
.../jca/context/SpringContextResourceAdapter.java | 5 +
.../endpoint/AbstractMessageEndpointFactory.java | 35 +-
.../endpoint/GenericMessageEndpointFactory.java | 1 +
.../endpoint/GenericMessageEndpointManager.java | 10 +-
.../jca/support/LocalConnectionFactoryBean.java | 6 +-
.../jca/support/ResourceAdapterFactoryBean.java | 9 +-
.../jca/support/SimpleBootstrapContext.java | 3 +
.../springframework/jca/work/DelegatingWork.java | 4 +-
.../jca/work/SimpleTaskWorkManager.java | 10 +-
.../jca/work/WorkManagerTaskExecutor.java | 34 +-
.../GlassFishWorkManagerTaskExecutor.java | 4 +
.../work/jboss/JBossWorkManagerTaskExecutor.java | 11 +-
.../jca/work/jboss/JBossWorkManagerUtils.java | 3 +
.../transaction/TransactionStatus.java | 7 +-
.../transaction/TransactionSystemException.java | 2 +-
...AbstractTransactionManagementConfiguration.java | 1 +
.../AnnotationTransactionAttributeSource.java | 11 +-
.../Ejb3TransactionAnnotationParser.java | 1 +
.../annotation/JtaTransactionAnnotationParser.java | 84 +
.../SpringTransactionAnnotationParser.java | 35 +-
.../annotation/TransactionAnnotationParser.java | 6 +-
.../AnnotationDrivenBeanDefinitionParser.java | 1 +
.../JtaTransactionManagerBeanDefinitionParser.java | 13 +-
.../transaction/config/TxNamespaceHandler.java | 1 +
...AbstractFallbackTransactionAttributeSource.java | 1 +
...anFactoryTransactionAttributeSourceAdvisor.java | 1 +
.../CompositeTransactionAttributeSource.java | 1 +
.../interceptor/DefaultTransactionAttribute.java | 2 +
.../DelegatingTransactionAttribute.java | 2 +
.../MatchAlwaysTransactionAttributeSource.java | 6 +-
.../MethodMapTransactionAttributeSource.java | 5 +-
.../NameMatchTransactionAttributeSource.java | 12 +-
.../interceptor/NoRollbackRuleAttribute.java | 2 +-
.../interceptor/TransactionAspectSupport.java | 9 +-
.../interceptor/TransactionAspectUtils.java | 65 -
.../TransactionAttributeSourceAdvisor.java | 2 +
.../TransactionAttributeSourceEditor.java | 2 +-
.../TransactionAttributeSourcePointcut.java | 3 +-
.../interceptor/TransactionInterceptor.java | 2 +
.../interceptor/TransactionProxyFactoryBean.java | 1 +
.../jta/JtaAfterCompletionSynchronization.java | 2 +
.../transaction/jta/JtaTransactionManager.java | 179 +-
.../transaction/jta/JtaTransactionObject.java | 4 +-
.../transaction/jta/ManagedTransactionAdapter.java | 9 +-
.../transaction/jta/OC4JJtaTransactionManager.java | 253 -
.../transaction/jta/SimpleTransactionFactory.java | 4 +-
.../jta/SpringJtaSynchronizationAdapter.java | 2 +
.../transaction/jta/UserTransactionAdapter.java | 8 +-
.../jta/WebSphereUowTransactionManager.java | 2 +
.../AbstractPlatformTransactionManager.java | 7 +-
.../support/AbstractTransactionStatus.java | 8 +
.../support/DefaultTransactionDefinition.java | 5 +
.../support/DefaultTransactionStatus.java | 1 +
.../support/DelegatingTransactionDefinition.java | 5 +
.../transaction/support/ResourceHolderSupport.java | 5 +-
.../support/ResourceHolderSynchronization.java | 7 +
.../support/SimpleTransactionStatus.java | 1 +
.../support/SmartTransactionObject.java | 7 +-
.../support/TransactionCallbackWithoutResult.java | 1 +
.../support/TransactionSynchronization.java | 5 +-
.../support/TransactionSynchronizationAdapter.java | 10 +-
.../transaction/support/TransactionTemplate.java | 2 +
.../src/main/resources/META-INF/spring.schemas | 3 +-
.../transaction/config/spring-tx-4.0.xsd | 247 +
...enceExceptionTranslationPostProcessorTests.java | 64 +-
.../AnnotationTransactionAttributeSourceTests.java | 273 +-
.../annotationTransactionNamespaceHandlerTests.xml | 12 +-
.../TransactionAttributeSourceTests.java | 10 +
spring-tx/src/test/resources/log4j.properties | 10 +
spring-tx/src/test/resources/log4j.xml | 28 -
.../java/org/springframework/http/HttpEntity.java | 2 +-
.../java/org/springframework/http/HttpHeaders.java | 282 +-
.../java/org/springframework/http/HttpStatus.java | 48 +-
.../http/InvalidMediaTypeException.java | 15 +-
.../java/org/springframework/http/MediaType.java | 516 +-
.../http/StreamingHttpOutputMessage.java | 52 +
.../client/AbstractAsyncClientHttpRequest.java | 84 +
.../AbstractBufferingAsyncClientHttpRequest.java | 63 +
.../http/client/AbstractClientHttpRequest.java | 13 +-
.../AbstractClientHttpRequestFactoryWrapper.java | 3 +-
.../http/client/AbstractClientHttpResponse.java | 1 +
.../http/client/AsyncClientHttpRequest.java | 46 +
.../http/client/AsyncClientHttpRequestFactory.java | 45 +
.../client/BufferingClientHttpRequestWrapper.java | 3 +-
.../client/BufferingClientHttpResponseWrapper.java | 7 +-
.../http/client/ClientHttpResponse.java | 1 +
.../http/client/CommonsClientHttpRequest.java | 89 -
.../client/CommonsClientHttpRequestFactory.java | 172 -
.../http/client/CommonsClientHttpResponse.java | 77 -
.../HttpComponentsAsyncClientHttpRequest.java | 142 +
...ttpComponentsAsyncClientHttpRequestFactory.java | 150 +
.../HttpComponentsAsyncClientHttpResponse.java | 83 +
.../client/HttpComponentsClientHttpRequest.java | 19 +-
.../HttpComponentsClientHttpRequestFactory.java | 173 +-
.../client/HttpComponentsClientHttpResponse.java | 40 +-
.../HttpComponentsStreamingClientHttpRequest.java | 163 +
.../http/client/InterceptingClientHttpRequest.java | 3 +
.../SimpleBufferingAsyncClientHttpRequest.java | 93 +
.../client/SimpleBufferingClientHttpRequest.java | 2 +
.../client/SimpleClientHttpRequestFactory.java | 34 +-
.../http/client/SimpleClientHttpResponse.java | 5 +
.../SimpleStreamingAsyncClientHttpRequest.java | 122 +
.../client/SimpleStreamingClientHttpRequest.java | 1 +
.../http/client/support/AsyncHttpAccessor.java | 82 +
.../http/client/support/HttpRequestWrapper.java | 5 +-
.../http/client/support/ProxyFactoryBean.java | 4 +
.../converter/AbstractHttpMessageConverter.java | 37 +-
.../BufferedImageHttpMessageConverter.java | 5 +
.../http/converter/FormHttpMessageConverter.java | 260 +-
.../ObjectToStringHttpMessageConverter.java | 2 +-
.../json/Jackson2ObjectMapperFactoryBean.java | 168 +-
.../json/JacksonObjectMapperFactoryBean.java | 26 +-
.../json/MappingJackson2HttpMessageConverter.java | 120 +-
.../json/MappingJacksonHttpMessageConverter.java | 18 +-
.../AllEncompassingFormHttpMessageConverter.java | 8 +-
.../xml/AbstractJaxb2HttpMessageConverter.java | 39 +-
.../xml/Jaxb2CollectionHttpMessageConverter.java | 3 +
.../xml/MarshallingHttpMessageConverter.java | 19 +-
.../converter/xml/SourceHttpMessageConverter.java | 27 +-
.../xml/XmlAwareFormHttpMessageConverter.java | 4 +-
.../http/server/ServerHttpAsyncRequestControl.java | 57 +
.../http/server/ServerHttpRequest.java | 27 +
.../http/server/ServerHttpResponse.java | 15 +-
.../ServletServerHttpAsyncRequestControl.java | 133 +
.../http/server/ServletServerHttpRequest.java | 34 +
.../http/server/ServletServerHttpResponse.java | 76 +-
.../remoting/caucho/BurlapClientInterceptor.java | 6 +-
.../remoting/caucho/BurlapExporter.java | 6 +-
.../remoting/caucho/BurlapProxyFactoryBean.java | 8 +-
.../remoting/caucho/BurlapServiceExporter.java | 6 +-
.../remoting/caucho/HessianClientInterceptor.java | 30 +-
.../remoting/caucho/HessianExporter.java | 33 +-
.../remoting/caucho/HessianProxyFactoryBean.java | 7 +-
.../remoting/caucho/HessianServiceExporter.java | 6 +-
.../caucho/SimpleBurlapServiceExporter.java | 6 +-
.../caucho/SimpleHessianServiceExporter.java | 6 +-
.../AbstractHttpInvokerRequestExecutor.java | 2 +
.../CommonsHttpInvokerRequestExecutor.java | 267 -
.../HttpComponentsHttpInvokerRequestExecutor.java | 38 +-
.../httpinvoker/HttpInvokerClientInterceptor.java | 2 +
.../httpinvoker/HttpInvokerProxyFactoryBean.java | 5 +-
.../httpinvoker/HttpInvokerServiceExporter.java | 3 +-
.../SimpleHttpInvokerRequestExecutor.java | 14 +-
.../SimpleHttpInvokerServiceExporter.java | 3 +-
.../jaxrpc/JaxRpcPortClientInterceptor.java | 749 -
.../jaxrpc/JaxRpcPortProxyFactoryBean.java | 90 -
.../jaxrpc/JaxRpcServicePostProcessor.java | 47 -
.../remoting/jaxrpc/JaxRpcSoapFaultException.java | 72 -
.../remoting/jaxrpc/LocalJaxRpcServiceFactory.java | 323 -
.../jaxrpc/LocalJaxRpcServiceFactoryBean.java | 64 -
.../remoting/jaxrpc/ServletEndpointSupport.java | 151 -
.../remoting/jaxrpc/package-info.java | 11 -
.../jaxws/AbstractJaxWsServiceExporter.java | 114 +-
.../remoting/jaxws/JaxWsPortClientInterceptor.java | 117 +-
.../remoting/jaxws/JaxWsPortProxyFactoryBean.java | 5 +-
.../remoting/jaxws/LocalJaxWsServiceFactory.java | 32 +-
.../jaxws/LocalJaxWsServiceFactoryBean.java | 6 +-
.../web/SpringServletContainerInitializer.java | 1 +
.../AbstractMappingContentNegotiationStrategy.java | 1 +
.../web/accept/ContentNegotiationManager.java | 3 +
.../ContentNegotiationManagerFactoryBean.java | 5 +
.../accept/FixedContentNegotiationStrategy.java | 1 +
.../accept/HeaderContentNegotiationStrategy.java | 4 +-
.../MappingMediaTypeFileExtensionResolver.java | 2 +
.../springframework/web/bind/EscapedErrors.java | 31 +-
.../web/bind/ServletRequestDataBinder.java | 6 -
...nsatisfiedServletRequestParameterException.java | 3 +-
.../springframework/web/bind/WebDataBinder.java | 32 +-
.../web/bind/annotation/ControllerAdvice.java | 66 +-
.../web/bind/annotation/ExceptionHandler.java | 6 +-
.../web/bind/annotation/PathVariable.java | 6 +-
.../web/bind/annotation/RequestMapping.java | 29 +-
.../web/bind/annotation/ResponseBody.java | 13 +-
.../web/bind/annotation/RestController.java | 54 +
.../web/bind/annotation/SessionAttributes.java | 2 +-
.../annotation/support/HandlerMethodInvoker.java | 46 +-
.../annotation/support/HandlerMethodResolver.java | 17 +-
.../support/ConfigurableWebBindingInitializer.java | 1 +
.../web/bind/support/DefaultDataBinderFactory.java | 1 +
.../bind/support/DefaultSessionAttributeStore.java | 5 +-
.../web/bind/support/SimpleSessionStatus.java | 2 +
.../web/bind/support/WebRequestDataBinder.java | 69 +-
.../web/client/AsyncRequestCallback.java | 44 +
.../web/client/AsyncRestOperations.java | 444 +
.../web/client/AsyncRestTemplate.java | 693 +
.../web/client/DefaultResponseErrorHandler.java | 2 +
.../web/client/HttpMessageConverterExtractor.java | 9 +-
.../springframework/web/client/RestOperations.java | 1 +
.../springframework/web/client/RestTemplate.java | 192 +-
.../context/AbstractContextLoaderInitializer.java | 1 +
.../web/context/ContextCleanupListener.java | 8 +-
.../springframework/web/context/ContextLoader.java | 11 +-
.../web/context/ContextLoaderListener.java | 39 +-
.../request/AbstractRequestAttributesScope.java | 6 +-
.../DestructionCallbackBindingListener.java | 2 +
.../context/request/FacesRequestAttributes.java | 37 +-
.../web/context/request/FacesWebRequest.java | 24 +-
.../Log4jNestedDiagnosticContextInterceptor.java | 4 +
.../context/request/RequestContextListener.java | 2 +
.../web/context/request/RequestScope.java | 1 +
.../context/request/ServletRequestAttributes.java | 8 +
.../web/context/request/ServletWebRequest.java | 28 +
.../web/context/request/SessionScope.java | 3 +-
.../web/context/request/async/AsyncWebRequest.java | 1 -
.../async/CallableProcessingInterceptor.java | 2 +-
.../CallableProcessingInterceptorAdapter.java | 5 +
.../web/context/request/async/DeferredResult.java | 16 +
...DeferredResultProcessingInterceptorAdapter.java | 4 +
.../request/async/NoSupportAsyncWebRequest.java | 7 +
.../async/StandardServletAsyncWebRequest.java | 11 +
.../web/context/request/async/WebAsyncManager.java | 7 +
.../AbstractRefreshableWebApplicationContext.java | 19 +-
.../support/GenericWebApplicationContext.java | 22 +-
.../support/ServletContextAttributeExporter.java | 3 +-
.../ServletContextAttributeFactoryBean.java | 6 +-
.../support/ServletContextAwareProcessor.java | 43 +-
.../context/support/ServletContextFactoryBean.java | 69 -
.../ServletContextParameterFactoryBean.java | 4 +
...ervletContextPropertyPlaceholderConfigurer.java | 2 +-
.../context/support/ServletContextResource.java | 3 +
.../ServletContextResourcePatternResolver.java | 19 +-
.../web/context/support/ServletContextScope.java | 6 +
.../support/StandardServletEnvironment.java | 1 +
.../support/StaticWebApplicationContext.java | 10 +
.../support/WebApplicationContextUtils.java | 5 +
.../support/WebApplicationObjectSupport.java | 1 +
.../web/filter/CompositeFilter.java | 4 +
.../web/filter/DelegatingFilterProxy.java | 1 +
.../web/filter/GenericFilterBean.java | 6 +
.../web/filter/OncePerRequestFilter.java | 1 +
.../web/filter/ShallowEtagHeaderFilter.java | 101 +-
.../web/jsf/DecoratingNavigationHandler.java | 2 +-
.../web/jsf/DelegatingNavigationHandlerProxy.java | 4 +-
.../jsf/DelegatingPhaseListenerMulticaster.java | 3 +
.../web/jsf/DelegatingVariableResolver.java | 173 -
.../web/jsf/SpringBeanVariableResolver.java | 57 -
.../jsf/WebApplicationContextVariableResolver.java | 117 -
.../web/jsf/el/SpringBeanFacesELResolver.java | 13 +-
.../el/WebApplicationContextFacesELResolver.java | 10 +-
.../springframework/web/jsf/el/package-info.java | 5 +-
.../web/method/ControllerAdviceBean.java | 156 +-
.../springframework/web/method/HandlerMethod.java | 2 +-
.../web/method/HandlerMethodSelector.java | 1 +
.../AbstractCookieValueMethodArgumentResolver.java | 13 +-
.../AbstractNamedValueMethodArgumentResolver.java | 23 +-
.../AbstractWebArgumentResolverAdapter.java | 27 +-
.../annotation/ErrorsMethodArgumentResolver.java | 10 +-
.../annotation/ExceptionHandlerMethodResolver.java | 1 +
.../ExpressionValueMethodArgumentResolver.java | 9 +-
.../web/method/annotation/MapMethodProcessor.java | 19 +-
.../annotation/ModelAttributeMethodProcessor.java | 4 +
.../web/method/annotation/ModelFactory.java | 4 +-
.../method/annotation/ModelMethodProcessor.java | 19 +-
.../RequestHeaderMapMethodArgumentResolver.java | 16 +-
.../RequestHeaderMethodArgumentResolver.java | 17 +-
.../RequestParamMapMethodArgumentResolver.java | 28 +-
.../RequestParamMethodArgumentResolver.java | 118 +-
.../annotation/SessionAttributesHandler.java | 15 +-
.../SessionStatusMethodArgumentResolver.java | 10 +-
.../support/CompositeUriComponentsContributor.java | 134 +
.../support/HandlerMethodArgumentResolver.java | 10 +-
.../HandlerMethodArgumentResolverComposite.java | 23 +-
.../support/HandlerMethodReturnValueHandler.java | 8 +-
.../HandlerMethodReturnValueHandlerComposite.java | 25 +-
.../web/method/support/InvocableHandlerMethod.java | 46 +-
.../web/method/support/ModelAndViewContainer.java | 12 +-
.../method/support/UriComponentsContributor.java | 55 +
.../multipart/commons/CommonsMultipartFile.java | 8 +
.../commons/CommonsMultipartResolver.java | 5 +-
.../AbstractMultipartHttpServletRequest.java | 9 +-
.../DefaultMultipartHttpServletRequest.java | 2 +
.../StandardMultipartHttpServletRequest.java | 9 +
.../support/StandardServletMultipartResolver.java | 2 +
.../web/util/ExpressionEvaluationUtils.java | 284 -
.../web/util/HierarchicalUriComponents.java | 36 +-
.../web/util/HtmlCharacterEntityReferences.java | 2 +-
.../web/util/HttpSessionMutexListener.java | 2 +
.../web/util/IntrospectorCleanupListener.java | 2 +
.../web/util/Log4jConfigListener.java | 2 +
.../web/util/ServletContextPropertyUtils.java | 3 +-
.../org/springframework/web/util/TagUtils.java | 4 +-
.../springframework/web/util/UriComponents.java | 27 +-
.../web/util/UriComponentsBuilder.java | 70 +-
.../org/springframework/web/util/UriTemplate.java | 24 -
.../org/springframework/web/util/UriUtils.java | 2 +-
.../web/util/WebAppRootListener.java | 4 +-
.../org/springframework/web/util/WebUtils.java | 29 +-
.../org/springframework/http/MediaTypeTests.java | 95 -
.../springframework/http/MockHttpInputMessage.java | 1 +
.../http/MockHttpOutputMessage.java | 2 +-
.../AbstractAsyncHttpRequestFactoryTestCase.java | 209 +
.../client/AbstractHttpRequestFactoryTestCase.java | 178 +-
.../http/client/AbstractJettyServerTestCase.java | 162 +
...BufferedSimpleAsyncHttpRequestFactoryTests.java | 48 +
.../client/CommonsHttpRequestFactoryTests.java | 37 -
...mponentsAsyncClientHttpRequestFactoryTests.java | 40 +
...ttpComponentsClientHttpRequestFactoryTests.java | 44 +-
.../InterceptingClientHttpRequestFactoryTests.java | 1 -
...ttpComponentsClientHttpRequestFactoryTests.java | 40 +
.../http/client/support/ProxyFactoryBeanTest.java | 74 -
.../http/client/support/ProxyFactoryBeanTests.java | 74 +
.../json/Jackson2ObjectMapperFactoryBeanTests.java | 154 +-
.../Jaxb2CollectionHttpMessageConverterTests.java | 52 +-
.../Jaxb2RootElementHttpMessageConverterTest.java | 170 -
.../Jaxb2RootElementHttpMessageConverterTests.java | 288 +
.../xml/MarshallingHttpMessageConverterTests.java | 118 +-
.../xml/SourceHttpMessageConverterTests.java | 59 +-
.../server/ServletServerHttpResponseTests.java | 16 +-
.../mock/web/test/MockAsyncContext.java | 28 +-
.../mock/web/test/MockHttpServletRequest.java | 221 +-
.../mock/web/test/MockHttpServletResponse.java | 25 +-
.../mock/web/test/MockHttpSession.java | 46 +-
.../web/test/MockMultipartHttpServletRequest.java | 20 +-
.../mock/web/test/MockServletContext.java | 146 +-
.../mock/web/test/MockSessionCookieConfig.java | 115 +
.../remoting/jaxrpc/JaxRpcSupportTests.java | 644 -
.../springframework/tests/web/FreePortScanner.java | 99 -
...ractMappingContentNegotiationStrategyTests.java | 99 -
.../MappingContentNegotiationStrategyTests.java | 100 +
.../WebRequestDataBinderIntegrationTests.java | 207 +
.../web/client/AbstractJettyServerTestCase.java | 269 +
.../client/AsyncRestTemplateIntegrationTests.java | 445 +
.../client/HttpMessageConverterExtractorTests.java | 7 +-
.../web/client/RestTemplateIntegrationTests.java | 221 +-
.../web/client/RestTemplateTests.java | 2 +
.../context/request/ServletWebRequestTests.java | 16 +-
.../context/request/async/DeferredResultTests.java | 17 +-
...AnnotationConfigWebApplicationContextTests.java | 2 +
.../support/SpringBeanAutowiringSupportTests.java | 11 +-
.../web/filter/HiddenHttpMethodFilterTest.java | 75 -
.../web/filter/HiddenHttpMethodFilterTests.java | 75 +
.../web/filter/ShallowEtagHeaderFilterTests.java | 93 +-
.../web/jsf/DelegatingVariableResolverTests.java | 87 -
.../web/method/ControllerAdviceBeanTests.java | 159 +
.../RequestHeaderMethodArgumentResolverTests.java | 10 +-
.../RequestParamMethodArgumentResolverTests.java | 173 +-
.../commons/CommonsMultipartResolverTests.java | 12 +-
.../support/ByteArrayMultipartFileEditorTests.java | 1 +
.../web/util/ExpressionEvaluationUtilsTests.java | 304 -
.../springframework/web/util/TagUtilsTests.java | 1 -
.../web/util/UriComponentsBuilderTests.java | 24 +
.../web/util/UriComponentsTests.java | 32 +-
.../web/util/UrlPathHelperTests.java | 16 +-
spring-web/src/test/resources/log4j.properties | 12 +
spring-web/src/test/resources/log4j.xml | 28 -
.../http/converter/xml/external.txt | 2 +-
.../web/portlet/DispatcherPortlet.java | 6 +-
.../web/portlet/FrameworkPortlet.java | 3 +-
.../web/portlet/GenericPortletBean.java | 6 +-
.../web/portlet/bind/PortletRequestDataBinder.java | 6 -
...stractRefreshablePortletApplicationContext.java | 7 +
.../context/PortletApplicationContextUtils.java | 3 +
.../context/PortletApplicationObjectSupport.java | 1 +
.../context/PortletContextAwareProcessor.java | 2 +
.../portlet/context/PortletContextResource.java | 3 +
.../PortletContextResourcePatternResolver.java | 6 +-
.../web/portlet/context/PortletContextScope.java | 6 +
.../portlet/context/PortletRequestAttributes.java | 8 +
.../web/portlet/context/PortletWebRequest.java | 22 +-
.../context/StaticPortletApplicationContext.java | 10 +
.../handler/AbstractHandlerExceptionResolver.java | 9 +-
.../portlet/handler/AbstractHandlerMapping.java | 2 +
.../handler/AbstractMapBasedHandlerMapping.java | 2 +-
.../portlet/handler/HandlerInterceptorAdapter.java | 10 +
.../portlet/handler/PortletModeHandlerMapping.java | 2 +-
.../handler/SimpleMappingExceptionResolver.java | 4 +-
.../handler/SimplePortletHandlerAdapter.java | 6 +
.../handler/SimplePortletPostProcessor.java | 16 +
.../WebRequestHandlerInterceptorAdapter.java | 10 +
.../multipart/CommonsPortletMultipartResolver.java | 4 +
.../multipart/DefaultMultipartActionRequest.java | 10 +-
.../web/portlet/mvc/AbstractCommandController.java | 213 -
.../web/portlet/mvc/AbstractController.java | 2 +
.../web/portlet/mvc/AbstractFormController.java | 974 -
.../portlet/mvc/AbstractWizardFormController.java | 982 -
.../web/portlet/mvc/BaseCommandController.java | 666 -
.../portlet/mvc/PortletModeNameViewController.java | 4 +-
.../web/portlet/mvc/PortletWrappingController.java | 23 +-
.../mvc/SimpleControllerHandlerAdapter.java | 8 +-
.../web/portlet/mvc/SimpleFormController.java | 562 -
.../annotation/AnnotationMethodHandlerAdapter.java | 25 +-
.../AnnotationMethodHandlerExceptionResolver.java | 3 +-
.../DefaultAnnotationHandlerMapping.java | 29 +-
.../web/portlet/util/PortletUtils.java | 17 +-
.../mock/web/portlet/MockPortletPreferences.java | 9 +
.../mock/web/portlet/MockPortletURL.java | 1 +
.../mock/web/portlet/MockResourceURL.java | 1 +
.../web/portlet/DispatcherPortletTests.java | 327 +-
.../portlet/SimplePortletApplicationContext.java | 141 -
.../web/portlet/mvc/CommandControllerTests.java | 478 -
.../src/test/resources/log4j.properties | 10 +
spring-webmvc-portlet/src/test/resources/log4j.xml | 28 -
.../view/tiles3/AbstractSpringPreparerFactory.java | 1 +
.../view/tiles3/SimpleSpringPreparerFactory.java | 1 -
.../web/servlet/view/tiles3/TilesConfigurer.java | 74 +-
.../web/servlet/view/tiles3/TilesView.java | 48 +-
.../src/test/resources/log4j.properties | 11 +-
.../web/servlet/DispatcherServlet.java | 70 +-
.../org/springframework/web/servlet/FlashMap.java | 1 +
.../web/servlet/FrameworkServlet.java | 47 +-
.../web/servlet/HandlerAdapter.java | 22 +-
.../web/servlet/HttpServletBean.java | 6 +-
.../web/servlet/LocaleContextResolver.java | 73 +
.../web/servlet/LocaleResolver.java | 40 +-
.../web/servlet/NoHandlerFoundException.java | 66 +
.../web/servlet/ResourceServlet.java | 2 +-
.../AnnotationDrivenBeanDefinitionParser.java | 121 +-
.../DefaultServletHandlerBeanDefinitionParser.java | 1 +
.../config/InterceptorsBeanDefinitionParser.java | 11 +
.../web/servlet/config/MvcNamespaceHandler.java | 1 +
.../config/ResourcesBeanDefinitionParser.java | 1 +
.../config/ViewControllerBeanDefinitionParser.java | 2 +
.../annotation/DelegatingWebMvcConfiguration.java | 7 +-
.../config/annotation/InterceptorRegistration.java | 26 +-
.../config/annotation/PathMatchConfigurer.java | 125 +
.../config/annotation/ResourceHandlerRegistry.java | 14 +
.../annotation/WebMvcConfigurationSupport.java | 53 +-
.../config/annotation/WebMvcConfigurer.java | 10 +-
.../config/annotation/WebMvcConfigurerAdapter.java | 23 +-
.../annotation/WebMvcConfigurerComposite.java | 22 +-
.../handler/AbstractHandlerExceptionResolver.java | 10 +-
.../servlet/handler/AbstractHandlerMapping.java | 2 +
.../handler/AbstractHandlerMethodMapping.java | 22 +-
.../handler/HandlerExceptionResolverComposite.java | 2 +
.../servlet/handler/HandlerInterceptorAdapter.java | 4 +
.../web/servlet/handler/MappedInterceptor.java | 28 +-
.../handler/SimpleServletHandlerAdapter.java | 3 +
.../handler/SimpleServletPostProcessor.java | 9 +
.../WebRequestHandlerInterceptorAdapter.java | 6 +-
.../i18n/AbstractLocaleContextResolver.java | 69 +
.../web/servlet/i18n/AbstractLocaleResolver.java | 3 +-
.../servlet/i18n/AcceptHeaderLocaleResolver.java | 2 +
.../web/servlet/i18n/CookieLocaleResolver.java | 157 +-
.../web/servlet/i18n/FixedLocaleResolver.java | 51 +-
.../web/servlet/i18n/SessionLocaleResolver.java | 85 +-
.../web/servlet/mvc/AbstractCommandController.java | 108 -
.../web/servlet/mvc/AbstractController.java | 1 +
.../web/servlet/mvc/AbstractFormController.java | 678 -
.../servlet/mvc/AbstractWizardFormController.java | 751 -
.../web/servlet/mvc/BaseCommandController.java | 595 -
.../web/servlet/mvc/CancellableFormController.java | 210 -
.../web/servlet/mvc/HttpRequestHandlerAdapter.java | 5 +-
.../servlet/mvc/ServletForwardingController.java | 1 +
.../web/servlet/mvc/ServletWrappingController.java | 12 +-
.../mvc/SimpleControllerHandlerAdapter.java | 5 +-
.../web/servlet/mvc/SimpleFormController.java | 468 -
.../web/servlet/mvc/WebContentInterceptor.java | 5 +-
.../annotation/AnnotationMethodHandlerAdapter.java | 42 +-
.../AnnotationMethodHandlerExceptionResolver.java | 13 +-
.../DefaultAnnotationHandlerMapping.java | 1 +
.../mvc/annotation/ModelAndViewResolver.java | 2 +-
.../ResponseStatusExceptionResolver.java | 1 +
.../mvc/condition/AbstractMediaTypeExpression.java | 3 +
.../mvc/condition/AbstractNameValueExpression.java | 3 +
.../mvc/condition/CompositeRequestCondition.java | 3 +
.../mvc/condition/ConsumesRequestCondition.java | 6 +-
.../mvc/condition/HeadersRequestCondition.java | 3 +
.../servlet/mvc/condition/NameValueExpression.java | 1 -
.../mvc/condition/ParamsRequestCondition.java | 3 +
.../mvc/condition/PatternsRequestCondition.java | 23 +-
.../mvc/condition/ProducesRequestCondition.java | 3 +
.../mvc/condition/RequestConditionHolder.java | 3 +
.../condition/RequestMethodsRequestCondition.java | 3 +
.../mvc/method/AbstractHandlerMethodAdapter.java | 4 +
.../web/servlet/mvc/method/RequestMappingInfo.java | 3 +
.../method/RequestMappingInfoHandlerMapping.java | 4 +-
...ractMessageConverterMethodArgumentResolver.java | 68 +-
.../AsyncTaskMethodReturnValueHandler.java | 13 +-
.../CallableMethodReturnValueHandler.java | 12 +-
.../DeferredResultMethodReturnValueHandler.java | 14 +-
.../ExceptionHandlerExceptionResolver.java | 31 +-
.../annotation/HttpEntityMethodProcessor.java | 4 +
.../annotation/HttpHeadersReturnValueHandler.java | 58 +
.../MatrixVariableMapMethodArgumentResolver.java | 2 +
.../MatrixVariableMethodArgumentResolver.java | 10 +-
.../ModelAndViewMethodReturnValueHandler.java | 12 +-
...delAndViewResolverMethodReturnValueHandler.java | 25 +-
.../method/annotation/MvcUriComponentsBuilder.java | 398 +
.../PathVariableMapMethodArgumentResolver.java | 10 +-
.../PathVariableMethodArgumentResolver.java | 48 +-
.../RedirectAttributesMethodArgumentResolver.java | 20 +-
.../annotation/RequestMappingHandlerAdapter.java | 48 +-
.../annotation/RequestMappingHandlerMapping.java | 2 +-
.../RequestPartMethodArgumentResolver.java | 91 +-
.../RequestResponseBodyMethodProcessor.java | 33 +-
.../annotation/ResponseEntityExceptionHandler.java | 26 +-
.../ServletCookieValueMethodArgumentResolver.java | 13 +-
.../annotation/ServletInvocableHandlerMethod.java | 65 +-
.../ServletModelAttributeMethodProcessor.java | 31 +-
.../ServletRequestMethodArgumentResolver.java | 47 +-
.../ServletResponseMethodArgumentResolver.java | 18 +-
...UriComponentsBuilderMethodArgumentResolver.java | 10 +-
.../annotation/ViewMethodReturnValueHandler.java | 10 +-
.../ViewNameMethodReturnValueHandler.java | 10 +-
.../multiaction/AbstractUrlMethodNameResolver.java | 1 +
.../mvc/multiaction/MultiActionController.java | 17 +-
.../NoSuchRequestHandlingMethodException.java | 4 +-
.../multiaction/ParameterMethodNameResolver.java | 1 +
.../multiaction/PropertiesMethodNameResolver.java | 3 +-
.../support/AnnotationControllerTypePredicate.java | 4 +-
.../support/ControllerBeanNameHandlerMapping.java | 2 +-
.../support/ControllerClassNameHandlerMapping.java | 6 +-
.../mvc/support/ControllerTypePredicate.java | 4 +-
.../support/DefaultHandlerExceptionResolver.java | 26 +-
.../servlet/mvc/support/RedirectAttributes.java | 6 +-
.../mvc/support/RedirectAttributesModelMap.java | 9 +
.../resource/DefaultServletHttpRequestHandler.java | 4 +-
.../resource/ResourceHttpRequestHandler.java | 5 +-
...notationConfigDispatcherServletInitializer.java | 4 +-
.../AbstractDispatcherServletInitializer.java | 11 +
.../servlet/support/AbstractFlashMapManager.java | 105 +-
.../web/servlet/support/JstlUtils.java | 10 +-
.../web/servlet/support/RequestContext.java | 256 +-
.../web/servlet/support/RequestContextUtils.java | 54 +-
.../servlet/support/RequestDataValueProcessor.java | 5 +-
.../support/ServletUriComponentsBuilder.java | 45 +-
.../servlet/support/SessionFlashMapManager.java | 23 +-
.../web/servlet/tags/ArgumentAware.java | 36 +
.../web/servlet/tags/ArgumentTag.java | 88 +
.../web/servlet/tags/BindErrorsTag.java | 7 +-
.../springframework/web/servlet/tags/BindTag.java | 8 +-
.../web/servlet/tags/EscapeBodyTag.java | 11 +-
.../springframework/web/servlet/tags/EvalTag.java | 17 +-
.../web/servlet/tags/HtmlEscapeTag.java | 12 +-
.../web/servlet/tags/HtmlEscapingAwareTag.java | 8 +-
.../web/servlet/tags/MessageTag.java | 108 +-
.../web/servlet/tags/NestedPathTag.java | 7 +-
.../springframework/web/servlet/tags/ParamTag.java | 22 +-
.../web/servlet/tags/RequestContextAwareTag.java | 2 +
.../springframework/web/servlet/tags/ThemeTag.java | 6 +-
.../web/servlet/tags/TransformTag.java | 29 +-
.../springframework/web/servlet/tags/UrlTag.java | 14 +-
.../tags/form/AbstractDataBoundFormElementTag.java | 14 +-
.../web/servlet/tags/form/AbstractFormTag.java | 27 +-
.../tags/form/AbstractHtmlElementBodyTag.java | 2 +
.../servlet/tags/form/AbstractHtmlElementTag.java | 1 +
.../tags/form/AbstractHtmlInputElementTag.java | 36 +-
.../tags/form/AbstractMultiCheckedElementTag.java | 10 +-
.../web/servlet/tags/form/ButtonTag.java | 43 +-
.../web/servlet/tags/form/CheckboxTag.java | 2 +-
.../web/servlet/tags/form/FormTag.java | 12 +-
.../web/servlet/tags/form/HiddenInputTag.java | 27 +-
.../web/servlet/tags/form/OptionTag.java | 19 +-
.../web/servlet/tags/form/OptionWriter.java | 12 +-
.../web/servlet/tags/form/OptionsTag.java | 21 +-
.../web/servlet/tags/form/SelectTag.java | 23 +-
.../servlet/tags/form/SelectedValueComparator.java | 18 +-
.../web/servlet/tags/form/TagWriter.java | 4 +-
.../web/servlet/theme/CookieThemeResolver.java | 2 +
.../web/servlet/theme/FixedThemeResolver.java | 2 +
.../web/servlet/theme/SessionThemeResolver.java | 2 +
.../servlet/view/AbstractCachingViewResolver.java | 3 +
.../web/servlet/view/AbstractTemplateView.java | 8 +-
.../web/servlet/view/AbstractUrlBasedView.java | 1 +
.../web/servlet/view/AbstractView.java | 3 +
.../web/servlet/view/BeanNameViewResolver.java | 16 +-
.../view/ContentNegotiatingViewResolver.java | 7 +-
.../view/DefaultRequestToViewNameTranslator.java | 1 +
.../web/servlet/view/InternalResourceView.java | 53 -
.../web/servlet/view/RedirectView.java | 6 +-
.../servlet/view/ResourceBundleViewResolver.java | 3 +
.../web/servlet/view/UrlBasedViewResolver.java | 1 +
.../web/servlet/view/XmlViewResolver.java | 3 +
.../servlet/view/document/AbstractExcelView.java | 8 +-
.../servlet/view/document/AbstractJExcelView.java | 3 +
.../view/document/AbstractPdfStamperView.java | 2 +-
.../web/servlet/view/document/AbstractPdfView.java | 2 +-
.../web/servlet/view/feed/AbstractFeedView.java | 2 +-
.../view/freemarker/FreeMarkerConfigurer.java | 10 +-
.../servlet/view/freemarker/FreeMarkerView.java | 4 +
.../jasperreports/AbstractJasperReportsView.java | 13 +-
.../JasperReportsMultiFormatView.java | 35 +-
.../servlet/view/json/MappingJackson2JsonView.java | 4 +-
.../servlet/view/json/MappingJacksonJsonView.java | 3 +-
.../view/tiles2/AbstractSpringPreparerFactory.java | 1 +
.../SpringTilesApplicationContextFactory.java | 114 -
...ringWildcardServletTilesApplicationContext.java | 72 +
.../web/servlet/view/tiles2/TilesConfigurer.java | 254 +-
.../web/servlet/view/tiles2/TilesView.java | 40 +-
.../servlet/view/velocity/VelocityConfigurer.java | 3 +
.../servlet/view/velocity/VelocityToolboxView.java | 4 +-
.../web/servlet/view/velocity/VelocityView.java | 47 +-
.../web/servlet/view/velocity/spring.vm | 21 +-
.../web/servlet/view/xml/MarshallingView.java | 11 +-
.../web/servlet/view/xslt/AbstractXsltView.java | 579 -
.../web/servlet/view/xslt/XsltView.java | 14 +-
.../src/main/resources/META-INF/spring-form.tld | 2 +-
.../src/main/resources/META-INF/spring.schemas | 3 +-
.../src/main/resources/META-INF/spring.tld | 24 +-
.../web/servlet/config/spring-mvc-3.0.xsd | 11 +-
.../web/servlet/config/spring-mvc-3.1.xsd | 12 +-
.../web/servlet/config/spring-mvc-3.2.xsd | 12 +-
.../web/servlet/config/spring-mvc-4.0.xsd | 518 +
.../support/ServletContextSupportTests.java | 19 +-
.../web/servlet/ComplexWebApplicationContext.java | 50 +-
.../web/servlet/DispatcherServletTests.java | 108 +-
.../web/servlet/SimpleWebApplicationContext.java | 2 -
.../AnnotationDrivenBeanDefinitionParserTests.java | 32 +-
.../web/servlet/config/MvcNamespaceTests.java | 90 +-
.../DelegatingWebMvcConfigurationTests.java | 36 +-
.../annotation/InterceptorRegistryTests.java | 18 +-
.../annotation/ResourceHandlerRegistryTests.java | 12 +-
.../WebMvcConfigurationSupportTests.java | 168 +-
.../servlet/handler/MappedInterceptorTests.java | 52 +
.../servlet/i18n/CookieLocaleResolverTests.java | 245 +-
.../web/servlet/i18n/LocaleResolverTests.java | 104 +-
.../servlet/i18n/SessionLocaleResolverTests.java | 14 +-
.../mvc/CancellableFormControllerTests.java | 239 -
.../web/servlet/mvc/CommandControllerTests.java | 522 -
.../web/servlet/mvc/FormControllerTests.java | 661 -
.../web/servlet/mvc/WizardFormControllerTests.java | 438 -
.../ResponseStatusExceptionResolverTests.java | 18 +-
.../web/servlet/mvc/mapping/BuyForm.java | 19 +-
.../RequestMappingInfoHandlerMappingTests.java | 2 +-
.../AbstractServletHandlerMethodTests.java | 2 +-
.../ExceptionHandlerExceptionResolverTests.java | 78 +-
.../annotation/MvcUriComponentsBuilderTests.java | 311 +
.../RequestMappingHandlerAdapterTests.java | 68 +-
.../RequestMappingHandlerMappingTests.java | 1 +
.../annotation/RequestPartIntegrationTests.java | 23 +-
.../RequestPartMethodArgumentResolverTests.java | 93 +-
.../RequestResponseBodyMethodProcessorTests.java | 105 +-
.../ResponseEntityExceptionHandlerTests.java | 13 +-
...vletAnnotationControllerHandlerMethodTests.java | 87 +-
.../ServletInvocableHandlerMethodTests.java | 93 +-
.../ServletRequestMethodArgumentResolverTests.java | 92 +-
.../DefaultHandlerExceptionResolverTests.java | 14 +
...ionConfigDispatcherServletInitializerTests.java | 41 +-
.../web/servlet/support/RequestContextTests.java | 3 +-
.../support/RequestDataValueProcessorWrapper.java | 8 +-
.../support/ServletUriComponentsBuilderTests.java | 18 +
.../web/servlet/tags/AbstractTagTests.java | 3 +-
.../web/servlet/tags/ArgumentTagTests.java | 119 +
.../web/servlet/tags/BindTagTests.java | 48 +-
.../web/servlet/tags/EvalTagTests.java | 6 +-
.../web/servlet/tags/HtmlEscapeTagTests.java | 36 +-
.../web/servlet/tags/MessageTagTests.java | 162 +-
.../web/servlet/tags/ParamTagTests.java | 44 +-
.../web/servlet/tags/ThemeTagTests.java | 3 +-
.../web/servlet/tags/UrlTagTests.java | 12 +-
.../web/servlet/tags/form/ButtonTagTests.java | 2 +-
.../web/servlet/tags/form/CheckboxTagTests.java | 2 +-
.../web/servlet/tags/form/CheckboxesTagTests.java | 2 +-
.../web/servlet/tags/form/Country.java | 1 +
.../web/servlet/tags/form/ErrorsTagTests.java | 2 +-
.../web/servlet/tags/form/FormTagTests.java | 23 +-
.../web/servlet/tags/form/HiddenInputTagTests.java | 4 +-
.../web/servlet/tags/form/InputTagTests.java | 26 +-
.../web/servlet/tags/form/ItemPet.java | 2 +
.../web/servlet/tags/form/OptionTagTests.java | 82 +-
.../web/servlet/tags/form/OptionsTagTests.java | 23 +-
.../servlet/tags/form/RadioButtonsTagTests.java | 2 +-
.../web/servlet/tags/form/SelectTagTests.java | 198 +-
.../web/servlet/tags/form/TestTypes.java | 1 +
.../web/servlet/tags/form/TextareaTagTests.java | 4 +-
.../view/ContentNegotiatingViewResolverTests.java | 4 +-
.../servlet/view/InternalResourceViewTests.java | 74 +-
.../web/servlet/view/RedirectViewTests.java | 11 +-
.../web/servlet/view/document/ExcelViewTests.java | 12 +-
.../view/freemarker/FreeMarkerConfigurerTests.java | 62 +-
...AbstractConfigurableJasperReportsViewTests.java | 4 +
.../jasperreports/AbstractJasperReportsTests.java | 15 +-
.../AbstractJasperReportsViewTests.java | 25 +
.../view/jasperreports/ExporterParameterTests.java | 8 +
.../jasperreports/JasperReportsHtmlViewTests.java | 4 +
.../JasperReportsMultiFormatViewTests.java | 8 +
.../view/json/MappingJackson2JsonViewTests.java | 54 +-
.../view/json/MappingJacksonJsonViewTests.java | 5 +-
.../view/velocity/VelocityToolboxViewTests.java | 4 +-
.../view/velocity/VelocityViewResolverTests.java | 1 -
.../servlet/view/velocity/VelocityViewTests.java | 2 +-
.../web/servlet/view/xml/MarshallingViewTests.java | 17 +-
.../web/servlet/view/xslt/TestXsltViewTests.java | 406 -
.../src/test/resources/jasperreports.properties | 1 +
spring-webmvc/src/test/resources/log4j.properties | 10 +
spring-webmvc/src/test/resources/log4j.xml | 28 -
.../config/mvc-config-argument-resolvers.xml | 6 +-
.../servlet/config/mvc-config-async-support.xml | 2 +-
.../servlet/config/mvc-config-bean-decoration.xml | 4 +-
.../mvc-config-content-negotiation-manager.xml | 4 +-
.../mvc-config-custom-conversion-service.xml | 6 +-
.../config/mvc-config-custom-validator-32.xml | 13 +
.../servlet/config/mvc-config-custom-validator.xml | 10 +-
.../mvc-config-default-servlet-optional-attrs.xml | 2 +-
.../servlet/config/mvc-config-default-servlet.xml | 2 +-
.../web/servlet/config/mvc-config-interceptors.xml | 15 +-
.../config/mvc-config-message-codes-resolver.xml | 2 +-
.../mvc-config-message-converters-defaults-off.xml | 4 +-
.../config/mvc-config-message-converters.xml | 2 +-
.../servlet/config/mvc-config-path-matching.xml | 26 +
.../config/mvc-config-resources-optional-attrs.xml | 2 +-
.../web/servlet/config/mvc-config-resources.xml | 2 +-
.../config/mvc-config-return-value-handlers.xml | 2 +-
.../config/mvc-config-view-controllers-minimal.xml | 4 +-
.../servlet/config/mvc-config-view-controllers.xml | 6 +-
.../web/servlet/config/mvc-config.xml | 2 +-
.../web/socket/AbstractWebSocketMessage.java | 98 +
.../springframework/web/socket/BinaryMessage.java | 94 +
.../springframework/web/socket/CloseStatus.java | 221 +
.../springframework/web/socket/PingMessage.java | 55 +
.../springframework/web/socket/PongMessage.java | 55 +
.../web/socket/SubProtocolCapable.java | 36 +
.../springframework/web/socket/TextMessage.java | 82 +
.../web/socket/WebSocketExtension.java | 177 +
.../web/socket/WebSocketHandler.java | 80 +
.../web/socket/WebSocketHttpHeaders.java | 332 +
.../web/socket/WebSocketMessage.java | 47 +
.../web/socket/WebSocketSession.java | 133 +
.../socket/adapter/AbstractWebSocketSession.java | 150 +
.../web/socket/adapter/NativeWebSocketSession.java | 43 +
.../jetty/JettyWebSocketHandlerAdapter.java | 129 +
.../adapter/jetty/JettyWebSocketSession.java | 207 +
.../WebSocketToJettyExtensionConfigAdapter.java | 37 +
.../web/socket/adapter/jetty/package-info.java | 21 +
.../web/socket/adapter/package-info.java | 21 +
.../standard/ConvertingEncoderDecoderSupport.java | 239 +
.../StandardToWebSocketExtensionAdapter.java | 36 +
.../standard/StandardWebSocketHandlerAdapter.java | 160 +
.../adapter/standard/StandardWebSocketSession.java | 220 +
.../WebSocketToStandardExtensionAdapter.java | 61 +
.../web/socket/adapter/standard/package-info.java | 21 +
.../web/socket/client/AbstractWebSocketClient.java | 122 +
.../socket/client/ConnectionManagerSupport.java | 173 +
.../web/socket/client/WebSocketClient.java | 43 +
.../socket/client/WebSocketConnectionManager.java | 165 +
.../socket/client/jetty/JettyWebSocketClient.java | 219 +
.../web/socket/client/jetty/package-info.java | 21 +
.../web/socket/client/package-info.java | 21 +
.../AnnotatedEndpointConnectionManager.java | 134 +
.../client/standard/EndpointConnectionManager.java | 169 +
.../client/standard/StandardWebSocketClient.java | 189 +
.../standard/WebSocketContainerFactoryBean.java | 84 +
.../web/socket/client/standard/package-info.java | 21 +
.../config/HandlersBeanDefinitionParser.java | 196 +
.../config/MessageBrokerBeanDefinitionParser.java | 491 +
.../socket/config/WebSocketNamespaceHandler.java | 43 +
.../web/socket/config/WebSocketNamespaceUtils.java | 166 +
.../AbstractWebSocketHandlerRegistration.java | 142 +
.../AbstractWebSocketMessageBrokerConfigurer.java | 56 +
.../DelegatingWebSocketConfiguration.java | 55 +
...egatingWebSocketMessageBrokerConfiguration.java | 100 +
.../socket/config/annotation/EnableWebSocket.java | 63 +
.../annotation/EnableWebSocketMessageBroker.java | 67 +
.../ServletWebSocketHandlerRegistration.java | 73 +
.../ServletWebSocketHandlerRegistry.java | 79 +
.../annotation/SockJsServiceRegistration.java | 239 +
.../config/annotation/StompEndpointRegistry.java | 32 +
.../StompWebSocketEndpointRegistration.java | 39 +
.../annotation/WebMvcStompEndpointRegistry.java | 139 +
.../WebMvcStompWebSocketEndpointRegistration.java | 117 +
.../annotation/WebSocketConfigurationSupport.java | 70 +
.../config/annotation/WebSocketConfigurer.java | 35 +
.../annotation/WebSocketHandlerRegistration.java | 52 +
.../annotation/WebSocketHandlerRegistry.java | 34 +
...WebSocketMessageBrokerConfigurationSupport.java | 100 +
.../WebSocketMessageBrokerConfigurer.java | 82 +
.../annotation/WebSocketTransportRegistration.java | 150 +
.../web/socket/config/annotation/package-info.java | 21 +
.../web/socket/config/package-info.java | 21 +
.../socket/handler/AbstractWebSocketHandler.java | 78 +
.../handler/BeanCreatingHandlerProvider.java | 78 +
.../web/socket/handler/BinaryWebSocketHandler.java | 47 +
.../ConcurrentWebSocketSessionDecorator.java | 171 +
.../ExceptionWebSocketHandlerDecorator.java | 96 +
.../handler/LoggingWebSocketHandlerDecorator.java | 74 +
.../handler/PerConnectionWebSocketHandler.java | 130 +
.../handler/SessionLimitExceededException.java | 44 +
.../web/socket/handler/TextWebSocketHandler.java | 47 +
.../socket/handler/WebSocketHandlerDecorator.java | 98 +
.../socket/handler/WebSocketSessionDecorator.java | 166 +
.../web/socket/handler/package-info.java | 22 +
.../web/socket/messaging/SessionConnectEvent.java | 77 +
.../socket/messaging/SessionConnectedEvent.java | 60 +
.../socket/messaging/SessionDisconnectEvent.java | 74 +
.../socket/messaging/StompSubProtocolHandler.java | 386 +
.../web/socket/messaging/SubProtocolHandler.java | 88 +
.../messaging/SubProtocolWebSocketHandler.java | 460 +
.../web/socket/messaging/package-info.java | 21 +
.../springframework/web/socket/package-info.java | 21 +
.../socket/server/HandshakeFailureException.java | 51 +
.../web/socket/server/HandshakeHandler.java | 60 +
.../web/socket/server/HandshakeInterceptor.java | 61 +
.../web/socket/server/RequestUpgradeStrategy.java | 68 +
.../server/jetty/JettyRequestUpgradeStrategy.java | 200 +
.../web/socket/server/jetty/package-info.java | 21 +
.../web/socket/server/package-info.java | 21 +
.../standard/AbstractStandardUpgradeStrategy.java | 126 +
.../standard/GlassFishRequestUpgradeStrategy.java | 213 +
.../server/standard/ServerEndpointExporter.java | 158 +
.../standard/ServerEndpointRegistration.java | 210 +
.../ServletServerContainerFactoryBean.java | 132 +
.../socket/server/standard/SpringConfigurator.java | 127 +
.../standard/TomcatRequestUpgradeStrategy.java | 88 +
.../standard/UndertowRequestUpgradeStrategy.java | 162 +
.../web/socket/server/standard/package-info.java | 21 +
.../server/support/DefaultHandshakeHandler.java | 354 +
.../server/support/HandshakeInterceptorChain.java | 81 +
.../support/HttpSessionHandshakeInterceptor.java | 98 +
.../support/WebSocketHttpRequestHandler.java | 138 +
.../web/socket/server/support/package-info.java | 22 +
.../web/socket/sockjs/SockJsException.java | 46 +
.../sockjs/SockJsMessageDeliveryException.java | 53 +
.../web/socket/sockjs/SockJsService.java | 61 +
.../sockjs/SockJsTransportFailureException.java | 34 +
.../sockjs/frame/AbstractSockJsMessageCodec.java | 83 +
.../sockjs/frame/DefaultSockJsFrameFormat.java | 50 +
.../sockjs/frame/Jackson2SockJsMessageCodec.java | 63 +
.../web/socket/sockjs/frame/SockJsFrame.java | 110 +
.../web/socket/sockjs/frame/SockJsFrameFormat.java | 27 +
.../socket/sockjs/frame/SockJsMessageCodec.java | 61 +
.../web/socket/sockjs/frame/package-info.java | 22 +
.../web/socket/sockjs/package-info.java | 21 +
.../sockjs/support/AbstractSockJsService.java | 494 +
.../sockjs/support/SockJsHttpRequestHandler.java | 101 +
.../web/socket/sockjs/support/package-info.java | 23 +
.../sockjs/transport/SockJsServiceConfig.java | 75 +
.../web/socket/sockjs/transport/SockJsSession.java | 43 +
.../sockjs/transport/SockJsSessionFactory.java | 41 +
.../socket/sockjs/transport/TransportHandler.java | 59 +
.../transport/TransportHandlingSockJsService.java | 338 +
.../web/socket/sockjs/transport/TransportType.java | 107 +
.../AbstractHttpReceivingTransportHandler.java | 103 +
.../AbstractHttpSendingTransportHandler.java | 112 +
.../handler/AbstractTransportHandler.java | 49 +
.../transport/handler/DefaultSockJsService.java | 102 +
.../handler/EventSourceTransportHandler.java | 80 +
.../handler/HtmlFileTransportHandler.java | 153 +
.../handler/JsonpPollingTransportHandler.java | 95 +
.../handler/JsonpReceivingTransportHandler.java | 82 +
.../transport/handler/SockJsWebSocketHandler.java | 90 +
.../handler/WebSocketTransportHandler.java | 100 +
.../handler/XhrPollingTransportHandler.java | 60 +
.../handler/XhrReceivingTransportHandler.java | 49 +
.../handler/XhrStreamingTransportHandler.java | 81 +
.../sockjs/transport/handler/package-info.java | 23 +
.../web/socket/sockjs/transport/package-info.java | 26 +
.../session/AbstractHttpSockJsSession.java | 352 +
.../transport/session/AbstractSockJsSession.java | 438 +
.../transport/session/PollingSockJsSession.java | 64 +
.../transport/session/StreamingSockJsSession.java | 75 +
.../session/WebSocketServerSockJsSession.java | 233 +
.../sockjs/transport/session/package-info.java | 22 +
.../src/main/resources/.gitignore | 0
.../src/main/resources/META-INF/spring.handlers | 1 +
.../src/main/resources/META-INF/spring.schemas | 2 +
.../src/main/resources/META-INF/spring.tooling | 4 +
.../web/socket/config/spring-websocket-4.0.xsd | 685 +
.../src/test/java}/.gitignore | 0
.../web/socket/AbstractHttpRequestTests.java | 73 +
.../socket/AbstractWebSocketIntegrationTests.java | 156 +
.../web/socket/ContextLoaderTestUtils.java | 58 +
.../web/socket/JettyWebSocketTestServer.java | 73 +
.../web/socket/TextMessageTests.java | 48 +
.../web/socket/TomcatWebSocketTestServer.java | 106 +
.../web/socket/UndertowTestServer.java | 120 +
.../web/socket/WebSocketExtensionTests.java | 52 +
.../web/socket/WebSocketIntegrationTests.java | 99 +
.../web/socket/WebSocketTestServer.java | 38 +
.../jetty/JettyWebSocketHandlerAdapterTests.java | 78 +
.../adapter/jetty/JettyWebSocketSessionTests.java | 132 +
.../ConvertingEncoderDecoderSupportTests.java | 317 +
.../StandardWebSocketHandlerAdapterTests.java | 83 +
.../standard/StandardWebSocketSessionTests.java | 110 +
.../client/WebSocketConnectionManagerTests.java | 170 +
.../client/jetty/JettyWebSocketClientTests.java | 144 +
.../standard/StandardWebSocketClientTests.java | 150 +
.../config/HandlersBeanDefinitionParserTests.java | 294 +
.../MessageBrokerBeanDefinitionParserTests.java | 369 +
.../WebMvcStompEndpointRegistrationTests.java | 124 +
.../WebMvcStompEndpointRegistryTests.java | 94 +
.../annotation/WebSocketConfigurationTests.java | 117 +
.../WebSocketHandlerRegistrationTests.java | 209 +
...cketMessageBrokerConfigurationSupportTests.java | 207 +
.../handler/BeanCreatingHandlerProviderTests.java | 94 +
.../ConcurrentWebSocketSessionDecoratorTests.java | 273 +
.../ExceptionWebSocketHandlerDecoratorTests.java | 102 +
.../PerConnectionWebSocketHandlerTests.java | 81 +
.../web/socket/handler/TestPrincipal.java | 56 +
.../web/socket/handler/TestWebSocketSession.java | 208 +
.../handler/WebSocketHandlerDecoratorTests.java | 40 +
.../socket/handler/WebSocketHttpHeadersTests.java | 55 +
.../messaging/StompSubProtocolHandlerTests.java | 317 +
.../socket/messaging/StompTextMessageBuilder.java | 71 +
.../messaging/StompWebSocketIntegrationTests.java | 272 +
.../SubProtocolWebSocketHandlerTests.java | 179 +
.../server/DefaultHandshakeHandlerTests.java | 142 +
.../standard/ServerEndpointExporterTests.java | 163 +
.../standard/ServerEndpointRegistrationTests.java | 92 +
.../server/standard/SpringConfiguratorTests.java | 140 +
.../support/HandshakeInterceptorChainTests.java | 100 +
.../HttpSessionHandshakeInterceptorTests.java | 85 +
.../socket/sockjs/support/SockJsServiceTests.java | 215 +
.../sockjs/transport/TransportTypeTests.java | 41 +
.../handler/DefaultSockJsServiceTests.java | 208 +
.../HttpReceivingTransportHandlerTests.java | 152 +
.../handler/HttpSendingTransportHandlerTests.java | 194 +
.../session/AbstractSockJsSessionTests.java | 74 +
.../transport/session/HttpSockJsSessionTests.java | 164 +
.../transport/session/SockJsSessionTests.java | 299 +
.../transport/session/StubSockJsServiceConfig.java | 85 +
.../transport/session/TestHttpSockJsSession.java | 129 +
.../transport/session/TestSockJsSession.java | 216 +
.../session/WebSocketServerSockJsSessionTests.java | 167 +
.../src/test/resources/log4j.properties | 10 +
...ocket-config-broker-converters-defaults-off.xml | 19 +
.../config/websocket-config-broker-converters.xml | 19 +
...nfig-broker-customchannels-default-executor.xml | 30 +
.../websocket-config-broker-customchannels.xml | 34 +
.../config/websocket-config-broker-relay.xml | 20 +
.../config/websocket-config-broker-simple.xml | 27 +
.../websocket-config-handlers-attributes.xml | 24 +
...websocket-config-handlers-sockjs-attributes.xml | 29 +
.../config/websocket-config-handlers-sockjs.xml | 17 +
.../socket/config/websocket-config-handlers.xml | 19 +
src/api/stylesheet.css | 730 +-
src/asciidoc/Guardfile | 16 +
src/asciidoc/appendix.adoc | 6628 +++
.../images/DataAccessException.gif | Bin
.../docbook => asciidoc}/images/aop-proxy-call.png | Bin
.../images/aop-proxy-plain-pojo-call.png | Bin
.../docbook => asciidoc}/images/aop-uml.gif | Bin
.../images/bean-lifecycle-overview.gif | Bin
.../docbook => asciidoc}/images/bind1.jpg | Bin
.../docbook => asciidoc}/images/bind2.jpg | Bin
.../images/container-magic.png | Bin
.../images/eclipse-setup-1.png | Bin
.../images/eclipse-setup-2.png | Bin
.../images/eclipse-setup-3.png | Bin
src/{reference/docbook => asciidoc}/images/ejb.gif | Bin
src/{reference/docbook => asciidoc}/images/ejb.png | Bin
src/{reference/docbook => asciidoc}/images/ejb.svg | 0
.../docbook => asciidoc}/images/full.gif | Bin
.../docbook => asciidoc}/images/full.png | Bin
.../docbook => asciidoc}/images/full.svg | 0
.../docbook => asciidoc}/images/idea-setup-1.png | Bin
.../docbook => asciidoc}/images/idea-setup-2.png | Bin
.../docbook => asciidoc}/images/idea-setup-3.png | Bin
.../docbook => asciidoc}/images/idea-setup-4.png | Bin
.../docbook => asciidoc}/images/idea-setup-5.png | Bin
.../docbook => asciidoc}/images/idea-setup-6.png | Bin
.../docbook => asciidoc}/images/mvc-contexts.gif | Bin
src/{reference/docbook => asciidoc}/images/mvc.png | Bin
.../images/overview-ejb.graffle | 0
.../docbook => asciidoc}/images/overview-ejb.png | Bin
.../images/overview-full.graffle | 0
.../docbook => asciidoc}/images/overview-full.png | Bin
.../images/overview-remoting.graffle | 0
.../images/overview-remoting.png | Bin
.../images/overview-thirdparty-web.graffle | 0
.../images/overview-thirdparty-web.png | Bin
.../images/oxm-exceptions.graffle | 0
.../docbook => asciidoc}/images/oxm-exceptions.png | Bin
.../docbook => asciidoc}/images/prototype.png | Bin
.../docbook => asciidoc}/images/remoting.gif | Bin
.../docbook => asciidoc}/images/remoting.png | Bin
.../docbook => asciidoc}/images/remoting.svg | 0
.../docbook => asciidoc}/images/singleton.png | Bin
.../images/spring-overview.gif | Bin
.../images/spring-overview.graffle | 0
src/asciidoc/images/spring-overview.png | Bin 0 -> 58395 bytes
.../images/spring-overview.svg | 0
.../images/spring-overview.vsd | Bin
.../docbook => asciidoc}/images/spring.sxd | Bin
.../docbook => asciidoc}/images/thirdparty-web.gif | Bin
.../docbook => asciidoc}/images/thirdparty-web.png | Bin
.../docbook => asciidoc}/images/thirdparty-web.svg | 0
src/{reference/docbook => asciidoc}/images/tx.png | Bin
.../images/tx_prop_required.png | Bin
.../images/tx_prop_requires_new.png | Bin
src/asciidoc/index-docinfo.xml | 11 +
src/asciidoc/index.adoc | 46839 +++++++++++++++++++
src/dist/changelog.txt | 1502 -
src/dist/readme.txt | 13 +-
src/eclipse/org.eclipse.jdt.core.prefs | 8 +-
src/idea/spring-framework.xml | 264 +
src/reference/docbook/aop-api.xml | 1970 -
src/reference/docbook/aop.xml | 3921 --
src/reference/docbook/beans-annotation-config.xml | 806 -
src/reference/docbook/beans-classpath-scanning.xml | 514 -
src/reference/docbook/beans-context-additional.xml | 641 -
src/reference/docbook/beans-customizing.xml | 682 -
src/reference/docbook/beans-dependencies.xml | 1656 -
src/reference/docbook/beans-extension-points.xml | 568 -
src/reference/docbook/beans-java.xml | 955 -
src/reference/docbook/beans-scopes.xml | 676 -
.../docbook/beans-standard-annotations.xml | 205 -
src/reference/docbook/beans.xml | 1187 -
src/reference/docbook/cache.xml | 625 -
src/reference/docbook/cci.xml | 1195 -
src/reference/docbook/classic-aop-spring.xml | 1953 -
src/reference/docbook/classic-spring.xml | 458 -
src/reference/docbook/dao.xml | 156 -
src/reference/docbook/dynamic-languages.xml | 1090 -
src/reference/docbook/ejb.xml | 443 -
src/reference/docbook/expressions.xml | 1280 -
src/reference/docbook/images/spring-overview.png | Bin 66242 -> 0 bytes
src/reference/docbook/index.xml | 492 -
src/reference/docbook/jdbc.xml | 2967 --
src/reference/docbook/jms.xml | 1333 -
src/reference/docbook/jmx.xml | 1642 -
src/reference/docbook/mail.xml | 404 -
src/reference/docbook/migration-3.1.xml | 37 -
src/reference/docbook/migration-3.2.xml | 357 -
src/reference/docbook/mvc.xml | 5511 ---
src/reference/docbook/new-in-3.0.xml | 522 -
src/reference/docbook/new-in-3.1.xml | 509 -
src/reference/docbook/new-in-3.2.xml | 328 -
src/reference/docbook/orm.xml | 2059 -
src/reference/docbook/overview.xml | 939 -
src/reference/docbook/oxm.xml | 782 -
src/reference/docbook/portlet.xml | 1820 -
src/reference/docbook/preface.xml | 42 -
src/reference/docbook/remoting.xml | 1658 -
src/reference/docbook/resources.xml | 746 -
src/reference/docbook/scheduling.xml | 891 -
src/reference/docbook/spring-form.tld.xml | 5331 ---
src/reference/docbook/spring.tld.xml | 969 -
src/reference/docbook/swf-sidebar.xml | 28 -
src/reference/docbook/testing.xml | 3767 --
src/reference/docbook/transaction.xml | 2543 -
src/reference/docbook/validation.xml | 1931 -
src/reference/docbook/view.xml | 2655 --
src/reference/docbook/web-integration.xml | 1136 -
src/reference/docbook/xml-custom.xml | 610 -
src/reference/docbook/xsd-configuration.xml | 1197 -
.../annotation/EnableCachingIntegrationTests.java | 3 +-
.../ltw/ComponentScanningWithLTWTests.java | 3 +-
...olderConfigurerEnvironmentIntegrationTests.java | 3 +-
...AndTransactionalAnnotationIntegrationTests.java | 3 +-
...nableTransactionManagementIntegrationTests.java | 3 +-
.../annotation/ProxyAnnotationDiscoveryTests.java | 4 +-
src/test/resources/log4j.properties | 11 +
src/test/resources/log4j.xml | 32 -
3513 files changed, 207381 insertions(+), 138626 deletions(-)
delete mode 100644 .mailmap
create mode 100644 CONTRIBUTING-DOCUMENTATION.adoc
delete mode 100644 debian/patches/0007_remove_backport_util_concurrent.patch
delete mode 100644 debian/patches/0010_velocity_17.diff
delete mode 100644 debian/patches/0026-derby-compatibility.patch
delete mode 100644 debian/patches/0032-missing-tiles-dependency.patch
delete mode 100644 debian/patches/0033-missing-taglibs-dependency.patch
create mode 100644 debian/patches/0034-velocity-tools-compatibility.patch
create mode 100644 debian/patches/0035-ignore-asciidoctor-plugin.patch
create mode 100644 debian/patches/0036-ignore-compilation-warnings.patch
create mode 100644 debian/source/lintian-overrides
create mode 100644 spring-aop/src/main/java/org/springframework/aop/framework/ObjenesisCglibAopProxy.java
create mode 100644 spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-4.0.xsd
create mode 100644 spring-aop/src/test/java/org/springframework/aop/framework/ClassWithConstructor.java
create mode 100644 spring-aop/src/test/resources/log4j.properties
delete mode 100644 spring-aop/src/test/resources/log4j.xml
create mode 100644 spring-aspects/src/test/java/org/springframework/cache/config/TestEntity.java
create mode 100644 spring-aspects/src/test/resources/log4j.properties
delete mode 100644 spring-aspects/src/test/resources/log4j.xml
create mode 100644 spring-beans-groovy/src/main/groovy/org/springframework/beans/factory/groovy/GroovyDynamicElementReader.groovy
create mode 100644 spring-beans-groovy/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java
create mode 100644 spring-beans-groovy/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionWrapper.java
create mode 100644 spring-beans-groovy/src/main/java/org/springframework/beans/factory/groovy/package-info.java
create mode 100644 spring-beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingBean.java
create mode 100644 spring-beans/src/main/java/org/springframework/beans/factory/support/GenericTypeAwareAutowireCandidateResolver.java
create mode 100644 spring-beans/src/main/java/org/springframework/beans/propertyeditors/ZoneIdEditor.java
create mode 100644 spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-4.0.xsd
delete mode 100644 spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans.dtd
copy spring-beans/src/main/resources/org/springframework/beans/factory/xml/{spring-tool-3.1.xsd => spring-tool-4.0.xsd} (100%)
create mode 100644 spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-4.0.xsd
delete mode 100644 spring-beans/src/test/java/org/springframework/beans/factory/SharedBeanRegistryTests.java
create mode 100644 spring-beans/src/test/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistryTests.java
create mode 100644 spring-beans/src/test/java/org/springframework/beans/propertyeditors/ZoneIdEditorTests.java
create mode 100644 spring-beans/src/test/resources/log4j.properties
delete mode 100644 spring-beans/src/test/resources/log4j.xml
create mode 100644 spring-context-support/src/main/java/org/springframework/cache/guava/GuavaCache.java
create mode 100644 spring-context-support/src/main/java/org/springframework/cache/guava/GuavaCacheManager.java
create mode 100644 spring-context-support/src/main/java/org/springframework/cache/guava/package-info.java
delete mode 100644 spring-context-support/src/main/java/org/springframework/ui/velocity/CommonsLoggingLogSystem.java
create mode 100644 spring-context-support/src/test/java/org/springframework/cache/guava/GuavaCacheManagerTests.java
create mode 100644 spring-context-support/src/test/java/org/springframework/cache/transaction/TransactionAwareCacheDecoratorTests.java
create mode 100644 spring-context-support/src/test/resources/log4j.properties
delete mode 100644 spring-context-support/src/test/resources/log4j.xml
create mode 100644 spring-context/src/main/java/org/springframework/cache/interceptor/MethodCacheKey.java
create mode 100644 spring-context/src/main/java/org/springframework/cache/interceptor/SimpleKey.java
create mode 100644 spring-context/src/main/java/org/springframework/cache/interceptor/SimpleKeyGenerator.java
create mode 100644 spring-context/src/main/java/org/springframework/context/annotation/Condition.java
create mode 100644 spring-context/src/main/java/org/springframework/context/annotation/ConditionContext.java
create mode 100644 spring-context/src/main/java/org/springframework/context/annotation/ConditionEvaluator.java
create mode 100644 spring-context/src/main/java/org/springframework/context/annotation/Conditional.java
create mode 100644 spring-context/src/main/java/org/springframework/context/annotation/ConfigurationCondition.java
create mode 100644 spring-context/src/main/java/org/springframework/context/annotation/ContextAnnotationAutowireCandidateResolver.java
create mode 100644 spring-context/src/main/java/org/springframework/context/annotation/DeferredImportSelector.java
create mode 100644 spring-context/src/main/java/org/springframework/context/annotation/Description.java
delete mode 100644 spring-context/src/main/java/org/springframework/context/annotation/MetadataUtils.java
create mode 100644 spring-context/src/main/java/org/springframework/context/annotation/ProfileCondition.java
create mode 100644 spring-context/src/main/java/org/springframework/context/annotation/PropertySources.java
create mode 100644 spring-context/src/main/java/org/springframework/context/i18n/SimpleTimeZoneAwareLocaleContext.java
create mode 100644 spring-context/src/main/java/org/springframework/context/i18n/TimeZoneAwareLocaleContext.java
create mode 100644 spring-context/src/main/java/org/springframework/context/support/GenericGroovyApplicationContext.java
create mode 100644 spring-context/src/main/java/org/springframework/context/support/PostProcessorRegistrationDelegate.java
delete mode 100644 spring-context/src/main/java/org/springframework/ejb/support/AbstractEnterpriseBean.java
delete mode 100644 spring-context/src/main/java/org/springframework/ejb/support/AbstractJmsMessageDrivenBean.java
delete mode 100644 spring-context/src/main/java/org/springframework/ejb/support/AbstractMessageDrivenBean.java
delete mode 100644 spring-context/src/main/java/org/springframework/ejb/support/AbstractSessionBean.java
delete mode 100644 spring-context/src/main/java/org/springframework/ejb/support/AbstractStatefulSessionBean.java
delete mode 100644 spring-context/src/main/java/org/springframework/ejb/support/AbstractStatelessSessionBean.java
delete mode 100644 spring-context/src/main/java/org/springframework/ejb/support/SmartSessionBean.java
delete mode 100644 spring-context/src/main/java/org/springframework/ejb/support/package-info.java
create mode 100644 spring-context/src/main/java/org/springframework/format/datetime/joda/LocalDateParser.java
create mode 100644 spring-context/src/main/java/org/springframework/format/datetime/joda/LocalDateTimeParser.java
create mode 100644 spring-context/src/main/java/org/springframework/format/datetime/joda/LocalTimeParser.java
create mode 100644 spring-context/src/main/java/org/springframework/format/datetime/standard/DateTimeContext.java
create mode 100644 spring-context/src/main/java/org/springframework/format/datetime/standard/DateTimeContextHolder.java
create mode 100644 spring-context/src/main/java/org/springframework/format/datetime/standard/DateTimeConverters.java
create mode 100644 spring-context/src/main/java/org/springframework/format/datetime/standard/DateTimeFormatterFactory.java
create mode 100644 spring-context/src/main/java/org/springframework/format/datetime/standard/DateTimeFormatterFactoryBean.java
create mode 100644 spring-context/src/main/java/org/springframework/format/datetime/standard/DateTimeFormatterRegistrar.java
create mode 100644 spring-context/src/main/java/org/springframework/format/datetime/standard/InstantFormatter.java
create mode 100644 spring-context/src/main/java/org/springframework/format/datetime/standard/Jsr310DateTimeFormatAnnotationFormatterFactory.java
create mode 100644 spring-context/src/main/java/org/springframework/format/datetime/standard/TemporalAccessorParser.java
create mode 100644 spring-context/src/main/java/org/springframework/format/datetime/standard/TemporalAccessorPrinter.java
create mode 100644 spring-context/src/main/java/org/springframework/format/datetime/standard/package-info.java
delete mode 100644 spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/ClassTransformerAdapter.java
delete mode 100644 spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishClassLoaderAdapter.java
delete mode 100644 spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassLoaderAdapter.java
delete mode 100644 spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassPreprocessorAdapter.java
delete mode 100644 spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JLoadTimeWeaver.java
delete mode 100644 spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/package-info.java
create mode 100644 spring-context/src/main/java/org/springframework/instrument/classloading/tomcat/TomcatLoadTimeWeaver.java
create mode 100644 spring-context/src/main/java/org/springframework/instrument/classloading/tomcat/package-info.java
create mode 100644 spring-context/src/main/java/org/springframework/scheduling/annotation/Schedules.java
delete mode 100644 spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ConcurrentTaskExecutor.java
delete mode 100644 spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/CustomizableThreadFactory.java
delete mode 100644 spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ThreadPoolTaskExecutor.java
delete mode 100644 spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/package-info.java
create mode 100644 spring-context/src/main/java/org/springframework/scheduling/concurrent/DefaultManagedAwareThreadFactory.java
create mode 100644 spring-context/src/main/java/org/springframework/scheduling/concurrent/DefaultManagedTaskExecutor.java
create mode 100644 spring-context/src/main/java/org/springframework/scheduling/concurrent/DefaultManagedTaskScheduler.java
delete mode 100644 spring-context/src/main/java/org/springframework/scheduling/timer/DelegatingTimerTask.java
delete mode 100644 spring-context/src/main/java/org/springframework/scheduling/timer/MethodInvokingTimerTaskFactoryBean.java
delete mode 100644 spring-context/src/main/java/org/springframework/scheduling/timer/ScheduledTimerTask.java
delete mode 100644 spring-context/src/main/java/org/springframework/scheduling/timer/TimerFactoryBean.java
delete mode 100644 spring-context/src/main/java/org/springframework/scheduling/timer/TimerTaskExecutor.java
delete mode 100644 spring-context/src/main/java/org/springframework/scheduling/timer/package-info.java
create mode 100644 spring-context/src/main/java/org/springframework/scripting/ScriptEvaluator.java
create mode 100644 spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptEvaluator.java
create mode 100644 spring-context/src/main/java/org/springframework/scripting/groovy/GroovyScriptEvaluator.java
create mode 100644 spring-context/src/main/java/org/springframework/scripting/support/StandardScriptEvaluator.java
create mode 100644 spring-context/src/main/java/org/springframework/validation/beanvalidation/OptionalValidatorFactoryBean.java
create mode 100644 spring-context/src/main/resources/org/springframework/cache/config/spring-cache-4.0.xsd
create mode 100644 spring-context/src/main/resources/org/springframework/context/config/spring-context-4.0.xsd
create mode 100644 spring-context/src/main/resources/org/springframework/ejb/config/spring-jee-4.0.xsd
create mode 100644 spring-context/src/main/resources/org/springframework/scheduling/config/spring-task-4.0.xsd
create mode 100644 spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-4.0.xsd
create mode 100644 spring-context/src/test/groovy/org/springframework/context/groovy/GroovyApplicationContextDynamicBeanPropertyTests.groovy
create mode 100644 spring-context/src/test/groovy/org/springframework/context/groovy/GroovyBeanDefinitionReaderTests.groovy
create mode 100644 spring-context/src/test/java/example/scannable/CustomAspectStereotype.java
create mode 100644 spring-context/src/test/java/org/springframework/aop/framework/ClassWithComplexConstructor.java
create mode 100644 spring-context/src/test/java/org/springframework/aop/framework/Dependency.java
create mode 100644 spring-context/src/test/java/org/springframework/aop/framework/ObjenesisProxyTests-context.xml
create mode 100644 spring-context/src/test/java/org/springframework/aop/framework/ObjenesisProxyTests.java
create mode 100644 spring-context/src/test/java/org/springframework/cache/config/ExpressionCachingIntegrationTests.java
create mode 100644 spring-context/src/test/java/org/springframework/cache/config/TestEntity.java
create mode 100644 spring-context/src/test/java/org/springframework/cache/interceptor/SimpleKeyGeneratorTests.java
create mode 100644 spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassWithConditionTests.java
create mode 100644 spring-context/src/test/java/org/springframework/context/annotation/ImportSelectorTests.java
create mode 100644 spring-context/src/test/java/org/springframework/context/annotation/LazyAutowiredAnnotationBeanPostProcessorTests.java
create mode 100644 spring-context/src/test/java/org/springframework/context/annotation/RoleAndDescriptionAnnotationTests.java
delete mode 100644 spring-context/src/test/java/org/springframework/context/annotation/RoleAnnotationTests.java
create mode 100644 spring-context/src/test/java/org/springframework/context/annotation/Spr11202Tests.java
create mode 100644 spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportWithConditionTests.java
create mode 100644 spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr10668Tests.java
create mode 100644 spring-context/src/test/java/org/springframework/context/annotation/p3.properties
create mode 100644 spring-context/src/test/java/org/springframework/context/annotation/p4.properties
create mode 100644 spring-context/src/test/java/org/springframework/context/groovy/GroovyApplicationContextTests.java
create mode 100644 spring-context/src/test/java/org/springframework/context/groovy/applicationContext.groovy
create mode 100644 spring-context/src/test/java/org/springframework/context/groovy/applicationContext2.groovy
create mode 100644 spring-context/src/test/java/org/springframework/context/groovy/test.xml
create mode 100644 spring-context/src/test/java/org/springframework/context/i18n/LocaleContextHolderTests.java
delete mode 100644 spring-context/src/test/java/org/springframework/context/support/SimpleThreadScopeTest.java
create mode 100644 spring-context/src/test/java/org/springframework/context/support/SimpleThreadScopeTests.java
create mode 100644 spring-context/src/test/java/org/springframework/format/datetime/standard/DateTimeFormatterFactoryBeanTests.java
create mode 100644 spring-context/src/test/java/org/springframework/format/datetime/standard/DateTimeFormatterFactoryTests.java
create mode 100644 spring-context/src/test/java/org/springframework/format/datetime/standard/DateTimeFormattingTests.java
delete mode 100644 spring-context/src/test/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaverTests.java
create mode 100644 spring-context/src/test/java/org/springframework/jmx/export/CustomDateEditorRegistrar.java
delete mode 100644 spring-context/src/test/java/org/springframework/scheduling/backportconcurrent/ConcurrentTaskExecutorTests.java
delete mode 100644 spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java
delete mode 100644 spring-context/src/test/java/org/springframework/scheduling/timer/TimerTaskExecutorTests.java
create mode 100644 spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptEvaluatorTests.java
create mode 100644 spring-context/src/test/java/org/springframework/scripting/bsh/simple.bsh
create mode 100644 spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptEvaluatorTests.java
create mode 100644 spring-context/src/test/java/org/springframework/scripting/groovy/simple.groovy
create mode 100644 spring-context/src/test/resources/log4j.properties
delete mode 100644 spring-context/src/test/resources/log4j.xml
create mode 100644 spring-core/src/main/java/org/springframework/asm/AnnotationVisitor.java
create mode 100644 spring-core/src/main/java/org/springframework/asm/AnnotationWriter.java
create mode 100644 spring-core/src/main/java/org/springframework/asm/Attribute.java
create mode 100644 spring-core/src/main/java/org/springframework/asm/ByteVector.java
create mode 100644 spring-core/src/main/java/org/springframework/asm/ClassReader.java
create mode 100644 spring-core/src/main/java/org/springframework/asm/ClassVisitor.java
create mode 100644 spring-core/src/main/java/org/springframework/asm/ClassWriter.java
create mode 100644 spring-core/src/main/java/org/springframework/asm/Context.java
create mode 100644 spring-core/src/main/java/org/springframework/asm/Edge.java
create mode 100644 spring-core/src/main/java/org/springframework/asm/FieldVisitor.java
create mode 100644 spring-core/src/main/java/org/springframework/asm/FieldWriter.java
create mode 100644 spring-core/src/main/java/org/springframework/asm/Frame.java
create mode 100644 spring-core/src/main/java/org/springframework/asm/Handle.java
create mode 100644 spring-core/src/main/java/org/springframework/asm/Handler.java
create mode 100644 spring-core/src/main/java/org/springframework/asm/Item.java
create mode 100644 spring-core/src/main/java/org/springframework/asm/Label.java
create mode 100644 spring-core/src/main/java/org/springframework/asm/MethodVisitor.java
create mode 100644 spring-core/src/main/java/org/springframework/asm/MethodWriter.java
create mode 100644 spring-core/src/main/java/org/springframework/asm/Opcodes.java
create mode 100644 spring-core/src/main/java/org/springframework/asm/Type.java
create mode 100644 spring-core/src/main/java/org/springframework/asm/TypePath.java
create mode 100644 spring-core/src/main/java/org/springframework/asm/TypeReference.java
delete mode 100644 spring-core/src/main/java/org/springframework/asm/util/TraceClassVisitor.java
delete mode 100644 spring-core/src/main/java/org/springframework/asm/util/package-info.java
delete mode 100644 spring-core/src/main/java/org/springframework/core/ConcurrentMap.java
create mode 100644 spring-core/src/main/java/org/springframework/core/DefaultParameterNameDiscoverer.java
create mode 100644 spring-core/src/main/java/org/springframework/core/ResolvableType.java
create mode 100644 spring-core/src/main/java/org/springframework/core/SerializableTypeWrapper.java
create mode 100644 spring-core/src/main/java/org/springframework/core/StandardReflectionParameterNameDiscoverer.java
create mode 100644 spring-core/src/main/java/org/springframework/core/annotation/AnnotatedElementUtils.java
delete mode 100644 spring-core/src/main/java/org/springframework/core/convert/AbstractDescriptor.java
delete mode 100644 spring-core/src/main/java/org/springframework/core/convert/BeanPropertyDescriptor.java
delete mode 100644 spring-core/src/main/java/org/springframework/core/convert/ClassDescriptor.java
delete mode 100644 spring-core/src/main/java/org/springframework/core/convert/FieldDescriptor.java
delete mode 100644 spring-core/src/main/java/org/springframework/core/convert/ParameterDescriptor.java
create mode 100644 spring-core/src/main/java/org/springframework/core/convert/support/ByteBufferConverter.java
create mode 100644 spring-core/src/main/java/org/springframework/core/convert/support/ZoneIdToTimeZoneConverter.java
create mode 100644 spring-core/src/main/java/org/springframework/core/convert/support/ZonedDateTimeToCalendarConverter.java
delete mode 100644 spring-core/src/main/java/org/springframework/core/enums/AbstractCachingLabeledEnumResolver.java
delete mode 100644 spring-core/src/main/java/org/springframework/core/enums/AbstractGenericLabeledEnum.java
delete mode 100644 spring-core/src/main/java/org/springframework/core/enums/AbstractLabeledEnum.java
delete mode 100644 spring-core/src/main/java/org/springframework/core/enums/LabeledEnum.java
delete mode 100644 spring-core/src/main/java/org/springframework/core/enums/LabeledEnumResolver.java
delete mode 100644 spring-core/src/main/java/org/springframework/core/enums/LetterCodedLabeledEnum.java
delete mode 100644 spring-core/src/main/java/org/springframework/core/enums/ShortCodedLabeledEnum.java
delete mode 100644 spring-core/src/main/java/org/springframework/core/enums/StaticLabeledEnum.java
delete mode 100644 spring-core/src/main/java/org/springframework/core/enums/StaticLabeledEnumResolver.java
delete mode 100644 spring-core/src/main/java/org/springframework/core/enums/StringCodedLabeledEnum.java
delete mode 100644 spring-core/src/main/java/org/springframework/core/enums/package-info.java
create mode 100644 spring-core/src/main/java/org/springframework/core/io/PathResource.java
create mode 100644 spring-core/src/main/java/org/springframework/core/task/AsyncListenableTaskExecutor.java
create mode 100644 spring-core/src/main/java/org/springframework/core/type/AnnotatedTypeMetadata.java
create mode 100644 spring-core/src/main/java/org/springframework/core/type/classreading/AbstractRecursiveAnnotationVisitor.java
create mode 100644 spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationReadingVisitorUtils.java
create mode 100644 spring-core/src/main/java/org/springframework/core/type/classreading/RecursiveAnnotationArrayVisitor.java
create mode 100644 spring-core/src/main/java/org/springframework/core/type/classreading/RecursiveAnnotationAttributesVisitor.java
create mode 100644 spring-core/src/main/java/org/springframework/util/AlternativeJdkIdGenerator.java
delete mode 100644 spring-core/src/main/java/org/springframework/util/CachingMapDecorator.java
create mode 100644 spring-core/src/main/java/org/springframework/util/IdGenerator.java
create mode 100644 spring-core/src/main/java/org/springframework/util/InvalidMimeTypeException.java
create mode 100644 spring-core/src/main/java/org/springframework/util/MimeType.java
create mode 100644 spring-core/src/main/java/org/springframework/util/MimeTypeUtils.java
create mode 100644 spring-core/src/main/java/org/springframework/util/ResizableByteArrayOutputStream.java
create mode 100644 spring-core/src/main/java/org/springframework/util/SocketUtils.java
create mode 100644 spring-core/src/main/java/org/springframework/util/concurrent/FutureAdapter.java
create mode 100644 spring-core/src/main/java/org/springframework/util/concurrent/ListenableFuture.java
create mode 100644 spring-core/src/main/java/org/springframework/util/concurrent/ListenableFutureAdapter.java
create mode 100644 spring-core/src/main/java/org/springframework/util/concurrent/ListenableFutureCallback.java
create mode 100644 spring-core/src/main/java/org/springframework/util/concurrent/ListenableFutureCallbackRegistry.java
create mode 100644 spring-core/src/main/java/org/springframework/util/concurrent/ListenableFutureTask.java
create mode 100644 spring-core/src/main/java/org/springframework/util/concurrent/package-info.java
delete mode 100644 spring-core/src/main/java/org/springframework/util/xml/AbstractStaxContentHandler.java
create mode 100644 spring-core/src/main/java/org/springframework/util/xml/AbstractStaxHandler.java
delete mode 100644 spring-core/src/main/java/org/springframework/util/xml/StaxEventContentHandler.java
create mode 100644 spring-core/src/main/java/org/springframework/util/xml/StaxEventHandler.java
delete mode 100644 spring-core/src/main/java/org/springframework/util/xml/StaxStreamContentHandler.java
create mode 100644 spring-core/src/main/java/org/springframework/util/xml/StaxStreamHandler.java
delete mode 100644 spring-core/src/test/java/org/springframework/core/AbstractControlFlowTests.java
delete mode 100644 spring-core/src/test/java/org/springframework/core/AbstractGenericsTests.java
delete mode 100644 spring-core/src/test/java/org/springframework/core/CollectionFactoryTests.java
create mode 100644 spring-core/src/test/java/org/springframework/core/ControlFlowTests.java
delete mode 100644 spring-core/src/test/java/org/springframework/core/DefaultControlFlowTests.java
delete mode 100644 spring-core/src/test/java/org/springframework/core/Jdk14ControlFlowTests.java
create mode 100644 spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java
create mode 100644 spring-core/src/test/java/org/springframework/core/SerializableTypeWrapperTests.java
create mode 100644 spring-core/src/test/java/org/springframework/core/StandardReflectionParameterNameDiscoverTests.java
create mode 100644 spring-core/src/test/java/org/springframework/core/annotation/AnnotatedElementUtilsTests.java
create mode 100644 spring-core/src/test/java/org/springframework/core/annotation/subpackage/NonPublicAnnotatedClass.java
create mode 100644 spring-core/src/test/java/org/springframework/core/annotation/subpackage/NonPublicAnnotation.java
create mode 100644 spring-core/src/test/java/org/springframework/core/convert/support/ByteBufferConverterTests.java
delete mode 100644 spring-core/src/test/java/org/springframework/core/enums/LabeledEnumTests.java
delete mode 100644 spring-core/src/test/java/org/springframework/core/enums/StandAloneStaticLabeledEnum.java
create mode 100644 spring-core/src/test/java/org/springframework/core/io/PathResourceTests.java
delete mode 100644 spring-core/src/test/java/org/springframework/core/type/CachingMetadataReaderLeakTest.java
create mode 100644 spring-core/src/test/java/org/springframework/core/type/CachingMetadataReaderLeakTests.java
delete mode 100644 spring-core/src/test/java/org/springframework/util/CachingMapDecoratorTests.java
create mode 100644 spring-core/src/test/java/org/springframework/util/MimeTypeTests.java
create mode 100644 spring-core/src/test/java/org/springframework/util/ResizableByteArrayOutputStreamTests.java
create mode 100644 spring-core/src/test/java/org/springframework/util/SocketUtilsTests.java
create mode 100644 spring-core/src/test/java/org/springframework/util/concurrent/FutureAdapterTests.java
create mode 100644 spring-core/src/test/java/org/springframework/util/concurrent/ListenableFutureTaskTests.java
delete mode 100644 spring-core/src/test/java/org/springframework/util/xml/AbstractStaxContentHandlerTestCase.java
create mode 100644 spring-core/src/test/java/org/springframework/util/xml/AbstractStaxHandlerTestCase.java
delete mode 100644 spring-core/src/test/java/org/springframework/util/xml/DomContentHandlerTest.java
create mode 100644 spring-core/src/test/java/org/springframework/util/xml/DomContentHandlerTests.java
delete mode 100644 spring-core/src/test/java/org/springframework/util/xml/StaxEventContentHandlerTests.java
create mode 100644 spring-core/src/test/java/org/springframework/util/xml/StaxEventHandlerTests.java
delete mode 100644 spring-core/src/test/java/org/springframework/util/xml/StaxStreamContentHandlerTests.java
create mode 100644 spring-core/src/test/java/org/springframework/util/xml/StaxStreamHandlerTests.java
delete mode 100644 spring-core/src/test/java/org/springframework/util/xml/StaxUtilsTest.java
create mode 100644 spring-core/src/test/java/org/springframework/util/xml/StaxUtilsTests.java
create mode 100644 spring-core/src/test/resources/log4j.properties
delete mode 100644 spring-core/src/test/resources/log4j.xml
create mode 100644 spring-expression/src/test/java/org/springframework/expression/spel/AbstractExpressionTests.java
delete mode 100644 spring-expression/src/test/java/org/springframework/expression/spel/ExpressionTestCase.java
create mode 100644 spring-expression/src/test/resources/log4j.properties
delete mode 100644 spring-expression/src/test/resources/log4j.xml
delete mode 100644 spring-instrument-tomcat/src/main/java/org/springframework/instrument/classloading/tomcat/package-info.java
create mode 100644 spring-instrument-tomcat/src/test/resources/log4j.properties
delete mode 100644 spring-instrument-tomcat/src/test/resources/log4j.xml
create mode 100644 spring-instrument/src/test/resources/log4j.properties
delete mode 100644 spring-instrument/src/test/resources/log4j.xml
create mode 100644 spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/ScriptException.java
create mode 100644 spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/ScriptParseException.java
create mode 100644 spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/ScriptUtils.java
create mode 100644 spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/UncategorizedScriptException.java
create mode 100644 spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-4.0.xsd
delete mode 100644 spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DelegatingDataSourceTest.java
create mode 100644 spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DelegatingDataSourceTests.java
create mode 100644 spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/AbstractDatabaseInitializationTests.java
create mode 100644 spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/AbstractDatabasePopulatorTests.java
delete mode 100644 spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/DatabasePopulatorTests.java
create mode 100644 spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/H2DatabasePopulatorTests.java
create mode 100644 spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/HsqlDatabasePopulatorTests.java
create mode 100644 spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/ScriptUtilsIntegrationTests.java
create mode 100644 spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/ScriptUtilsUnitTests.java
create mode 100644 spring-jdbc/src/test/resources/log4j.properties
delete mode 100644 spring-jdbc/src/test/resources/log4j.xml
create mode 100644 spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-destroy-nested-config-h2.xml
create mode 100644 spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/embedded/db-schema-block-comments.sql
create mode 100644 spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/embedded/db-schema-custom-comments.sql
create mode 100644 spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/embedded/db-schema-derby-with-drop.sql
delete mode 100644 spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/embedded/db-schema-derby.sql
create mode 100644 spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/init/drop-users-schema.sql
create mode 100644 spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/init/test-data-with-comments-and-leading-tabs.sql
rename {spring-test/src/test/resources/org/springframework/test/jdbc => spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/init}/test-data-with-comments.sql (100%)
create mode 100644 spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/init/test-data-with-multi-line-comments.sql
create mode 100644 spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/init/users-data-without-separator.sql
create mode 100644 spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/init/users-schema-without-separator.sql
delete mode 100644 spring-jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager102.java
delete mode 100644 spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory102.java
delete mode 100644 spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate102.java
delete mode 100644 spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer102.java
delete mode 100644 spring-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer102.java
delete mode 100644 spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter102.java
delete mode 100644 spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter102.java
create mode 100644 spring-jms/src/main/resources/org/springframework/jms/config/spring-jms-4.0.xsd
delete mode 100644 spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102JtaTests.java
delete mode 100644 spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102Tests.java
delete mode 100644 spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102TransactedTests.java
delete mode 100644 spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapter102Tests.java
delete mode 100644 spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter102.java
delete mode 100644 spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverter102Tests.java
create mode 100644 spring-jms/src/test/resources/log4j.properties
delete mode 100644 spring-jms/src/test/resources/log4j.xml
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/Message.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/MessageChannel.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/MessageDeliveryException.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/MessageHandler.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/MessageHandlingException.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/MessageHeaders.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/MessagingException.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/PollableChannel.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/SubscribableChannel.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/converter/AbstractMessageConverter.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/converter/ByteArrayMessageConverter.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/converter/CompositeMessageConverter.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/converter/ContentTypeResolver.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/converter/DefaultContentTypeResolver.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/converter/MappingJackson2MessageConverter.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/converter/MessageConversionException.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/converter/MessageConverter.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/converter/SimpleMessageConverter.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/converter/StringMessageConverter.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/converter/package-info.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/core/AbstractDestinationResolvingMessagingTemplate.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/core/AbstractMessageSendingTemplate.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/core/AbstractMessagingTemplate.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/core/BeanFactoryMessageChannelDestinationResolver.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/core/DestinationResolutionException.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/core/DestinationResolver.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/core/DestinationResolvingMessageReceivingOperations.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/core/DestinationResolvingMessageRequestReplyOperations.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/core/DestinationResolvingMessageSendingOperations.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/core/GenericMessagingTemplate.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/core/MessagePostProcessor.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/core/MessageReceivingOperations.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/core/MessageRequestReplyOperations.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/core/MessageSendingOperations.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/core/package-info.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/handler/AbstractMessageCondition.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/handler/DestinationPatternsMessageCondition.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/handler/HandlerMethod.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/handler/HandlerMethodSelector.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/handler/MessageCondition.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/DestinationVariable.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/Header.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/Headers.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/MessageExceptionHandler.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/MessageMapping.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/Payload.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/SendTo.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/ValueConstants.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/package-info.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/AbstractMethodArgumentResolutionException.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/AnnotationExceptionHandlerMethodResolver.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/DestinationVariableMethodArgumentResolver.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/HeaderMethodArgumentResolver.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/HeadersMethodArgumentResolver.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/MessageMethodArgumentResolver.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/MethodArgumentNotValidException.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/MethodArgumentTypeMismatchException.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/PayloadArgumentResolver.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/package-info.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AbstractExceptionHandlerMethodResolver.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AbstractMethodMessageHandler.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/HandlerMethodArgumentResolver.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/HandlerMethodArgumentResolverComposite.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/HandlerMethodReturnValueHandler.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/HandlerMethodReturnValueHandlerComposite.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/InvocableHandlerMethod.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/package-info.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/handler/package-info.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/package-info.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessageHeaderAccessor.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessageMappingInfo.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessageSendingOperations.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessageType.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessageTypeMessageCondition.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessagingTemplate.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/SendToUser.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/SubscribeMapping.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/package-info.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/MissingSessionUserException.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/PrincipalMethodArgumentResolver.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandler.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandler.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SubscriptionMethodReturnValueHandler.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/package-info.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/broker/AbstractBrokerMessageHandler.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/broker/AbstractSubscriptionRegistry.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/broker/BrokerAvailabilityEvent.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/broker/DefaultSubscriptionRegistry.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/broker/SimpleBrokerMessageHandler.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/broker/SubscriptionRegistry.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/broker/package-info.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractBrokerRegistration.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/config/ChannelRegistration.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/config/MessageBrokerRegistry.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/config/SimpleBrokerRegistration.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/config/StompBrokerRelayRegistration.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/config/TaskExecutorRegistration.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/config/package-info.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/package-info.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/BufferingStompDecoder.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/Reactor11StompCodec.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompCodec.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompCommand.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompConversionException.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompEncoder.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaderAccessor.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/package-info.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/user/DefaultUserDestinationResolver.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/user/DefaultUserSessionRegistry.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/user/DestinationUserNameProvider.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/user/UserDestinationMessageHandler.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/user/UserDestinationResolver.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/user/UserDestinationResult.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/user/UserSessionRegistry.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/simp/user/package-info.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/support/AbstractMessageChannel.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/support/AbstractSubscribableChannel.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/support/ChannelInterceptor.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/support/ChannelInterceptorAdapter.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/support/ChannelInterceptorChain.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/support/ErrorMessage.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/support/ExecutorSubscribableChannel.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/support/GenericMessage.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/support/MessageBuilder.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/support/MessageHeaderAccessor.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/support/NativeMessageHeaderAccessor.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/support/package-info.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/tcp/FixedIntervalReconnectStrategy.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/tcp/ReconnectStrategy.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/tcp/TcpConnection.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/tcp/TcpConnectionHandler.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/tcp/TcpOperations.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/tcp/package-info.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/AbstractPromiseToListenableFutureAdapter.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/PassThroughPromiseToListenableFutureAdapter.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/Reactor11TcpClient.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/Reactor11TcpConnection.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/ReactorTcpClient.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/ReactorTcpConnection.java
create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/package-info.java
create mode 100644 spring-messaging/src/main/java/overview.html
create mode 100644 spring-messaging/src/test/java/org/springframework/messaging/MessageHeadersTests.java
create mode 100644 spring-messaging/src/test/java/org/springframework/messaging/StubMessageChannel.java
create mode 100644 spring-messaging/src/test/java/org/springframework/messaging/converter/DefaultContentTypeResolverTests.java
create mode 100644 spring-messaging/src/test/java/org/springframework/messaging/converter/MappingJackson2MessageConverterTests.java
create mode 100644 spring-messaging/src/test/java/org/springframework/messaging/converter/MessageConverterTests.java
create mode 100644 spring-messaging/src/test/java/org/springframework/messaging/converter/StringMessageConverterTests.java
create mode 100644 spring-messaging/src/test/java/org/springframework/messaging/core/DestinationResolvingMessagingTemplateTests.java
create mode 100644 spring-messaging/src/test/java/org/springframework/messaging/core/GenericMessagingTemplateTests.java
create mode 100644 spring-messaging/src/test/java/org/springframework/messaging/core/MessageReceivingTemplateTests.java
create mode 100644 spring-messaging/src/test/java/org/springframework/messaging/core/MessageRequestReplyTemplateTests.java
create mode 100644 spring-messaging/src/test/java/org/springframework/messaging/core/MessageSendingTemplateTests.java
create mode 100644 spring-messaging/src/test/java/org/springframework/messaging/handler/DestinationPatternsMessageConditionTests.java
create mode 100644 spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/AnnotationExceptionHandlerMethodResolverTests.java
create mode 100644 spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/DestinationVariableMethodArgumentResolverTests.java
create mode 100644 spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/HeaderMethodArgumentResolverTests.java
create mode 100644 spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/HeadersMethodArgumentResolverTests.java
create mode 100644 spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/MessageMethodArgumentResolverTests.java
create mode 100644 spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/PayloadArgumentResolverTests.java
create mode 100644 spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/MethodMessageHandlerTests.java
create mode 100644 spring-messaging/src/test/java/org/springframework/messaging/simp/SimpMessageTypeMessageConditionTests.java
create mode 100644 spring-messaging/src/test/java/org/springframework/messaging/simp/SimpMessagingTemplateTests.java
create mode 100644 spring-messaging/src/test/java/org/springframework/messaging/simp/TestPrincipal.java
create mode 100644 spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandlerTests.java
create mode 100644 spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandlerTests.java
create mode 100644 spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SubscriptionMethodReturnValueHandlerTests.java
create mode 100644 spring-messaging/src/test/java/org/springframework/messaging/simp/broker/BrokerMessageHandlerTests.java
create mode 100644 spring-messaging/src/test/java/org/springframework/messaging/simp/broker/DefaultSubscriptionRegistryTests.java
create mode 100644 spring-messaging/src/test/java/org/springframework/messaging/simp/broker/SimpleBrokerMessageHandlerTests.java
create mode 100644 spring-messaging/src/test/java/org/springframework/messaging/simp/config/MessageBrokerConfigurationTests.java
create mode 100644 spring-messaging/src/test/java/org/springframework/messaging/simp/config/StompBrokerRelayRegistrationTests.java
create mode 100644 spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/BufferingStompDecoderTests.java
create mode 100644 spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerIntegrationTests.java
create mode 100644 spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerTests.java
create mode 100644 spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompCodecTests.java
create mode 100644 spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompHeaderAccessorTests.java
create mode 100644 spring-messaging/src/test/java/org/springframework/messaging/simp/user/DefaultUserDestinationResolverTests.java
create mode 100644 spring-messaging/src/test/java/org/springframework/messaging/simp/user/DefaultUserSessionRegistryTests.java
create mode 100644 spring-messaging/src/test/java/org/springframework/messaging/simp/user/UserDestinationMessageHandlerTests.java
create mode 100644 spring-messaging/src/test/java/org/springframework/messaging/support/ChannelInterceptorTests.java
create mode 100644 spring-messaging/src/test/java/org/springframework/messaging/support/MessageBuilderTests.java
create mode 100644 spring-messaging/src/test/java/org/springframework/messaging/support/MessageHeaderAccessorTests.java
create mode 100644 spring-messaging/src/test/java/org/springframework/messaging/support/NativeMessageHeaderAccessorTests.java
create mode 100644 spring-messaging/src/test/java/org/springframework/messaging/support/PublishSubscribeChannelTests.java
create mode 100644 spring-messaging/src/test/resources/log4j.properties
create mode 100644 spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateCallback.java
create mode 100644 spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateOperations.java
create mode 100644 spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateTemplate.java
create mode 100644 spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/support/HibernateDaoSupport.java
create mode 100644 spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/support/OpenSessionInterceptor.java
create mode 100644 spring-orm-hibernate4/src/test/java/org/springframework/orm/hibernate4/HibernateTemplateTests.java
create mode 100644 spring-orm-hibernate4/src/test/resources/log4j.properties
delete mode 100644 spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalCacheProviderProxy.java
create mode 100644 spring-orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInterceptor.java
delete mode 100644 spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientCallback.java
delete mode 100644 spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientFactoryBean.java
delete mode 100644 spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientOperations.java
delete mode 100644 spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientTemplate.java
delete mode 100644 spring-orm/src/main/java/org/springframework/orm/ibatis/package-info.java
delete mode 100644 spring-orm/src/main/java/org/springframework/orm/ibatis/support/AbstractLobTypeHandler.java
delete mode 100644 spring-orm/src/main/java/org/springframework/orm/ibatis/support/BlobByteArrayTypeHandler.java
delete mode 100644 spring-orm/src/main/java/org/springframework/orm/ibatis/support/BlobSerializableTypeHandler.java
delete mode 100644 spring-orm/src/main/java/org/springframework/orm/ibatis/support/ClobStringTypeHandler.java
delete mode 100644 spring-orm/src/main/java/org/springframework/orm/ibatis/support/SqlMapClientDaoSupport.java
delete mode 100644 spring-orm/src/main/java/org/springframework/orm/ibatis/support/package-info.java
delete mode 100644 spring-orm/src/main/java/org/springframework/orm/jdo/JdoAccessor.java
delete mode 100644 spring-orm/src/main/java/org/springframework/orm/jdo/JdoCallback.java
delete mode 100644 spring-orm/src/main/java/org/springframework/orm/jdo/JdoInterceptor.java
delete mode 100644 spring-orm/src/main/java/org/springframework/orm/jdo/JdoOperations.java
delete mode 100644 spring-orm/src/main/java/org/springframework/orm/jdo/JdoTemplate.java
delete mode 100644 spring-orm/src/main/java/org/springframework/orm/jdo/support/JdoDaoSupport.java
delete mode 100644 spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryPlus.java
delete mode 100644 spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryPlusOperations.java
delete mode 100644 spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerPlus.java
delete mode 100644 spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerPlusOperations.java
delete mode 100644 spring-orm/src/main/java/org/springframework/orm/jpa/JpaAccessor.java
delete mode 100644 spring-orm/src/main/java/org/springframework/orm/jpa/JpaCallback.java
delete mode 100644 spring-orm/src/main/java/org/springframework/orm/jpa/JpaInterceptor.java
delete mode 100644 spring-orm/src/main/java/org/springframework/orm/jpa/JpaOperations.java
delete mode 100644 spring-orm/src/main/java/org/springframework/orm/jpa/JpaTemplate.java
delete mode 100644 spring-orm/src/main/java/org/springframework/orm/jpa/support/JpaDaoSupport.java
delete mode 100644 spring-orm/src/main/java/org/springframework/orm/jpa/vendor/TopLinkJpaDialect.java
delete mode 100644 spring-orm/src/main/java/org/springframework/orm/jpa/vendor/TopLinkJpaVendorAdapter.java
delete mode 100644 spring-orm/src/test/java/org/springframework/orm/ibatis/SqlMapClientTests.java
delete mode 100644 spring-orm/src/test/java/org/springframework/orm/ibatis/support/LobTypeHandlerTests.java
delete mode 100644 spring-orm/src/test/java/org/springframework/orm/jdo/JdoInterceptorTests.java
delete mode 100644 spring-orm/src/test/java/org/springframework/orm/jdo/JdoTemplateTests.java
delete mode 100644 spring-orm/src/test/java/org/springframework/orm/jdo/support/JdoDaoSupportTests.java
delete mode 100644 spring-orm/src/test/java/org/springframework/orm/jpa/JpaInterceptorTests.java
delete mode 100644 spring-orm/src/test/java/org/springframework/orm/jpa/JpaTemplateTests.java
create mode 100644 spring-orm/src/test/java/org/springframework/orm/jpa/SharedEntityManagerCreatorTests.java
delete mode 100644 spring-orm/src/test/java/org/springframework/orm/jpa/support/JpaDaoSupportTests.java
create mode 100644 spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceContextTransactionTests.java
delete mode 100644 spring-orm/src/test/java/org/springframework/orm/jpa/toplink/TopLinkEntityManagerFactoryIntegrationTests.java
delete mode 100644 spring-orm/src/test/java/org/springframework/orm/jpa/toplink/TopLinkMultiEntityManagerFactoryIntegrationTests.java
delete mode 100644 spring-orm/src/test/java/org/springframework/orm/jpa/toplink/toplink-manager-multi.xml
delete mode 100644 spring-orm/src/test/java/org/springframework/orm/jpa/toplink/toplink-manager.xml
create mode 100644 spring-orm/src/test/resources/log4j.properties
delete mode 100644 spring-orm/src/test/resources/log4j.xml
delete mode 100644 spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-1.5.xsd
create mode 100644 spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-4.0.xsd
delete mode 100644 spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/ComponentControllerSupport.java
delete mode 100644 spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesConfigurer.java
delete mode 100644 spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesJstlView.java
delete mode 100644 spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesView.java
delete mode 100644 spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/package-info.java
delete mode 100644 spring-struts/src/main/java/org/springframework/web/struts/ActionServletAwareProcessor.java
delete mode 100644 spring-struts/src/main/java/org/springframework/web/struts/ActionSupport.java
delete mode 100644 spring-struts/src/main/java/org/springframework/web/struts/AutowiringRequestProcessor.java
delete mode 100644 spring-struts/src/main/java/org/springframework/web/struts/AutowiringTilesRequestProcessor.java
delete mode 100644 spring-struts/src/main/java/org/springframework/web/struts/ContextLoaderPlugIn.java
delete mode 100644 spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionProxy.java
delete mode 100644 spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionUtils.java
delete mode 100644 spring-struts/src/main/java/org/springframework/web/struts/DelegatingRequestProcessor.java
delete mode 100644 spring-struts/src/main/java/org/springframework/web/struts/DelegatingTilesRequestProcessor.java
delete mode 100644 spring-struts/src/main/java/org/springframework/web/struts/DispatchActionSupport.java
delete mode 100644 spring-struts/src/main/java/org/springframework/web/struts/LookupDispatchActionSupport.java
delete mode 100644 spring-struts/src/main/java/org/springframework/web/struts/MappingDispatchActionSupport.java
delete mode 100644 spring-struts/src/main/java/org/springframework/web/struts/SpringBindingActionForm.java
delete mode 100644 spring-struts/src/main/java/org/springframework/web/struts/package-info.java
delete mode 100644 spring-struts/src/test/java/org/springframework/web/servlet/view/tiles/TestComponentController.java
delete mode 100644 spring-struts/src/test/java/org/springframework/web/servlet/view/tiles/TilesViewTests.java
delete mode 100644 spring-struts/src/test/java/org/springframework/web/struts/StrutsSupportTests.java
delete mode 100644 spring-struts/src/test/java/org/springframework/web/struts/TestAction.java
delete mode 100644 spring-struts/src/test/resources/log4j.xml
delete mode 100644 spring-struts/src/test/resources/org/springframework/web/servlet/view/tiles/context-messages.properties
delete mode 100644 spring-struts/src/test/resources/org/springframework/web/servlet/view/tiles/context-messages_en_GB.properties
delete mode 100644 spring-struts/src/test/resources/org/springframework/web/servlet/view/tiles/context-messages_en_US.properties
delete mode 100644 spring-struts/src/test/resources/org/springframework/web/servlet/view/tiles/tiles-test.xml
delete mode 100644 spring-struts/src/test/resources/org/springframework/web/struts/WEB-INF/action-servlet.xml
delete mode 100644 spring-test-mvc/src/main/java/org/springframework/test/util/XpathExpectationsHelper.java
delete mode 100644 spring-test-mvc/src/main/java/org/springframework/test/web/client/MockMvcClientHttpRequestFactory.java
delete mode 100644 spring-test-mvc/src/main/java/org/springframework/test/web/client/MockRestServiceServer.java
delete mode 100644 spring-test-mvc/src/main/java/org/springframework/test/web/client/RequestMatcherClientHttpRequest.java
delete mode 100644 spring-test-mvc/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java
delete mode 100644 spring-test-mvc/src/main/java/org/springframework/test/web/client/match/JsonPathRequestMatchers.java
delete mode 100644 spring-test-mvc/src/main/java/org/springframework/test/web/client/match/MockRestRequestMatchers.java
delete mode 100644 spring-test-mvc/src/main/java/org/springframework/test/web/client/match/XpathRequestMatchers.java
delete mode 100644 spring-test-mvc/src/main/java/org/springframework/test/web/client/response/DefaultResponseCreator.java
delete mode 100644 spring-test-mvc/src/main/java/org/springframework/test/web/servlet/DefaultMvcResult.java
delete mode 100644 spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MockMvc.java
delete mode 100644 spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MockMvcBuilderSupport.java
delete mode 100644 spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MvcResult.java
delete mode 100644 spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultActions.java
delete mode 100644 spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultHandler.java
delete mode 100644 spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java
delete mode 100644 spring-test-mvc/src/main/java/org/springframework/test/web/servlet/TestDispatcherServlet.java
delete mode 100644 spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockAsyncContext.java
delete mode 100644 spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java
delete mode 100644 spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.java
delete mode 100644 spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.java
delete mode 100644 spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/Servlet3MockHttpServletRequest.java
delete mode 100644 spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/Servlet3MockMultipartHttpServletRequest.java
delete mode 100644 spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java
delete mode 100644 spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/CookieResultMatchers.java
delete mode 100644 spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchers.java
delete mode 100644 spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/HandlerResultMatchers.java
delete mode 100644 spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/HeaderResultMatchers.java
delete mode 100644 spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/JsonPathResultMatchers.java
delete mode 100644 spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultHandlers.java
delete mode 100644 spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultMatchers.java
delete mode 100644 spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ModelResultMatchers.java
delete mode 100644 spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java
delete mode 100644 spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/RequestResultMatchers.java
delete mode 100644 spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java
delete mode 100644 spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ViewResultMatchers.java
delete mode 100644 spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/XpathResultMatchers.java
delete mode 100644 spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/DefaultMockMvcBuilder.java
delete mode 100644 spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/MockMvcBuilders.java
delete mode 100644 spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/PatternMappingFilterProxy.java
delete mode 100644 spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java
delete mode 100644 spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/StubWebApplicationContext.java
delete mode 100644 spring-test-mvc/src/test/java/org/springframework/test/util/JsonPathExpectationsHelperTests.java
delete mode 100644 spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/ContentRequestMatcherTests.java
delete mode 100644 spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/HeaderRequestMatcherTests.java
delete mode 100644 spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/JsonPathRequestMatcherTests.java
delete mode 100644 spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/XmlContentRequestMatcherTests.java
delete mode 100644 spring-test-mvc/src/test/java/org/springframework/test/web/servlet/DefaultMvcResultTests.java
delete mode 100644 spring-test-mvc/src/test/java/org/springframework/test/web/servlet/Spr10025Tests.java
delete mode 100644 spring-test-mvc/src/test/java/org/springframework/test/web/servlet/Spr10093Tests.java
delete mode 100644 spring-test-mvc/src/test/java/org/springframework/test/web/servlet/StubMvcResult.java
delete mode 100644 spring-test-mvc/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java
delete mode 100644 spring-test-mvc/src/test/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilderTests.java
delete mode 100644 spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java
delete mode 100644 spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/StatusResultMatchersTests.java
delete mode 100644 spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java
delete mode 100644 spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/AsyncTests.java
delete mode 100644 spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/FileUploadControllerTests.java
delete mode 100644 spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/ViewResolutionTests.java
delete mode 100644 spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerTests.java
delete mode 100644 spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/HeaderAssertionTests.java
delete mode 100644 spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/UrlAssertionTests.java
delete mode 100644 spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XpathAssertionTests.java
delete mode 100644 spring-test-mvc/src/test/java/org/springframework/test/web/servlet/setup/DefaultMockMvcBuilderTests.java
delete mode 100644 spring-test-mvc/src/test/java/org/springframework/test/web/servlet/setup/Spr10277Tests.java
delete mode 100644 spring-test-mvc/src/test/resources/log4j.properties
create mode 100644 spring-test/src/main/java/org/springframework/mock/web/MockAsyncContext.java
create mode 100644 spring-test/src/main/java/org/springframework/mock/web/MockSessionCookieConfig.java
delete mode 100644 spring-test/src/main/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java
delete mode 100644 spring-test/src/main/java/org/springframework/test/AbstractSingleSpringContextTests.java
delete mode 100644 spring-test/src/main/java/org/springframework/test/AbstractSpringContextTests.java
delete mode 100644 spring-test/src/main/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java
delete mode 100644 spring-test/src/main/java/org/springframework/test/AbstractTransactionalSpringContextTests.java
delete mode 100644 spring-test/src/main/java/org/springframework/test/ConditionalTestCase.java
delete mode 100644 spring-test/src/main/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java
delete mode 100644 spring-test/src/main/java/org/springframework/test/annotation/ExpectedException.java
delete mode 100644 spring-test/src/main/java/org/springframework/test/annotation/NotTransactional.java
create mode 100644 spring-test/src/main/java/org/springframework/test/context/ActiveProfilesResolver.java
create mode 100644 spring-test/src/main/java/org/springframework/test/context/DefaultTestContext.java
create mode 100644 spring-test/src/main/java/org/springframework/test/context/MetaAnnotationUtils.java
delete mode 100644 spring-test/src/main/java/org/springframework/test/context/junit38/AbstractJUnit38SpringContextTests.java
delete mode 100644 spring-test/src/main/java/org/springframework/test/context/junit38/AbstractTransactionalJUnit38SpringContextTests.java
delete mode 100644 spring-test/src/main/java/org/springframework/test/context/junit38/package-info.java
delete mode 100644 spring-test/src/main/java/org/springframework/test/jdbc/SimpleJdbcTestUtils.java
delete mode 100644 spring-test/src/main/java/org/springframework/test/jpa/AbstractAspectjJpaTests.java
delete mode 100644 spring-test/src/main/java/org/springframework/test/jpa/AbstractJpaTests.java
delete mode 100644 spring-test/src/main/java/org/springframework/test/jpa/OrmXmlOverridingShadowingClassLoader.java
delete mode 100644 spring-test/src/main/java/org/springframework/test/jpa/package-info.java
rename {spring-test-mvc => spring-test}/src/main/java/org/springframework/test/util/JsonPathExpectationsHelper.java (100%)
rename {spring-test-mvc => spring-test}/src/main/java/org/springframework/test/util/MatcherAssertionErrors.java (100%)
rename {spring-test-mvc => spring-test}/src/main/java/org/springframework/test/util/XmlExpectationsHelper.java (100%)
create mode 100644 spring-test/src/main/java/org/springframework/test/util/XpathExpectationsHelper.java
delete mode 100644 spring-test/src/main/java/org/springframework/test/web/AbstractModelAndViewTests.java
create mode 100644 spring-test/src/main/java/org/springframework/test/web/client/MockMvcClientHttpRequestFactory.java
create mode 100644 spring-test/src/main/java/org/springframework/test/web/client/MockRestServiceServer.java
rename {spring-test-mvc => spring-test}/src/main/java/org/springframework/test/web/client/RequestMatcher.java (100%)
create mode 100644 spring-test/src/main/java/org/springframework/test/web/client/RequestMatcherClientHttpRequest.java
rename {spring-test-mvc => spring-test}/src/main/java/org/springframework/test/web/client/ResponseActions.java (100%)
rename {spring-test-mvc => spring-test}/src/main/java/org/springframework/test/web/client/ResponseCreator.java (100%)
create mode 100644 spring-test/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java
create mode 100644 spring-test/src/main/java/org/springframework/test/web/client/match/JsonPathRequestMatchers.java
create mode 100644 spring-test/src/main/java/org/springframework/test/web/client/match/MockRestRequestMatchers.java
create mode 100644 spring-test/src/main/java/org/springframework/test/web/client/match/XpathRequestMatchers.java
rename {spring-test-mvc => spring-test}/src/main/java/org/springframework/test/web/client/match/package-info.java (100%)
rename {spring-test-mvc => spring-test}/src/main/java/org/springframework/test/web/client/package-info.java (100%)
create mode 100644 spring-test/src/main/java/org/springframework/test/web/client/response/DefaultResponseCreator.java
rename {spring-test-mvc => spring-test}/src/main/java/org/springframework/test/web/client/response/MockRestResponseCreators.java (100%)
rename {spring-test-mvc => spring-test}/src/main/java/org/springframework/test/web/client/response/package-info.java (100%)
create mode 100644 spring-test/src/main/java/org/springframework/test/web/servlet/DefaultMvcResult.java
create mode 100644 spring-test/src/main/java/org/springframework/test/web/servlet/MockMvc.java
rename {spring-test-mvc => spring-test}/src/main/java/org/springframework/test/web/servlet/MockMvcBuilder.java (100%)
create mode 100644 spring-test/src/main/java/org/springframework/test/web/servlet/MockMvcBuilderSupport.java
create mode 100644 spring-test/src/main/java/org/springframework/test/web/servlet/MvcResult.java
rename {spring-test-mvc => spring-test}/src/main/java/org/springframework/test/web/servlet/RequestBuilder.java (100%)
create mode 100644 spring-test/src/main/java/org/springframework/test/web/servlet/ResultActions.java
create mode 100644 spring-test/src/main/java/org/springframework/test/web/servlet/ResultHandler.java
create mode 100644 spring-test/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java
create mode 100644 spring-test/src/main/java/org/springframework/test/web/servlet/TestDispatcherServlet.java
rename {spring-test-mvc => spring-test}/src/main/java/org/springframework/test/web/servlet/package-info.java (100%)
create mode 100644 spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java
create mode 100644 spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.java
create mode 100644 spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.java
rename {spring-test-mvc => spring-test}/src/main/java/org/springframework/test/web/servlet/request/RequestPostProcessor.java (100%)
rename {spring-test-mvc => spring-test}/src/main/java/org/springframework/test/web/servlet/request/package-info.java (100%)
create mode 100644 spring-test/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java
create mode 100644 spring-test/src/main/java/org/springframework/test/web/servlet/result/CookieResultMatchers.java
create mode 100644 spring-test/src/main/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchers.java
create mode 100644 spring-test/src/main/java/org/springframework/test/web/servlet/result/HandlerResultMatchers.java
create mode 100644 spring-test/src/main/java/org/springframework/test/web/servlet/result/HeaderResultMatchers.java
create mode 100644 spring-test/src/main/java/org/springframework/test/web/servlet/result/JsonPathResultMatchers.java
create mode 100644 spring-test/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultHandlers.java
create mode 100644 spring-test/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultMatchers.java
create mode 100644 spring-test/src/main/java/org/springframework/test/web/servlet/result/ModelResultMatchers.java
create mode 100644 spring-test/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java
create mode 100644 spring-test/src/main/java/org/springframework/test/web/servlet/result/RequestResultMatchers.java
create mode 100644 spring-test/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java
create mode 100644 spring-test/src/main/java/org/springframework/test/web/servlet/result/ViewResultMatchers.java
create mode 100644 spring-test/src/main/java/org/springframework/test/web/servlet/result/XpathResultMatchers.java
rename {spring-test-mvc => spring-test}/src/main/java/org/springframework/test/web/servlet/result/package-info.java (100%)
create mode 100644 spring-test/src/main/java/org/springframework/test/web/servlet/setup/AbstractMockMvcBuilder.java
create mode 100644 spring-test/src/main/java/org/springframework/test/web/servlet/setup/DefaultMockMvcBuilder.java
create mode 100644 spring-test/src/main/java/org/springframework/test/web/servlet/setup/MockMvcBuilders.java
create mode 100644 spring-test/src/main/java/org/springframework/test/web/servlet/setup/PatternMappingFilterProxy.java
create mode 100644 spring-test/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java
create mode 100644 spring-test/src/main/java/org/springframework/test/web/servlet/setup/StubWebApplicationContext.java
rename {spring-test-mvc => spring-test}/src/main/java/org/springframework/test/web/servlet/setup/package-info.java (100%)
create mode 100644 spring-test/src/test/java/org/springframework/mock/web/MockMultipartHttpServletRequestTests.java
delete mode 100644 spring-test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java
delete mode 100644 spring-test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests-context.properties
delete mode 100644 spring-test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests.java
delete mode 100644 spring-test/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java
delete mode 100644 spring-test/src/test/java/org/springframework/test/Spr3264SingleSpringContextTests.java
delete mode 100644 spring-test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests-context.xml
delete mode 100644 spring-test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests.java
delete mode 100644 spring-test/src/test/java/org/springframework/test/annotation/ProfileValueAnnotationAwareTransactionalTests-context.xml
delete mode 100644 spring-test/src/test/java/org/springframework/test/annotation/ProfileValueAnnotationAwareTransactionalTests.java
rename spring-test/src/test/java/org/springframework/test/context/{ContextLoaderUtilsTests$BareAnnotations-context.xml => AbstractContextLoaderUtilsTests$BareAnnotations-context.xml} (100%)
create mode 100644 spring-test/src/test/java/org/springframework/test/context/AbstractContextLoaderUtilsTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/ContextLoaderUtilsActiveProfilesTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/ContextLoaderUtilsConfigurationAttributesTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/ContextLoaderUtilsContextHierarchyTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/ContextLoaderUtilsContextInitializerTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/ContextLoaderUtilsMergedConfigTests.java
delete mode 100644 spring-test/src/test/java/org/springframework/test/context/ContextLoaderUtilsTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/MetaAnnotationUtilsTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/OverriddenMetaAnnotationAttributesTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/hierarchies/meta/MetaContextHierarchyConfig.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/hierarchies/meta/MetaHierarchyLevelOneTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/hierarchies/meta/MetaHierarchyLevelTwoTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/hierarchies/meta/MetaMetaContextHierarchyConfig.java
delete mode 100644 spring-test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests-context.xml
delete mode 100644 spring-test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests.java
delete mode 100644 spring-test/src/test/java/org/springframework/test/context/junit38/FailingBeforeAndAfterMethodsTests-context.xml
delete mode 100644 spring-test/src/test/java/org/springframework/test/context/junit38/FailingBeforeAndAfterMethodsTests.java
delete mode 100644 spring-test/src/test/java/org/springframework/test/context/junit38/ProfileValueJUnit38SpringContextTests.java
delete mode 100644 spring-test/src/test/java/org/springframework/test/context/junit38/RepeatedJUnit38SpringContextTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsJUnitTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTestNGTests.java
delete mode 100644 spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests.java
delete mode 100644 spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/InitializerWithoutConfigFilesOrClassesTest.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/InitializerWithoutConfigFilesOrClassesTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/junit4/annotation/meta/ConfigClassesAndProfileResolverWithCustomDefaultsMetaConfig.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/junit4/annotation/meta/ConfigClassesAndProfileResolverWithCustomDefaultsMetaConfigTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/junit4/annotation/meta/ConfigClassesAndProfileResolverWithCustomDefaultsMetaConfigWithOverridesTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/junit4/annotation/meta/ConfigClassesAndProfilesMetaConfig.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/junit4/annotation/meta/ConfigClassesAndProfilesMetaConfigTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/junit4/annotation/meta/ConfigClassesAndProfilesWithCustomDefaultsMetaConfig.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/junit4/annotation/meta/ConfigClassesAndProfilesWithCustomDefaultsMetaConfigTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/junit4/annotation/meta/ConfigClassesAndProfilesWithCustomDefaultsMetaConfigWithOverridesTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/junit4/annotation/meta/MetaMetaConfig.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/junit4/annotation/meta/MetaMetaConfigDefaultsTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/junit4/hybrid/HybridContextLoader.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/junit4/hybrid/HybridContextLoaderTests-context.xml
create mode 100644 spring-test/src/test/java/org/springframework/test/context/junit4/hybrid/HybridContextLoaderTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/junit4/profile/annotation/DevProfileResolverAnnotationConfigTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/junit4/profile/importresource/DevProfileResolverAnnotationConfigTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/junit4/profile/resolver/ClassNameActiveProfilesResolver.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/junit4/profile/resolver/ClassNameActiveProfilesResolverTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/junit4/profile/xml/DevProfileResolverXmlConfigTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/support/DirtiesContextTestExecutionListenerTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/support/GenericPropertiesContextLoaderTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/support/GenericXmlContextLoaderTests.java
delete mode 100644 spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/testng/transaction/ejb/AbstractEjbTxDaoTestNGTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/testng/transaction/ejb/CommitForRequiredEjbTxDaoTestNGTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/testng/transaction/ejb/CommitForRequiresNewEjbTxDaoTestNGTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/testng/transaction/ejb/RollbackForRequiredEjbTxDaoTestNGTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/testng/transaction/ejb/RollbackForRequiresNewEjbTxDaoTestNGTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/testng/transaction/ejb/testng-package.xml
create mode 100644 spring-test/src/test/java/org/springframework/test/context/testng/transaction/ejb/testng-test-separate.xml
create mode 100644 spring-test/src/test/java/org/springframework/test/context/testng/transaction/ejb/testng-test-together.xml
create mode 100644 spring-test/src/test/java/org/springframework/test/context/transaction/TransactionalTestExecutionListenerTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/transaction/ejb/AbstractEjbTxDaoTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/transaction/ejb/CommitForRequiredEjbTxDaoTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/transaction/ejb/CommitForRequiresNewEjbTxDaoTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/transaction/ejb/RollbackForRequiredEjbTxDaoTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/transaction/ejb/RollbackForRequiresNewEjbTxDaoTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/transaction/ejb/dao/AbstractEjbTxTestEntityDao.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/transaction/ejb/dao/RequiredEjbTxTestEntityDao.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/transaction/ejb/dao/RequiresNewEjbTxTestEntityDao.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/transaction/ejb/dao/TestEntityDao.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/transaction/ejb/model/TestEntity.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/web/AnnotationConfigWebContextLoaderTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/web/GenericXmlWebContextLoaderTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/web/MetaAnnotationConfigWacTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/web/ServletContextAwareBean.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/web/ServletContextAwareBeanWacTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/context/web/WebTestConfiguration.java
create mode 100644 spring-test/src/test/java/org/springframework/test/jdbc/JdbcTestUtilsIntegrationTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/util/JsonPathExpectationsHelperTests.java
rename {spring-test-mvc => spring-test}/src/test/java/org/springframework/test/web/Person.java (100%)
rename {spring-test-mvc => spring-test}/src/test/java/org/springframework/test/web/client/MockClientHttpRequestFactoryTests.java (100%)
rename {spring-test-mvc => spring-test}/src/test/java/org/springframework/test/web/client/match/ContentRequestMatchersTests.java (100%)
rename {spring-test-mvc => spring-test}/src/test/java/org/springframework/test/web/client/match/JsonPathRequestMatchersTests.java (100%)
rename {spring-test-mvc => spring-test}/src/test/java/org/springframework/test/web/client/match/RequestMatchersTests.java (100%)
rename {spring-test-mvc => spring-test}/src/test/java/org/springframework/test/web/client/match/XpathRequestMatchersTests.java (100%)
rename {spring-test-mvc => spring-test}/src/test/java/org/springframework/test/web/client/response/ResponseCreatorsTests.java (100%)
rename {spring-test-mvc => spring-test}/src/test/java/org/springframework/test/web/client/samples/MockMvcClientHttpRequestFactoryTests.java (100%)
rename {spring-test-mvc => spring-test}/src/test/java/org/springframework/test/web/client/samples/SampleTests.java (100%)
create mode 100644 spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/ContentRequestMatcherTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/HeaderRequestMatcherTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/JsonPathRequestMatcherTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/web/client/samples/matchers/XmlContentRequestMatcherTests.java
rename {spring-test-mvc => spring-test}/src/test/java/org/springframework/test/web/client/samples/matchers/XpathRequestMatcherTests.java (100%)
create mode 100644 spring-test/src/test/java/org/springframework/test/web/servlet/DefaultMvcResultTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/web/servlet/StubMvcResult.java
create mode 100644 spring-test/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilderTests.java
rename {spring-test-mvc => spring-test}/src/test/java/org/springframework/test/web/servlet/result/ContentResultMatchersTests.java (100%)
rename {spring-test-mvc => spring-test}/src/test/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchersTests.java (100%)
rename {spring-test-mvc => spring-test}/src/test/java/org/springframework/test/web/servlet/result/JsonPathResultMatchersTests.java (100%)
create mode 100644 spring-test/src/test/java/org/springframework/test/web/servlet/result/MockMvcResultMatchersTests.java
rename {spring-test-mvc => spring-test}/src/test/java/org/springframework/test/web/servlet/result/ModelResultMatchersTests.java (100%)
create mode 100644 spring-test/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/web/servlet/result/StatusResultMatchersTests.java
rename {spring-test-mvc => spring-test}/src/test/java/org/springframework/test/web/servlet/result/XpathResultMatchersTests.java (100%)
create mode 100644 spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java
rename {spring-test-mvc => spring-test}/src/test/java/org/springframework/test/web/servlet/samples/context/PersonController.java (100%)
rename {spring-test-mvc => spring-test}/src/test/java/org/springframework/test/web/servlet/samples/context/PersonDao.java (100%)
rename {spring-test-mvc => spring-test}/src/test/java/org/springframework/test/web/servlet/samples/context/WebAppResourceTests.java (100%)
rename {spring-test-mvc => spring-test}/src/test/java/org/springframework/test/web/servlet/samples/context/XmlConfigTests.java (100%)
create mode 100644 spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/EncodedUriTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/HttpOptionsTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/MockMvcBuilderMethodChainTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/RequestContextHolderTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/AsyncTests.java
rename {spring-test-mvc => spring-test}/src/test/java/org/springframework/test/web/servlet/samples/standalone/ExceptionHandlerTests.java (100%)
create mode 100644 spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/FileUploadControllerTests.java
rename {spring-test-mvc => spring-test}/src/test/java/org/springframework/test/web/servlet/samples/standalone/FilterTests.java (100%)
rename {spring-test-mvc => spring-test}/src/test/java/org/springframework/test/web/servlet/samples/standalone/RedirectTests.java (100%)
rename {spring-test-mvc => spring-test}/src/test/java/org/springframework/test/web/servlet/samples/standalone/RequestBuilderTests.java (100%)
rename {spring-test-mvc => spring-test}/src/test/java/org/springframework/test/web/servlet/samples/standalone/RequestParameterTests.java (100%)
rename {spring-test-mvc => spring-test}/src/test/java/org/springframework/test/web/servlet/samples/standalone/ResponseBodyTests.java (100%)
create mode 100644 spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/ViewResolutionTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerTests.java
rename {spring-test-mvc => spring-test}/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ContentAssertionTests.java (100%)
rename {spring-test-mvc => spring-test}/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/CookieAssertionTests.java (100%)
rename {spring-test-mvc => spring-test}/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/FlashAttributeAssertionTests.java (100%)
rename {spring-test-mvc => spring-test}/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/HandlerAssertionTests.java (100%)
create mode 100644 spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/HeaderAssertionTests.java
rename {spring-test-mvc => spring-test}/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/JsonPathAssertionTests.java (100%)
rename {spring-test-mvc => spring-test}/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ModelAssertionTests.java (100%)
rename {spring-test-mvc => spring-test}/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/RequestAttributeAssertionTests.java (100%)
rename {spring-test-mvc => spring-test}/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/SessionAttributeAssertionTests.java (100%)
rename {spring-test-mvc => spring-test}/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/StatusAssertionTests.java (100%)
create mode 100644 spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/UrlAssertionTests.java
rename {spring-test-mvc => spring-test}/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ViewNameAssertionTests.java (100%)
rename {spring-test-mvc => spring-test}/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XmlContentAssertionTests.java (100%)
create mode 100644 spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XpathAssertionTests.java
rename {spring-test-mvc => spring-test}/src/test/java/org/springframework/test/web/servlet/setup/ConditionalDelegatingFilterProxyTests.java (100%)
create mode 100644 spring-test/src/test/java/org/springframework/test/web/servlet/setup/DefaultMockMvcBuilderTests.java
create mode 100644 spring-test/src/test/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilderTests.java
delete mode 100644 spring-test/src/test/java/org/springframework/web/multipart/MockMultipartHttpServletRequestTests.java
rename {spring-test-mvc => spring-test}/src/test/resources/META-INF/web-resources/WEB-INF/layouts/standardLayout.jsp (100%)
rename {spring-test-mvc => spring-test}/src/test/resources/META-INF/web-resources/WEB-INF/layouts/tiles.xml (100%)
rename {spring-test-mvc => spring-test}/src/test/resources/META-INF/web-resources/WEB-INF/views/home.jsp (100%)
rename {spring-test-mvc => spring-test}/src/test/resources/META-INF/web-resources/WEB-INF/views/tiles.xml (100%)
rename {spring-test-mvc => spring-test}/src/test/resources/META-INF/web-resources/resources/Spring.js (100%)
create mode 100644 spring-test/src/test/resources/log4j.properties
delete mode 100644 spring-test/src/test/resources/log4j.xml
create mode 100644 spring-test/src/test/resources/org/springframework/test/context/transaction/ejb/common-config.xml
create mode 100644 spring-test/src/test/resources/org/springframework/test/context/transaction/ejb/required-tx-config.xml
create mode 100644 spring-test/src/test/resources/org/springframework/test/context/transaction/ejb/requires-new-tx-config.xml
copy spring-test/src/test/{java/org/springframework/test/context/testng => resources/org/springframework/test/jdbc}/data.sql (100%)
copy spring-test/src/test/{java/org/springframework/test/context/testng => resources/org/springframework/test/jdbc}/schema.sql (100%)
rename {spring-test-mvc => spring-test}/src/test/resources/org/springframework/test/web/client/samples/ludwig.json (100%)
rename {spring-test-mvc => spring-test}/src/test/resources/org/springframework/test/web/servlet/samples/context/root-context.xml (100%)
rename {spring-test-mvc => spring-test}/src/test/resources/org/springframework/test/web/servlet/samples/context/security.xml (100%)
rename {spring-test-mvc => spring-test}/src/test/resources/org/springframework/test/web/servlet/samples/context/servlet-context.xml (100%)
rename {spring-test-mvc => spring-test}/src/test/webapp/WEB-INF/layouts/main.jsp (100%)
rename {spring-test-mvc => spring-test}/src/test/webapp/WEB-INF/layouts/tiles.xml (100%)
rename {spring-test-mvc => spring-test}/src/test/webapp/WEB-INF/readme.txt (100%)
rename {spring-test-mvc => spring-test}/src/test/webapp/WEB-INF/views/tiles.xml (100%)
rename {spring-test-mvc => spring-test}/src/test/webapp/resources/Spring.js (100%)
create mode 100644 spring-tx/src/main/java/org/springframework/transaction/annotation/JtaTransactionAnnotationParser.java
delete mode 100644 spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectUtils.java
delete mode 100644 spring-tx/src/main/java/org/springframework/transaction/jta/OC4JJtaTransactionManager.java
create mode 100644 spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-4.0.xsd
create mode 100644 spring-tx/src/test/resources/log4j.properties
delete mode 100644 spring-tx/src/test/resources/log4j.xml
create mode 100644 spring-web/src/main/java/org/springframework/http/StreamingHttpOutputMessage.java
create mode 100644 spring-web/src/main/java/org/springframework/http/client/AbstractAsyncClientHttpRequest.java
create mode 100644 spring-web/src/main/java/org/springframework/http/client/AbstractBufferingAsyncClientHttpRequest.java
create mode 100644 spring-web/src/main/java/org/springframework/http/client/AsyncClientHttpRequest.java
create mode 100644 spring-web/src/main/java/org/springframework/http/client/AsyncClientHttpRequestFactory.java
delete mode 100644 spring-web/src/main/java/org/springframework/http/client/CommonsClientHttpRequest.java
delete mode 100644 spring-web/src/main/java/org/springframework/http/client/CommonsClientHttpRequestFactory.java
delete mode 100644 spring-web/src/main/java/org/springframework/http/client/CommonsClientHttpResponse.java
create mode 100644 spring-web/src/main/java/org/springframework/http/client/HttpComponentsAsyncClientHttpRequest.java
create mode 100644 spring-web/src/main/java/org/springframework/http/client/HttpComponentsAsyncClientHttpRequestFactory.java
create mode 100644 spring-web/src/main/java/org/springframework/http/client/HttpComponentsAsyncClientHttpResponse.java
create mode 100644 spring-web/src/main/java/org/springframework/http/client/HttpComponentsStreamingClientHttpRequest.java
create mode 100644 spring-web/src/main/java/org/springframework/http/client/SimpleBufferingAsyncClientHttpRequest.java
create mode 100644 spring-web/src/main/java/org/springframework/http/client/SimpleStreamingAsyncClientHttpRequest.java
create mode 100644 spring-web/src/main/java/org/springframework/http/client/support/AsyncHttpAccessor.java
create mode 100644 spring-web/src/main/java/org/springframework/http/server/ServerHttpAsyncRequestControl.java
create mode 100644 spring-web/src/main/java/org/springframework/http/server/ServletServerHttpAsyncRequestControl.java
delete mode 100644 spring-web/src/main/java/org/springframework/remoting/httpinvoker/CommonsHttpInvokerRequestExecutor.java
delete mode 100644 spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortClientInterceptor.java
delete mode 100644 spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortProxyFactoryBean.java
delete mode 100644 spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcServicePostProcessor.java
delete mode 100644 spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcSoapFaultException.java
delete mode 100644 spring-web/src/main/java/org/springframework/remoting/jaxrpc/LocalJaxRpcServiceFactory.java
delete mode 100644 spring-web/src/main/java/org/springframework/remoting/jaxrpc/LocalJaxRpcServiceFactoryBean.java
delete mode 100644 spring-web/src/main/java/org/springframework/remoting/jaxrpc/ServletEndpointSupport.java
delete mode 100644 spring-web/src/main/java/org/springframework/remoting/jaxrpc/package-info.java
create mode 100644 spring-web/src/main/java/org/springframework/web/bind/annotation/RestController.java
create mode 100644 spring-web/src/main/java/org/springframework/web/client/AsyncRequestCallback.java
create mode 100644 spring-web/src/main/java/org/springframework/web/client/AsyncRestOperations.java
create mode 100644 spring-web/src/main/java/org/springframework/web/client/AsyncRestTemplate.java
delete mode 100644 spring-web/src/main/java/org/springframework/web/context/support/ServletContextFactoryBean.java
delete mode 100644 spring-web/src/main/java/org/springframework/web/jsf/DelegatingVariableResolver.java
delete mode 100644 spring-web/src/main/java/org/springframework/web/jsf/SpringBeanVariableResolver.java
delete mode 100644 spring-web/src/main/java/org/springframework/web/jsf/WebApplicationContextVariableResolver.java
create mode 100644 spring-web/src/main/java/org/springframework/web/method/support/CompositeUriComponentsContributor.java
create mode 100644 spring-web/src/main/java/org/springframework/web/method/support/UriComponentsContributor.java
delete mode 100644 spring-web/src/main/java/org/springframework/web/util/ExpressionEvaluationUtils.java
create mode 100644 spring-web/src/test/java/org/springframework/http/client/AbstractAsyncHttpRequestFactoryTestCase.java
create mode 100644 spring-web/src/test/java/org/springframework/http/client/AbstractJettyServerTestCase.java
create mode 100644 spring-web/src/test/java/org/springframework/http/client/BufferedSimpleAsyncHttpRequestFactoryTests.java
delete mode 100644 spring-web/src/test/java/org/springframework/http/client/CommonsHttpRequestFactoryTests.java
create mode 100644 spring-web/src/test/java/org/springframework/http/client/HttpComponentsAsyncClientHttpRequestFactoryTests.java
create mode 100644 spring-web/src/test/java/org/springframework/http/client/StreamingHttpComponentsClientHttpRequestFactoryTests.java
delete mode 100644 spring-web/src/test/java/org/springframework/http/client/support/ProxyFactoryBeanTest.java
create mode 100644 spring-web/src/test/java/org/springframework/http/client/support/ProxyFactoryBeanTests.java
delete mode 100644 spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTest.java
create mode 100644 spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTests.java
create mode 100644 spring-web/src/test/java/org/springframework/mock/web/test/MockSessionCookieConfig.java
delete mode 100644 spring-web/src/test/java/org/springframework/remoting/jaxrpc/JaxRpcSupportTests.java
delete mode 100644 spring-web/src/test/java/org/springframework/tests/web/FreePortScanner.java
delete mode 100644 spring-web/src/test/java/org/springframework/web/accept/AbstractMappingContentNegotiationStrategyTests.java
create mode 100644 spring-web/src/test/java/org/springframework/web/accept/MappingContentNegotiationStrategyTests.java
create mode 100644 spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderIntegrationTests.java
create mode 100644 spring-web/src/test/java/org/springframework/web/client/AbstractJettyServerTestCase.java
create mode 100644 spring-web/src/test/java/org/springframework/web/client/AsyncRestTemplateIntegrationTests.java
delete mode 100644 spring-web/src/test/java/org/springframework/web/filter/HiddenHttpMethodFilterTest.java
create mode 100644 spring-web/src/test/java/org/springframework/web/filter/HiddenHttpMethodFilterTests.java
delete mode 100644 spring-web/src/test/java/org/springframework/web/jsf/DelegatingVariableResolverTests.java
create mode 100644 spring-web/src/test/java/org/springframework/web/method/ControllerAdviceBeanTests.java
delete mode 100644 spring-web/src/test/java/org/springframework/web/util/ExpressionEvaluationUtilsTests.java
create mode 100644 spring-web/src/test/resources/log4j.properties
delete mode 100644 spring-web/src/test/resources/log4j.xml
delete mode 100644 spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractCommandController.java
delete mode 100644 spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractFormController.java
delete mode 100644 spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractWizardFormController.java
delete mode 100644 spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/BaseCommandController.java
delete mode 100644 spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/SimpleFormController.java
delete mode 100644 spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/SimplePortletApplicationContext.java
delete mode 100644 spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/CommandControllerTests.java
create mode 100644 spring-webmvc-portlet/src/test/resources/log4j.properties
delete mode 100644 spring-webmvc-portlet/src/test/resources/log4j.xml
create mode 100644 spring-webmvc/src/main/java/org/springframework/web/servlet/LocaleContextResolver.java
create mode 100644 spring-webmvc/src/main/java/org/springframework/web/servlet/NoHandlerFoundException.java
create mode 100644 spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/PathMatchConfigurer.java
create mode 100644 spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/AbstractLocaleContextResolver.java
delete mode 100644 spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractCommandController.java
delete mode 100644 spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractFormController.java
delete mode 100644 spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractWizardFormController.java
delete mode 100644 spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/BaseCommandController.java
delete mode 100644 spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/CancellableFormController.java
delete mode 100644 spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/SimpleFormController.java
create mode 100644 spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/HttpHeadersReturnValueHandler.java
create mode 100644 spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.java
create mode 100644 spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ArgumentAware.java
create mode 100644 spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ArgumentTag.java
delete mode 100644 spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/SpringTilesApplicationContextFactory.java
create mode 100644 spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/SpringWildcardServletTilesApplicationContext.java
delete mode 100644 spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/AbstractXsltView.java
create mode 100644 spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-4.0.xsd
delete mode 100644 spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/CancellableFormControllerTests.java
delete mode 100644 spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/CommandControllerTests.java
delete mode 100644 spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/FormControllerTests.java
delete mode 100644 spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/WizardFormControllerTests.java
create mode 100644 spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilderTests.java
create mode 100644 spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ArgumentTagTests.java
delete mode 100644 spring-webmvc/src/test/java/org/springframework/web/servlet/view/xslt/TestXsltViewTests.java
create mode 100644 spring-webmvc/src/test/resources/jasperreports.properties
create mode 100644 spring-webmvc/src/test/resources/log4j.properties
delete mode 100644 spring-webmvc/src/test/resources/log4j.xml
create mode 100644 spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-custom-validator-32.xml
create mode 100644 spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-path-matching.xml
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/AbstractWebSocketMessage.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/BinaryMessage.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/CloseStatus.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/PingMessage.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/PongMessage.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/SubProtocolCapable.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/TextMessage.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/WebSocketExtension.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/WebSocketHandler.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/WebSocketHttpHeaders.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/WebSocketMessage.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/WebSocketSession.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/adapter/AbstractWebSocketSession.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/adapter/NativeWebSocketSession.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketHandlerAdapter.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketSession.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/WebSocketToJettyExtensionConfigAdapter.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/package-info.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/adapter/package-info.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/ConvertingEncoderDecoderSupport.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/StandardToWebSocketExtensionAdapter.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/StandardWebSocketHandlerAdapter.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/StandardWebSocketSession.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/WebSocketToStandardExtensionAdapter.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/package-info.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/client/AbstractWebSocketClient.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/client/ConnectionManagerSupport.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/client/WebSocketClient.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/client/WebSocketConnectionManager.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/client/jetty/JettyWebSocketClient.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/client/jetty/package-info.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/client/package-info.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/client/standard/AnnotatedEndpointConnectionManager.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/client/standard/EndpointConnectionManager.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/client/standard/StandardWebSocketClient.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/client/standard/WebSocketContainerFactoryBean.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/client/standard/package-info.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/config/HandlersBeanDefinitionParser.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParser.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/config/WebSocketNamespaceHandler.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/config/WebSocketNamespaceUtils.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/AbstractWebSocketHandlerRegistration.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/AbstractWebSocketMessageBrokerConfigurer.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/DelegatingWebSocketConfiguration.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/DelegatingWebSocketMessageBrokerConfiguration.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/EnableWebSocket.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/EnableWebSocketMessageBroker.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/ServletWebSocketHandlerRegistration.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/ServletWebSocketHandlerRegistry.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/SockJsServiceRegistration.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/StompEndpointRegistry.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/StompWebSocketEndpointRegistration.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebMvcStompEndpointRegistry.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebMvcStompWebSocketEndpointRegistration.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebSocketConfigurationSupport.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebSocketConfigurer.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebSocketHandlerRegistration.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebSocketHandlerRegistry.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebSocketMessageBrokerConfigurationSupport.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebSocketMessageBrokerConfigurer.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebSocketTransportRegistration.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/package-info.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/config/package-info.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/handler/AbstractWebSocketHandler.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/handler/BeanCreatingHandlerProvider.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/handler/BinaryWebSocketHandler.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/handler/ConcurrentWebSocketSessionDecorator.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/handler/ExceptionWebSocketHandlerDecorator.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/handler/LoggingWebSocketHandlerDecorator.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/handler/PerConnectionWebSocketHandler.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/handler/SessionLimitExceededException.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/handler/TextWebSocketHandler.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/handler/WebSocketHandlerDecorator.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/handler/WebSocketSessionDecorator.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/handler/package-info.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/messaging/SessionConnectEvent.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/messaging/SessionConnectedEvent.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/messaging/SessionDisconnectEvent.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/messaging/SubProtocolHandler.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/messaging/SubProtocolWebSocketHandler.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/messaging/package-info.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/package-info.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/server/HandshakeFailureException.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/server/HandshakeHandler.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/server/HandshakeInterceptor.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/server/RequestUpgradeStrategy.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/JettyRequestUpgradeStrategy.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/package-info.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/server/package-info.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/server/standard/AbstractStandardUpgradeStrategy.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/server/standard/GlassFishRequestUpgradeStrategy.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/server/standard/ServerEndpointExporter.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/server/standard/ServerEndpointRegistration.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/server/standard/ServletServerContainerFactoryBean.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/server/standard/SpringConfigurator.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/server/standard/TomcatRequestUpgradeStrategy.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/server/standard/UndertowRequestUpgradeStrategy.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/server/standard/package-info.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/server/support/DefaultHandshakeHandler.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/server/support/HandshakeInterceptorChain.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/server/support/HttpSessionHandshakeInterceptor.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/server/support/WebSocketHttpRequestHandler.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/server/support/package-info.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/sockjs/SockJsException.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/sockjs/SockJsMessageDeliveryException.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/sockjs/SockJsService.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/sockjs/SockJsTransportFailureException.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/sockjs/frame/AbstractSockJsMessageCodec.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/sockjs/frame/DefaultSockJsFrameFormat.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/sockjs/frame/Jackson2SockJsMessageCodec.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/sockjs/frame/SockJsFrame.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/sockjs/frame/SockJsFrameFormat.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/sockjs/frame/SockJsMessageCodec.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/sockjs/frame/package-info.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/sockjs/package-info.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/SockJsHttpRequestHandler.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/package-info.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/SockJsServiceConfig.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/SockJsSession.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/SockJsSessionFactory.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/TransportHandler.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/TransportHandlingSockJsService.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/TransportType.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/AbstractHttpReceivingTransportHandler.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/AbstractHttpSendingTransportHandler.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/AbstractTransportHandler.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/DefaultSockJsService.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/EventSourceTransportHandler.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/HtmlFileTransportHandler.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/JsonpPollingTransportHandler.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/JsonpReceivingTransportHandler.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/SockJsWebSocketHandler.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/WebSocketTransportHandler.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/XhrPollingTransportHandler.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/XhrReceivingTransportHandler.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/XhrStreamingTransportHandler.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/package-info.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/package-info.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractHttpSockJsSession.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractSockJsSession.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/PollingSockJsSession.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/StreamingSockJsSession.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/WebSocketServerSockJsSession.java
create mode 100644 spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/package-info.java
rename {spring-struts => spring-websocket}/src/main/resources/.gitignore (100%)
create mode 100644 spring-websocket/src/main/resources/META-INF/spring.handlers
create mode 100644 spring-websocket/src/main/resources/META-INF/spring.schemas
create mode 100644 spring-websocket/src/main/resources/META-INF/spring.tooling
create mode 100644 spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket-4.0.xsd
copy {spring-context-support/src/main/resources => spring-websocket/src/test/java}/.gitignore (100%)
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/AbstractHttpRequestTests.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/AbstractWebSocketIntegrationTests.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/ContextLoaderTestUtils.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/JettyWebSocketTestServer.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/TextMessageTests.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/TomcatWebSocketTestServer.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/UndertowTestServer.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/WebSocketExtensionTests.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/WebSocketIntegrationTests.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/WebSocketTestServer.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketHandlerAdapterTests.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketSessionTests.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/adapter/standard/ConvertingEncoderDecoderSupportTests.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/adapter/standard/StandardWebSocketHandlerAdapterTests.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/adapter/standard/StandardWebSocketSessionTests.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/client/WebSocketConnectionManagerTests.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/client/jetty/JettyWebSocketClientTests.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/client/standard/StandardWebSocketClientTests.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/config/HandlersBeanDefinitionParserTests.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebMvcStompEndpointRegistrationTests.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebMvcStompEndpointRegistryTests.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketConfigurationTests.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketHandlerRegistrationTests.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketMessageBrokerConfigurationSupportTests.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/handler/BeanCreatingHandlerProviderTests.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/handler/ConcurrentWebSocketSessionDecoratorTests.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/handler/ExceptionWebSocketHandlerDecoratorTests.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/handler/PerConnectionWebSocketHandlerTests.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/handler/TestPrincipal.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/handler/TestWebSocketSession.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/handler/WebSocketHandlerDecoratorTests.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/handler/WebSocketHttpHeadersTests.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompSubProtocolHandlerTests.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompTextMessageBuilder.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompWebSocketIntegrationTests.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/messaging/SubProtocolWebSocketHandlerTests.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/server/DefaultHandshakeHandlerTests.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/server/standard/ServerEndpointExporterTests.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/server/standard/ServerEndpointRegistrationTests.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/server/standard/SpringConfiguratorTests.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/server/support/HandshakeInterceptorChainTests.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/server/support/HttpSessionHandshakeInterceptorTests.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/sockjs/support/SockJsServiceTests.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/TransportTypeTests.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/DefaultSockJsServiceTests.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/HttpReceivingTransportHandlerTests.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/HttpSendingTransportHandlerTests.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/session/AbstractSockJsSessionTests.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/session/HttpSockJsSessionTests.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/session/SockJsSessionTests.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/session/StubSockJsServiceConfig.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/session/TestHttpSockJsSession.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/session/TestSockJsSession.java
create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/session/WebSocketServerSockJsSessionTests.java
create mode 100644 spring-websocket/src/test/resources/log4j.properties
create mode 100644 spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-converters-defaults-off.xml
create mode 100644 spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-converters.xml
create mode 100644 spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-customchannels-default-executor.xml
create mode 100644 spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-customchannels.xml
create mode 100644 spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-relay.xml
create mode 100644 spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-simple.xml
create mode 100644 spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-handlers-attributes.xml
create mode 100644 spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-handlers-sockjs-attributes.xml
create mode 100644 spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-handlers-sockjs.xml
create mode 100644 spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-handlers.xml
create mode 100644 src/asciidoc/Guardfile
create mode 100644 src/asciidoc/appendix.adoc
rename src/{reference/docbook => asciidoc}/images/DataAccessException.gif (100%)
rename src/{reference/docbook => asciidoc}/images/aop-proxy-call.png (100%)
rename src/{reference/docbook => asciidoc}/images/aop-proxy-plain-pojo-call.png (100%)
rename src/{reference/docbook => asciidoc}/images/aop-uml.gif (100%)
rename src/{reference/docbook => asciidoc}/images/bean-lifecycle-overview.gif (100%)
rename src/{reference/docbook => asciidoc}/images/bind1.jpg (100%)
rename src/{reference/docbook => asciidoc}/images/bind2.jpg (100%)
rename src/{reference/docbook => asciidoc}/images/container-magic.png (100%)
rename src/{reference/docbook => asciidoc}/images/eclipse-setup-1.png (100%)
rename src/{reference/docbook => asciidoc}/images/eclipse-setup-2.png (100%)
rename src/{reference/docbook => asciidoc}/images/eclipse-setup-3.png (100%)
rename src/{reference/docbook => asciidoc}/images/ejb.gif (100%)
rename src/{reference/docbook => asciidoc}/images/ejb.png (100%)
rename src/{reference/docbook => asciidoc}/images/ejb.svg (100%)
rename src/{reference/docbook => asciidoc}/images/full.gif (100%)
rename src/{reference/docbook => asciidoc}/images/full.png (100%)
rename src/{reference/docbook => asciidoc}/images/full.svg (100%)
rename src/{reference/docbook => asciidoc}/images/idea-setup-1.png (100%)
rename src/{reference/docbook => asciidoc}/images/idea-setup-2.png (100%)
rename src/{reference/docbook => asciidoc}/images/idea-setup-3.png (100%)
rename src/{reference/docbook => asciidoc}/images/idea-setup-4.png (100%)
rename src/{reference/docbook => asciidoc}/images/idea-setup-5.png (100%)
rename src/{reference/docbook => asciidoc}/images/idea-setup-6.png (100%)
rename src/{reference/docbook => asciidoc}/images/mvc-contexts.gif (100%)
rename src/{reference/docbook => asciidoc}/images/mvc.png (100%)
rename src/{reference/docbook => asciidoc}/images/overview-ejb.graffle (100%)
rename src/{reference/docbook => asciidoc}/images/overview-ejb.png (100%)
rename src/{reference/docbook => asciidoc}/images/overview-full.graffle (100%)
rename src/{reference/docbook => asciidoc}/images/overview-full.png (100%)
rename src/{reference/docbook => asciidoc}/images/overview-remoting.graffle (100%)
rename src/{reference/docbook => asciidoc}/images/overview-remoting.png (100%)
rename src/{reference/docbook => asciidoc}/images/overview-thirdparty-web.graffle (100%)
rename src/{reference/docbook => asciidoc}/images/overview-thirdparty-web.png (100%)
rename src/{reference/docbook => asciidoc}/images/oxm-exceptions.graffle (100%)
rename src/{reference/docbook => asciidoc}/images/oxm-exceptions.png (100%)
rename src/{reference/docbook => asciidoc}/images/prototype.png (100%)
rename src/{reference/docbook => asciidoc}/images/remoting.gif (100%)
rename src/{reference/docbook => asciidoc}/images/remoting.png (100%)
rename src/{reference/docbook => asciidoc}/images/remoting.svg (100%)
rename src/{reference/docbook => asciidoc}/images/singleton.png (100%)
rename src/{reference/docbook => asciidoc}/images/spring-overview.gif (100%)
rename src/{reference/docbook => asciidoc}/images/spring-overview.graffle (100%)
create mode 100644 src/asciidoc/images/spring-overview.png
rename src/{reference/docbook => asciidoc}/images/spring-overview.svg (100%)
rename src/{reference/docbook => asciidoc}/images/spring-overview.vsd (100%)
rename src/{reference/docbook => asciidoc}/images/spring.sxd (100%)
rename src/{reference/docbook => asciidoc}/images/thirdparty-web.gif (100%)
rename src/{reference/docbook => asciidoc}/images/thirdparty-web.png (100%)
rename src/{reference/docbook => asciidoc}/images/thirdparty-web.svg (100%)
rename src/{reference/docbook => asciidoc}/images/tx.png (100%)
rename src/{reference/docbook => asciidoc}/images/tx_prop_required.png (100%)
rename src/{reference/docbook => asciidoc}/images/tx_prop_requires_new.png (100%)
create mode 100644 src/asciidoc/index-docinfo.xml
create mode 100644 src/asciidoc/index.adoc
delete mode 100644 src/dist/changelog.txt
create mode 100644 src/idea/spring-framework.xml
delete mode 100644 src/reference/docbook/aop-api.xml
delete mode 100644 src/reference/docbook/aop.xml
delete mode 100644 src/reference/docbook/beans-annotation-config.xml
delete mode 100644 src/reference/docbook/beans-classpath-scanning.xml
delete mode 100644 src/reference/docbook/beans-context-additional.xml
delete mode 100644 src/reference/docbook/beans-customizing.xml
delete mode 100644 src/reference/docbook/beans-dependencies.xml
delete mode 100644 src/reference/docbook/beans-extension-points.xml
delete mode 100644 src/reference/docbook/beans-java.xml
delete mode 100644 src/reference/docbook/beans-scopes.xml
delete mode 100644 src/reference/docbook/beans-standard-annotations.xml
delete mode 100644 src/reference/docbook/beans.xml
delete mode 100644 src/reference/docbook/cache.xml
delete mode 100644 src/reference/docbook/cci.xml
delete mode 100644 src/reference/docbook/classic-aop-spring.xml
delete mode 100644 src/reference/docbook/classic-spring.xml
delete mode 100644 src/reference/docbook/dao.xml
delete mode 100644 src/reference/docbook/dynamic-languages.xml
delete mode 100644 src/reference/docbook/ejb.xml
delete mode 100644 src/reference/docbook/expressions.xml
delete mode 100644 src/reference/docbook/images/spring-overview.png
delete mode 100644 src/reference/docbook/index.xml
delete mode 100644 src/reference/docbook/jdbc.xml
delete mode 100644 src/reference/docbook/jms.xml
delete mode 100644 src/reference/docbook/jmx.xml
delete mode 100644 src/reference/docbook/mail.xml
delete mode 100644 src/reference/docbook/migration-3.1.xml
delete mode 100644 src/reference/docbook/migration-3.2.xml
delete mode 100644 src/reference/docbook/mvc.xml
delete mode 100644 src/reference/docbook/new-in-3.0.xml
delete mode 100644 src/reference/docbook/new-in-3.1.xml
delete mode 100644 src/reference/docbook/new-in-3.2.xml
delete mode 100644 src/reference/docbook/orm.xml
delete mode 100644 src/reference/docbook/overview.xml
delete mode 100644 src/reference/docbook/oxm.xml
delete mode 100644 src/reference/docbook/portlet.xml
delete mode 100644 src/reference/docbook/preface.xml
delete mode 100644 src/reference/docbook/remoting.xml
delete mode 100644 src/reference/docbook/resources.xml
delete mode 100644 src/reference/docbook/scheduling.xml
delete mode 100644 src/reference/docbook/spring-form.tld.xml
delete mode 100644 src/reference/docbook/spring.tld.xml
delete mode 100644 src/reference/docbook/swf-sidebar.xml
delete mode 100644 src/reference/docbook/testing.xml
delete mode 100644 src/reference/docbook/transaction.xml
delete mode 100644 src/reference/docbook/validation.xml
delete mode 100644 src/reference/docbook/view.xml
delete mode 100644 src/reference/docbook/web-integration.xml
delete mode 100644 src/reference/docbook/xml-custom.xml
delete mode 100644 src/reference/docbook/xsd-configuration.xml
create mode 100644 src/test/resources/log4j.properties
delete mode 100644 src/test/resources/log4j.xml
--
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