Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/cc3565f3 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/cc3565f3 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/cc3565f3 Branch: refs/heads/master Commit: cc3565f3e7737d6e4b048de5a14374afe1e8db54 Parents: 9ef150d 233faae Author: Sergey Beryozkin <[email protected]> Authored: Thu Aug 17 09:50:08 2017 +0100 Committer: Sergey Beryozkin <[email protected]> Committed: Thu Aug 17 09:50:08 2017 +0100 ---------------------------------------------------------------------- .../apache/cxf/common/util/Base64Utility.java | 3 +- .../cxf/common/xmlschema/XmlSchemaUtils.java | 1 - .../AbstractOutDatabindingInterceptor.java | 4 +- .../interceptor/AttachmentOutInterceptor.java | 2 +- .../interceptor/OneWayProcessorInterceptor.java | 5 +- .../security/DefaultSecurityContext.java | 2 - .../org/apache/cxf/message/MessageUtils.java | 5 +- .../staxutils/transform/InTransformReader.java | 1 - .../ws/addressing/EndpointReferenceUtils.java | 5 - .../samples/jax_rs/description_swagger2/pom.xml | 2 +- .../jax_rs/spring_boot_scan/application/pom.xml | 2 +- .../rs/service/SampleRestApplication.java | 14 + .../src/main/resources/application.yml | 4 +- .../apache/cxf/binding/corba/CorbaConduit.java | 2 +- .../cxf/binding/corba/CorbaDestination.java | 1 - .../apache/cxf/binding/corba/CorbaMessage.java | 2 - .../CorbaStreamFaultInInterceptor.java | 2 - .../corba/runtime/CorbaObjectReader.java | 3 +- .../corba/runtime/CorbaObjectWriter.java | 3 +- .../corba/types/CorbaExceptionHandler.java | 2 - .../binding/corba/types/CorbaHandlerUtils.java | 2 +- .../cxf/binding/corba/utils/CorbaUtils.java | 2 - .../apache/cxf/jaxrs/impl/HttpHeadersImpl.java | 4 +- .../cxf/jaxrs/impl/MediaTypeHeaderProvider.java | 2 +- .../org/apache/cxf/jaxrs/impl/ResponseImpl.java | 2 +- .../org/apache/cxf/jaxrs/impl/UriInfoImpl.java | 4 +- .../jaxrs/interceptor/JAXRSInInterceptor.java | 4 +- .../jaxrs/interceptor/JAXRSOutInterceptor.java | 5 +- .../cxf/jaxrs/provider/BinaryDataProvider.java | 4 +- .../cxf/jaxrs/provider/MultipartProvider.java | 8 +- .../cxf/jaxrs/provider/ProviderFactory.java | 2 +- .../security/KerberosAuthenticationFilter.java | 4 +- .../jaxrs/servlet/CXFNonSpringJaxrsServlet.java | 4 +- .../apache/cxf/jaxrs/utils/ExceptionUtils.java | 8 +- .../apache/cxf/jaxrs/utils/InjectionUtils.java | 3 +- .../org/apache/cxf/jaxrs/utils/JAXRSUtils.java | 5 +- .../apache/cxf/jaxrs/client/AbstractClient.java | 7 +- .../cxf/jaxrs/provider/json/JSONProvider.java | 6 +- .../search/AbstractSearchConditionParser.java | 3 +- .../cxf/jaxrs/ext/search/SearchContextImpl.java | 4 +- .../cxf/jaxrs/ext/search/fiql/FiqlParser.java | 4 +- .../oauth/filters/OAuthServletFilter.java | 4 +- .../cxf/rs/security/oauth/utils/OAuthUtils.java | 6 +- .../oauth2/filters/OAuthRequestFilter.java | 4 +- .../http/asyncclient/AsyncHTTPConduit.java | 5 +- .../http/netty/client/NettyHttpConduit.java | 5 +- .../transport/http/AbstractHTTPDestination.java | 2 +- .../apache/cxf/transport/http/HTTPConduit.java | 9 +- .../http/URLConnectionHTTPConduit.java | 16 +- .../http/auth/AbstractSpnegoAuthSupplier.java | 6 +- .../apache/cxf/transport/jms/JMSConduit.java | 3 +- .../cxf/transport/jms/JMSDestination.java | 3 +- .../cxf/transport/jms/JMSMessageUtils.java | 6 +- .../cxf/transport/local/LocalConduit.java | 4 +- .../addressing/impl/InternalContextUtils.java | 7 +- .../ws/addressing/impl/MAPAggregatorImpl.java | 3 +- .../java/org/apache/cxf/ws/rm/Destination.java | 4 +- .../apache/cxf/ws/rm/DestinationSequence.java | 7 +- .../apache/cxf/ws/rm/InternalContextUtils.java | 3 +- .../cxf/ws/rm/RMCaptureInInterceptor.java | 4 +- .../apache/cxf/ws/rm/RMDeliveryInterceptor.java | 2 +- .../org/apache/cxf/ws/rm/RMInInterceptor.java | 9 +- .../KerberosTokenInterceptorProvider.java | 4 +- .../wss4j/AbstractTokenInterceptor.java | 2 +- .../wss4j/PolicyBasedWSS4JInInterceptor.java | 2 +- .../wss4j/PolicyBasedWSS4JOutInterceptor.java | 2 +- .../PolicyBasedWSS4JStaxInInterceptor.java | 2 +- .../PolicyBasedWSS4JStaxOutInterceptor.java | 2 +- .../security/wss4j/WSS4JStaxInInterceptor.java | 3 +- .../cxf/ws/security/wss4j/WSS4JUtils.java | 3 +- .../wss4j/AbstractPolicySecurityTest.java | 122 ++------ .../wss4j/example-sts-issued-saml-assertion.xml | 58 +--- .../java2js/processor/JavaToJSProcessor.java | 2 - .../generator/wsdl11/BeanGenerator.java | 7 +- .../processor/JavaToWSDLProcessor.java | 2 - .../processor/JavaToProcessorTest.java | 2 - .../internal/jaxws/JaxwsServiceBuilderTest.java | 25 +- .../internal/jaxws/expected/cxf188.wsdl | 32 +++ .../jaxws/expected/doc_wrapped_bare.wsdl | 285 +++++++++++++++++++ .../jaxws/expected/rpc_lit_service_no_anno.wsdl | 34 +++ .../internal/jaxws/expected/rpc_on_method.wsdl | 34 +++ .../cxf/tools/wsdlto/WSDLToJavaContainer.java | 3 - .../customization/JAXWSBindingSerializer.java | 43 --- .../generators/AbstractJAXWSGenerator.java | 4 +- .../generators/HandlerConfigGenerator.java | 10 - .../frontend/jaxws/generators/SEIGenerator.java | 1 - .../processor/internal/ServiceProcessor.java | 2 +- .../jaxws/wsdl11/JAXWSDefinitionBuilder.java | 2 - .../misc/processor/XSDToWSDLProcessor.java | 3 - 89 files changed, 563 insertions(+), 392 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/cc3565f3/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java ----------------------------------------------------------------------
