Merge branch 'master' of https://github.com/apache/cxf
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/cb14bf9a Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/cb14bf9a Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/cb14bf9a Branch: refs/heads/master Commit: cb14bf9ac392a7936aff08d7e54dd12720f8e733 Parents: 8f38958 7fab624 Author: Andy McCright <and...@us.ibm.com> Authored: Thu Apr 27 15:57:26 2017 -0500 Committer: Andy McCright <and...@us.ibm.com> Committed: Thu Apr 27 15:57:26 2017 -0500 ---------------------------------------------------------------------- .../cxf/attachment/ImageDataContentHandler.java | 4 +- .../cxf/common/jaxb/JAXBContextCache.java | 5 +- .../org/apache/cxf/common/util/CacheMap.java | 2 +- .../apache/cxf/configuration/jsse/SSLUtils.java | 16 +- .../jsse/TLSParameterJaxBUtils.java | 10 +- .../java/org/apache/cxf/helpers/FileUtils.java | 3 +- .../java/org/apache/cxf/helpers/IOUtils.java | 6 +- .../helpers/LoadingByteArrayOutputStream.java | 14 +- .../org/apache/cxf/io/CachedOutputStream.java | 10 +- .../java/org/apache/cxf/io/CachedWriter.java | 6 +- .../org/apache/cxf/resource/URIResolver.java | 4 +- .../org/apache/cxf/staxutils/StaxUtils.java | 4 +- .../apache/cxf/common/util/CacheMapTest.java | 3 + .../src/main/resources/application.yml | 2 + .../java/demo/jms_greeter/client/Client.java | 9 +- distribution/src/main/release/samples/pom.xml | 2 +- .../maven_plugin/wsdl2java/WSDL2JavaMojo.java | 7 +- .../maven_plugin/javatowadl/DumpJavaDoc.java | 12 +- .../javatowadl/ResourceMapJavaDocProvider.java | 10 +- osgi/itests/pom.xml | 95 +-- .../osgi/itests/BundlesAndNamespacesTest.java | 7 +- .../cxf/osgi/itests/CXFOSGiTestSupport.java | 222 +------ osgi/itests/src/test/resources/log4j.properties | 5 + parent/pom.xml | 12 +- pom.xml | 4 +- .../cxf/binding/corba/utils/OrbConfig.java | 5 +- .../cxf/jaxrs/AbstractJAXRSFactoryBean.java | 4 +- .../cxf/jaxrs/provider/BinaryDataProvider.java | 11 +- .../cxf/jaxrs/provider/MultipartProvider.java | 4 +- .../AbstractSpringComponentScanServer.java | 151 +++-- .../AbstractSpringConfigurationFactory.java | 7 +- .../endpoint/dynamic/DynamicClientFactory.java | 10 +- .../persistence/FilesystemExchangeDataDAO.java | 5 +- rt/rs/client/pom.xml | 7 +- .../jaxrs/client/logging/RESTLoggingTest.java | 110 ++-- .../swagger/DefaultSwagger2Serializers.java | 8 +- .../cxf/jaxrs/swagger/Swagger2Feature.java | 5 +- .../cxf/jaxrs/json/basic/JsonMapObject.java | 9 + .../security/jose/jws/JwsCompactConsumer.java | 1 + .../cxf/rs/security/oauth2/common/Client.java | 11 +- .../filters/AccessTokenIntrospectionClient.java | 2 + .../oauth2/filters/JwtAccessTokenValidator.java | 12 +- .../oauth2/filters/OAuthRequestFilter.java | 4 +- .../code/AuthorizationCodeGrantHandler.java | 1 - .../provider/AbstractOAuthDataProvider.java | 13 +- .../DefaultEHCacheOAuthDataProvider.java | 42 +- .../oauth2/provider/OAuthJSONProvider.java | 19 +- .../services/DynamicRegistrationService.java | 39 +- .../rs/security/oauth2/utils/EHCacheUtil.java | 42 ++ .../rs/security/oauth2/utils/JwtTokenUtils.java | 16 +- .../security/oauth2/utils/OAuthConstants.java | 11 +- .../http_undertow/UndertowHTTPDestination.java | 7 +- .../http_undertow/UndertowHTTPHandler.java | 6 + .../httpclient/PublicSuffixMatcherLoader.java | 4 +- rt/transports/jms/pom.xml | 8 +- .../apache/cxf/transport/jms/JMSConduit.java | 2 +- .../apache/cxf/transport/jms/JMSConstants.java | 18 +- .../cxf/transport/jms/JMSDestination.java | 9 +- .../transport/jms/JMSMessageHeadersType.java | 245 ++++++-- .../cxf/transport/jms/JMSMessageUtils.java | 381 +++--------- .../cxf/transport/jms/JMSPropertyType.java | 26 +- .../transport/jms/SecurityContextFactory.java | 75 +++ .../transport/jms/spec/JMSSpecConstants.java | 5 +- .../util/PollingMessageListenerContainer.java | 93 +-- .../cxf/transport/jms/JMSDestinationTest.java | 7 +- .../cxf/transport/jms/JMSHeaderTypeTest.java | 73 +++ .../transport/jms/util/MessageListenerTest.java | 72 ++- rt/transports/websocket/pom.xml | 6 + .../websocket/WebSocketDestinationFactory.java | 98 ++- .../AtmosphereWebSocketUndertowDestination.java | 294 +++++++++ .../undertow/ByteBufferInputStream.java | 51 ++ .../undertow/UndertowWebSocketDestination.java | 232 ++++++++ .../WebSocketUndertowServletRequest.java | 593 +++++++++++++++++++ .../WebSocketUndertowServletResponse.java | 392 ++++++++++++ .../x509/repo/file/FileCertificateRepo.java | 24 +- .../security/oauth2/tls/JAXRSOAuth2TlsTest.java | 166 +++++- .../oauth2/tls/OAuthDataProviderImpl.java | 1 + .../oauth2/tls/OAuthDataProviderImplJwt.java | 44 ++ .../oidc/OIDCDynamicRegistrationTest.java | 47 ++ .../jaxrs/security/oauth2/tls/client2.xml | 38 ++ .../jaxrs/security/oauth2/tls/serverTls.xml | 172 +++++- .../cxf/systest/jms/JMSClientServerTest.java | 20 +- .../cxf/systest/jms/TwoWayJMSImplBase.java | 17 +- .../systest/jms/security/TwoWayJMSImplBase.java | 23 +- systests/transport-undertow/pom.xml | 61 ++ .../systest/http_undertow/websocket/Book.java | 123 ++++ .../websocket/BookNotFoundDetails.java | 36 ++ .../websocket/BookNotFoundFault.java | 41 ++ .../websocket/BookServerWebSocket.java | 83 +++ .../websocket/BookStorePerRequest.java | 129 ++++ .../websocket/BookStoreWebSocket.java | 186 ++++++ .../http_undertow/websocket/Chapter.java | 106 ++++ ...RSClientServerWebSocketNoAtmosphereTest.java | 51 ++ ...ntServerWebSocketSpringNoAtmosphereTest.java | 52 ++ .../JAXRSClientServerWebSocketSpringTest.java | 48 ++ .../JAXRSClientServerWebSocketTest.java | 482 +++++++++++++++ .../JAXRSClientServerWebSocketTest.java.bak | 438 ++++++++++++++ .../http_undertow/websocket/SuperBook.java | 45 ++ .../websocket/SuperBookInterface.java | 23 + .../websocket/WebSocketTestClient.java | 329 ++++++++++ .../resources/jaxrs_websocket/WEB-INF/beans.xml | 54 ++ .../resources/jaxrs_websocket/WEB-INF/web.xml | 41 ++ .../jaxrs_websocket/beans-embedded.xml | 48 ++ .../jaxrs_websocket/beans-embedded2.xml | 48 ++ .../systest/ws/rm/WSRMPolicyResolveTest.java | 2 +- .../systest/ws/policy/RM10PolicyWsdlTest.java | 40 +- .../cxf/testutil/common/ServerLauncher.java | 12 +- .../org/apache/cxf/tools/common/ClassUtils.java | 9 +- .../org/apache/cxf/tools/util/JAXBUtils.java | 13 +- .../cxf/tools/util/OutputStreamCreator.java | 4 +- .../apache/cxf/tools/util/ToolsStaxUtils.java | 8 +- .../cxf/tools/corba/common/SchemaFactory.java | 9 +- .../tools/corba/common/WSDLCorbaFactory.java | 9 +- .../corba/utils/FileOutputStreamFactory.java | 7 +- .../java2js/processor/JavaToJSProcessor.java | 9 +- .../generator/wsdl11/WSDL11Generator.java | 4 +- .../tools/wadlto/jaxb/CustomizationParser.java | 4 +- .../cxf/tools/wadlto/jaxrs/SourceGenerator.java | 4 +- .../cxf/tools/wsdlto/WSDLToJavaContainer.java | 11 +- .../databinding/jaxb/JAXBDataBinding.java | 7 +- .../javascript/WSDLToJavaScriptProcessor.java | 9 +- .../customization/CustomizationParser.java | 4 +- .../misc/processor/XSDToWSDLProcessor.java | 5 +- 123 files changed, 5679 insertions(+), 1187 deletions(-) ----------------------------------------------------------------------
