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/eec3cd48 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/eec3cd48 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/eec3cd48 Branch: refs/heads/master Commit: eec3cd484749630e599732a082e45d60ef1d10d7 Parents: 751e63a e00b842 Author: Andy McCright <and...@us.ibm.com> Authored: Wed Apr 5 09:48:33 2017 -0500 Committer: Andy McCright <and...@us.ibm.com> Committed: Wed Apr 5 09:48:33 2017 -0500 ---------------------------------------------------------------------- core/pom.xml | 2 +- .../org/apache/cxf/annotations/Logging.java | 1 + .../cxf/attachment/AttachmentDeserializer.java | 20 +- .../apache/cxf/attachment/AttachmentImpl.java | 2 +- .../apache/cxf/attachment/AttachmentUtil.java | 10 +- .../cxf/attachment/Base64DecoderStream.java | 3 +- .../cxf/bus/extension/ExtensionManagerBus.java | 36 +- .../cxf/bus/extension/ExtensionRegistry.java | 2 +- .../BusWiringBeanFactoryPostProcessor.java | 2 +- .../apache/cxf/bus/spring/NamespaceHandler.java | 4 +- .../apache/cxf/bus/spring/SpringBusFactory.java | 4 +- .../catalog/CatalogXmlSchemaURIResolver.java | 2 +- .../apache/cxf/catalog/OASISCatalogManager.java | 38 ++- .../common/classloader/ClassLoaderUtils.java | 41 ++- .../org/apache/cxf/common/i18n/BundleUtils.java | 35 +- .../cxf/common/injection/ResourceInjector.java | 2 +- .../cxf/common/jaxb/JAXBContextCache.java | 2 +- .../org/apache/cxf/common/jaxb/JAXBUtils.java | 35 +- .../jaxb/SchemaCollectionContextProxy.java | 2 +- .../org/apache/cxf/common/logging/LogUtils.java | 45 ++- .../org/apache/cxf/common/util/ASMHelper.java | 7 +- .../org/apache/cxf/common/util/ClassHelper.java | 5 - .../apache/cxf/common/util/PackageUtils.java | 5 +- .../apache/cxf/common/util/PrimitiveUtils.java | 7 +- .../org/apache/cxf/common/util/ProxyHelper.java | 31 +- .../apache/cxf/common/util/ReflectionUtil.java | 17 + .../cxf/common/util/SpringClasspathScanner.java | 2 +- .../org/apache/cxf/common/util/StringUtils.java | 2 +- .../org/apache/cxf/common/util/UrlUtils.java | 2 +- .../cxf/common/util/WeakIdentityHashMap.java | 2 +- .../common/util/XmlSchemaPrimitiveUtils.java | 2 +- .../cxf/common/xmlschema/SchemaCollection.java | 2 +- .../jsse/TLSClientParametersConfig.java | 2 +- .../jsse/TLSParameterJaxBUtils.java | 21 +- .../jsse/TLSServerParametersConfig.java | 2 +- .../cxf/databinding/AbstractDataBinding.java | 2 +- .../databinding/source/XMLStreamDataWriter.java | 111 +++++- .../cxf/endpoint/AbstractEndpointFactory.java | 2 +- .../java/org/apache/cxf/endpoint/Client.java | 2 +- .../org/apache/cxf/endpoint/ClientImpl.java | 29 +- .../org/apache/cxf/feature/LoggingFeature.java | 2 +- .../java/org/apache/cxf/helpers/DOMUtils.java | 30 +- .../java/org/apache/cxf/helpers/FileUtils.java | 2 +- .../apache/cxf/helpers/HttpHeaderHelper.java | 2 +- .../java/org/apache/cxf/helpers/IOUtils.java | 5 +- .../apache/cxf/helpers/MapNamespaceContext.java | 2 +- .../java/org/apache/cxf/helpers/XPathUtils.java | 16 +- .../interceptor/AbstractLoggingInterceptor.java | 1 + .../interceptor/AttachmentOutInterceptor.java | 4 + .../cxf/interceptor/ClientFaultConverter.java | 2 +- .../apache/cxf/interceptor/LoggingMessage.java | 1 + .../cxf/interceptor/StaxInInterceptor.java | 2 +- .../cxf/interceptor/StaxOutInterceptor.java | 2 +- .../security/SecureAnnotationsInterceptor.java | 2 +- .../security/SimpleAuthorizingInterceptor.java | 4 +- .../cxf/internal/CXFAPINamespaceHandler.java | 5 +- .../apache/cxf/phase/PhaseInterceptorChain.java | 2 +- .../org/apache/cxf/resource/URIResolver.java | 14 +- .../org/apache/cxf/service/ServiceImpl.java | 2 +- .../factory/AbstractServiceFactoryBean.java | 2 +- .../factory/AnnotationsFactoryBeanListener.java | 11 - .../factory/FactoryBeanListenerManager.java | 3 +- .../factory/OldLoggingFactoryBeanListener.java | 77 +++++ .../service/model/AbstractPropertiesHolder.java | 2 +- .../apache/cxf/service/model/MessageInfo.java | 2 +- .../cxf/service/model/ServiceModelUtil.java | 2 +- .../cxf/staxutils/CachingXmlEventWriter.java | 2 +- .../cxf/staxutils/W3CDOMStreamReader.java | 7 +- .../staxutils/transform/InTransformReader.java | 4 +- .../staxutils/transform/OutTransformWriter.java | 4 +- .../cxf/transport/TransportURIResolver.java | 9 +- .../org/apache/cxf/ws/addressing/Names.java | 2 + .../schemas/configuration/security.xsd | 16 + .../java/org/apache/cxf/bus/CXFBusImplTest.java | 2 +- .../cxf/bus/extension/ExtensionManagerTest.java | 2 +- .../cxf/bus/spring/BusDefinitionParserTest.java | 5 +- .../common/annotation/AnnotatedGreeterImpl.java | 2 +- .../cxf/common/util/PackageUtilsTest.java | 13 + .../cxf/common/util/PropertyUtilsTest.java | 4 +- .../cxf/common/xmlschema/ImportRepairTest.java | 2 +- .../databinding/AbstractDataBindingTest.java | 4 +- .../security/JAASLoginInterceptorTest.java | 2 +- .../PropertiesExpandingStreamReaderTest.java | 2 +- .../transform/InTransformReaderTest.java | 56 ++-- .../transform/OutTransformWriterTest.java | 62 ++-- .../staxutils/transform/TransformTestUtils.java | 2 +- distribution/src/main/release/bin/idl2wsdl | 7 +- distribution/src/main/release/bin/idl2wsdl.bat | 8 +- distribution/src/main/release/bin/java2js | 7 +- distribution/src/main/release/bin/java2js.bat | 9 +- distribution/src/main/release/bin/java2ws | 7 +- distribution/src/main/release/bin/java2ws.bat | 6 +- distribution/src/main/release/bin/mc | 7 +- distribution/src/main/release/bin/mc.bat | 7 +- distribution/src/main/release/bin/wadl2java | 7 +- distribution/src/main/release/bin/wadl2java.bat | 6 +- distribution/src/main/release/bin/wsdl2corba | 7 +- .../src/main/release/bin/wsdl2corba.bat | 5 +- distribution/src/main/release/bin/wsdl2java | 6 +- distribution/src/main/release/bin/wsdl2java.bat | 6 +- distribution/src/main/release/bin/wsdl2js | 7 +- distribution/src/main/release/bin/wsdl2js.bat | 5 +- distribution/src/main/release/bin/wsdl2service | 7 +- .../src/main/release/bin/wsdl2service.bat | 7 +- distribution/src/main/release/bin/wsdl2soap | 7 +- distribution/src/main/release/bin/wsdl2soap.bat | 6 +- distribution/src/main/release/bin/wsdl2xml | 7 +- distribution/src/main/release/bin/wsdl2xml.bat | 6 +- distribution/src/main/release/bin/wsdlvalidator | 7 +- .../src/main/release/bin/wsdlvalidator.bat | 6 +- distribution/src/main/release/bin/xsd2wsdl | 8 +- distribution/src/main/release/bin/xsd2wsdl.bat | 7 +- distribution/src/main/release/lib/WHICH_JARS | 29 +- .../cxf/demo/aegis/commands/WriteZoo.java | 2 +- .../bank/src/main/java/cxf/server/BankImpl.java | 2 +- .../src/main/java/corba/server/BankImpl.java | 2 +- .../src/main/java/cxf/server/BankImpl.java | 2 +- .../java/demo/jaxrs/server/CustomerService.java | 4 +- .../src/main/java/demo/jaxrs/server/Order.java | 2 +- .../httpsdemo/server/CustomerServiceImpl.java | 2 +- .../java/demo/jaxrs/server/CustomerService.java | 2 +- .../java/demo/jaxrs/search/server/Catalog.java | 2 +- .../jaxrs/server/simple/StreamingService.java | 2 +- .../jaxrs/server/socket/StreamingService.java | 2 +- .../release/samples/jax_rs/spring_boot/pom.xml | 4 +- .../rs/service/SampleRestApplicationTest.java | 58 ++++ .../jax_rs/spring_boot_scan/application/pom.xml | 4 +- .../rs/service/SampleRestApplicationTest.java | 58 ++++ .../service/AbstractCustomerServiceSecured.java | 4 +- .../demo/jaxrs/service/CustomerServiceImpl.java | 4 +- .../src/main/java/demo/jaxrs/service/Order.java | 2 +- .../release/samples/jax_rs/sse_cdi/README.txt | 6 +- .../main/release/samples/jax_rs/sse_cdi/pom.xml | 12 +- .../demo/jaxrs/sse/StatsRestServiceImpl.java | 57 ++-- .../src/main/resources/web-ui/index.html | 2 +- .../release/samples/jax_rs/sse_spring/pom.xml | 6 - .../demo/jaxrs/sse/StatsRestServiceImpl.java | 3 +- .../demo/jaxrs/sse/StatsRestServiceImpl.java | 3 +- .../java/demo/jaxrs/tracing/client/Client.java | 2 +- .../tracing/server/CatalogApplication.java | 2 +- .../java/demo/jaxrs/server/CustomerService.java | 8 +- .../src/main/java/demo/jaxrs/server/Order.java | 2 +- .../java/demo/jaxrs/server/CustomerService.java | 8 +- .../src/main/java/demo/jaxrs/server/Order.java | 2 +- .../samples/jax_rs/websocket_web/pom.xml | 3 +- .../java/demo/jaxrs/server/CustomerService.java | 8 +- .../src/main/java/demo/jaxrs/server/Order.java | 2 +- .../release/samples/jaxws_spring_boot/pom.xml | 18 +- .../sample/ws/SampleWsApplicationClient.java | 30 +- .../ws/service/SampleWsApplicationTest.java | 82 +++++ .../ws/service/SampleWsApplicationTests.java | 82 ----- .../server/CustomerServiceSpringServer.java | 4 +- .../samples/js_browser_client_simple/pom.xml | 4 - .../GetProtectedResourceController.java | 2 +- .../TemporaryCredentialsController.java | 2 +- .../controllers/TokenRequestController.java | 2 +- distribution/src/main/release/samples/pom.xml | 5 + .../src/main/java/demo/wssec/client/Client.java | 4 +- .../src/main/java/demo/wssec/server/Server.java | 4 +- .../src/main/java/demo/wssec/client/Client.java | 4 +- .../src/main/java/demo/wssec/server/Server.java | 4 +- integration/cdi/pom.xml | 4 +- .../cxf/cdi/JAXRSCdiResourceExtensionTest.java | 2 +- .../classloader/PlugInClassLoaderHelper.java | 2 +- .../org/apache/cxf/jca/jarloader/JarLoader.java | 4 +- .../boot/autoconfigure/CxfProperties.java | 2 +- .../tracing/brave/AbstractBraveInterceptor.java | 2 +- .../cxf/tracing/brave/BraveStopInterceptor.java | 2 +- integration/tracing/tracing-htrace/pom.xml | 5 + .../tracing/htrace/HTraceStopInterceptor.java | 2 +- .../htrace/ext/LogbackSpanConverter.java | 69 ++++ .../main/resources/archetype-resources/pom.xml | 4 +- .../main/resources/archetype-resources/pom.xml | 4 +- .../main/resources/archetype-resources/pom.xml | 4 +- .../cxf/maven_plugin/AbstractCodegenMoho.java | 44 ++- .../cxf/maven_plugin/ClassLoaderSwitcher.java | 15 +- .../corba/maven/plugins/IDLToWSDLPlugin.java | 1 + .../corba/maven/plugins/WSDLToIDLPlugin.java | 5 +- maven-plugins/java2wadl-plugin/pom.xml | 2 +- .../maven_plugin/javatowadl/Java2WADLMojo.java | 1 + .../cxf/maven_plugin/ClassLoaderSwitcher.java | 20 +- .../apache/cxf/maven_plugin/Java2WSMojo.java | 1 + .../common/ClassLoaderSwitcher.java | 21 +- .../cxf/maven_plugin/wadlto/WADL2JavaMojo.java | 2 + .../cxf/maven_plugin/WSDLValidatorMojo.java | 1 + osgi/itests/pom.xml | 12 + .../apache/cxf/osgi/itests/jaxrs/BookStore.java | 2 +- .../features/src/main/resources/features.xml | 16 +- parent/pom.xml | 127 +++++-- pom.xml | 29 +- .../apache/cxf/binding/corba/CorbaConduit.java | 2 +- .../apache/cxf/binding/corba/CorbaTypeMap.java | 4 +- .../binding/corba/runtime/CorbaDSIServant.java | 2 +- .../corba/runtime/CorbaStreamWriter.java | 4 +- .../binding/corba/types/CorbaHandlerUtils.java | 2 +- .../cxf/binding/corba/utils/CorbaAnyHelper.java | 4 +- .../binding/corba/utils/CorbaBindingHelper.java | 4 +- .../cxf/binding/corba/utils/CorbaUtils.java | 2 +- .../corba/runtime/CorbaDSIServantTest.java | 2 +- .../cxf/binding/soap/SOAPBindingUtil.java | 37 +- .../cxf/binding/soap/SoapBindingFactory.java | 4 +- .../org/apache/cxf/binding/soap/SoapFault.java | 2 +- .../cxf/binding/soap/SoapVersionFactory.java | 2 +- .../interceptor/ReadHeadersInterceptor.java | 7 +- .../interceptor/Soap12FaultInInterceptor.java | 2 +- .../soap/interceptor/SoapOutInterceptor.java | 4 + .../SoapPreProtocolOutInterceptor.java | 6 + .../soap/jms/interceptor/JMSFaultType.java | 2 +- .../interceptor/SoapFaultSerializerTest.java | 2 +- rt/databinding/aegis/pom.xml | 5 - .../apache/cxf/aegis/util/jdom/StaxBuilder.java | 2 +- .../apache/cxf/aegis/AbstractAegisIoImpl.java | 4 +- .../java/org/apache/cxf/aegis/AegisContext.java | 2 +- .../main/java/org/apache/cxf/aegis/Context.java | 4 +- .../cxf/aegis/databinding/AegisDatabinding.java | 6 +- .../aegis/databinding/ElementDataWriter.java | 2 +- .../aegis/databinding/XMLStreamDataWriter.java | 2 +- .../apache/cxf/aegis/type/XMLTypeCreator.java | 2 +- .../cxf/aegis/type/basic/BeanTypeInfo.java | 6 +- .../type/basic/InterfaceInvocationHandler.java | 2 +- .../cxf/aegis/type/basic/XMLBeanTypeInfo.java | 2 +- .../cxf/aegis/type/collection/MapType.java | 4 +- .../cxf/aegis/type/java5/AnnotatedTypeInfo.java | 44 ++- .../cxf/aegis/type/java5/AnnotationReader.java | 19 +- .../apache/cxf/aegis/type/java5/EnumType.java | 37 +- .../cxf/aegis/type/java5/Java5TypeCreator.java | 8 +- .../cxf/aegis/type/mtom/AbstractXOPType.java | 2 +- .../cxf/aegis/util/stax/JDOMStreamReader.java | 2 +- .../cxf/aegis/util/stax/JDOMStreamWriter.java | 2 +- .../cxf/aegis/custom/service/ServiceImpl.java | 2 +- .../cxf/aegis/inheritance/ws2/impl/WS2Impl.java | 2 +- .../aegis/namespaces/ExplicitPrefixTest.java | 4 +- .../type/java5/CollectionTestsWithService.java | 4 +- .../cxf/aegis/type/java5/EnumTypeTest.java | 33 ++ .../apache/cxf/aegis/type/java5/JaxbBean1.java | 10 + .../cxf/aegis/type/java5/JaxbTestEnum.java | 7 +- .../cxf/aegis/type/java5/JaxbTypeTest.java | 28 +- .../cxf/aegis/type/java5/dto/MapDTOService.java | 2 +- .../java5/map/StudentServiceDocLiteralImpl.java | 2 +- .../type/java5/map/StudentServiceImpl.java | 4 +- .../cxf/aegis/type/java5/map/StudentTest.java | 4 +- .../cxf/aegis/type/map/fortest/MapTestImpl.java | 4 +- .../aegis/type/map/fortest/ObjectWithAMap.java | 2 +- .../aegis/type/map/ns2/ObjectWithAMapNs2.java | 2 +- .../java/org/apache/cxf/jaxb/JAXBDataBase.java | 35 ++ .../org/apache/cxf/jaxb/JAXBDataBinding.java | 8 +- .../org/apache/cxf/jaxb/JAXBEncoderDecoder.java | 18 +- .../org/apache/cxf/jaxb/io/DataReaderImpl.java | 7 +- .../org/apache/cxf/jaxb/io/DataWriterImpl.java | 8 +- .../DataBindingMarshallerPropertiesTest.java | 2 +- .../apache/cxf/jaxb/JAXBDataBindingTest.java | 12 +- .../apache/cxf/jaxb/JAXBEncoderDecoderTest.java | 4 +- .../java/org/apache/cxf/jaxb/JAXBUtilsTest.java | 2 +- .../cxf/jaxb/io/XMLStreamDataWriterTest.java | 4 +- .../cxf/clustering/FailoverTargetSelector.java | 28 +- rt/features/logging/README.md | 9 + rt/features/logging/pom.xml | 1 - .../ext/logging/AbstractLoggingInterceptor.java | 3 +- .../org/apache/cxf/ext/logging/Logging.java | 63 ++++ .../logging/LoggingBusLifecycleListener.java | 83 +++++ .../ext/logging/LoggingFactoryBeanListener.java | 74 ++++ .../apache/cxf/ext/logging/LoggingFeature.java | 28 +- .../logging/OldLoggingFactoryBeanListener.java | 128 +++++++ .../logging/event/DefaultLogEventMapper.java | 15 +- .../cxf/ext/logging/event/LogEventMapper.java | 25 -- .../ext/logging/event/LogMessageFormatter.java | 2 +- .../ext/logging/event/PrettyLoggingFilter.java | 106 ++++-- .../logging/event/PrintWriterEventSender.java | 4 + .../resources/META-INF/cxf/bus-extensions.txt | 3 + .../ext/logging/TestPrettyLoggingFilter.java | 90 +++++ .../cxf/jaxrs/JAXRSServerFactoryBean.java | 2 +- .../cxf/jaxrs/JAXRSServiceFactoryBean.java | 2 +- .../org/apache/cxf/jaxrs/JAXRSServiceImpl.java | 2 +- .../cxf/jaxrs/impl/AbstractPropertiesImpl.java | 4 + .../jaxrs/impl/CacheControlHeaderProvider.java | 2 +- .../cxf/jaxrs/impl/ConfigurationImpl.java | 6 +- .../apache/cxf/jaxrs/impl/HttpHeadersImpl.java | 4 +- .../jaxrs/impl/HttpServletRequestFilter.java | 15 +- .../apache/cxf/jaxrs/impl/LinkBuilderImpl.java | 2 +- .../cxf/jaxrs/impl/PropertyHolderFactory.java | 2 +- .../cxf/jaxrs/impl/RequestPreprocessor.java | 2 +- .../org/apache/cxf/jaxrs/impl/ResponseImpl.java | 2 +- .../cxf/jaxrs/impl/RuntimeDelegateImpl.java | 2 +- .../apache/cxf/jaxrs/impl/UriBuilderImpl.java | 4 +- .../cxf/jaxrs/model/AbstractResourceInfo.java | 4 +- .../apache/cxf/jaxrs/model/ApplicationInfo.java | 2 +- .../apache/cxf/jaxrs/model/ResourceTypes.java | 8 +- .../apache/cxf/jaxrs/model/UserApplication.java | 2 +- .../apache/cxf/jaxrs/model/UserResource.java | 2 +- .../jaxrs/provider/AbstractJAXBProvider.java | 4 +- .../cxf/jaxrs/provider/JAXBElementProvider.java | 2 +- .../provider/RequestDispatcherProvider.java | 2 +- .../jaxrs/provider/ServerProviderFactory.java | 2 +- .../cxf/jaxrs/provider/XSLTJaxbProvider.java | 8 +- .../security/KerberosAuthOutInterceptor.java | 2 +- .../jaxrs/servlet/CXFNonSpringJaxrsServlet.java | 39 ++- .../AbstractSpringComponentScanServer.java | 60 +++- .../org/apache/cxf/jaxrs/utils/FormUtils.java | 12 + .../org/apache/cxf/jaxrs/utils/HttpUtils.java | 23 ++ .../apache/cxf/jaxrs/utils/InjectionUtils.java | 29 +- .../org/apache/cxf/jaxrs/utils/JAXRSUtils.java | 30 +- .../utils/ParameterizedCollectionType.java | 5 + .../apache/cxf/jaxrs/utils/ResourceUtils.java | 4 +- .../apache/cxf/jaxrs/utils/SpecExceptions.java | 2 +- .../jaxrs/impl/EvaluatePreconditionsTest.java | 2 +- .../apache/cxf/jaxrs/impl/MetadataMapTest.java | 6 +- .../cxf/jaxrs/impl/UriBuilderImplTest.java | 42 +-- .../apache/cxf/jaxrs/model/URITemplateTest.java | 14 +- .../jaxrs/provider/JAXBElementProviderTest.java | 46 +-- .../cxf/jaxrs/provider/XPathProviderTest.java | 2 +- .../org/apache/cxf/jaxrs/resources/Book.java | 2 +- .../cxf/jaxrs/resources/BookNoSubResource.java | 2 +- .../jaxrs/resources/BookStoreNoAnnotations.java | 2 +- .../apache/cxf/jaxrs/utils/HttpUtilsTest.java | 23 ++ .../cxf/jaxrs/utils/InjectionUtilsTest.java | 16 + .../cxf/jaxrs/utils/ResourceUtilsTest.java | 2 +- .../cxf/jaxws/AbstractJAXWSMethodInvoker.java | 2 +- .../java/org/apache/cxf/jaxws/EndpointImpl.java | 2 +- .../apache/cxf/jaxws/JAXWSMethodInvoker.java | 2 +- .../jaxws/JAXWSProviderMethodDispatcher.java | 14 +- .../java/org/apache/cxf/jaxws/ServiceImpl.java | 2 +- .../cxf/jaxws/context/WrappedAttachments.java | 2 +- .../jaxws/context/WrappedMessageContext.java | 6 +- .../handler/AnnotationHandlerChainBuilder.java | 16 +- .../cxf/jaxws/handler/HandlerChainBuilder.java | 2 +- .../cxf/jaxws/handler/HandlerResolverImpl.java | 2 +- .../interceptors/WebFaultOutInterceptor.java | 6 + .../interceptors/WrapperClassInInterceptor.java | 7 +- .../support/JaxWsServiceConfiguration.java | 6 +- .../cxf/jaxws/ConfiguredEndpointTest.java | 4 +- .../org/apache/cxf/jaxws/JaxWsClientTest.java | 1 + .../cxf/jaxws/JaxWsServerFactoryBeanTest.java | 6 +- .../context/WebServiceContextImplTest.java | 2 +- .../jaxws/context/WrappedAttachmentsTest.java | 2 +- .../context/WrappedMessageContextTest.java | 2 +- .../handler/InitParamResourceResolverTest.java | 2 +- .../support/ContextPropertiesMappingTest.java | 6 +- .../cxf/jaxws/ws/PolicyAnnotationTest.java | 8 +- .../JAXWSHttpSpiDestinationTest.java | 2 +- .../endpoint/dynamic/DynamicClientFactory.java | 34 +- .../cxf/frontend/ClientProxyFactoryBean.java | 19 +- .../org/apache/cxf/frontend/WSDLGetUtils.java | 50 ++- .../service/factory/ClientFactoryBeanTest.java | 2 +- .../factory/ReflectionServiceFactoryTest.java | 4 +- .../cxf/service/factory/ServerFactoryTest.java | 2 +- .../apache/cxf/javascript/BasicNameManager.java | 2 +- .../apache/cxf/javascript/JavascriptUtils.java | 2 +- .../javascript/NamespacePrefixAccumulator.java | 2 +- .../service/ServiceJavascriptBuilder.java | 6 +- .../org/apache/cxf/javascript/cxf-utils.js | 2 +- .../apache/cxf/javascript/JsXMLHttpRequest.java | 2 +- .../interceptor/PersistOutInterceptor.java | 8 +- .../jmx/InstrumentationManagerImpl.java | 5 +- .../export/runtime/ModelMBeanInfoSupporter.java | 8 +- rt/rs/client/pom.xml | 2 +- .../apache/cxf/jaxrs/client/AbstractClient.java | 18 +- .../cxf/jaxrs/client/ClientConfiguration.java | 12 +- .../cxf/jaxrs/client/ClientProxyImpl.java | 61 +++- .../cxf/jaxrs/client/FrontendClientAdapter.java | 5 +- .../org/apache/cxf/jaxrs/client/WebClient.java | 10 +- .../CacheControlClientReaderInterceptor.java | 2 +- .../cxf/jaxrs/client/spec/ClientImpl.java | 15 +- .../client/spec/InvocationBuilderImpl.java | 2 +- .../AbstractJaxRsClientConfiguration.java | 2 +- .../cxf/jaxrs/client/spec/ClientImplTest.java | 130 +++++++ .../org/apache/cxf/jaxrs/resources/Book.java | 2 +- .../jaxrs/resources/BookStoreNoAnnotations.java | 2 +- .../cxf/jaxrs/swagger/JaxRs2Extension.java | 6 +- .../apache/cxf/jaxrs/swagger/SwaggerUtils.java | 2 +- .../jaxrs/model/wadl/WadlGeneratorJsonTest.java | 2 +- .../json/basic/JsonMapObjectReaderWriter.java | 89 +++-- .../basic/JsonMapObjectReaderWriterTest.java | 11 + .../jsonp/JsonpPreStreamInterceptor.java | 2 +- .../jaxrs/provider/json/JSONProviderTest.java | 68 ++-- rt/rs/extensions/rx/pom.xml | 1 - rt/rs/extensions/search/pom.xml | 6 + .../cxf/jaxrs/ext/search/Beanspector.java | 2 +- .../cxf/jaxrs/ext/search/InterfaceProxy.java | 2 +- .../apache/cxf/jaxrs/ext/search/SearchBean.java | 2 +- .../ext/search/SimpleSearchConditionTest.java | 4 +- .../client/FiqlSearchConditionBuilderTest.java | 2 +- .../jaxrs/ext/search/fiql/FiqlParserTest.java | 2 +- .../jpa/JPATypedQueryVisitorFiqlTest.java | 6 +- .../jpa/JPATypedQueryVisitorODataTest.java | 6 +- .../sci/JaxrsServletContainerInitializer.java | 8 +- .../rs/security/jose/jwa/AlgorithmUtils.java | 4 +- .../jwe/AbstractContentEncryptionAlgorithm.java | 27 +- .../jose/jwe/AbstractJweEncryption.java | 16 - .../jose/jwe/AesCbcHmacJweEncryption.java | 26 +- .../jwe/AesGcmContentEncryptionAlgorithm.java | 6 +- .../jwe/EcdhAesWrapKeyEncryptionAlgorithm.java | 2 +- .../jose/jwe/EcdhDirectKeyJweDecryption.java | 2 +- .../jose/jwe/EcdhDirectKeyJweEncryption.java | 2 +- .../cxf/rs/security/jose/jwe/JweUtils.java | 6 +- .../PbesHmacAesWrapKeyEncryptionAlgorithm.java | 6 +- .../cxf/rs/security/jose/jwk/JwkUtils.java | 2 +- .../jose/jws/EcDsaJwsSignatureVerifier.java | 2 +- .../cxf/rs/security/jose/jwt/JwtUtils.java | 38 +-- .../security/jose/jwe/JweJsonConsumerTest.java | 4 +- .../cxf/rs/security/jose/jwk/JwkUtilsTest.java | 43 +++ .../cxf/rs/security/jose/jwt/JwtUtilsTest.java | 33 +- .../security/oauth/client/OAuthClientUtils.java | 8 +- .../oauth/filters/AbstractAuthFilter.java | 2 +- .../oauth/services/AccessTokenHandler.java | 2 +- .../services/AuthorizationRequestHandler.java | 2 +- .../oauth/services/RequestTokenHandler.java | 2 +- .../cxf/rs/security/oauth/utils/OAuthUtils.java | 2 +- .../oauth2/common/AccessTokenValidation.java | 2 +- .../cxf/rs/security/oauth2/common/Client.java | 2 +- .../oauth2/common/OAuthAuthorizationData.java | 12 +- .../oauth2/common/TokenIntrospection.java | 2 +- .../rs/security/oauth2/common/UserSubject.java | 18 +- .../filters/AccessTokenIntrospectionClient.java | 5 +- .../oauth2/filters/JwtAccessTokenValidator.java | 5 +- .../oauth2/filters/OAuthScopesFilter.java | 4 +- .../oauth2/grants/AbstractGrantHandler.java | 7 +- .../oauth2/grants/code/JPACodeDataProvider.java | 2 +- .../owner/JAASResourceOwnerLoginHandler.java | 3 +- .../grants/owner/ResourceOwnerGrantHandler.java | 13 +- .../grants/owner/ResourceOwnerLoginHandler.java | 8 +- .../provider/AbstractOAuthDataProvider.java | 79 ++++- .../DefaultEHCacheOAuthDataProvider.java | 4 +- .../DefaultEncryptingOAuthDataProvider.java | 2 +- .../provider/JCacheOAuthDataProvider.java | 2 +- .../oauth2/provider/JPAOAuthDataProvider.java | 18 +- .../ProviderAuthenticationStrategy.java | 23 ++ .../oauth2/services/AbstractOAuthService.java | 28 +- .../oauth2/services/AccessTokenService.java | 11 +- .../services/DynamicRegistrationService.java | 8 + .../services/RedirectionBasedGrantService.java | 8 +- .../hawk/AbstractHawkAccessTokenValidator.java | 2 +- .../security/oauth2/utils/OAuthConstants.java | 1 + .../rs/security/oauth2/utils/OAuthUtils.java | 18 + .../utils/crypto/ModelEncryptionSupport.java | 2 +- .../security/oauth2/common/UserSubjectTest.java | 39 +++ .../provider/JPAOAuthDataProviderTest.java | 53 +++ .../oauth2/provider/TestingUserSubject.java | 37 ++ .../utils/crypto/EncryptingDataProvider.java | 2 +- .../src/test/resources/META-INF/persistence.xml | 2 + .../cxf/rs/security/oidc/utils/OidcUtils.java | 2 +- ...AbstractRequestAssertionConsumerHandler.java | 9 +- .../security/saml/sso/AbstractSSOSpHandler.java | 14 +- .../saml/sso/SAMLSSOResponseValidator.java | 22 +- .../security/saml/sso/SSOValidatorResponse.java | 14 +- .../security/xml/AbstractXmlSecInHandler.java | 23 +- .../rs/security/xml/EncryptionProperties.java | 7 + .../rs/security/xml/SignatureProperties.java | 39 ++- .../rs/security/xml/XmlSecInInterceptor.java | 97 +++++- .../rs/security/xml/XmlSecOutInterceptor.java | 7 +- .../cxf/jaxrs/sse/SseBroadcasterImpl.java | 31 +- .../cxf/jaxrs/sse/SseUnboundedSubscription.java | 72 ++++ .../atmosphere/SseAtmosphereEventSinkImpl.java | 23 +- .../cxf/rt/security/SecurityConstants.java | 17 +- .../cxf/rt/security/crypto/CryptoUtils.java | 28 +- .../cxf/rt/security/utils/SecurityUtils.java | 5 +- .../transport/http/asyncclient/Activator.java | 2 +- .../http_jetty/JettyHTTPServerEngine.java | 38 ++- .../JettyHTTPServerEngineFactory.java | 14 +- .../osgi/HTTPJettyTransportActivator.java | 5 +- .../http_jetty/JettyHTTPDestinationTest.java | 4 +- .../netty/server/NettyHttpServletHandler.java | 9 +- .../server/NettyHttpServletPipelineFactory.java | 4 +- .../server/servlet/NettyServletContext.java | 4 +- .../netty/server/NettyHttpDestinationTest.java | 4 +- rt/transports/http-undertow/pom.xml | 2 - .../osgi/HTTPUndertowTransportActivator.java | 5 +- .../UndertowHTTPDestinationTest.java | 4 +- .../cxf/transport/http/CXFAuthenticator.java | 8 +- .../transport/http/DestinationRegistryImpl.java | 23 +- .../apache/cxf/transport/http/HTTPConduit.java | 9 +- .../cxf/transport/http/MessageTrustDecider.java | 6 +- .../http/URLConnectionHTTPConduit.java | 19 +- .../transport/http/auth/DigestAuthSupplier.java | 2 +- .../cxf/transport/http/auth/HttpAuthHeader.java | 2 +- .../HttpConduitBPBeanDefinitionParser.java | 1 + .../http/osgi/HttpConduitConfigApplier.java | 67 ++-- .../policy/impl/ClientPolicyCalculator.java | 20 +- .../spring/HttpConduitBeanDefinitionParser.java | 1 + .../transport/servlet/AbstractHTTPServlet.java | 6 +- .../transport/servlet/CXFNonSpringServlet.java | 9 + .../transport/servlet/ServletConfigAware.java | 31 ++ .../transport/servlet/ServletDestination.java | 2 +- .../apache/cxf/transport/http/HeadersTest.java | 6 +- .../http/auth/DigestAuthSupplierTest.java | 2 +- .../transport/http/auth/HttpAuthHeaderTest.java | 2 +- .../http/policy/ClientPolicyCalculatorTest.java | 1 + .../transport/http/policy/PolicyUtilsTest.java | 2 +- .../spring/HttpConduitConfigurationTest.java | 2 +- rt/transports/jms/pom.xml | 2 - .../cxf/transport/jms/BackChannelConduit.java | 11 +- .../apache/cxf/transport/jms/JMSConduit.java | 51 ++- .../cxf/transport/jms/JMSConfiguration.java | 20 +- .../cxf/transport/jms/JMSMessageUtils.java | 26 +- .../cxf/transport/jms/JMSPropertyType.java | 19 +- .../cxf/transport/jms/uri/JMSEndpoint.java | 6 +- .../cxf/transport/jms/uri/JMSURIParser.java | 2 +- .../util/PollingMessageListenerContainer.java | 6 +- .../cxf/transport/jms/uri/MyBeanLocator.java | 2 +- .../apache/cxf/transport/udp/UDPConduit.java | 2 +- rt/transports/websocket/pom.xml | 5 + .../websocket/ahc/AhcWebSocketConduit.java | 4 +- .../AtmosphereWebSocketServletDestination.java | 51 ++- .../atmosphere/DefaultProtocolInterceptor.java | 4 +- .../jetty9/Jetty9WebSocketDestination.java | 87 +++-- .../websocket/jetty9/JettyWebSocketHandler.java | 13 +- .../apache/cxf/ws/addressing/soap/MAPCodec.java | 3 +- .../ws/addressing/impl/ContextUtilsTest.java | 2 +- .../cxf/ws/addressing/soap/MAPCodecTest.java | 2 +- rt/ws/eventing/pom.xml | 5 +- .../EventSinkInterfaceNotificationTask.java | 2 +- .../java/org/apache/cxf/ws/mex/MEXUtils.java | 2 +- .../DomainExpressionBuilderRegistryTest.java | 2 +- rt/ws/rm/pom.xml | 1 - .../apache/cxf/ws/rm/CapturingXMLWriter.java | 2 +- .../java/org/apache/cxf/ws/rm/Destination.java | 5 +- .../apache/cxf/ws/rm/DestinationSequence.java | 11 +- .../main/java/org/apache/cxf/ws/rm/Proxy.java | 2 +- .../cxf/ws/rm/RMCaptureInInterceptor.java | 4 +- .../java/org/apache/cxf/ws/rm/RMEndpoint.java | 4 +- .../java/org/apache/cxf/ws/rm/RMManager.java | 12 +- .../main/java/org/apache/cxf/ws/rm/Source.java | 2 +- .../cxf/ws/rm/persistence/jdbc/RMTxStore.java | 4 +- .../cxf/ws/rm/soap/RedeliveryQueueImpl.java | 2 +- .../cxf/ws/rm/soap/RetransmissionQueueImpl.java | 2 +- .../cxf/ws/rm/DestinationSequenceTest.java | 4 +- .../apache/cxf/ws/rm/ManagedRMManagerTest.java | 2 +- .../java/org/apache/cxf/ws/rm/ProxyTest.java | 7 +- .../cxf/ws/security/SecurityConstants.java | 11 +- .../security/policy/WSSecurityPolicyLoader.java | 2 +- .../custom/DefaultAlgorithmSuiteLoader.java | 2 +- .../HttpsTokenInterceptorProvider.java | 46 +-- .../IssuedTokenInterceptorProvider.java | 13 +- .../policy/interceptors/STSInvoker.java | 14 +- .../interceptors/STSTokenOutInterceptor.java | 13 +- .../SecureConversationInInterceptor.java | 7 +- .../SpnegoContextTokenInInterceptor.java | 8 +- .../provider/SecurityTokenServiceProvider.java | 4 +- .../security/tokenstore/MemoryTokenStore.java | 16 +- .../ws/security/tokenstore/SecurityToken.java | 72 ++-- .../ws/security/trust/AbstractSTSClient.java | 15 +- .../security/trust/DefaultSTSTokenCacher.java | 210 ++++++++++++ .../cxf/ws/security/trust/STSTokenCacher.java | 59 ++++ .../ws/security/trust/STSTokenRetriever.java | 236 ++----------- .../apache/cxf/ws/security/trust/STSUtils.java | 2 +- .../ReceivedTokenCallbackHandler.java | 83 +++-- ...tUsernameTokenAuthenticatingInterceptor.java | 2 +- .../DefaultWSS4JSecurityContextCreator.java | 51 +-- .../wss4j/StaxSecurityContextInInterceptor.java | 36 +- .../cxf/ws/security/wss4j/StaxSerializer.java | 4 +- .../ws/security/wss4j/WSS4JInInterceptor.java | 2 +- .../ws/security/wss4j/WSS4JOutInterceptor.java | 1 + .../cxf/ws/security/wss4j/WSS4JUtils.java | 10 +- .../policyhandlers/AbstractBindingBuilder.java | 17 +- .../AbstractStaxBindingHandler.java | 2 +- .../AsymmetricBindingHandler.java | 7 +- .../StaxSymmetricBindingHandler.java | 7 +- .../policyhandlers/SymmetricBindingHandler.java | 22 +- .../policyhandlers/TransportBindingHandler.java | 13 +- .../tokenstore/MemoryTokenStoreTest.java | 5 +- .../wss4j/CryptoCoverageCheckerTest.java | 2 +- .../DOMToStaxEncryptionIdentifierTest.java | 10 +- .../security/wss4j/DOMToStaxRoundTripTest.java | 28 +- .../wss4j/DOMToStaxSignatureIdentifierTest.java | 10 +- .../wss4j/DefaultCryptoCoverageCheckerTest.java | 2 +- .../security/wss4j/SecurityActionTokenTest.java | 4 +- .../security/wss4j/StaxRoundTripActionTest.java | 26 +- .../ws/security/wss4j/StaxRoundTripTest.java | 50 +-- .../StaxToDOMEncryptionIdentifierTest.java | 10 +- .../security/wss4j/StaxToDOMRoundTripTest.java | 80 ++--- .../wss4j/StaxToDOMSignatureIdentifierTest.java | 10 +- .../cxf/ws/security/wss4j/TestPwdCallback.java | 2 +- .../cxf/ws/security/wss4j/WSS4JInOutTest.java | 36 +- .../security/wss4j/WSS4JOutInterceptorTest.java | 4 +- .../security/wss4j/saml/DOMToStaxSamlTest.java | 12 +- .../ws/security/wss4j/saml/SamlTokenTest.java | 68 ++-- .../security/wss4j/saml/StaxToDOMSamlTest.java | 60 ++-- .../dialect/fragment/FragmentDialect.java | 2 +- .../transfer/manager/MemoryResourceManager.java | 2 +- .../cxf/ws/transfer/resource/ResourceLocal.java | 2 +- .../resourcefactory/ResourceFactoryImpl.java | 2 +- .../integration/IntegrationBaseTest.java | 2 +- .../apache/cxf/wsdl/JAXBExtensionHelper.java | 6 +- .../cxf/wsdl/service/factory/ClassReader.java | 2 +- .../cxf/wsdl/service/factory/ParamReader.java | 2 +- .../factory/ReflectionServiceFactoryBean.java | 68 +++- .../factory/XercesSchemaValidationUtils.java | 2 +- .../java/org/apache/cxf/wsdl11/NSManager.java | 2 +- .../org/apache/cxf/wsdl11/SOAPBindingUtil.java | 2 +- .../java/org/apache/cxf/wsdl11/SchemaUtil.java | 2 +- .../apache/cxf/wsdl11/ServiceWSDLBuilder.java | 6 +- .../apache/cxf/wsdl11/WSDLServiceBuilder.java | 2 +- .../DocLiteralInInterceptorTest.java | 2 +- .../apache/cxf/wsdl11/WSDLManagerImplTest.java | 2 +- services/sts/sts-core/pom.xml | 10 - .../org/apache/cxf/sts/cache/CacheUtils.java | 4 +- .../cxf/sts/cache/HazelCastTokenStore.java | 16 +- .../cxf/sts/operation/AbstractOperation.java | 27 +- .../cxf/sts/operation/TokenCancelOperation.java | 2 +- .../cxf/sts/operation/TokenIssueOperation.java | 2 +- .../cxf/sts/operation/TokenRenewOperation.java | 2 +- .../sts/operation/TokenValidateOperation.java | 2 +- .../sts/rest/RESTSecurityTokenServiceImpl.java | 6 +- .../provider/DefaultConditionsProvider.java | 89 +++-- .../sts/token/provider/SAMLTokenProvider.java | 12 +- .../cxf/sts/token/provider/SCTProvider.java | 17 +- .../token/provider/TokenProviderResponse.java | 52 ++- .../provider/jwt/DefaultJWTClaimsProvider.java | 96 +++--- .../token/provider/jwt/JWTTokenProvider.java | 8 +- .../cxf/sts/token/renewer/SAMLTokenRenewer.java | 12 +- .../sts/token/renewer/TokenRenewerResponse.java | 48 +-- .../sts/token/validator/SAMLTokenValidator.java | 11 +- .../sts/token/validator/X509TokenValidator.java | 13 +- .../cxf/sts/cache/CacheIdentityMapper.java | 2 +- .../cxf/sts/cache/HazelCastTokenStoreTest.java | 15 +- .../claims/mapper/JexlIssueSamlClaimsTest.java | 2 +- .../sts/operation/IssueJWTClaimsUnitTest.java | 2 +- .../operation/IssueJWTOnbehalfofUnitTest.java | 2 +- .../sts/operation/IssueJWTRealmUnitTest.java | 2 +- .../sts/operation/IssueOnbehalfofUnitTest.java | 2 +- .../sts/operation/IssueSamlClaimsUnitTest.java | 2 +- .../sts/operation/IssueSamlRealmUnitTest.java | 2 +- .../apache/cxf/sts/operation/IssueUnitTest.java | 15 +- .../cxf/sts/operation/RenewSamlUnitTest.java | 16 +- .../ValidateJWTTransformationTest.java | 2 +- .../ValidateTokenTransformationUnitTest.java | 2 +- .../cxf/sts/token/provider/JWTClaimsTest.java | 2 +- .../token/provider/JWTProviderLifetimeTest.java | 122 +++---- .../provider/JWTTokenProviderRealmTest.java | 2 +- .../token/provider/JWTTokenProviderTest.java | 28 +- .../cxf/sts/token/provider/SAMLClaimsTest.java | 10 +- .../provider/SAMLProviderLifetimeTest.java | 109 +++--- .../token/provider/SAMLProviderRealmTest.java | 2 +- .../renewer/SAMLTokenRenewerLifetimeTest.java | 81 ++--- .../token/renewer/SAMLTokenRenewerPOPTest.java | 16 +- .../renewer/SAMLTokenRenewerRealmTest.java | 20 +- .../sts/token/renewer/SAMLTokenRenewerTest.java | 18 +- .../validator/JWTTokenValidatorRealmTest.java | 2 +- .../SAMLTokenValidatorCachedRealmTest.java | 2 +- .../validator/SAMLTokenValidatorRealmTest.java | 2 +- .../token/validator/SAMLTokenValidatorTest.java | 15 +- services/sts/systests/advanced/pom.xml | 10 + .../AsymmetricEncryptionTest.java | 2 +- .../systest/sts/batch/SAMLBatchUnitTest.java | 4 +- .../systest/sts/batch/SimpleBatchSTSClient.java | 17 +- .../cxf/systest/sts/caching/CachingTest.java | 6 +- .../systest/sts/caching/ServerCachingTest.java | 2 +- .../systest/sts/custom/CustomParameterTest.java | 145 +++++++- .../custom_onbehalfof/CustomOnBehalfOfTest.java | 5 +- .../DistributedCachingTest.java | 2 + .../apache/cxf/systest/sts/jwt/JWTUnitTest.java | 4 +- .../cxf/systest/sts/jwt/JaxrsJWTTest.java | 2 +- .../cxf/systest/sts/renew/SAMLRenewTest.java | 2 +- .../systest/sts/renew/SAMLRenewUnitTest.java | 6 +- .../sts/secure_conv/SCTSAMLTokenProvider.java | 15 +- .../SecurityContextTokenCancelTest.java | 6 +- .../SecurityContextTokenUnitTest.java | 2 +- .../cxf/systest/sts/soap12/Soap12Test.java | 2 +- .../cxf/systest/sts/custom/cxf-sts-common.xml | 4 + .../apache/cxf/systest/sts/custom/cxf-sts.xml | 20 +- .../sts/distributed_caching/cxf-sts-1.xml | 17 +- .../sts/distributed_caching/cxf-sts-2.xml | 17 +- .../sts/common/CustomIdentityMapper.java | 4 +- .../sts/delegation/SAMLDelegationTest.java | 2 +- .../systest/sts/issueunit/IssueUnitTest.java | 9 +- .../sts/sendervouches/DoubleItPortTypeImpl.java | 3 +- .../stsclient/STSTokenOutInterceptorTest.java | 8 +- .../sts/stsclient/STSTokenRetrieverTest.java | 8 +- .../sts/symmetric/SymmetricBindingTest.java | 10 +- .../cxf/systest/sts/template/TemplateTest.java | 6 +- .../sts/transport/TransportBindingTest.java | 6 +- .../UsernameActAsCachingTest.java | 34 +- .../sts/username_actas/UsernameActAsTest.java | 7 +- .../UsernameOnBehalfOfCachingTest.java | 34 +- .../UsernameOnBehalfOfTest.java | 7 +- .../cxf/systest/sts/deployment/sts/realms.xml | 9 +- services/sts/systests/sts-itests/pom.xml | 6 + .../sts/itests/BasicSTSIntegrationTest.java | 12 +- .../systest/sts/itests/unit/STSUnitTest.java | 23 +- .../org/apache/cxf/ws/discovery/WSDVersion.java | 8 +- .../internal/WSDiscoveryServiceImpl.java | 6 +- services/wsn/wsn-api/pom.xml | 8 +- .../org/apache/cxf/wsn/util/CXFWSNHelper.java | 4 +- services/wsn/wsn-core/pom.xml | 7 +- .../org/apache/cxf/wsn/AbstractEndpoint.java | 15 +- .../org/apache/cxf/wsn/jms/JmsPublisher.java | 2 +- services/xkms/xkms-itests/pom.xml | 1 + .../cxf/xkms/x509/validator/DateValidator.java | 6 +- .../x509/repo/ldap/LdapCertificateRepo.java | 2 +- systests/container-integration/grizzly/pom.xml | 2 +- .../cxf/systest/aegis/AegisJaxWsImpl.java | 4 +- .../cxf/systest/aegis/AegisJaxWsWsdlNsImpl.java | 3 - .../cxf/systest/aegis/SportsServiceImpl.java | 2 +- .../apache/cxf/systest/aegis/mtom/MtomTest.java | 2 +- .../apache/cxf/systest/jaxb/HashMapAdapter.java | 2 +- .../apache/cxf/systest/jaxb/MTOMBase64Test.java | 2 +- .../org/apache/cxf/systest/jaxb/MTOMTest.java | 2 +- .../apache/cxf/systest/jaxrs/AtomBookStore.java | 4 +- .../java/org/apache/cxf/systest/jaxrs/Book.java | 2 +- .../org/apache/cxf/systest/jaxrs/BookBean.java | 4 +- .../systest/jaxrs/BookContinuationStore.java | 2 +- .../systest/jaxrs/BookCxfContinuationStore.java | 2 +- .../cxf/systest/jaxrs/BookNoXmlRootElement.java | 2 +- .../apache/cxf/systest/jaxrs/BookServer.java | 2 +- .../apache/cxf/systest/jaxrs/BookServer20.java | 2 +- .../org/apache/cxf/systest/jaxrs/BookStore.java | 17 +- .../cxf/systest/jaxrs/BookStoreDispatch.java | 2 +- .../systest/jaxrs/BookStoreNoAnnotations.java | 2 +- .../jaxrs/BookStoreNoAnnotationsImpl.java | 2 +- .../cxf/systest/jaxrs/BookStorePerRequest.java | 2 +- .../cxf/systest/jaxrs/BookStoreSpring.java | 15 +- .../cxf/systest/jaxrs/BookStoreStorage.java | 2 +- .../org/apache/cxf/systest/jaxrs/BookType.java | 2 +- .../cxf/systest/jaxrs/CustomOutInterceptor.java | 2 +- .../org/apache/cxf/systest/jaxrs/Document.java | 38 +++ .../cxf/systest/jaxrs/DocumentResource.java | 35 ++ .../cxf/systest/jaxrs/DocumentResourceImpl.java | 33 ++ .../systest/jaxrs/GenericBookStoreSpring2.java | 2 +- .../jaxrs/JAXRS20ClientServerBookTest.java | 16 + .../jaxrs/JAXRSClientServerBookTest.java | 13 +- .../jaxrs/JAXRSClientServerODataSearchTest.java | 2 +- ...ServerResourceCreatedSpringProviderTest.java | 2 +- .../jaxrs/JAXRSClientServerSpringBookTest.java | 17 +- .../jaxrs/JAXRSClientServerStreamingTest.java | 2 +- .../jaxrs/JAXRSRequestDispatcherTest.java | 6 +- .../cxf/systest/jaxrs/JAXRSSoapBookTest.java | 12 +- .../cxf/systest/jaxrs/JAXRSUnicodeTest.java | 71 ++++ .../apache/cxf/systest/jaxrs/JMSBookStore.java | 2 +- .../cxf/systest/jaxrs/MultipartServer.java | 2 +- .../org/apache/cxf/systest/jaxrs/XXETest.java | 54 +++ .../systest/jaxrs/extraction/BookCatalog.java | 2 +- .../extraction/JAXRSClientServerTikaTest.java | 2 +- .../jaxrs/failover/AbstractFailoverTest.java | 2 +- .../jaxrs/failover/FailoverBookServer.java | 43 +++ .../jaxrs/failover/FailoverBookStore.java | 47 +++ .../jaxrs/failover/FailoverWebClientTest.java | 89 +++++ .../jaxrs/failover/LoadDistributorServer.java | 43 +++ .../failover/LoadDistributorWebClientTest.java | 80 +++++ .../jaxrs/jaxws/BookStoreSoapRestImpl.java | 2 +- .../cxf/systest/jaxrs/jms/JAXRSJmsTest.java | 2 +- .../apache/cxf/systest/jaxrs/provider/Book.java | 2 +- .../systest/jaxrs/provider/BookJsonStore.java | 2 +- .../systest/jaxrs/security/BookLoginModule.java | 2 +- .../systest/jaxrs/security/SecureBookStore.java | 2 +- .../jaxrs/security/SecureBookStoreGenerics.java | 2 +- .../security/SecureBookStoreNoAnnotations.java | 2 +- .../security/SecureBookStoreNoInterface.java | 2 +- .../validation/BookStoreWithValidation.java | 2 +- .../BookStoreWithValidationPerRequest.java | 2 +- .../jaxrs/websocket/BookStoreWebSocket.java | 2 +- .../src/test/resources/jaxrs/WEB-INF/beans.xml | 8 + .../resources/jaxrs_unicode/WEB-INF/beans.xml | 35 ++ .../resources/jaxrs_unicode/WEB-INF/web.xml | 45 +++ .../jaxrs/src/test/resources/logging.properties | 74 ++++ .../cxf/systest/jaxrs/failover/cxf-client.xml | 43 +++ .../systest/jaxrs/failover/cxf-lb-service.xml | 65 ++++ .../cxf/systest/jaxrs/failover/cxf-service.xml | 75 +++++ systests/jaxws/pom.xml | 11 - .../dispatch/DispatchClientServerTest.java | 4 +- .../cxf/systest/handlers/TestHandler.java | 2 +- .../cxf/systest/handlers/TestHandlerBase.java | 2 +- .../apache/cxf/systest/jaxws/CXF6655Test.java | 14 +- .../jaxws/ClientServerGreeterNoWsdlTest.java | 2 +- .../cxf/systest/jaxws/ClientServerMiscTest.java | 4 +- .../systest/jaxws/ClientServerRPCLitTest.java | 2 +- .../cxf/systest/jaxws/ClientServerTest.java | 2 +- .../jaxws/SchemaValidationClientServerTest.java | 2 +- .../cxf/systest/jaxws/ServerGreeterNoWsdl.java | 2 +- .../JavaFirstSchemaValidationTest.java | 4 +- .../AttachmentStreamSourceXMLProvider.java | 2 +- .../provider/ProviderClientServerTest.java | 2 +- .../org/apache/cxf/systest/provider/Server.java | 2 +- .../apache/cxf/systest/provider/XMLServer.java | 2 +- .../systest/kerberos/jaxrs/kerberos/Book.java | 2 +- .../kerberos/jaxrs/kerberos/BookStoreImpl.java | 2 +- .../systest/kerberos/ldap/LDAPClaimsTest.java | 170 +++++----- .../security/jose/jwejws/JAXRSJwsJsonTest.java | 6 +- .../jose/jwejws/JweJwsAlgorithmTest.java | 30 +- .../jose/jwejws/JweJwsReferenceTest.java | 18 +- .../security/jose/jwt/JWTAlgorithmTest.java | 70 ++-- .../security/jose/jwt/JWTAuthnAuthzTest.java | 22 +- .../security/jose/jwt/JWTPropertiesTest.java | 72 ++-- .../oauth/TemporaryCredentialServiceTest.java | 2 +- .../security/oauth2/common/OAuth2TestUtils.java | 10 +- .../grants/AuthorizationGrantNegativeTest.java | 10 +- .../grants/CallbackHandlerLoginHandler.java | 3 +- .../security/oauth2/grants/JAXRSOAuth2Test.java | 35 +- .../security/oidc/IdTokenProviderImpl.java | 10 +- .../security/oidc/MemoryClientDataProvider.java | 2 +- .../jaxrs/security/oidc/OIDCFlowTest.java | 6 +- .../jaxrs/security/oidc/OIDCNegativeTest.java | 6 +- .../saml/JAXRSSamlAuthorizationTest.java | 13 +- .../jaxrs/security/saml/JAXRSSamlTest.java | 2 +- .../security/saml/KeystorePasswordCallback.java | 4 + .../jaxrs/security/xml/JAXRSXmlSecTest.java | 336 ++++++++++++++----- .../systest/jaxrs/security/bethal.properties | 24 ++ .../jaxrs/security/jose/jwejws/server.xml | 2 +- .../systest/jaxrs/security/morpit.properties | 21 ++ .../jaxrs/security/morpittrust.properties | 23 ++ .../cxf/systest/jaxrs/security/xml/server.xml | 45 +++ .../systest/jaxrs/security/xml/stax-server.xml | 60 +++- .../apache/cxf/systest/jaxrs/sse/BookStore.java | 3 +- .../cxf/systest/jaxrs/sse/BookStore2.java | 3 +- .../htrace/HTraceTracingCustomHeadersTest.java | 6 +- .../jaxrs/tracing/htrace/HTraceTracingTest.java | 4 +- .../jaxws/tracing/brave/BraveTracingTest.java | 2 +- .../jaxws/tracing/htrace/HTraceTracingTest.java | 4 +- .../cxf/systest/jms/GreeterImplSoap12.java | 2 +- .../systest/jms/security/JMSWSSecurityTest.java | 10 +- .../apache/cxf/systest/jms/security/Server.java | 2 +- .../cxf/systest/jms/tx/MyBeanLocator.java | 2 +- .../http_undertow/ClientServerSessionTest.java | 2 +- .../http_undertow/MapIdentityManager.java | 1 + .../org/apache/cxf/https/ssl3/sslv3-server.xml | 16 + systests/transports/pom.xml | 11 - .../org/apache/cxf/systest/http/BusServer.java | 2 +- .../systest/http/ClientServerSessionTest.java | 2 +- .../systest/http/HTTPProxyAuthConduitTest.java | 44 ++- .../cxf/systest/http/HTTPProxyConduitTest.java | 24 +- .../org/apache/cxf/systest/https/BusServer.java | 2 +- .../conduit/HTTPSProxyAuthConduitTest.java | 48 ++- .../https/conduit/HTTPSProxyConduitTest.java | 30 +- .../systest/https/trust/TrustManagerTest.java | 75 +++-- .../https/trust/TrustServerNoSpring.java | 84 +++++ .../ciphersuites-explicit-client.xml | 2 +- .../https/ciphersuites/ciphersuites-server.xml | 5 +- systests/uncategorized/pom.xml | 1 - .../apache/cxf/systest/basicDOCBare/Server.java | 2 +- .../cxf/systest/clustering/ControlImpl.java | 4 +- .../LoadDistributorAddressOverrideTest.java | 6 +- .../systest/clustering/LoadDistributorTest.java | 6 +- .../systest/exception/GenericExceptionTest.java | 2 +- .../cxf/systest/exception/GenericsEcho.java | 2 +- .../MultiplexClientServerTest.java | 2 +- .../cxf/systest/lifecycle/LifeCycleTest.java | 4 +- .../cxf/systest/mtom/ClientMtomXopTest.java | 115 ++++++- .../apache/cxf/systest/mtom/MtomServerTest.java | 4 +- .../cxf/systest/outofband/header/Server.java | 8 +- .../schema_validation/ValidationServer.java | 2 +- .../systest/soap12/Soap12ClientServerTest.java | 2 +- .../cxf/systest/soapfault/details/Server11.java | 2 +- .../cxf/systest/soapfault/details/Server12.java | 2 +- .../StaxTransformFeatureTest.java | 8 +- .../ws/rm/AbstractClientPersistenceTest.java | 2 +- .../apache/cxf/systest/ws/rm/ControlImpl.java | 2 +- .../cxf/systest/ws/rm/DecoupledBareTest.java | 2 +- .../ws/rm/DecoupledClientServerOnewayTest.java | 2 +- .../ws/rm/DecoupledClientServerTest.java | 2 +- .../ws/rm/DeliveryAssuranceOnewayTest.java | 2 +- .../ws/rm/MessageCallbackOnewayTest.java | 2 +- .../systest/ws/rm/ProtocolVariationsTest.java | 8 +- .../apache/cxf/systest/ws/rm/SequenceTest.java | 10 +- .../cxf/systest/ws/rm/SequenceTimeoutTest.java | 213 ++++++++++++ .../ws/rm/sec/WSRMWithWSSecurityPolicyTest.java | 22 +- .../cxf/systest/wssec/examples/ut/server.xml | 1 + .../systest/wssec/examples/ut/stax-server.xml | 1 + .../cxf/systest/ws/action/ActionTest.java | 112 +++++++ .../cxf/systest/ws/basicauth/BasicAuthTest.java | 112 +++++++ .../apache/cxf/systest/ws/basicauth/Server.java | 47 +++ .../ws/common/KeystorePasswordCallback.java | 2 + .../CryptoCoverageCheckerTest.java | 24 +- .../apache/cxf/systest/ws/fault/FaultTest.java | 31 +- .../systest/ws/fault/ModifiedRequestTest.java | 19 +- .../ws/gcm/MGF256AlgorithmSuiteLoader.java | 2 +- .../cxf/systest/ws/httpget/HTTPGetTest.java | 2 +- .../cxf/systest/ws/https/HttpsTokenTest.java | 44 +++ .../ws/policy/JavaFirstPolicyServiceTest.java | 4 +- .../policy/handler/CommonPasswordCallback.java | 2 +- .../ws/policy/handler/HelloServiceImpl.java | 7 +- .../cxf/systest/ws/saml/SamlTokenTest.java | 62 ++-- .../saml/subjectconf/SamlSubjectConfTest.java | 19 +- .../systest/ws/security/SecurityPolicyTest.java | 4 +- .../ws/security/WSSecurityClientTest.java | 4 +- .../handler/UsernamePasswordCallback.java | 2 +- .../cxf/systest/ws/wssc/WSSCUnitTest.java | 21 +- .../systest/ws/x509/DoubleItPropertiesImpl.java | 9 +- .../cxf/systest/ws/x509/SHA512PolicyLoader.java | 2 +- .../src/test/resources/bethal.properties | 24 ++ .../src/test/resources/kerberos.jaas | 8 - .../cxf/systest/ws/action/DoubleItAction.wsdl | 12 + .../org/apache/cxf/systest/ws/action/client.xml | 104 ++++++ .../org/apache/cxf/systest/ws/action/server.xml | 104 ++++++ .../systest/ws/basicauth/DoubleItBasicAuth.wsdl | 75 +++++ .../apache/cxf/systest/ws/basicauth/client.xml | 48 +++ .../apache/cxf/systest/ws/basicauth/server.xml | 52 +++ .../cxf/systest/ws/https/DoubleItHttps.wsdl | 6 + .../org/apache/cxf/systest/ws/https/client.xml | 26 ++ .../org/apache/cxf/systest/ws/https/server.xml | 14 + .../apache/cxf/systest/ws/https/stax-server.xml | 20 ++ .../cxf/systest/ws/security/DoubleIt.wsdl | 4 +- .../apache/cxf/systest/ws/ut/server-derived.xml | 7 + .../org/apache/cxf/systest/ws/ut/server.xml | 1 + .../apache/cxf/systest/ws/ut/stax-server.xml | 1 + .../src/test/resources/truststore.properties | 23 ++ .../cxf/systest/ws/AbstractWSATestBase.java | 4 +- .../apache/cxf/systest/ws/addr_wsdl/Server.java | 4 +- .../systest/ws/addressing/DecoupledJMSTest.java | 2 +- .../cxf/systest/ws/addressing/MAPTestBase.java | 2 +- .../cxf/systest/ws/addressing/MAPVerifier.java | 2 +- .../ws/addressing/NonDecoupledJMSTest.java | 2 +- .../wsdl_maven/codegen/src/it/it-parent/pom.xml | 4 +- testutils/pom.xml | 4 + .../cxf/customer/bare/CustomerService.java | 2 +- .../cxf/customer/book/BookServiceImpl.java | 2 +- .../customer/book/BookServiceWrappedImpl.java | 2 +- .../cxf/customer/wraped/CustomerService.java | 2 +- .../cxf/mtom_xop/TestMtomProviderImpl.java | 104 ++++++ .../java/org/apache/cxf/test/TestUtilities.java | 2 +- .../java/org/apache/cxf/test/XPathAssert.java | 4 +- .../cxf/testutil/common/ServerLauncher.java | 2 +- .../AnnotatedGreeterImpl.java | 2 +- .../AnnotatedGreeterNoOverloadImpl.java | 2 +- .../AnotherDerivedGreeterImpl.java | 2 +- .../DerivedGreeterImpl.java | 2 +- testutils/src/main/resources/wsdl/mtom_xop.wsdl | 3 + .../org/apache/cxf/test/XPathAssertTest.java | 2 +- .../tools/common/AbstractCXFToolContainer.java | 2 +- .../cxf/tools/common/CommandInterfaceUtils.java | 1 + .../cxf/tools/common/ProcessorTestBase.java | 2 +- .../java/org/apache/cxf/tools/common/Tag.java | 2 +- .../apache/cxf/tools/common/ToolContext.java | 12 +- .../cxf/tools/common/VelocityGenerator.java | 2 +- .../cxf/tools/common/model/JavaMethod.java | 4 +- .../cxf/tools/common/model/JavaParameter.java | 2 +- .../apache/cxf/tools/common/model/JavaType.java | 2 +- .../cxf/tools/common/toolspec/ToolRunner.java | 8 +- .../tools/util/BuiltInTypesJavaMappingUtil.java | 2 +- .../apache/cxf/tools/util/ClassCollector.java | 14 +- .../org/apache/cxf/tools/util/PropertyUtil.java | 2 +- .../tools/common/ProcessorEnvironmentTest.java | 14 +- .../tools/corba/common/CorbaPrimitiveMap.java | 2 +- .../corba/common/ProcessorEnvironment.java | 8 +- .../corba/common/XmlSchemaPrimitiveMap.java | 2 +- .../tools/corba/common/idltypes/IdlRoot.java | 2 +- .../corba/idlpreprocessor/DefineState.java | 2 +- .../corba/processors/idl/AttributeVisitor.java | 4 +- .../idl/DeferredActionCollection.java | 2 +- .../processors/idl/IDLToWSDLProcessor.java | 8 +- .../corba/processors/idl/ModuleToNSMapper.java | 4 +- .../processors/idl/ScopeNameCollection.java | 2 +- .../corba/processors/idl/WSDLSchemaManager.java | 10 +- .../processors/wsdl/WSDLToCorbaBinding.java | 2 +- .../processors/wsdl/WSDLToCorbaHelper.java | 2 +- .../corba/common/CorbaPrimitiveMapTest.java | 2 +- .../processors/IDLToWSDLGenerationTest.java | 6 +- .../processors/WSDLToCorbaBindingTest.java | 2 +- .../processors/WSDLToCorbaBindingTypeTest.java | 2 +- .../org/apache/cxf/tools/java2js/JavaToJS.java | 2 + .../org/apache/cxf/tools/java2ws/JavaToWS.java | 1 + .../generator/wsdl11/WSDL11Generator.java | 2 +- .../processor/internal/AntGenerator.java | 4 +- .../org/apache/cxf/tools/java2ws/AegisTest.java | 2 +- .../apache/cxf/tools/java2ws/JavaToWSTest.java | 4 +- .../processor/JavaToProcessorTest.java | 16 +- .../validator/internal/SchemaValidator.java | 2 +- .../internal/UniqueBodyPartsValidator.java | 2 +- .../tools/validator/internal/ValidatorUtil.java | 2 +- .../validator/internal/WSDLRefValidator.java | 10 +- .../tools/validator/internal/model/XNode.java | 2 +- .../org/apache/cxf/tools/wadlto/WADLToJava.java | 2 +- .../cxf/tools/wadlto/jaxrs/JAXRSContainer.java | 2 +- .../cxf/tools/wadlto/jaxrs/SourceGenerator.java | 18 +- .../org/apache/cxf/tools/wsdlto/WSDLToJava.java | 3 +- .../cxf/tools/wsdlto/WSDLToJavaContainer.java | 9 +- .../wsdlto/core/WSDLDefinitionBuilder.java | 2 +- .../databinding/jaxb/JAXBDataBinding.java | 17 +- .../wsdlto/javascript/JavaScriptContainer.java | 2 +- .../jaxws/customization/CustomNodeSelector.java | 2 +- .../customization/CustomizationParser.java | 4 +- .../frontend/jaxws/generators/AntGenerator.java | 4 +- .../jaxws/generators/ImplGenerator.java | 2 +- .../jaxws/generators/ServerGenerator.java | 2 +- .../processor/internal/ServiceProcessor.java | 2 +- .../wsdlto/frontend/jaxws/template/build.vm | 10 +- .../jaxws/validator/UniqueBodyValidator.java | 4 +- .../WrapperStyleNameCollisionValidator.java | 8 +- .../jaxws/wsdl11/CustomizedWSDLLocator.java | 2 +- .../misc/processor/AbstractWSDLToProcessor.java | 2 +- .../misc/processor/WSDLToXMLProcessor.java | 2 +- .../misc/processor/address/AddressFactory.java | 2 +- .../misc/processor/address/JmsAddress.java | 4 +- .../misc/processor/address/SoapAddress.java | 4 +- .../misc/processor/address/XmlAddress.java | 4 +- .../cxf/tools/wsdlto/jaxws/CodeGenBugTest.java | 2 +- 983 files changed, 9731 insertions(+), 3892 deletions(-) ----------------------------------------------------------------------