[libspring-java] 02/05: Merge tag 'upstream/4.3.4'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri Nov 11 22:34:48 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository libspring-java.
commit 156c4ff870232ad589229d5c336861f9b43cdbf5
Merge: 4461ffa 0591d26
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Fri Nov 11 22:59:28 2016 +0100
Merge tag 'upstream/4.3.4'
Upstream version 4.3.4
build.gradle | 46 +-
gradle.properties | 2 +-
.../BeanFactoryAspectInstanceFactory.java | 15 +-
...azySingletonAspectInstanceFactoryDecorator.java | 12 +-
.../MetadataAwareAspectInstanceFactory.java | 2 +-
...ctInterceptorDrivenBeanDefinitionDecorator.java | 4 +-
.../interceptor/CustomizableTraceInterceptor.java | 4 +-
.../AbstractBeanFactoryPointcutAdvisor.java | 28 +-
.../aop/support/AbstractRegexpMethodPointcut.java | 7 +-
.../dynamic/AbstractRefreshableTargetSource.java | 4 +-
.../aop/scope/ScopedProxyAutowireTests.java | 10 +-
.../factory/groovy/GroovyBeanDefinitionReader.java | 4 +-
.../beans/TypeConverterDelegate.java | 8 +-
.../beans/TypeMismatchException.java | 12 +-
.../springframework/beans/factory/BeanFactory.java | 52 +-
.../factory/BeanNotOfRequiredTypeException.java | 5 +-
.../factory/NoSuchBeanDefinitionException.java | 57 +-
.../AutowiredAnnotationBeanPostProcessor.java | 93 +-
.../InitDestroyAnnotationBeanPostProcessor.java | 3 +-
.../RequiredAnnotationBeanPostProcessor.java | 5 +-
.../InstantiationAwareBeanPostProcessor.java | 5 +-
...InstantiationAwareBeanPostProcessorAdapter.java | 5 +-
.../beans/factory/config/Scope.java | 7 +-
.../beans/factory/config/YamlMapFactoryBean.java | 23 +-
.../beans/factory/config/YamlProcessor.java | 20 +-
.../factory/config/YamlPropertiesFactoryBean.java | 29 +-
.../AbstractAutowireCapableBeanFactory.java | 54 +-
.../beans/factory/support/AbstractBeanFactory.java | 52 +-
.../support/DefaultListableBeanFactory.java | 13 +-
.../support/DefaultSingletonBeanRegistry.java | 2 +-
.../beans/factory/xml/UtilNamespaceHandler.java | 3 +-
.../factory/DefaultListableBeanFactoryTests.java | 4 +-
.../factory/config/YamlMapFactoryBeanTests.java | 51 +-
.../beans/factory/config/YamlProcessorTests.java | 42 +-
.../config/YamlPropertiesFactoryBeanTests.java | 42 +-
.../cache/ehcache/EhCacheCache.java | 4 +-
.../scheduling/quartz/SchedulerFactoryBean.java | 2 +
.../annotation/AnnotationCacheOperationSource.java | 11 +-
.../annotation/SpringCacheAnnotationParser.java | 8 +-
.../cache/concurrent/ConcurrentMapCache.java | 2 +-
.../cache/interceptor/CacheAspectSupport.java | 36 +-
.../springframework/cache/support/NoOpCache.java | 92 +
.../cache/support/NoOpCacheManager.java | 58 -
...lassPathScanningCandidateComponentProvider.java | 2 +-
.../annotation/ConfigurationClassParser.java | 21 +-
...ContextAnnotationAutowireCandidateResolver.java | 2 +-
.../context/annotation/Primary.java | 31 +-
...bstractPropertyLoadingBeanDefinitionParser.java | 6 +-
.../PropertyOverrideBeanDefinitionParser.java | 7 +-
.../PropertyPlaceholderBeanDefinitionParser.java | 5 +-
.../context/event/EventListener.java | 15 +-
.../event/SimpleApplicationEventMulticaster.java | 9 +-
.../support/AbstractApplicationContext.java | 7 +-
.../support/ApplicationListenerDetector.java | 120 +
.../context/support/DefaultLifecycleProcessor.java | 6 +-
.../context/support/LiveBeansView.java | 15 +-
.../support/PostProcessorRegistrationDelegate.java | 81 +-
.../ReloadableResourceBundleMessageSource.java | 6 +-
.../context/support/StaticMessageSource.java | 6 +-
.../support/FormattingConversionService.java | 9 +-
.../scheduling/annotation/Async.java | 18 +-
.../scheduling/annotation/EnableAsync.java | 23 +-
.../validation/AbstractPropertyBindingResult.java | 4 +-
.../beanvalidation/SpringValidatorAdapter.java | 4 +-
...plicationContextDynamicBeanPropertyTests.groovy | 3 +-
.../xml/support/CustomNamespaceHandlerTests.java | 33 +-
.../org/springframework/cache/CacheReproTests.java | 45 +
.../AnnotationCacheOperationSourceTests.java | 54 +-
.../AnnotationConfigApplicationContextTests.java | 4 +-
.../config/ContextNamespaceHandlerTests.java | 50 +
.../event/ApplicationContextEventTests.java | 52 +-
.../ApplicationListenerMethodAdapterTests.java | 132 +-
.../support/BeanFactoryPostProcessorTests.java | 70 +-
.../context/support/LiveBeansViewTests.java | 121 +
...ormattingConversionServiceFactoryBeanTests.java | 26 +-
.../support/FormattingConversionServiceTests.java | 126 +-
...tNamespaceHandlerTests-location-placeholder.xml | 22 +
.../main/java/org/springframework/asm/Type.java | 4 +-
.../springframework/core/CollectionFactory.java | 25 +-
.../java/org/springframework/core/Conventions.java | 13 +-
.../org/springframework/core/ResolvableType.java | 4 +-
.../core/annotation/AnnotationUtils.java | 7 +-
.../core/convert/TypeDescriptor.java | 142 +-
.../core/convert/converter/ConverterFactory.java | 4 +-
.../core/convert/converter/ConverterRegistry.java | 6 +-
.../convert/support/GenericConversionService.java | 31 +-
.../convert/support/ObjectToObjectConverter.java | 1 +
.../springframework/core/io/ResourceLoader.java | 12 +-
.../core/io/support/EncodedResource.java | 5 +-
.../AnnotationReadingVisitorUtils.java | 4 +-
.../java/org/springframework/util/ClassUtils.java | 21 +-
.../org/springframework/util/CollectionUtils.java | 8 +-
.../org/springframework/util/InstanceFilter.java | 10 +-
.../org/springframework/util/ReflectionUtils.java | 2 +
.../springframework/util/StringValueResolver.java | 9 +-
.../java/org/springframework/util/TypeUtils.java | 14 +-
.../springframework/core/ResolvableTypeTests.java | 15 +-
.../DefaultConversionServiceTests.java | 21 +-
.../support/GenericConversionServiceTests.java | 8 +-
.../org/springframework/tests/MockitoUtils.java | 23 +-
.../springframework/tests/TestResourceUtils.java | 15 +-
.../util/xml/AbstractStaxXMLReaderTestCase.java | 52 +-
.../util/xml/StaxEventXMLReaderTests.java | 9 +-
.../util/xml/StaxStreamXMLReaderTests.java | 9 +-
.../springframework/expression/spel/CodeFlow.java | 71 +-
.../expression/spel/ast/FunctionReference.java | 6 +-
.../springframework/expression/spel/ast/OpEQ.java | 105 +-
.../springframework/expression/spel/ast/OpNE.java | 87 +-
.../expression/spel/ast/Operator.java | 66 +-
.../expression/spel/ast/OperatorInstanceof.java | 2 +-
.../spel/ast/PropertyOrFieldReference.java | 12 +-
.../spel/support/StandardTypeLocator.java | 2 +-
.../spel/SpelCompilationCoverageTests.java | 2465 +++++++++++---------
.../jdbc/core/BeanPropertyRowMapper.java | 6 +-
.../springframework/jdbc/core/JdbcTemplate.java | 4 +-
.../core/metadata/GenericCallMetaDataProvider.java | 8 +-
.../metadata/GenericTableMetaDataProvider.java | 4 +-
.../core/support/JdbcBeanDefinitionReader.java | 4 +-
.../datasource/DataSourceTransactionManager.java | 20 +-
.../datasource/init/DatabasePopulatorUtils.java | 9 +-
.../datasource/init/ResourceDatabasePopulator.java | 41 +-
.../init/ResourceDatabasePopulatorTests.java | 16 +-
.../jdbc/datasource/init/ScriptUtilsUnitTests.java | 48 +-
.../converter/MappingJackson2MessageConverter.java | 2 +-
.../springframework/messaging/MessageChannel.java | 4 +-
.../support/MessageMethodArgumentResolver.java | 22 +-
.../handler/invocation/InvocableHandlerMethod.java | 11 +-
.../support/SendToMethodReturnValueHandler.java | 64 +-
.../simp/config/AbstractBrokerRegistration.java | 7 +-
.../simp/stomp/BufferingStompDecoder.java | 95 +-
.../messaging/simp/stomp/StompClientSupport.java | 34 +-
.../messaging/simp/stomp/StompDecoder.java | 3 +-
.../messaging/simp/stomp/StompEncoder.java | 28 +-
.../messaging/simp/stomp/StompHeaderAccessor.java | 26 +-
.../simp/user/MultiServerUserRegistry.java | 2 +-
.../messaging/support/MessageHeaderAccessor.java | 2 +-
.../MessageMethodArgumentResolverTests.java | 4 +-
.../SimpAnnotationMethodMessageHandlerTests.java | 22 +-
.../simp/stomp/DefaultStompSessionTests.java | 5 +-
.../orm/hibernate5/LocalSessionFactoryBean.java | 9 +
.../DefaultPersistenceUnitManager.java | 4 +-
.../transaction/TestContextTransactionUtils.java | 5 +-
.../web/servlet/DispatcherServletCustomizer.java | 37 +
.../test/web/servlet/MockMvcBuilderSupport.java | 35 +-
.../web/servlet/setup/AbstractMockMvcBuilder.java | 20 +-
.../support/TestPropertySourceUtilsTests.java | 1 -
.../htmlunit/DelegatingWebConnectionTests.java | 16 +-
.../WebConnectionHtmlUnitDriverTests.java | 2 +-
.../context/AsyncControllerJavaConfigTests.java | 9 +-
.../servlet/setup/DefaultMockMvcBuilderTests.java | 32 +
.../transaction/TransactionStatus.java | 6 +-
.../annotation/JtaTransactionAnnotationParser.java | 5 +-
...AbstractFallbackTransactionAttributeSource.java | 40 +-
.../interceptor/DefaultTransactionAttribute.java | 29 +-
.../interceptor/TransactionAspectSupport.java | 21 +-
.../interceptor/MapTransactionAttributeSource.java | 8 +-
.../java/org/springframework/http/HttpHeaders.java | 17 +-
.../client/AbstractAsyncClientHttpRequest.java | 9 +-
.../HttpComponentsAsyncClientHttpRequest.java | 35 +-
.../HttpComponentsAsyncClientHttpResponse.java | 6 +-
.../client/HttpComponentsClientHttpRequest.java | 16 +-
.../client/HttpComponentsClientHttpResponse.java | 8 +-
.../HttpComponentsStreamingClientHttpRequest.java | 15 +-
.../http/client/Netty4ClientHttpRequest.java | 68 +-
.../client/Netty4ClientHttpRequestFactory.java | 84 +-
.../http/client/Netty4ClientHttpResponse.java | 3 +-
.../http/client/OkHttp3AsyncClientHttpRequest.java | 2 +-
.../http/client/OkHttp3ClientHttpRequest.java | 2 +-
.../http/client/OkHttpAsyncClientHttpRequest.java | 2 +-
.../http/client/OkHttpClientHttpRequest.java | 2 +-
.../ResourceRegionHttpMessageConverter.java | 4 +-
.../remoting/caucho/HessianExporter.java | 4 +-
.../web/bind/annotation/CrossOrigin.java | 22 +-
.../web/client/HttpClientErrorException.java | 30 +-
.../web/client/HttpServerErrorException.java | 37 +-
.../web/cors/CorsConfiguration.java | 138 +-
.../web/filter/AbstractRequestLoggingFilter.java | 4 +
.../web/method/support/InvocableHandlerMethod.java | 11 +-
.../web/util/UriComponentsBuilder.java | 9 +-
.../AbstractAsyncHttpRequestFactoryTestCase.java | 12 +-
.../ResourceHttpMessageConverterTests.java | 14 +-
.../web/client/AbstractJettyServerTestCase.java | 70 +-
.../web/cors/CorsConfigurationTests.java | 42 +-
.../web/util/UriComponentsBuilderTests.java | 145 +-
.../web/servlet/FrameworkServlet.java | 2 +-
.../springframework/web/servlet/ModelAndView.java | 4 +-
.../servlet/config/CorsBeanDefinitionParser.java | 37 +-
.../config/annotation/CorsRegistration.java | 74 +-
.../config/annotation/ResourceHandlerRegistry.java | 3 +-
...ractMessageConverterMethodArgumentResolver.java | 4 +-
.../ExceptionHandlerExceptionResolver.java | 12 +-
.../annotation/HttpEntityMethodProcessor.java | 37 +-
.../annotation/RequestMappingHandlerMapping.java | 17 +-
.../annotation/ResponseEntityExceptionHandler.java | 20 +-
.../annotation/ServletInvocableHandlerMethod.java | 9 +-
.../support/DefaultHandlerExceptionResolver.java | 8 +-
.../servlet/resource/AbstractVersionStrategy.java | 8 +-
.../resource/ResourceHttpRequestHandler.java | 40 +-
.../springframework/web/servlet/tags/UrlTag.java | 2 +-
.../servlet/view/AbstractCachingViewResolver.java | 2 +-
.../view/ContentNegotiatingViewResolver.java | 2 +-
.../view/groovy/GroovyMarkupViewResolver.java | 2 +-
.../web/servlet/DispatcherServletTests.java | 1 -
.../web/servlet/config/MvcNamespaceTests.java | 4 +-
.../HttpEntityMethodProcessorMockTests.java | 255 +-
...vletAnnotationControllerHandlerMethodTests.java | 26 +
.../resource/ResourceHttpRequestHandlerTests.java | 6 -
.../web/socket/client/AbstractWebSocketClient.java | 27 +-
.../socket/messaging/StompSubProtocolHandler.java | 21 +-
.../server/support/OriginHandshakeInterceptor.java | 4 +-
.../socket/sockjs/client/AbstractXhrTransport.java | 4 +-
.../socket/sockjs/transport/TransportHandler.java | 12 +-
.../transport/TransportHandlingSockJsService.java | 8 +
.../AbstractHttpReceivingTransportHandler.java | 7 +-
.../handler/AbstractTransportHandler.java | 7 +-
.../handler/EventSourceTransportHandler.java | 7 +
.../handler/HtmlFileTransportHandler.java | 7 +
.../handler/JsonpPollingTransportHandler.java | 6 +
.../handler/WebSocketTransportHandler.java | 7 +-
.../handler/XhrPollingTransportHandler.java | 7 +
.../handler/XhrStreamingTransportHandler.java | 7 +
.../session/AbstractHttpSockJsSession.java | 19 +-
.../transport/session/AbstractSockJsSession.java | 12 +-
.../messaging/StompSubProtocolHandlerTests.java | 23 +-
.../messaging/WebSocketStompClientTests.java | 21 +-
.../handler/DefaultSockJsServiceTests.java | 5 +-
.../handler/HttpSendingTransportHandlerTests.java | 12 +-
.../transport/session/SockJsSessionTests.java | 25 +-
src/asciidoc/core-beans.adoc | 110 +-
src/asciidoc/data-access.adoc | 4 +-
src/asciidoc/integration.adoc | 44 +-
src/asciidoc/web-mvc.adoc | 3 +-
232 files changed, 4642 insertions(+), 3286 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libspring-java.git
More information about the pkg-java-commits
mailing list