cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccri...@apache.org
Subject [2/7] cxf git commit: Merge pull request #4 from apache/master
Date Mon, 12 Jun 2017 14:09:36 GMT
Merge pull request #4 from apache/master

update

Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/751e63ac
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/751e63ac
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/751e63ac

Branch: refs/heads/master
Commit: 751e63ac9fdf5752ae3956b84925ec91ea6e0253
Parents: 45bc221 afdf936
Author: Andy McCright <j.andrew.mccright@gmail.com>
Authored: Wed Mar 1 16:40:02 2017 -0600
Committer: GitHub <noreply@github.com>
Committed: Wed Mar 1 16:40:02 2017 -0600

----------------------------------------------------------------------
 .../cxf/performance/client/BenchClient.java     |   90 +-
 .../cxf/performance/server/BenchmarkImpl.java   |   64 +-
 .../cxf/performance/server/BenchmarkServer.java |   12 +-
 .../apache/cxf/pat/internal/TestCaseBase.java   |   28 +-
 .../org/apache/cxf/pat/internal/TestResult.java |   16 +-
 .../org/apache/cxf/pat/internal/TestRunner.java |    8 +-
 .../performance/basic_type/client/Client.java   |   20 +-
 .../performance/basic_type/server/Server.java   |   10 +-
 .../basic_type/server/ServerImpl.java           |   12 +-
 .../performance/complex_type/client/Client.java |   32 +-
 .../performance/complex_type/server/Server.java |   10 +-
 .../complex_type/server/ServerImpl.java         |    8 +-
 .../performance/complex_type/client/Client.java |   22 +-
 .../common/KeystorePasswordCallback.java        |    8 +-
 .../performance/complex_type/server/Server.java |   14 +-
 .../complex_type/server/ServerImpl.java         |   10 +-
 .../src/main/resources/etc/https-cfg-client.xml |    2 +-
 .../main/resources/etc/https-cfg-service.xml    |    2 +-
 .../src/main/resources/etc/policy-asym.xml      |    2 +-
 .../src/main/resources/etc/policy-sym.xml       |    2 +-
 .../src/main/resources/etc/policy-symsc.xml     |    2 +-
 .../src/main/webapp/WEB-INF/cxf-servlet.xml     |    2 +-
 .../cxf/profile/ClientEndpointCreationLoop.java |   10 +-
 .../cxf/profile/DefaultBusInitialization.java   |    4 +-
 .../DynamicClientEndpointCreationLoop.java      |   14 +-
 .../cxf/profile/EndpointCreationLoop.java       |   10 +-
 .../cxf/profile/EndpointCreationLoop2.java      |   14 +-
 .../cxf/profile/EndpointCreationLoop3.java      |   12 +-
 .../cxf/profile/FastInfosetExperiment.java      |   32 +-
 bin/DoMerges.java                               |  136 +--
 core/pom.xml                                    |    4 +-
 core/src/main/java/org/apache/cxf/Bus.java      |   20 +-
 .../main/java/org/apache/cxf/BusFactory.java    |   22 +-
 .../org/apache/cxf/annotations/DataBinding.java |    4 +-
 .../cxf/annotations/EndpointProperties.java     |    4 +-
 .../cxf/annotations/EndpointProperty.java       |   18 +-
 .../org/apache/cxf/annotations/FactoryType.java |   14 +-
 .../org/apache/cxf/annotations/FastInfoset.java |    2 +-
 .../org/apache/cxf/annotations/Logging.java     |   16 +-
 .../org/apache/cxf/annotations/Policies.java    |    4 +-
 .../java/org/apache/cxf/annotations/Policy.java |   22 +-
 .../org/apache/cxf/annotations/Provider.java    |    4 +-
 .../cxf/annotations/SchemaValidation.java       |    2 +-
 .../apache/cxf/annotations/UseAsyncMethod.java  |   14 +-
 .../java/org/apache/cxf/annotations/UseNio.java |    2 +-
 .../cxf/annotations/WSDLDocumentation.java      |   20 +-
 .../WSDLDocumentationCollection.java            |    6 +-
 .../cxf/attachment/AttachmentDataSource.java    |   12 +-
 .../cxf/attachment/AttachmentDeserializer.java  |   24 +-
 .../apache/cxf/attachment/AttachmentImpl.java   |    4 +-
 .../cxf/attachment/AttachmentSerializer.java    |   76 +-
 .../apache/cxf/attachment/AttachmentUtil.java   |   96 +-
 .../cxf/attachment/Base64DecoderStream.java     |    4 +-
 .../cxf/attachment/ContentDisposition.java      |    2 +-
 .../cxf/attachment/DelegatingInputStream.java   |    2 +-
 .../cxf/attachment/ImageDataContentHandler.java |   18 +-
 .../attachment/LazyAttachmentCollection.java    |   38 +-
 .../apache/cxf/attachment/LazyDataSource.java   |   18 +-
 .../cxf/attachment/MimeBodyPartInputStream.java |   20 +-
 .../cxf/binding/AbstractBindingFactory.java     |    6 +-
 .../java/org/apache/cxf/binding/Binding.java    |   14 +-
 .../org/apache/cxf/binding/BindingFactory.java  |   12 +-
 .../cxf/binding/BindingFactoryManager.java      |    4 +-
 .../java/org/apache/cxf/bus/CXFBusFactory.java  |    8 +-
 .../java/org/apache/cxf/bus/ManagedBus.java     |   14 +-
 .../cxf/bus/blueprint/BlueprintBeanLocator.java |   42 +-
 .../apache/cxf/bus/blueprint/BlueprintBus.java  |   10 +-
 .../BlueprintNameSpaceHandlerFactory.java       |    2 +-
 .../blueprint/BundleDelegatingClassLoader.java  |   24 +-
 .../cxf/bus/blueprint/BusDefinitionParser.java  |    8 +-
 .../cxf/bus/blueprint/ConfigurerImpl.java       |   28 +-
 .../org/apache/cxf/bus/extension/Extension.java |   54 +-
 .../cxf/bus/extension/ExtensionException.java   |    2 +-
 .../cxf/bus/extension/ExtensionManager.java     |    6 +-
 .../cxf/bus/extension/ExtensionManagerBus.java  |   82 +-
 .../cxf/bus/extension/ExtensionManagerImpl.java |   79 +-
 .../cxf/bus/extension/ExtensionRegistry.java    |   10 +-
 .../extension/TextExtensionFragmentParser.java  |   12 +-
 .../bus/managers/BindingFactoryManagerImpl.java |   42 +-
 .../bus/managers/CXFBusLifeCycleManager.java    |   22 +-
 .../managers/ClientLifeCycleManagerImpl.java    |   12 +-
 .../managers/ConduitInitiatorManagerImpl.java   |   14 +-
 .../managers/DestinationFactoryManagerImpl.java |   10 +-
 .../managers/EndpointResolverRegistryImpl.java  |   42 +-
 .../cxf/bus/managers/HeaderManagerImpl.java     |   12 +-
 .../cxf/bus/managers/PhaseManagerImpl.java      |    4 +-
 .../managers/ServerLifeCycleManagerImpl.java    |    8 +-
 .../cxf/bus/managers/ServerRegistryImpl.java    |   20 +-
 .../ServiceContractResolverRegistryImpl.java    |   14 +-
 .../bus/managers/WorkQueueImplMBeanWrapper.java |   30 +-
 .../cxf/bus/managers/WorkQueueManagerImpl.java  |   48 +-
 .../WorkQueueManagerImplMBeanWrapper.java       |   22 +-
 .../org/apache/cxf/bus/osgi/CXFActivator.java   |   20 +-
 .../bus/osgi/CXFExtensionBundleListener.java    |   24 +-
 .../cxf/bus/osgi/ManagedWorkQueueList.java      |   12 +-
 .../apache/cxf/bus/osgi/OSGIBusListener.java    |   16 +-
 .../apache/cxf/bus/osgi/OSGiBeanLocator.java    |   24 +-
 .../cxf/bus/resource/ResourceManagerImpl.java   |    4 +-
 .../cxf/bus/spring/BusApplicationContext.java   |   78 +-
 .../BusApplicationContextResourceResolver.java  |   16 +-
 .../cxf/bus/spring/BusDefinitionParser.java     |   44 +-
 .../cxf/bus/spring/BusEntityResolver.java       |   20 +-
 .../bus/spring/BusExtensionPostProcessor.java   |   10 +-
 .../BusWiringBeanFactoryPostProcessor.java      |   14 +-
 ...rolledValidationXmlBeanDefinitionReader.java |   38 +-
 .../cxf/bus/spring/Jsr250BeanPostProcessor.java |   24 +-
 .../apache/cxf/bus/spring/NamespaceHandler.java |    4 +-
 .../cxf/bus/spring/SpringBeanLocator.java       |   42 +-
 .../org/apache/cxf/bus/spring/SpringBus.java    |   24 +-
 .../apache/cxf/bus/spring/SpringBusFactory.java |   54 +-
 .../cxf/bus/spring/TunedDocumentLoader.java     |   36 +-
 .../cxf/buslifecycle/BusCreationListener.java   |   12 +-
 .../cxf/buslifecycle/BusLifeCycleListener.java  |    2 +-
 .../catalog/CatalogXmlSchemaURIResolver.java    |   10 +-
 .../apache/cxf/catalog/OASISCatalogManager.java |   20 +-
 .../cxf/catalog/OASISCatalogManagerHelper.java  |    6 +-
 .../annotation/AbstractAnnotationVisitor.java   |   28 +-
 .../common/annotation/AnnotationProcessor.java  |   62 +-
 .../common/annotation/AnnotationVisitor.java    |   30 +-
 .../common/classloader/ClassLoaderUtils.java    |   32 +-
 .../org/apache/cxf/common/i18n/BundleUtils.java |   24 +-
 .../org/apache/cxf/common/i18n/Exception.java   |   16 +-
 .../org/apache/cxf/common/i18n/Message.java     |   12 +-
 .../cxf/common/i18n/UncheckedException.java     |   26 +-
 .../common/injection/NoJSR250Annotations.java   |    6 +-
 .../cxf/common/injection/ResourceInjector.java  |  186 ++--
 .../cxf/common/jaxb/JAXBContextCache.java       |   58 +-
 .../cxf/common/jaxb/JAXBContextProxy.java       |    2 +-
 .../org/apache/cxf/common/jaxb/JAXBUtils.java   |  303 +++---
 .../apache/cxf/common/jaxb/NamespaceMapper.java |    8 +-
 .../jaxb/SchemaCollectionContextProxy.java      |   18 +-
 .../logging/AbstractDelegatingLogger.java       |    8 +-
 .../apache/cxf/common/logging/JDKBugHacks.java  |   24 +-
 .../apache/cxf/common/logging/Log4jLogger.java  |   34 +-
 .../org/apache/cxf/common/logging/LogUtils.java |  126 +--
 .../apache/cxf/common/logging/Slf4jLogger.java  |    8 +-
 .../apache/cxf/common/security/SimpleGroup.java |   22 +-
 .../cxf/common/security/SimplePrincipal.java    |   14 +-
 .../common/security/SimpleSecurityContext.java  |    2 +-
 .../cxf/common/security/UsernameToken.java      |    4 +-
 .../org/apache/cxf/common/util/ASMHelper.java   |  108 +-
 .../cxf/common/util/Base64OutputStream.java     |   10 +-
 .../cxf/common/util/Base64UrlUtility.java       |   12 +-
 .../apache/cxf/common/util/Base64Utility.java   |  118 +-
 .../org/apache/cxf/common/util/CacheMap.java    |   24 +-
 .../cxf/common/util/CglibProxyHelper.java       |   20 +-
 .../org/apache/cxf/common/util/ClassHelper.java |   24 +-
 .../cxf/common/util/ClasspathScanner.java       |  112 +-
 .../apache/cxf/common/util/CollectionUtils.java |   10 +-
 .../org/apache/cxf/common/util/Compiler.java    |   50 +-
 .../cxf/common/util/CompressionUtils.java       |   22 +-
 .../common/util/MessageDigestInputStream.java   |    4 +-
 .../util/ModCountCopyOnWriteArrayList.java      |   14 +-
 .../apache/cxf/common/util/PackageUtils.java    |   26 +-
 .../apache/cxf/common/util/PrimitiveUtils.java  |   10 +-
 .../cxf/common/util/PropertiesLoaderUtils.java  |   12 +-
 .../apache/cxf/common/util/PropertyUtils.java   |   16 +-
 .../cxf/common/util/ProxyClassLoader.java       |    6 +-
 .../org/apache/cxf/common/util/ProxyHelper.java |   12 +-
 .../util/ReflectionInvokationHandler.java       |   24 +-
 .../apache/cxf/common/util/ReflectionUtil.java  |   40 +-
 .../apache/cxf/common/util/SortedArraySet.java  |   30 +-
 .../cxf/common/util/SpringAopClassHelper.java   |   20 +-
 .../cxf/common/util/SpringClasspathScanner.java |   86 +-
 .../apache/cxf/common/util/SpringOsgiUtil.java  |    2 +-
 .../org/apache/cxf/common/util/StringUtils.java |   50 +-
 .../cxf/common/util/SystemPropertyAction.java   |   10 +-
 .../apache/cxf/common/util/URIParserUtil.java   |   14 +-
 .../org/apache/cxf/common/util/UrlUtils.java    |   34 +-
 .../cxf/common/util/WeakIdentityHashMap.java    |    8 +-
 .../common/util/XmlSchemaPrimitiveUtils.java    |   18 +-
 .../InvalidXmlSchemaReferenceException.java     |    4 +-
 .../cxf/common/xmlschema/LSInputImpl.java       |    2 +-
 .../cxf/common/xmlschema/SchemaCollection.java  |    4 +-
 .../cxf/common/xmlschema/XmlSchemaUtils.java    |   10 +-
 .../apache/cxf/configuration/Configurable.java  |   12 +-
 .../configuration/ConfiguredBeanLocator.java    |   26 +-
 .../apache/cxf/configuration/Configurer.java    |   12 +-
 .../AbstractBPBeanDefinitionParser.java         |   68 +-
 .../blueprint/InterceptorTypeConverter.java     |    4 +-
 .../blueprint/SimpleBPBeanDefinitionParser.java |   16 +-
 .../apache/cxf/configuration/jsse/SSLUtils.java |  362 ++----
 .../configuration/jsse/TLSClientParameters.java |   28 +-
 .../jsse/TLSClientParametersConfig.java         |   28 +-
 .../configuration/jsse/TLSParameterBase.java    |   26 +-
 .../jsse/TLSParameterJaxBUtils.java             |   41 +-
 .../configuration/jsse/TLSServerParameters.java |   20 +-
 .../jsse/TLSServerParametersConfig.java         |   14 +-
 .../spring/AbstractBeanDefinitionParser.java    |  148 +--
 .../AbstractFactoryBeanDefinitionParser.java    |   20 +-
 .../configuration/spring/ConfigurerImpl.java    |   56 +-
 .../configuration/spring/JAXBBeanFactory.java   |   12 +-
 .../spring/MappingBeanDefinitionParser.java     |    8 +-
 .../apache/cxf/continuations/Continuation.java  |   44 +-
 .../cxf/continuations/ContinuationCallback.java |   10 +-
 .../cxf/continuations/ContinuationProvider.java |    6 +-
 .../SuspendedInvocationException.java           |   10 +-
 .../cxf/databinding/AbstractDataBinding.java    |    6 +-
 ...AbstractInterceptorProvidingDataBinding.java |    6 +-
 .../cxf/databinding/AbstractWrapperHelper.java  |   62 +-
 .../org/apache/cxf/databinding/DataReader.java  |   16 +-
 .../org/apache/cxf/databinding/DataWriter.java  |   12 +-
 .../databinding/WrapperCapableDatabinding.java  |    2 +-
 .../apache/cxf/databinding/WrapperHelper.java   |   10 +-
 .../cxf/databinding/source/NodeDataReader.java  |   12 +-
 .../cxf/databinding/source/NodeDataWriter.java  |    6 +-
 .../databinding/source/SourceDataBinding.java   |    6 +-
 .../databinding/source/XMLStreamDataReader.java |   34 +-
 .../databinding/source/XMLStreamDataWriter.java |   12 +-
 .../databinding/source/mime/MimeAttribute.java  |    6 +-
 .../databinding/source/mime/MimeSerializer.java |    4 +-
 .../cxf/databinding/stax/StaxDataBinding.java   |   14 +-
 .../stax/StaxDataBindingFeature.java            |    2 +-
 .../stax/StaxDataBindingInterceptor.java        |   18 +-
 .../cxf/endpoint/AbstractConduitSelector.java   |   68 +-
 .../cxf/endpoint/AbstractEndpointFactory.java   |   30 +-
 .../java/org/apache/cxf/endpoint/Client.java    |   88 +-
 .../org/apache/cxf/endpoint/ClientImpl.java     |   60 +-
 .../cxf/endpoint/ClientLifeCycleListener.java   |    2 +-
 .../cxf/endpoint/ClientLifeCycleManager.java    |    2 +-
 .../apache/cxf/endpoint/ConduitSelector.java    |   10 +-
 .../cxf/endpoint/ConduitSelectorHolder.java     |    2 +-
 .../cxf/endpoint/DeferredConduitSelector.java   |   14 +-
 .../java/org/apache/cxf/endpoint/Endpoint.java  |   20 +-
 .../org/apache/cxf/endpoint/EndpointImpl.java   |   32 +-
 .../cxf/endpoint/EndpointImplFactory.java       |    4 +-
 .../apache/cxf/endpoint/EndpointResolver.java   |    8 +-
 .../cxf/endpoint/EndpointResolverRegistry.java  |   24 +-
 .../apache/cxf/endpoint/ManagedEndpoint.java    |   30 +-
 .../cxf/endpoint/NullConduitSelector.java       |   14 +-
 .../endpoint/PreexistingConduitSelector.java    |   18 +-
 .../java/org/apache/cxf/endpoint/Retryable.java |    2 +-
 .../java/org/apache/cxf/endpoint/Server.java    |   10 +-
 .../org/apache/cxf/endpoint/ServerImpl.java     |   52 +-
 .../cxf/endpoint/ServerLifeCycleListener.java   |    2 +-
 .../cxf/endpoint/ServerLifeCycleManager.java    |    2 +-
 .../cxf/endpoint/ServiceContractResolver.java   |    6 +-
 .../ServiceContractResolverRegistry.java        |    6 +-
 .../cxf/endpoint/SimpleEndpointImplFactory.java |    8 +-
 .../cxf/endpoint/UpfrontConduitSelector.java    |   18 +-
 .../org/apache/cxf/extension/BusExtension.java  |    2 +-
 .../java/org/apache/cxf/extension/Registry.java |   12 +-
 .../org/apache/cxf/extension/RegistryImpl.java  |   14 +-
 .../org/apache/cxf/feature/AbstractFeature.java |   16 +-
 .../apache/cxf/feature/FastInfosetFeature.java  |   14 +-
 .../java/org/apache/cxf/feature/Feature.java    |    8 +-
 .../java/org/apache/cxf/feature/Features.java   |    2 +-
 .../org/apache/cxf/feature/LoggingFeature.java  |   28 +-
 .../cxf/feature/StaxTransformFeature.java       |   20 +-
 .../org/apache/cxf/feature/WrappedFeature.java  |   12 +-
 .../transform/AbstractXSLTInterceptor.java      |   10 +-
 .../cxf/feature/transform/XSLTFeature.java      |   18 +-
 .../feature/transform/XSLTInInterceptor.java    |    4 +-
 .../feature/transform/XSLTOutInterceptor.java   |    2 +-
 .../apache/cxf/feature/transform/XSLTUtils.java |    2 +-
 .../DefaultSchemaValidationTypeProvider.java    |    4 +-
 .../validation/SchemaValidationFeature.java     |    8 +-
 .../SchemaValidationTypeProvider.java           |    2 +-
 .../java/org/apache/cxf/headers/Header.java     |   26 +-
 .../org/apache/cxf/headers/HeaderManager.java   |    4 +-
 .../org/apache/cxf/headers/HeaderProcessor.java |    6 +-
 .../cxf/helpers/BaseNamespaceHandler.java       |   42 +
 .../java/org/apache/cxf/helpers/CastUtils.java  |   14 +-
 .../java/org/apache/cxf/helpers/DOMUtils.java   |   58 +-
 .../java/org/apache/cxf/helpers/FileUtils.java  |   64 +-
 .../apache/cxf/helpers/HttpHeaderHelper.java    |   22 +-
 .../java/org/apache/cxf/helpers/IOUtils.java    |   54 +-
 .../java/org/apache/cxf/helpers/JavaUtils.java  |    8 +-
 .../helpers/LoadingByteArrayOutputStream.java   |   20 +-
 .../apache/cxf/helpers/MapNamespaceContext.java |    4 +-
 .../java/org/apache/cxf/helpers/NSDecl.java     |    2 +-
 .../java/org/apache/cxf/helpers/NSStack.java    |   10 +-
 .../org/apache/cxf/helpers/ServiceUtils.java    |   52 +-
 .../java/org/apache/cxf/helpers/XPathUtils.java |    8 +-
 .../AbstractAttributedInterceptorProvider.java  |   16 +-
 .../AbstractBasicInterceptorProvider.java       |   14 +-
 .../AbstractFaultChainInitiatorObserver.java    |   30 +-
 .../AbstractInDatabindingInterceptor.java       |   48 +-
 .../interceptor/AbstractLoggingInterceptor.java |   75 +-
 .../AbstractOutDatabindingInterceptor.java      |   48 +-
 .../cxf/interceptor/AnnotationInterceptors.java |   32 +-
 .../interceptor/AttachmentInInterceptor.java    |    4 +-
 .../interceptor/AttachmentOutInterceptor.java   |   32 +-
 .../cxf/interceptor/ClientFaultConverter.java   |   32 +-
 .../cxf/interceptor/FIStaxInInterceptor.java    |   22 +-
 .../cxf/interceptor/FIStaxOutInterceptor.java   |   22 +-
 .../java/org/apache/cxf/interceptor/Fault.java  |   28 +-
 .../cxf/interceptor/FaultOutInterceptor.java    |   12 +-
 .../InFaultChainInitiatorObserver.java          |   10 +-
 .../cxf/interceptor/InFaultInterceptors.java    |    8 +-
 .../apache/cxf/interceptor/InInterceptors.java  |    8 +-
 .../org/apache/cxf/interceptor/Interceptor.java |    8 +-
 .../cxf/interceptor/InterceptorChain.java       |   34 +-
 .../cxf/interceptor/InterceptorProvider.java    |   12 +-
 .../cxf/interceptor/LoggingInInterceptor.java   |   28 +-
 .../apache/cxf/interceptor/LoggingMessage.java  |   14 +-
 .../cxf/interceptor/LoggingOutInterceptor.java  |   40 +-
 .../interceptor/MessageSenderInterceptor.java   |   12 +-
 .../interceptor/OneWayProcessorInterceptor.java |   42 +-
 .../OutFaultChainInitiatorObserver.java         |    8 +-
 .../cxf/interceptor/OutFaultInterceptors.java   |    8 +-
 .../apache/cxf/interceptor/OutInterceptors.java |   10 +-
 .../interceptor/OutgoingChainInterceptor.java   |   36 +-
 .../interceptor/ServiceInvokerInterceptor.java  |   28 +-
 .../interceptor/StaxInEndingInterceptor.java    |    4 +-
 .../cxf/interceptor/StaxInInterceptor.java      |   24 +-
 .../interceptor/StaxOutEndingInterceptor.java   |    8 +-
 .../cxf/interceptor/StaxOutInterceptor.java     |   16 +-
 .../AbstractAuthorizingInInterceptor.java       |   36 +-
 .../AbstractSecurityContextInInterceptor.java   |   26 +-
 .../AbstractUsernameTokenInInterceptor.java     |    8 +-
 .../security/AuthenticationException.java       |    2 +-
 .../security/DefaultSecurityContext.java        |   38 +-
 .../DelegatingAuthenticationInterceptor.java    |   20 +-
 .../DepthRestrictingStreamInterceptor.java      |   28 +-
 .../security/JAASAuthenticationFeature.java     |  116 +-
 .../security/JAASLoginInterceptor.java          |   42 +-
 .../NameDigestPasswordCallbackHandler.java      |   80 +-
 .../security/NamePasswordCallbackHandler.java   |   68 +-
 .../OperationInfoAuthorizingInterceptor.java    |  192 ++--
 .../security/RolePrefixSecurityContextImpl.java |   20 +-
 .../security/SecureAnnotationsInterceptor.java  |   24 +-
 .../security/SimpleAuthorizingInterceptor.java  |   22 +-
 .../CallbackHandlerProviderUsernameToken.java   |    2 +-
 .../callback/CallbackHandlerTlsCert.java        |   10 +-
 .../callback/CertKeyToUserNameMapper.java       |    2 +-
 .../transform/TransformInInterceptor.java       |   24 +-
 .../transform/TransformOutInterceptor.java      |   48 +-
 .../cxf/internal/CXFAPINamespaceHandler.java    |   29 +-
 .../cxf/io/AbstractThresholdOutputStream.java   |   18 +-
 .../cxf/io/AbstractWrappedOutputStream.java     |    6 +-
 .../cxf/io/CacheAndWriteOutputStream.java       |   16 +-
 .../org/apache/cxf/io/CachedOutputStream.java   |   54 +-
 .../java/org/apache/cxf/io/CachedWriter.java    |   48 +-
 .../main/java/org/apache/cxf/io/CipherPair.java |   10 +-
 .../org/apache/cxf/io/CopyingOutputStream.java  |    4 +-
 .../apache/cxf/io/DelegatingInputStream.java    |    6 +-
 .../apache/cxf/io/WriteOnCloseOutputStream.java |    8 +-
 .../org/apache/cxf/logging/FaultListener.java   |    2 +-
 .../cxf/management/InstrumentationManager.java  |   22 +-
 .../apache/cxf/management/ManagedComponent.java |    6 +-
 .../cxf/management/ManagementConstants.java     |    6 +-
 .../management/annotation/ManagedResource.java  |    2 +-
 .../cxf/message/AbstractWrappedMessage.java     |   16 +-
 .../java/org/apache/cxf/message/Attachment.java |   10 +-
 .../java/org/apache/cxf/message/Exchange.java   |   46 +-
 .../org/apache/cxf/message/ExchangeImpl.java    |   20 +-
 .../java/org/apache/cxf/message/FaultMode.java  |    6 +-
 .../java/org/apache/cxf/message/Message.java    |  116 +-
 .../apache/cxf/message/MessageContentsList.java |   12 +-
 .../org/apache/cxf/message/MessageImpl.java     |   32 +-
 .../org/apache/cxf/message/MessageUtils.java    |   30 +-
 .../java/org/apache/cxf/message/StringMap.java  |    4 +-
 .../org/apache/cxf/message/StringMapImpl.java   |    8 +-
 .../cxf/phase/AbstractPhaseInterceptor.java     |   58 +-
 .../main/java/org/apache/cxf/phase/Phase.java   |   26 +-
 .../org/apache/cxf/phase/PhaseChainCache.java   |   30 +-
 .../org/apache/cxf/phase/PhaseComparator.java   |    2 +-
 .../org/apache/cxf/phase/PhaseInterceptor.java  |   20 +-
 .../apache/cxf/phase/PhaseInterceptorChain.java |  186 ++--
 .../org/apache/cxf/policy/PolicyCalculator.java |    4 +-
 .../cxf/resource/ClassLoaderResolver.java       |   14 +-
 .../apache/cxf/resource/ClasspathResolver.java  |    8 +-
 .../cxf/resource/DefaultResourceManager.java    |   87 +-
 .../cxf/resource/ExtendedURIResolver.java       |    6 +-
 .../apache/cxf/resource/ObjectTypeResolver.java |    6 +-
 .../apache/cxf/resource/PropertiesResolver.java |   12 +-
 .../apache/cxf/resource/ResourceManager.java    |   24 +-
 .../apache/cxf/resource/ResourceResolver.java   |    2 +-
 .../cxf/resource/SinglePropertyResolver.java    |    6 +-
 .../org/apache/cxf/resource/URIResolver.java    |   74 +-
 .../cxf/security/LoginSecurityContext.java      |    8 +-
 .../apache/cxf/security/SecurityContext.java    |    2 +-
 .../security/claims/authorization/Claim.java    |    8 +-
 .../cxf/security/transport/TLSSessionInfo.java  |    6 +-
 .../java/org/apache/cxf/service/Service.java    |   14 +-
 .../org/apache/cxf/service/ServiceImpl.java     |   18 +-
 .../service/ServiceModelSchemaValidator.java    |   10 +-
 .../apache/cxf/service/ServiceModelVisitor.java |   32 +-
 .../factory/AbstractServiceFactoryBean.java     |   26 +-
 .../factory/AnnotationsFactoryBeanListener.java |   34 +-
 .../service/factory/FactoryBeanListener.java    |   56 +-
 .../factory/FactoryBeanListenerManager.java     |   20 +-
 .../service/factory/SimpleMethodDispatcher.java |   30 +-
 .../cxf/service/invoker/AbstractInvoker.java    |   78 +-
 .../apache/cxf/service/invoker/BeanInvoker.java |    2 +-
 .../org/apache/cxf/service/invoker/Factory.java |   10 +-
 .../cxf/service/invoker/FactoryInvoker.java     |   10 +-
 .../cxf/service/invoker/MethodDispatcher.java   |    4 +-
 .../cxf/service/invoker/PooledFactory.java      |   22 +-
 .../cxf/service/invoker/SessionFactory.java     |    8 +-
 .../cxf/service/invoker/SingletonFactory.java   |    4 +-
 .../invoker/spring/SpringBeanFactory.java       |   12 +-
 .../model/AbstractDescriptionElement.java       |    2 +-
 .../service/model/AbstractMessageContainer.java |   52 +-
 .../service/model/AbstractPropertiesHolder.java |   38 +-
 .../cxf/service/model/BindingFaultInfo.java     |    6 +-
 .../apache/cxf/service/model/BindingInfo.java   |   32 +-
 .../cxf/service/model/BindingMessageInfo.java   |    6 +-
 .../cxf/service/model/BindingOperationInfo.java |   34 +-
 .../cxf/service/model/DescriptionInfo.java      |   10 +-
 .../apache/cxf/service/model/EndpointInfo.java  |   44 +-
 .../apache/cxf/service/model/Extensible.java    |   16 +-
 .../org/apache/cxf/service/model/FaultInfo.java |   16 +-
 .../apache/cxf/service/model/InterfaceInfo.java |   24 +-
 .../apache/cxf/service/model/MessageInfo.java   |   20 +-
 .../cxf/service/model/MessagePartInfo.java      |   24 +-
 .../apache/cxf/service/model/OperationInfo.java |   50 +-
 .../apache/cxf/service/model/ServiceInfo.java   |    6 +-
 .../cxf/service/model/ServiceModelUtil.java     |    6 +-
 .../cxf/service/model/ServiceSchemaInfo.java    |    6 +-
 .../service/model/UnwrappedOperationInfo.java   |   14 +-
 .../cxf/staxutils/AbstractDOMStreamReader.java  |   44 +-
 .../cxf/staxutils/CachingXmlEventWriter.java    |   63 +-
 .../staxutils/DelegatingXMLStreamWriter.java    |   12 +-
 .../staxutils/DepthExceededStaxException.java   |    6 +-
 .../staxutils/DepthRestrictingStreamReader.java |   22 +-
 .../cxf/staxutils/DepthXMLStreamReader.java     |    6 +-
 .../cxf/staxutils/DocumentDepthProperties.java  |   12 +-
 .../cxf/staxutils/FragmentStreamReader.java     |   30 +-
 .../staxutils/OverlayW3CDOMStreamWriter.java    |   16 +-
 .../cxf/staxutils/PartialXMLStreamReader.java   |   12 +-
 .../staxutils/PrettyPrintXMLStreamWriter.java   |   12 +-
 .../PropertiesExpandingStreamReader.java        |   10 +-
 .../org/apache/cxf/staxutils/StaxSource.java    |   12 +-
 .../org/apache/cxf/staxutils/StaxUtils.java     |  356 +++---
 .../staxutils/StreamWriterContentHandler.java   |   12 +-
 .../cxf/staxutils/W3CDOMStreamReader.java       |   28 +-
 .../cxf/staxutils/W3CDOMStreamWriter.java       |   16 +-
 .../cxf/staxutils/W3CNamespaceContext.java      |   16 +-
 .../apache/cxf/staxutils/WoodstoxHelper.java    |    6 +-
 .../cxf/staxutils/XMLStreamReaderWrapper.java   |    4 +-
 .../transform/DelegatingNamespaceContext.java   |   16 +-
 .../staxutils/transform/ElementProperty.java    |   10 +-
 .../transform/IgnoreNamespacesWriter.java       |   10 +-
 .../staxutils/transform/InTransformReader.java  |   78 +-
 .../staxutils/transform/OutTransformWriter.java |   96 +-
 .../cxf/staxutils/transform/ParsingEvent.java   |    6 +-
 .../cxf/staxutils/transform/QNamesMap.java      |   12 +-
 .../cxf/staxutils/transform/TransformUtils.java |   40 +-
 .../staxutils/validation/EmbeddedSchema.java    |    2 +-
 .../validation/Stax2ValidationUtils.java        |   22 +-
 .../StaxSchemaValidationInInterceptor.java      |    6 +-
 .../StaxSchemaValidationOutInterceptor.java     |    6 +-
 .../validation/W3CMultiSchemaFactory.java       |   28 +-
 .../validation/WoodstoxValidationImpl.java      |    8 +-
 .../apache/cxf/transport/AbstractConduit.java   |   10 +-
 .../cxf/transport/AbstractDestination.java      |   26 +-
 .../transport/AbstractMultiplexDestination.java |   10 +-
 .../cxf/transport/AbstractObservable.java       |   20 +-
 .../cxf/transport/AbstractTransportFactory.java |    8 +-
 .../java/org/apache/cxf/transport/Assertor.java |    4 +-
 .../cxf/transport/ChainInitiationObserver.java  |   32 +-
 .../java/org/apache/cxf/transport/Conduit.java  |   18 +-
 .../apache/cxf/transport/ConduitInitiator.java  |    8 +-
 .../cxf/transport/ConduitInitiatorManager.java  |    8 +-
 .../org/apache/cxf/transport/Destination.java   |   10 +-
 .../cxf/transport/DestinationFactory.java       |    8 +-
 .../transport/DestinationFactoryManager.java    |    6 +-
 .../org/apache/cxf/transport/HttpUriMapper.java |   12 +-
 .../apache/cxf/transport/MessageObserver.java   |    2 +-
 .../cxf/transport/MultipleEndpointObserver.java |   20 +-
 .../cxf/transport/MultiplexDestination.java     |   12 +-
 .../org/apache/cxf/transport/Observable.java    |    6 +-
 .../java/org/apache/cxf/transport/Session.java  |    4 +-
 .../apache/cxf/transport/TransportFinder.java   |   64 +-
 .../cxf/transport/TransportURIResolver.java     |   28 +-
 .../cxf/transport/common/gzip/GZIPFeature.java  |   28 +-
 .../common/gzip/GZIPInInterceptor.java          |    6 +-
 .../common/gzip/GZIPOutInterceptor.java         |   34 +-
 .../AbstractBeanValidationInterceptor.java      |   10 +-
 .../AbstractValidationInterceptor.java          |   36 +-
 .../cxf/validation/BeanValidationFeature.java   |    2 +-
 .../BeanValidationOutInterceptor.java           |   16 +-
 .../cxf/validation/BeanValidationProvider.java  |   48 +-
 .../validation/ClientBeanValidationFeature.java |    6 +-
 .../cxf/validation/ValidationConfiguration.java |    8 +-
 .../java/org/apache/cxf/version/Version.java    |    6 +-
 .../cxf/workqueue/AutomaticWorkQueue.java       |   10 +-
 .../cxf/workqueue/AutomaticWorkQueueImpl.java   |  160 +--
 .../cxf/workqueue/OneShotAsyncExecutor.java     |   12 +-
 .../cxf/workqueue/SynchronousExecutor.java      |   10 +-
 .../org/apache/cxf/workqueue/WorkQueue.java     |    8 +-
 .../apache/cxf/workqueue/WorkQueueManager.java  |    6 +-
 .../cxf/ws/addressing/AddressingConstants.java  |   56 +-
 .../cxf/ws/addressing/AddressingProperties.java |   30 +-
 .../apache/cxf/ws/addressing/ContextUtils.java  |  132 +--
 .../ws/addressing/EndpointReferenceUtils.java   |  218 ++--
 .../ws/addressing/EndpointUtilsException.java   |    2 +-
 .../cxf/ws/addressing/JAXWSAConstants.java      |   22 +-
 .../apache/cxf/ws/addressing/MAPAggregator.java |   36 +-
 .../cxf/ws/addressing/MessageIdCache.java       |    4 +-
 .../org/apache/cxf/ws/addressing/Names.java     |   96 +-
 .../cxf/ws/addressing/VersionTransformer.java   |  158 +--
 .../cxf/ws/addressing/WSAContextUtils.java      |    4 +-
 .../cxf/ws/addressing/WSAddressingFeature.java  |   18 +-
 core/src/main/resources/META-INF/cxf/cxf.xml    |    2 +-
 .../java/org/apache/cxf/BusFactoryTest.java     |    8 +-
 .../attachment/AttachmentDeserializerTest.java  |  192 ++--
 .../attachment/AttachmentSerializerTest.java    |   96 +-
 .../java/org/apache/cxf/bus/CXFBusImplTest.java |   30 +-
 .../cxf/bus/extension/ExtensionManagerTest.java |   28 +-
 .../apache/cxf/bus/extension/ExtensionTest.java |   36 +-
 .../TextExtensionFragmentParserTest.java        |    6 +-
 .../EndpointResolverRegistryImplTest.java       |   64 +-
 .../cxf/bus/managers/ServerRegistryImpTest.java |   10 +-
 ...ServiceContractResolverRegistryImplTest.java |   30 +-
 .../cxf/bus/osgi/OSGiBusListenerTest.java       |  420 +++----
 .../bus/spring/BusApplicationContextTest.java   |    4 +-
 .../bus/spring/BusApplicationListenerTest.java  |    2 +-
 .../cxf/bus/spring/BusDefinitionParserTest.java |   34 +-
 .../cxf/bus/spring/SpringBusFactoryTest.java    |   76 +-
 .../test/java/org/apache/cxf/bus/spring/bus.xml |    2 +-
 .../org/apache/cxf/bus/spring/customerBus.xml   |    2 +-
 .../org/apache/cxf/bus/spring/customerBus2.xml  |    2 +-
 .../java/org/apache/cxf/bus/spring/init.xml     |    2 +-
 .../org/apache/cxf/bus/spring/lazyInitBus.xml   |    2 +-
 .../cxf/bus/spring/resources/bus-overwrite.xml  |    2 +-
 .../java/org/apache/cxf/bus/spring/test.xml     |    2 +-
 .../org/apache/cxf/bus/spring/testjsr250.xml    |    2 +-
 .../CXFBusLifeCycleManagerTest.java             |   30 +-
 .../common/annotation/AnnotatedGreeterImpl.java |   18 +-
 .../annotation/AnnotationProcessorTest.java     |   74 +-
 .../apache/cxf/common/i18n/BundleUtilsTest.java |    6 +-
 .../org/apache/cxf/common/i18n/MessageTest.java |   18 +-
 .../common/injection/ResourceInjectorTest.java  |  192 ++--
 .../apache/cxf/common/logging/LogUtilsTest.java |   24 +-
 .../cxf/common/security/SimpleGroupTest.java    |   14 +-
 .../common/security/SimplePrincipalTest.java    |    4 +-
 .../cxf/common/util/Base64UtilityTest.java      |   24 +-
 .../cxf/common/util/CollectionUtilsTest.java    |   10 +-
 .../cxf/common/util/PackageUtilsTest.java       |   26 +-
 .../common/util/PropertiesLoaderUtilsTest.java  |    6 +-
 .../cxf/common/util/PropertyUtilsTest.java      |   26 +-
 .../apache/cxf/common/util/StringUtilsTest.java |   22 +-
 .../cxf/common/util/URIParserUtilsTest.java     |    2 +-
 .../apache/cxf/common/util/UrlUtilsTest.java    |    8 +-
 .../util/XmlSchemaPrimitiveUtilsTest.java       |    4 +-
 .../cxf/common/xmlschema/DOMErrorException.java |    4 +-
 .../apache/cxf/common/xmlschema/DOMLSInput.java |    6 +-
 .../cxf/common/xmlschema/ImportRepairTest.java  |   22 +-
 .../apache/cxf/configuration/foo/Address.java   |   36 +-
 .../org/apache/cxf/configuration/foo/Foo.java   |   48 +-
 .../cxf/configuration/foo/ObjectFactory.java    |   36 +-
 .../org/apache/cxf/configuration/foo/Point.java |   16 +-
 .../spring/ConfigurerImplTest.java              |  128 +--
 .../cxf/configuration/spring/test-beans.xml     |    2 +-
 .../configuration/spring/test-jaxb-beans.xml    |    2 +-
 .../SuspendedInvocationExceptionTest.java       |   16 +-
 .../databinding/AbstractDataBindingTest.java    |    4 +-
 .../source/XMLStreamDataReaderTest.java         |   24 +-
 .../org/apache/cxf/endpoint/DummyServer.java    |   10 +-
 .../apache/cxf/endpoint/EndpointImplTest.java   |   16 +-
 .../feature/transform/XSLTInterceptorsTest.java |  300 ++---
 .../org/apache/cxf/helpers/FileUtilsTest.java   |    6 +-
 .../cxf/helpers/HttpHeaderHelperTest.java       |   12 +-
 .../org/apache/cxf/helpers/IOUtilsTest.java     |    4 +-
 .../org/apache/cxf/helpers/NameSpaceTest.java   |   22 +-
 .../apache/cxf/helpers/ServiceUtilsTest.java    |   64 +-
 .../interceptor/LoggingOutInterceptorTest.java  |   29 +-
 .../OutgoingChainInterceptorTest.java           |    2 +-
 .../ServiceInvokerInterceptorTest.java          |   26 +-
 .../security/DefaultSecurityContextTest.java    |   24 +-
 .../NamePasswordCallbackHandlerTest.java        |   16 +-
 ...OperationInfoAuthorizingInterceptorTest.java |    6 +-
 .../RolePrefixSecurityContextImplTest.java      |   26 +-
 .../SecureAnnotationsInterceptorTest.java       |   30 +-
 .../SimpleAuthorizingInterceptorTest.java       |   94 +-
 .../internal/CXFAPINamespaceHandlerTest.java    |    4 +-
 .../cxf/io/CacheAndWriteOutputStreamTest.java   |    2 +-
 .../apache/cxf/io/CachedOutputStreamTest.java   |   20 +-
 .../org/apache/cxf/io/CachedStreamTestBase.java |   40 +-
 .../org/apache/cxf/io/CachedWriterTest.java     |   12 +-
 .../cxf/phase/PhaseInterceptorChainTest.java    |   64 +-
 .../cxf/resource/ClassLoaderResolverTest.java   |   28 +-
 .../resource/DefaultResourceManagerTest.java    |  178 +++
 .../apache/cxf/resource/URIResolverTest.java    |   60 +-
 .../cxf/service/model/BindingFaultInfoTest.java |    4 +-
 .../service/model/BindingOperationInfoTest.java |   20 +-
 .../apache/cxf/service/model/FaultInfoTest.java |    8 +-
 .../cxf/service/model/InterfaceInfoTest.java    |   10 +-
 .../cxf/service/model/MessageInfoTest.java      |   10 +-
 .../cxf/service/model/MessagePartInfoTest.java  |   14 +-
 .../cxf/service/model/OperationInfoTest.java    |   20 +-
 .../DepthRestrictingStreamReaderTest.java       |   60 +-
 .../cxf/staxutils/DepthXMLStreamReaderTest.java |   10 +-
 .../cxf/staxutils/FragmentStreamReaderTest.java |   24 +-
 .../staxutils/PartialXMLStreamReaderTest.java   |   20 +-
 .../PropertiesExpandingStreamReaderTest.java    |    4 +-
 .../cxf/staxutils/StaxStreamFilterTest.java     |   16 +-
 .../org/apache/cxf/staxutils/StaxUtilsTest.java |  122 +--
 .../cxf/staxutils/W3CDOMStreamReaderTest.java   |    6 +-
 .../DelegatingNamespaceContextTest.java         |   16 +-
 .../transform/InTransformReaderTest.java        |  246 ++---
 .../transform/OutTransformWriterTest.java       |  222 ++--
 .../staxutils/transform/TransformTestUtils.java |   56 +-
 .../transport/ChainInitiationObserverTest.java  |   18 +-
 .../apache/cxf/transport/HttpUriMapperTest.java |    6 +-
 .../common/gzip/GZIPAcceptEncodingTest.java     |    4 +-
 .../org/apache/cxf/version/VersionTest.java     |    2 +-
 .../cxf/workqueue/AutomaticWorkQueueTest.java   |   40 +-
 distribution/javadoc/pom.xml                    |   16 -
 distribution/manifest/pom.xml                   |   22 -
 distribution/pom.xml                            |   50 -
 distribution/src/main/release/lib/WHICH_JARS    |    4 -
 .../src/main/java/demo/hw/client/Client.java    |    2 +-
 .../main/java/demo/hw/server/HelloWorld.java    |    2 +-
 .../apache/cxf/sample/test/TestAegisSample.java |    4 +-
 .../apache/cxf/demo/aegis/commands/ReadZoo.java |    4 +-
 .../cxf/demo/aegis/commands/WriteZoo.java       |    2 +-
 .../org/apache/cxf/demo/aegis/types/Zoo.java    |    4 +-
 .../src/demo/hw_http/server/GreeterImpl.java    |   10 +-
 .../java/demo/callback/client/CallbackImpl.java |    8 +-
 .../main/java/demo/callback/client/Client.java  |   24 +-
 .../java/demo/callback/server/ServerImpl.java   |   22 +-
 .../main/java/demo/stream/client/Client.java    |   10 +-
 .../stream/interceptor/StreamInterceptor.java   |   10 +-
 .../java/demo/stream/server/GreeterImpl.java    |   16 +-
 .../src/main/resources/client.xml               |    2 +-
 .../src/main/resources/server.xml               |    2 +-
 .../bank/src/main/java/cxf/client/Client.java   |   16 +-
 .../bank/src/main/java/cxf/server/BankImpl.java |    6 +-
 .../src/main/java/corba/client/Client.java      |    6 +-
 .../src/main/java/corba/server/AccountImpl.java |    6 +-
 .../src/main/java/corba/server/BankImpl.java    |   14 +-
 .../src/main/java/corba/server/Server.java      |    6 +-
 .../src/main/java/cxf/client/Client.java        |   14 +-
 .../src/main/java/cxf/server/AccountImpl.java   |    4 +-
 .../src/main/java/cxf/server/BankImpl.java      |    8 +-
 .../src/main/java/corba/client/Client.java      |    2 +-
 .../main/java/cxf/server/HelloWorldImpl.java    |    4 +-
 .../main/java/demo/spring/client/Client.java    |    2 +-
 .../src/main/resources/client-beans.xml         |    2 +-
 .../src/main/webapp/WEB-INF/cxf-servlet.xml     |    2 +-
 .../release/samples/in_jvm_transport/coloc.xml  |    2 +-
 .../colocated/client/DispatchSourceClient.java  |   34 +-
 .../src/main/java/demo/hw/client/Client.java    |    8 +-
 .../main/java/demo/hw/server/HelloWorld.java    |    2 +-
 .../java/demo/hw/server/IntegerUserMap.java     |    2 +-
 .../demo/hw/server/IntegerUserMapAdapter.java   |    2 +-
 .../src/main/webapp/WEB-INF/cxf-servlet.xml     |    2 +-
 .../src/main/java/demo/hw/client/Client.java    |    2 +-
 .../src/main/java/demo/server/ServerJMS.java    |    4 +-
 .../src/main/java/demo/hw/client/Client.java    |    2 +-
 .../main/java/demo/hw/server/HelloWorld.java    |    2 +-
 .../main/java/demo/spring/client/Client.java    |    2 +-
 .../src/main/resources/client-beans.xml         |    2 +-
 .../src/main/webapp/WEB-INF/cxf-servlet.xml     |    2 +-
 .../src/main/java/demo/jaxrs/server/Server.java |    2 +-
 .../src/main/java/httpsdemo/client/Client.java  |   14 +-
 .../java/httpsdemo/common/CustomerService.java  |    4 +-
 .../src/main/java/httpsdemo/server/Server.java  |    4 +-
 .../src/main/resources/ClientConfig.xml         |    2 +-
 .../src/main/resources/ServerConfig.xml         |    2 +-
 .../java/demo/jaxrs/server/IdTokenService.java  |    2 +-
 .../main/webapp/WEB-INF/applicationContext.xml  |    2 +-
 .../demo/jaxrs/server/BigQueryResponse.java     |    6 +-
 .../java/demo/jaxrs/server/BigQueryServer.java  |   28 +-
 .../java/demo/jaxrs/server/BigQueryService.java |   30 +-
 .../java/demo/jaxrs/server/BigQueryStart.java   |    2 +-
 .../java/demo/jaxrs/server/ShakespeareText.java |    2 +-
 .../main/webapp/WEB-INF/applicationContext.xml  |    2 +-
 .../src/main/java/demo/jaxrs/server/Server.java |    2 +-
 .../java/demo/jaxrs/swagger/server/Item.java    |    6 +-
 .../java/demo/jaxrs/swagger/server/Sample.java  |   36 +-
 .../java/demo/jaxrs/swagger/server/Server.java  |   14 +-
 .../samples/jax_rs/description_swagger2/pom.xml |    4 +
 .../jaxrs/swagger/server/ApiOriginFilter.java   |    6 +-
 .../java/demo/jaxrs/swagger/server/Item.java    |    6 +-
 .../java/demo/jaxrs/swagger/server/Sample.java  |   36 +-
 .../java/demo/jaxrs/swagger/server/Server.java  |    8 +-
 .../jaxrs/swagger/server/ApiOriginFilter.java   |    6 +-
 .../java/demo/jaxrs/swagger/server/Item.java    |    6 +-
 .../java/demo/jaxrs/swagger/server/Sample.java  |   36 +-
 .../jax_rs/description_swagger2_spring/pom.xml  |    4 +
 .../jaxrs/swagger/server/ApiOriginFilter.java   |    6 +-
 .../java/demo/jaxrs/swagger/server/Item.java    |    6 +-
 .../java/demo/jaxrs/swagger/server/Sample.java  |   36 +-
 .../java/demo/jaxrs/swagger/server/Server.java  |    2 +-
 .../src/main/resources/context.xml              |    2 +-
 .../jax_rs/description_swagger2_web/README.txt  |    2 +-
 .../jax_rs/description_swagger2_web/pom.xml     |   33 +-
 .../jaxrs/swagger/server/ApiOriginFilter.java   |    6 +-
 .../java/demo/jaxrs/swagger/server/Item.java    |    6 +-
 .../java/demo/jaxrs/swagger/server/Sample.java  |   36 +-
 .../java/demo/jaxrs/swagger/server/Sample2.java |   36 +-
 .../src/main/webapp/WEB-INF/context.xml         |    2 +-
 .../main/java/minimalosgi/SampleServlet.java    |    2 +-
 .../java/demo/jaxrs/search/client/Client.java   |   70 +-
 .../java/demo/jaxrs/search/server/Catalog.java  |  108 +-
 .../java/demo/jaxrs/search/server/Server.java   |   16 +-
 .../java/demo/jaxrs/search/server/Storage.java  |   28 +-
 .../main/java/demo/jaxrs/server/SparkUtils.java |   12 +-
 .../java/demo/jaxrs/server/simple/Server.java   |    8 +-
 .../server/simple/SparkStreamingListener.java   |    8 +-
 .../server/simple/SparkStreamingOutput.java     |    8 +-
 .../jaxrs/server/simple/StreamingService.java   |   42 +-
 .../jaxrs/server/simple/StringListReceiver.java |    4 +-
 .../java/demo/jaxrs/server/socket/Server.java   |   42 +-
 .../java/demo/jaxrs/server/socket/SparkJob.java |    2 +-
 .../jaxrs/server/socket/SparkResultJob.java     |    4 +-
 .../server/socket/SparkStreamingOutput.java     |    2 +-
 .../jaxrs/server/socket/StreamingService.java   |   14 +-
 .../rs/client/SampleRestClientApplication.java  |    6 +-
 .../java/sample/rs/service/HelloService.java    |    6 +-
 .../rs/service/SampleRestApplication.java       |    2 +-
 .../rs/service/hello1/HelloServiceImpl1.java    |    6 +-
 .../rs/service/hello2/HelloServiceImpl2.java    |    4 +-
 .../java/sample/rs/service/HelloService.java    |    6 +-
 .../rs/service/SampleRestApplication.java       |    2 +-
 .../rs/service/hello1/HelloServiceImpl1.java    |    6 +-
 .../rs/service/hello2/HelloServiceImpl2.java    |    4 +-
 .../rs/client/SampleRestClientApplication.java  |    8 +-
 .../java/sample/rs/service/HelloService.java    |    6 +-
 .../src/main/java/demo/jaxrs/client/Client.java |   70 +-
 .../service/AbstractCustomerServiceSecured.java |    6 +-
 .../demo/jaxrs/service/CustomerService.java     |    4 +-
 .../jaxrs/service/CustomerServiceSecured.java   |    4 +-
 .../service/CustomerServiceSecuredImpl.java     |    2 +-
 .../src/main/webapp/WEB-INF/beans.xml           |    2 +-
 .../src/main/java/demo/jaxrs/sse/Stats.java     |    4 +-
 .../java/demo/jaxrs/sse/StatsApplication.java   |    2 +-
 .../demo/jaxrs/sse/StatsRestServiceImpl.java    |   48 +-
 .../main/java/demo/jaxrs/sse/StatsServer.java   |    4 +-
 .../src/main/java/demo/jaxrs/sse/Stats.java     |    4 +-
 .../main/java/demo/jaxrs/sse/StatsConfig.java   |    4 +-
 .../demo/jaxrs/sse/StatsRestServiceImpl.java    |   52 +-
 .../main/java/demo/jaxrs/sse/StatsServer.java   |    4 +-
 .../src/main/java/demo/jaxrs/sse/Stats.java     |    4 +-
 .../demo/jaxrs/sse/StatsRestServiceImpl.java    |   50 +-
 .../main/java/demo/jaxrs/sse/StatsServer.java   |   10 +-
 .../resources/WEB-INF/applicationContext.xml    |    2 +-
 .../samples/jax_rs/tracing_brave/README.txt     |   39 +
 .../samples/jax_rs/tracing_brave/pom.xml        |  136 +++
 .../java/demo/jaxrs/tracing/client/Client.java  |   48 +
 .../java/demo/jaxrs/tracing/server/Catalog.java |  135 +++
 .../tracing/server/CatalogApplication.java      |   45 +
 .../demo/jaxrs/tracing/server/CatalogStore.java |   71 ++
 .../java/demo/jaxrs/tracing/server/Server.java  |   52 +
 .../jax_rs/tracing_brave_osgi/README.txt        |   79 ++
 .../samples/jax_rs/tracing_brave_osgi/pom.xml   |  117 ++
 .../java/demo/jaxrs/tracing/server/Catalog.java |  135 +++
 .../demo/jaxrs/tracing/server/CatalogStore.java |   71 ++
 .../services/javax.json.spi.JsonProvider        |    1 +
 .../resources/OSGI-INF/blueprint/context.xml    |   58 +
 .../java/demo/jaxrs/tracing/client/Client.java  |    8 +-
 .../tracing/conf/TracingConfiguration.java      |    4 +-
 .../java/demo/jaxrs/tracing/server/Catalog.java |   28 +-
 .../tracing/server/CatalogApplication.java      |    4 +-
 .../demo/jaxrs/tracing/server/CatalogStore.java |   26 +-
 .../java/demo/jaxrs/tracing/server/Server.java  |    6 +-
 .../src/main/java/demo/jaxrs/client/Client.java |    8 +-
 .../demo/jaxrs/client/WebSocketTestClient.java  |   50 +-
 .../java/demo/jaxrs/server/CustomerService.java |   18 +-
 .../src/main/java/demo/jaxrs/server/Server.java |    2 +-
 .../java/demo/jaxrs/server/CustomerService.java |   18 +-
 .../java/demo/jaxrs/server/CustomerService.java |   18 +-
 .../src/main/webapp/WEB-INF/beans.xml           |    4 +-
 .../src/main/java/demo/hw/client/Client.java    |    2 +-
 .../main/java/demo/hw/client/HelloWorld.java    |    2 +-
 .../main/java/demo/hw/server/HelloWorld.java    |    2 +-
 .../src/main/java/demo/hw/client/Client.java    |   26 +-
 .../java/demo/hw/client/TestAsyncHandler.java   |    6 +-
 .../main/java/demo/hw/server/GreeterImpl.java   |   26 +-
 .../src/main/java/demo/hw/server/Server.java    |    8 +-
 .../src/main/webapp/WEB-INF/cxf-servlet.xml     |    2 +-
 .../java/demo/hwDispatch/client/Client.java     |   10 +-
 .../server/GreeterDOMSourceMessageProvider.java |    8 +-
 .../server/GreeterDOMSourcePayloadProvider.java |    8 +-
 .../server/GreeterSoapMessageProvider.java      |    2 +-
 .../java/demo/hwDispatch/server/Server.java     |    6 +-
 .../main/java/demo/handlers/client/Client.java  |    2 +-
 .../handlers/common/SmallNumberHandler.java     |   10 +-
 .../main/java/demo/handlers/server/Server.java  |    6 +-
 .../sample/ws/SampleWsApplicationClient.java    |    2 +-
 .../src/main/java/sample/ws/service/Hello.java  |    8 +-
 .../java/sample/ws/service/HelloPortImpl.java   |    4 +-
 .../samples/jaxws_tracing_brave_osgi/README.txt |   78 ++
 .../samples/jaxws_tracing_brave_osgi/pom.xml    |   99 ++
 .../java/demo/jaxws/tracing/server/Book.java    |   48 +
 .../jaxws/tracing/server/CatalogService.java    |   29 +
 .../tracing/server/impl/CatalogServiceImpl.java |   85 ++
 .../resources/OSGI-INF/blueprint/context.xml    |   60 +
 .../java/demo/jms_greeter/client/Client.java    |    2 +-
 .../demo/jms_greeter/server/GreeterJMSImpl.java |    4 +-
 .../java/demo/jms_greeter/server/Server.java    |    2 +-
 .../demo/jms_greeter/server/GreeterJMSImpl.java |    4 +-
 .../client/CustomerServiceSpringClient.java     |    8 +-
 .../client/CustomerServiceTester.java           |   22 +-
 .../server/CustomerServiceImpl.java             |    6 +-
 .../server/CustomerServiceSpringServer.java     |    2 +-
 .../resources/client-applicationContext.xml     |    4 +-
 .../resources/server-applicationContext.xml     |    4 +-
 .../demo/hw/server/JavascriptExampleImpl.java   |   20 +-
 .../main/java/demo/hw/server/data/Beverage.java |    4 +-
 .../java/demo/hw/server/data/Ingredient.java    |    8 +-
 .../src/main/resources/cxf.xml                  |    2 +-
 .../src/main/java/demo/hw/client/Client.java    |   20 +-
 .../src/main/java/demo/hw/client/Get.java       |    4 +-
 .../main/java/demo/hw/server/GreeterImpl.java   |   18 +-
 .../src/main/resources/cxf.xml                  |    2 +-
 .../main/java/demo/hw/server/GreeterImpl.java   |   16 +-
 .../java/demo/hwDispatch/client/Client.java     |    4 +-
 .../samples/logbrowser-blueprint/README.txt     |   39 -
 .../samples/logbrowser-blueprint/pom.xml        |  109 --
 .../resources/OSGI-INF/blueprint/context.xml    |   56 -
 .../src/test/resources/index_plain.html         |  211 ----
 .../main/release/samples/logbrowser/README.txt  |   49 -
 .../samples/logbrowser/logging.properties       |   27 -
 .../src/main/release/samples/logbrowser/pom.xml |  153 ---
 .../src/main/java/demo/logbrowser/App.java      |   58 -
 .../src/main/java/demo/service/App.java         |   36 -
 .../main/java/demo/service/CustomerService.java |  141 ---
 .../src/main/java/demo/service/Server.java      |   60 -
 .../logbrowser/src/main/webapp/WEB-INF/web.xml  |   65 --
 .../src/main/webapp/customer-service.html       |  179 ---
 .../src/main/webapp/jquery-1.4.2.min.js         |  154 ---
 .../src/main/java/demo/mtom/server/Server.java  |    4 +-
 .../demo/mtom/server/TestMtomPortTypeImpl.java  |    8 +-
 .../GetProtectedResourceController.java         |    2 +-
 .../TemporaryCredentialsController.java         |    2 +-
 .../controllers/TokenRequestController.java     |    2 +-
 .../demo/oauth/client/model/OAuthParams.java    |    2 +-
 .../src/main/webapp/WEB-INF/spring-servlet.xml  |    2 +-
 .../main/java/demo/oauth/server/CustomAuth.java |    2 +-
 .../controllers/ApplicationController.java      |    4 +-
 .../controllers/MemoryOAuthDataProvider.java    |   20 +-
 .../controllers/SampleOAuthDataProvider.java    |    8 +-
 .../spring/SpringOAuthAuthenticationFilter.java |    2 +-
 .../src/main/webapp/WEB-INF/oauth-beans.xml     |    2 +-
 .../src/main/webapp/WEB-INF/security-beans.xml  |    4 +-
 .../src/main/webapp/WEB-INF/spring-servlet.xml  |    2 +-
 distribution/src/main/release/samples/pom.xml   |    8 +-
 .../main/java/demo/spring/client/Client.java    |    2 +-
 .../src/main/resources/client-beans.xml         |    2 +-
 .../src/main/webapp/WEB-INF/cxf-servlet.xml     |    2 +-
 .../java/demo/soap_header/client/Client.java    |   10 +-
 .../soap_header/server/HeaderTesterImpl.java    |    8 +-
 .../src/main/java/demo/wssec/client/Client.java |    6 +-
 .../wssec/client/ClientCallbackHandler.java     |    2 +-
 .../java/demo/wssec/server/GreeterImpl.java     |   10 +-
 .../java/demo/wssec/sts/STSCallbackHandler.java |    2 +-
 .../src/main/resources/wssec-client-stax.xml    |    2 +-
 .../sts/src/main/resources/wssec-client.xml     |    2 +-
 .../src/main/resources/wssec-server-stax.xml    |    2 +-
 .../sts/src/main/resources/wssec-server.xml     |    2 +-
 .../sts/src/main/resources/wssec-sts-stax.xml   |    2 +-
 .../sts/src/main/resources/wssec-sts.xml        |    2 +-
 .../java/demo/throttling/client/Client.java     |   22 +-
 .../java/demo/throttling/server/Customer.java   |   16 +-
 .../server/CustomerMetricsInterceptor.java      |    2 +-
 .../demo/throttling/server/GreeterImpl.java     |    6 +-
 .../java/demo/throttling/server/Server.java     |   12 +-
 .../demo/ws_addressing/server/GreeterImpl.java  |   16 +-
 .../ws_addressing/src/main/resources/client.xml |    2 +-
 .../ws_addressing/src/main/resources/server.xml |    2 +-
 .../apache/cxf/samples/discovery/Client.java    |    6 +-
 .../cxf/samples/discovery/GreeterImpl.java      |    2 +-
 .../org/apache/cxf/samples/discovery/Main.java  |    4 +-
 .../demo/wseventing/ApplicationSingleton.java   |    2 +-
 .../eventapi/CatastrophicEventSinkImpl.java     |    2 +-
 .../src/main/webapp/WEB-INF/beans.xml           |    2 +-
 .../src/main/java/demo/client/Client.java       |   16 +-
 .../java/demo/ws_policy/server/GreeterImpl.java |   14 +-
 .../ws_policy/src/main/resources/client.xml     |    2 +-
 .../ws_policy/src/main/resources/server.xml     |    2 +-
 .../src/main/java/demo/ws_rm/client/Client.java |    2 +-
 .../demo/ws_rm/common/MessageLossSimulator.java |   40 +-
 .../java/demo/ws_rm/server/GreeterImpl.java     |    8 +-
 .../src/main/java/demo/ws_rm/server/Server.java |    2 +-
 .../samples/ws_rm/src/main/resources/client.xml |    2 +-
 .../samples/ws_rm/src/main/resources/server.xml |    2 +-
 .../src/main/java/demo/wssec/client/Client.java |    8 +-
 .../main/java/demo/wssec/client/StaxClient.java |   16 +-
 .../demo/wssec/client/UTPasswordCallback.java   |    8 +-
 .../src/main/java/demo/wssec/client/wssec.xml   |    2 +-
 .../java/demo/wssec/server/GreeterImpl.java     |    8 +-
 .../src/main/java/demo/wssec/server/Server.java |   10 +-
 .../main/java/demo/wssec/server/StaxServer.java |   16 +-
 .../demo/wssec/server/UTPasswordCallback.java   |   10 +-
 .../src/main/java/demo/wssec/server/wssec.xml   |    2 +-
 .../src/main/java/demo/wssec/client/Client.java |    2 +-
 .../java/demo/wssec/server/GreeterImpl.java     |    6 +-
 .../src/main/resources/ClientConfig.xml         |    2 +-
 .../src/main/resources/ClientConfigStax.xml     |    2 +-
 .../src/main/resources/ServiceConfig.xml        |    2 +-
 .../src/main/resources/ServiceConfigStax.xml    |    2 +-
 .../main/java/demo/wssec/client/StaxClient.java |    4 +-
 .../java/demo/wssec/server/GreeterImpl.java     |    8 +-
 .../src/main/java/demo/wssec/server/Server.java |    2 +-
 .../main/java/demo/wssec/server/StaxServer.java |    8 +-
 .../ws_security/ut/src/main/resources/wssec.xml |    2 +-
 .../src/main/java/demo/wssec/client/Client.java |    2 +-
 .../java/demo/wssec/server/GreeterImpl.java     |    6 +-
 .../src/main/resources/ClientConfig.xml         |    2 +-
 .../src/main/resources/ClientConfigStax.xml     |    2 +-
 .../src/main/resources/ServiceConfig.xml        |    2 +-
 .../src/main/resources/ServiceConfigStax.xml    |    2 +-
 .../client/CustomerServiceClient.java           |    6 +-
 .../client/CustomerServiceSpringClient.java     |    4 +-
 .../client/CustomerServiceTester.java           |   16 +-
 .../server/CustomerServiceImpl.java             |    6 +-
 .../server/CustomerServiceSpringServer.java     |    2 +-
 .../resources/client-applicationContext.xml     |    2 +-
 .../wsdl_first/src/main/resources/cxf.xml       |    2 +-
 .../resources/server-applicationContext.xml     |    2 +-
 .../src/main/webapp/WEB-INF/cxf-servlet.xml     |    2 +-
 .../main/java/demo/hw/client/ComplexClient.java |   22 +-
 .../apache/cxf/demo/complex/ComplexImpl.java    |    6 +-
 .../src/main/resources/server-beans.xml         |    2 +-
 .../demo/hw_https/client/ClientNonSpring.java   |   22 +-
 .../java/demo/hw_https/server/GreeterImpl.java  |   10 +-
 .../src/main/resources/InsecureClient.xml       |    2 +-
 .../src/main/resources/SecureClient.xml         |    2 +-
 .../src/main/resources/ServerConfig.xml         |    2 +-
 .../src/main/java/demo/hw/client/Client.java    |    2 +-
 .../main/java/demo/hw/server/GreeterImpl.java   |    4 +-
 .../main/java/demo/hwRPCLit/client/Client.java  |   24 +-
 .../demo/hwRPCLit/server/GreeterRPCLitImpl.java |    4 +-
 .../main/java/demo/hwRPCLit/server/Server.java  |    4 +-
 .../src/main/java/demo/hw/client/Client.java    |   20 +-
 .../main/java/demo/hw/server/GreeterImpl.java   |   16 +-
 .../src/main/java/demo/hw/client/Client.java    |    4 +-
 .../main/java/demo/hw/server/GreeterImpl.java   |    2 +-
 .../samples/wsdl_first_xmlbeans/README.txt      |   72 --
 .../release/samples/wsdl_first_xmlbeans/cxf.xml |   38 -
 .../release/samples/wsdl_first_xmlbeans/pom.xml |  155 ---
 .../src/main/java/demo/hw/client/Client.java    |   99 --
 .../main/java/demo/hw/client/SpringClient.java  |   85 --
 .../main/java/demo/hw/client/client-beans.xml   |   31 -
 .../main/java/demo/hw/server/GreeterImpl.java   |   78 --
 .../src/main/java/demo/hw/server/Server.java    |   41 -
 .../main/java/demo/hw/server/SpringServer.java  |   40 -
 .../main/java/demo/hw/server/server-beans.xml   |   31 -
 .../wsdl_first_xmlbeans/wsdl/hello_world.wsdl   |  161 ---
 .../org/apache/cxf/cdi/AbstractCXFBean.java     |    2 +
 .../java/org/apache/cxf/cdi/CXFCdiServlet.java  |   22 +-
 .../java/org/apache/cxf/cdi/CdiBusBean.java     |   12 +-
 .../org/apache/cxf/cdi/CdiResourceProvider.java |    8 +-
 .../cxf/cdi/JAXRSCdiResourceExtension.java      |   64 +-
 ...AXRSServerFactoryCustomizationExtension.java |    4 +-
 .../cxf/cdi/JAXRSCdiResourceExtensionTest.java  |    8 +-
 integration/jca/pom.xml                         |   17 +
 .../cxf/connector/CXFConnectionFactory.java     |    8 +-
 .../cxf/connector/CXFConnectionParam.java       |   26 +-
 .../org/apache/cxf/connector/Connection.java    |    2 +-
 .../core/classloader/FireWallClassLoader.java   |   26 +-
 .../jca/core/classloader/PlugInClassLoader.java |   34 +-
 .../classloader/PlugInClassLoaderHelper.java    |   10 +-
 .../cxf/jca/core/logging/LoggerHelper.java      |   16 +-
 .../AbstractManagedConnectionFactoryImpl.java   |   12 +-
 .../AbstractManagedConnectionImpl.java          |   14 +-
 .../jca/core/resourceadapter/ResourceBean.java  |   16 +-
 .../core/resourceadapter/UriHandlerInit.java    |    2 +-
 .../AssociatedManagedConnectionFactoryImpl.java |   12 +-
 .../cxf/jca/cxf/CXFConnectionRequestInfo.java   |    8 +-
 .../cxf/jca/cxf/CXFInvocationHandler.java       |    6 +-
 .../cxf/jca/cxf/CXFInvocationHandlerData.java   |   20 +-
 .../cxf/jca/cxf/CXFManagedConnection.java       |    6 +-
 .../jca/cxf/CXFManagedConnectionMetaData.java   |    2 +-
 .../org/apache/cxf/jca/cxf/CXFWorkAdapter.java  |   14 +-
 .../cxf/jca/cxf/ConnectionFactoryImpl.java      |   20 +-
 .../org/apache/cxf/jca/cxf/JCABusFactory.java   |   62 +-
 .../jca/cxf/ManagedConnectionFactoryImpl.java   |   22 +-
 .../cxf/jca/cxf/ManagedConnectionImpl.java      |   48 +-
 .../apache/cxf/jca/cxf/ResourceAdapterImpl.java |   32 +-
 .../cxf/jca/cxf/WorkManagerThreadPool.java      |   36 +-
 .../cxf/handlers/CXFInvocationHandlerBase.java  |    8 +-
 .../cxf/handlers/InvocationHandlerFactory.java  |   14 +-
 .../cxf/handlers/InvokingInvocationHandler.java |   10 +-
 .../cxf/handlers/ProxyInvocationHandler.java    |   10 +-
 .../jca/inbound/DispatchMDBActivationSpec.java  |    6 +-
 .../cxf/jca/inbound/DispatchMDBInvoker.java     |   18 +-
 .../jca/inbound/DispatchMDBMessageListener.java |    8 +-
 .../inbound/DispatchMDBMessageListenerImpl.java |   24 +-
 .../apache/cxf/jca/inbound/InboundEndpoint.java |   26 +-
 .../cxf/jca/inbound/MDBActivationSpec.java      |   34 +-
 .../cxf/jca/inbound/MDBActivationWork.java      |   76 +-
 .../org/apache/cxf/jca/inbound/MDBInvoker.java  |   18 +-
 .../org/apache/cxf/jca/jarloader/JarLoader.java |   26 +-
 .../apache/cxf/jca/outbound/CXFConnection.java  |    8 +-
 .../cxf/jca/outbound/CXFConnectionFactory.java  |   20 +-
 .../cxf/jca/outbound/CXFConnectionSpec.java     |   40 +-
 .../outbound/CXFManagedConnectionMetaData.java  |    4 +-
 .../cxf/jca/outbound/ConnectionFactoryImpl.java |    2 +-
 .../jca/outbound/DefaultConnectionManager.java  |    2 +-
 .../outbound/ManagedConnectionFactoryImpl.java  |   48 +-
 .../cxf/jca/outbound/ManagedConnectionImpl.java |  114 +-
 .../org/apache/cxf/jca/servant/EJBEndpoint.java |   66 +-
 .../org/apache/cxf/jca/servant/EJBInvoker.java  |   12 +-
 .../cxf/jca/servant/EJBServantConfig.java       |   16 +-
 .../classloader/FireWallClassLoaderTest.java    |   12 +-
 .../core/classloader/PlugInClassLoaderTest.java |   20 +-
 .../cxf/jca/core/logging/LoggerHelperTest.java  |    4 +-
 .../DummyManagedConnectionImpl.java             |    4 +-
 .../jca/core/resourceadapter/HandlerTest.java   |   20 +-
 .../ManagedConnectionFactoryImplTest.java       |   12 +-
 .../ManagedConnectionImplTest.java              |    6 +-
 .../ResourceAdapterInternalExceptionTest.java   |   30 +-
 .../core/resourceadapter/ResourceBeanTest.java  |    2 +-
 .../resourceadapter/UriHandlerInitTest.java     |    8 +-
 ...ociatedManagedConnectionFactoryImplTest.java |   20 +-
 .../jca/cxf/CXFConnectionRequestInfoTest.java   |    4 +-
 .../cxf/jca/cxf/ConnectionFactoryImplTest.java  |   82 +-
 .../test/java/org/apache/cxf/jca/cxf/Imple.java |    4 +-
 .../apache/cxf/jca/cxf/JCABusFactoryTest.java   |   18 +-
 .../cxf/ManagedConnectionFactoryImplTest.java   |   36 +-
 .../cxf/jca/cxf/ManagedConnectionImplTest.java  |   28 +-
 .../cxf/jca/cxf/ManagedConnectionTestBase.java  |   40 +-
 .../cxf/jca/cxf/ResourceAdapterImplTest.java    |   10 +-
 .../handlers/AbstractInvocationHandlerTest.java |   18 +-
 .../cxf/jca/cxf/handlers/DummyHandler.java      |   18 +-
 .../cxf/jca/cxf/handlers/HandlerTestBase.java   |   16 +-
 .../handlers/InvocationHandlerFactoryTest.java  |   28 +-
 .../handlers/InvokingInvocationHandlerTest.java |    4 +-
 .../ObjectMethodInvocationHandlerTest.java      |  110 +-
 .../handlers/ProxyInvocationHandlerTest.java    |   18 +-
 .../apache/cxf/jca/cxf/handlers/TestTarget.java |   80 +-
 .../org/apache/cxf/jca/cxf/test/DummyBus.java   |   40 +-
 .../apache/cxf/jca/jarloader/JarLoaderTest.java |    6 +-
 .../jca/outbound/ManagedConnectionImplTest.java |    2 +-
 .../apache/cxf/jca/servant/EJBEndpointTest.java |   16 +-
 .../cxf/jca/servant/EJBServantConfigTest.java   |   18 +-
 .../org/apache/cxf/jca/servant/Greeter.java     |    2 +-
 .../org/apache/cxf/jca/servant/GreeterImpl.java |    4 +-
 .../jca/servant/ThreadContextCheckerHome.java   |    6 +-
 integration/pom.xml                             |    1 +
 integration/spring-boot/autoconfigure/pom.xml   |    7 +
 .../autoconfigure/CxfAutoConfiguration.java     |   10 +-
 .../CxfAutoConfigurationTests.java              |    4 +-
 integration/tracing/tracing-brave/pom.xml       |   86 ++
 .../brave/AbstractBraveClientInterceptor.java   |   63 ++
 .../brave/AbstractBraveClientProvider.java      |  104 ++
 .../tracing/brave/AbstractBraveInterceptor.java |  158 +++
 .../tracing/brave/AbstractBraveProvider.java    |  140 +++
 .../cxf/tracing/brave/BraveClientFeature.java   |   50 +
 .../brave/BraveClientStartInterceptor.java      |   50 +
 .../brave/BraveClientStopInterceptor.java       |   50 +
 .../apache/cxf/tracing/brave/BraveFeature.java  |   60 +
 .../tracing/brave/BraveStartInterceptor.java    |   46 +
 .../cxf/tracing/brave/BraveStopInterceptor.java |   70 ++
 .../cxf/tracing/brave/BraveTracerContext.java   |  109 ++
 .../tracing/brave/ClientSpanNameProvider.java   |   39 +
 .../tracing/brave/ServerSpanNameProvider.java   |   39 +
 .../apache/cxf/tracing/brave/TraceScope.java    |   43 +
 .../brave/jaxrs/BraveClientProvider.java        |   60 +
 .../brave/jaxrs/BraveContextProvider.java       |   50 +
 .../cxf/tracing/brave/jaxrs/BraveFeature.java   |   49 +
 .../cxf/tracing/brave/jaxrs/BraveProvider.java  |   80 ++
 .../cxf/tracing/brave/BraveTraceTest.java       |  106 ++
 .../tracing/brave/LoggingSpanNameProvider.java  |   31 +
 .../org/apache/cxf/tracing/brave/MyService.java |   26 +
 .../apache/cxf/tracing/brave/MyServiceImpl.java |   28 +
 .../htrace/AbstractHTraceClientInterceptor.java |    8 +-
 .../htrace/AbstractHTraceClientProvider.java    |   28 +-
 .../htrace/AbstractHTraceInterceptor.java       |    4 +-
 .../tracing/htrace/AbstractHTraceProvider.java  |   42 +-
 .../htrace/HTraceClientStartInterceptor.java    |    8 +-
 .../htrace/HTraceClientStopInterceptor.java     |    4 +-
 .../tracing/htrace/HTraceStartInterceptor.java  |    8 +-
 .../tracing/htrace/HTraceStopInterceptor.java   |   16 +-
 .../cxf/tracing/htrace/HTraceTracerContext.java |   16 +-
 .../tracing/htrace/ext/LoggingSpanReceiver.java |  194 ++++
 .../htrace/jaxrs/HTraceClientProvider.java      |   11 +-
 .../htrace/jaxrs/HTraceContextProvider.java     |    8 +-
 .../cxf/tracing/htrace/jaxrs/HTraceFeature.java |   14 +-
 .../tracing/htrace/jaxrs/HTraceProvider.java    |   18 +-
 .../archetypes/cxf-jaxrs-service/pom.xml        |    2 +-
 .../src/main/webapp/WEB-INF/beans.xml           |    2 +-
 .../src/test/java/HelloWorldIT.java             |    2 +-
 .../archetypes/cxf-jaxws-javafirst/pom.xml      |    2 +-
 .../src/main/java/HelloWorld.java               |    4 +-
 .../src/main/java/HelloWorldImpl.java           |    4 +-
 .../src/main/webapp/WEB-INF/beans.xml           |    2 +-
 .../src/test/java/HelloWorldImplTest.java       |    4 +-
 .../archetypes/cxf-jaxws-wsdlfirst/pom.xml      |    2 +-
 .../src/main/java/HelloWorldPortTypeImpl.java   |    8 +-
 .../src/main/webapp/WEB-INF/beans.xml           |    2 +-
 .../test/java/HelloWorldPortTypeImplTest.java   |    6 +-
 maven-plugins/codegen-plugin/pom.xml            |    2 +-
 .../cxf/maven_plugin/AbstractCodegenMoho.java   |  124 +--
 .../cxf/maven_plugin/ClassLoaderSwitcher.java   |    6 +-
 .../apache/cxf/maven_plugin/WsdlArtifact.java   |   10 +-
 .../apache/cxf/maven_plugin/WsdlUtilities.java  |    8 +-
 .../wsdl2java/ForkOnceWSDL2Java.java            |    6 +-
 .../cxf/maven_plugin/wsdl2java/Option.java      |   64 +-
 .../maven_plugin/wsdl2java/WSDL2JavaMojo.java   |   44 +-
 .../cxf/maven_plugin/wsdl2java/WsdlOption.java  |   24 +-
 .../wsdl2java/WsdlOptionLoader.java             |   18 +-
 .../wsdl2js/ForkOnceWSDL2Javascript.java        |    6 +-
 .../apache/cxf/maven_plugin/wsdl2js/Option.java |   12 +-
 .../wsdl2js/WSDL2JavaScriptMojo.java            |   22 +-
 .../cxf/maven_plugin/wsdl2js/WsdlOption.java    |   16 +-
 .../corba/maven/plugins/IDLToWSDLPlugin.java    |   10 +-
 .../corba/maven/plugins/IdltowsdlOption.java    |    2 +-
 .../corba/maven/plugins/WSDLToIDLPlugin.java    |   32 +-
 .../corba/maven/plugins/WsdltoidlOption.java    |    2 +-
 maven-plugins/java2wadl-plugin/pom.xml          |   26 +-
 .../maven_plugin/javatowadl/DumpJavaDoc.java    |   14 +-
 .../maven_plugin/javatowadl/Java2WADLMojo.java  |  112 +-
 .../javatowadl/ParseJavaDocMojo.java            |   26 +-
 .../javatowadl/ResourceMapJavaDocProvider.java  |   30 +-
 .../cxf/maven_plugin/ClassLoaderSwitcher.java   |    6 +-
 .../apache/cxf/maven_plugin/Java2WSMojo.java    |   17 +-
 .../common/ClassLoaderSwitcher.java             |    6 +-
 .../maven_plugin/common/DocumentArtifact.java   |    8 +-
 .../common/ForkOnceCodeGenerator.java           |    4 +-
 .../wadlto/AbstractCodeGeneratorMojo.java       |   92 +-
 .../apache/cxf/maven_plugin/wadlto/Option.java  |   54 +-
 .../cxf/maven_plugin/wadlto/OptionLoader.java   |   34 +-
 .../cxf/maven_plugin/wadlto/WADL2JavaMojo.java  |   28 +-
 .../cxf/maven_plugin/wadlto/WadlOption.java     |   22 +-
 .../cxf/maven_plugin/WSDLValidatorMojo.java     |   36 +-
 osgi/bundle/compatible/pom.xml                  |   46 -
 .../cxf/osgi/itests/NoAriesBlueprintTest.java   |    2 +-
 .../apache/cxf/osgi/itests/OSGiTestSupport.java |    6 +-
 .../osgi/itests/BundlesAndNamespacesTest.java   |    5 +-
 .../cxf/osgi/itests/CXFOSGiTestSupport.java     |   44 +-
 .../org/apache/cxf/osgi/itests/jaxrs/Book.java  |   10 +-
 .../apache/cxf/osgi/itests/jaxrs/BookStore.java |   16 +-
 .../cxf/osgi/itests/jaxrs/JaxRsServiceTest.java |    8 +-
 .../cxf/osgi/itests/soap/HttpServiceTest.java   |    6 +-
 .../cxf/osgi/itests/soap/HttpTestActivator.java |    2 +-
 .../cxf/osgi/itests/soap/JmsServiceTest.java    |    2 +-
 .../cxf/osgi/itests/soap/JmsTestActivator.java  |    2 +-
 .../resources/etc/org.ops4j.pax.logging.cfg     |   60 +
 .../cxf/karaf/commands/ListBussesCommand.java   |    2 +-
 .../karaf/commands/ListEndpointsCommand.java    |   22 +-
 .../karaf/commands/StartEndpointCommand.java    |   14 +-
 .../cxf/karaf/commands/StopEndpointCommand.java |   14 +-
 .../karaf/commands/completers/BusCompleter.java |    6 +-
 .../completers/EndpointCompleterSupport.java    |    8 +-
 .../completers/StoppedEndpointCompleter.java    |    2 +-
 .../karaf/commands/internal/CXFController.java  |    2 +-
 osgi/karaf/features/pom.xml                     |   53 +-
 .../features/src/main/resources/features.xml    |   72 +-
 osgi/pom.xml                                    |    2 +-
 osgi/repository/pom.xml                         |   12 +-
 parent/pom.xml                                  |  135 ++-
 pom.xml                                         |   46 +-
 .../cxf/binding/coloc/ColocInInterceptor.java   |    6 +-
 .../cxf/binding/coloc/ColocMessageObserver.java |   32 +-
 .../binding/coloc/ColocOutFaultObserver.java    |    2 +-
 .../cxf/binding/coloc/ColocOutInterceptor.java  |   56 +-
 .../org/apache/cxf/binding/coloc/ColocUtil.java |   50 +-
 .../binding/coloc/WebFaultInInterceptor.java    |   16 +-
 .../cxf/binding/coloc/blueprint/Activator.java  |    2 +-
 .../blueprint/ColocBPNamespaceHandler.java      |    7 +-
 .../cxf/binding/coloc/feature/ColocFeature.java |    2 +-
 .../binding/coloc/ColocMessageObserverTest.java |   14 +-
 .../binding/coloc/ColocOutInterceptorTest.java  |   98 +-
 .../apache/cxf/binding/coloc/ColocUtilTest.java |   44 +-
 .../blueprint/ColocBPNamespaceHandlerTest.java  |   72 +-
 rt/bindings/corba/pom.xml                       |    2 +
 .../apache/cxf/binding/corba/CorbaBinding.java  |   10 +-
 .../binding/corba/CorbaBindingException.java    |    4 +-
 .../cxf/binding/corba/CorbaBindingFactory.java  |   12 +-
 .../apache/cxf/binding/corba/CorbaConduit.java  |   72 +-
 .../cxf/binding/corba/CorbaDestination.java     |   84 +-
 .../apache/cxf/binding/corba/CorbaMessage.java  |   32 +-
 .../cxf/binding/corba/CorbaServerConduit.java   |   22 +-
 .../apache/cxf/binding/corba/CorbaTypeMap.java  |    2 +-
 .../apache/cxf/binding/corba/TypeMapCache.java  |    4 +-
 .../CorbaStreamFaultInInterceptor.java          |   38 +-
 .../CorbaStreamFaultOutInterceptor.java         |   56 +-
 .../interceptors/CorbaStreamInInterceptor.java  |   52 +-
 .../CorbaStreamOutEndingInterceptor.java        |    6 +-
 .../interceptors/CorbaStreamOutInterceptor.java |    8 +-
 .../interceptors/SystemExceptionHelper.java     |   30 +-
 .../binding/corba/runtime/CorbaDSIServant.java  |   32 +-
 .../corba/runtime/CorbaObjectReader.java        |   22 +-
 .../corba/runtime/CorbaObjectWriter.java        |   14 +-
 .../corba/runtime/CorbaStreamReader.java        |   12 +-
 .../corba/runtime/CorbaStreamWriter.java        |   20 +-
 .../binding/corba/runtime/OrbConfigurer.java    |    8 +-
 .../corba/types/AbstractCorbaTypeListener.java  |    2 +-
 .../types/AbstractNoStartEndEventProducer.java  |    6 +-
 .../types/AbstractStartEndEventProducer.java    |    6 +-
 .../types/CorbaAnonStructEventProducer.java     |    2 +-
 .../corba/types/CorbaAnyEventProducer.java      |   16 +-
 .../binding/corba/types/CorbaAnyHandler.java    |   14 +-
 .../binding/corba/types/CorbaAnyListener.java   |    4 +-
 .../binding/corba/types/CorbaArrayHandler.java  |   14 +-
 .../binding/corba/types/CorbaArrayListener.java |    2 +-
 .../corba/types/CorbaEnumEventProducer.java     |    2 +-
 .../binding/corba/types/CorbaEnumHandler.java   |   10 +-
 .../binding/corba/types/CorbaEnumListener.java  |    2 +-
 .../corba/types/CorbaExceptionHandler.java      |   24 +-
 .../corba/types/CorbaExceptionListener.java     |    4 +-
 .../corba/types/CorbaFixedEventProducer.java    |    4 +-
 .../binding/corba/types/CorbaFixedHandler.java  |   18 +-
 .../binding/corba/types/CorbaFixedListener.java |    2 +-
 .../binding/corba/types/CorbaObjectHandler.java |   20 +-
 .../CorbaObjectReferenceEventProducer.java      |   62 +-
 .../types/CorbaObjectReferenceHandler.java      |    2 +-
 .../types/CorbaOctetSequenceEventProducer.java  |    4 +-
 .../corba/types/CorbaOctetSequenceHandler.java  |   12 +-
 .../types/CorbaPrimitiveArrayEventProducer.java |    2 +-
 .../corba/types/CorbaPrimitiveHandler.java      |   28 +-
 .../corba/types/CorbaPrimitiveListener.java     |    4 +-
 .../CorbaPrimitiveSequenceEventProducer.java    |    2 +-
 .../types/CorbaPrimitiveTypeEventProducer.java  |    2 +-
 .../corba/types/CorbaSequenceHandler.java       |   16 +-
 .../corba/types/CorbaSequenceListener.java      |    6 +-
 .../corba/types/CorbaStructEventProducer.java   |    8 +-
 .../binding/corba/types/CorbaStructHandler.java |   18 +-
 .../corba/types/CorbaStructListener.java        |    4 +-
 .../corba/types/CorbaTypeEventProducer.java     |   18 +-
 .../binding/corba/types/CorbaTypeListener.java  |    2 +-
 .../corba/types/CorbaUnionEventProducer.java    |   12 +-
 .../binding/corba/types/CorbaUnionHandler.java  |   52 +-
 .../binding/corba/types/CorbaUnionListener.java |   16 +-
 .../binding/corba/types/HandlerIterator.java    |   10 +-
 .../corba/types/ParameterEventProducer.java     |    4 +-
 .../corba/types/SkipStartEndEventProducer.java  |    4 +-
 .../cxf/binding/corba/utils/ContextUtils.java   |    4 +-
 .../cxf/binding/corba/utils/CorbaAnyHelper.java |   66 +-
 .../binding/corba/utils/CorbaBindingHelper.java |   40 +-
 .../corba/utils/CorbaObjectReferenceHelper.java |   26 +-
 .../cxf/binding/corba/utils/EprMetaData.java    |   22 +-
 .../cxf/binding/corba/utils/OrbConfig.java      |   38 +-
 .../cxf/binding/corba/wsdl/CorbaConstants.java  |    4 +-
 .../cxf/binding/corba/wsdl/CorbaTypeImpl.java   |   12 +-
 .../cxf/binding/corba/wsdl/W3CConstants.java    |    6 +-
 .../corba/wsdl/WSDLExtensionRegister.java       |   16 +-
 .../binding/corba/CorbaBindingFactoryTest.java  |   72 +-
 .../cxf/binding/corba/CorbaBindingTest.java     |   28 +-
 .../cxf/binding/corba/CorbaConduitTest.java     |  180 +--
 .../cxf/binding/corba/CorbaDestinationTest.java |   48 +-
 .../cxf/binding/corba/CorbaMessageTest.java     |   40 +-
 .../binding/corba/CorbaServerConduitTest.java   |  172 +--
 .../cxf/binding/corba/CorbaTypeMapTest.java     |   10 +-
 .../org/apache/cxf/binding/corba/TestUtils.java |   28 +-
 .../corba/runtime/CorbaDSIServantTest.java      |   68 +-
 .../corba/runtime/CorbaObjectReaderTest.java    |  202 ++--
 .../corba/runtime/CorbaObjectWriterTest.java    |  160 +--
 .../corba/runtime/CorbaStreamReaderTest.java    |   22 +-
 .../corba/runtime/CorbaStreamableTest.java      |   42 +-
 .../corba/types/CorbaAnyHandlerTest.java        |    6 +-
 .../corba/types/CorbaArrayHandlerTest.java      |    8 +-
 .../corba/types/CorbaEnumHandlerTest.java       |   16 +-
 .../corba/types/CorbaFixedHandlerTest.java      |   16 +-
 .../corba/types/CorbaHandlerUtilsTest.java      |   56 +-
 .../types/CorbaHandlerUtilsYokoNSTest.java      |    4 +-
 .../corba/types/CorbaObjectHandlerTest.java     |   16 +-
 .../corba/types/CorbaPrimitiveHandlerTest.java  |   68 +-
 .../corba/types/CorbaSequenceHandlerTest.java   |   12 +-
 .../corba/types/CorbaStructHandlerTest.java     |   36 +-
 .../binding/corba/utils/ContextUtilsTest.java   |    8 +-
 .../cxf/binding/corba/utils/CorbaUtilsTest.java |   44 +-
 rt/bindings/object/pom.xml                      |  103 --
 .../cxf/binding/object/LocalServerListener.java |  138 ---
 .../cxf/binding/object/Messages.properties      |   22 -
 .../cxf/binding/object/ObjectBinding.java       |   51 -
 .../object/ObjectBindingConfiguration.java      |   50 -
 .../binding/object/ObjectBindingFactory.java    |  117 --
 .../object/ObjectDispatchInInterceptor.java     |   69 --
 .../object/ObjectDispatchOutInterceptor.java    |   53 -
 .../cxf/binding/object/blueprint/Activator.java |   50 -
 .../blueprint/ObjectBindingBPHandler.java       |   51 -
 .../binding/object/spring/NamespaceHandler.java |   30 -
 .../resources/META-INF/cxf/bus-extensions.txt   |    1 -
 .../src/main/resources/META-INF/spring.handlers |   21 -
 .../src/main/resources/META-INF/spring.schemas  |   21 -
 .../schemas/bindings/blueprint/object.xsd       |   41 -
 .../main/resources/schemas/bindings/object.xsd  |   40 -
 .../org/apache/cxf/binding/object/Echo.java     |   26 -
 .../org/apache/cxf/binding/object/EchoImpl.java |   30 -
 .../object/LocalServerRegistrationTest.java     |  115 --
 .../cxf/binding/object/ObjectBindingTest.java   |  180 ---
 .../blueprint/ObjectBindingBPHandlerTest.java   |   36 -
 rt/bindings/pom.xml                             |    1 -
 .../org/apache/cxf/binding/soap/HeaderUtil.java |    2 +-
 .../cxf/binding/soap/SOAPBindingUtil.java       |   12 +-
 .../org/apache/cxf/binding/soap/Soap11.java     |   16 +-
 .../org/apache/cxf/binding/soap/Soap12.java     |   12 +-
 .../apache/cxf/binding/soap/SoapBinding.java    |   18 +-
 .../binding/soap/SoapBindingConfiguration.java  |   18 +-
 .../cxf/binding/soap/SoapBindingConstants.java  |    6 +-
 .../cxf/binding/soap/SoapBindingFactory.java    |  134 +--
 .../org/apache/cxf/binding/soap/SoapFault.java  |   48 +-
 .../org/apache/cxf/binding/soap/SoapHeader.java |    6 +-
 .../apache/cxf/binding/soap/SoapMessage.java    |   16 +-
 .../cxf/binding/soap/SoapTransportFactory.java  |   42 +-
 .../apache/cxf/binding/soap/SoapVersion.java    |   22 +-
 .../cxf/binding/soap/SoapVersionFactory.java    |    8 +-
 .../soap/blueprint/SoapBindingBPHandler.java    |   10 +-
 ...SoapBindingBPInfoConfigDefinitionParser.java |    6 +-
 .../interceptor/AbstractSoapInterceptor.java    |   18 +-
 .../soap/interceptor/CheckFaultInterceptor.java |    4 +-
 .../EndpointSelectionInterceptor.java           |    6 +-
 .../interceptor/MustUnderstandInterceptor.java  |   60 +-
 .../soap/interceptor/RPCInInterceptor.java      |   28 +-
 .../soap/interceptor/RPCOutInterceptor.java     |   10 +-
 .../interceptor/ReadHeadersInterceptor.java     |   36 +-
 .../interceptor/Soap11FaultInInterceptor.java   |    4 +-
 .../interceptor/Soap11FaultOutInterceptor.java  |   32 +-
 .../interceptor/Soap12FaultInInterceptor.java   |   38 +-
 .../interceptor/Soap12FaultOutInterceptor.java  |   24 +-
 .../interceptor/SoapActionInInterceptor.java    |   36 +-
 .../soap/interceptor/SoapHeaderInterceptor.java |   20 +-
 .../SoapHeaderOutFilterInterceptor.java         |   10 +-
 .../soap/interceptor/SoapOutInterceptor.java    |   80 +-
 .../SoapPreProtocolOutInterceptor.java          |   36 +-
 .../soap/interceptor/StartBodyInterceptor.java  |   12 +-
 .../interceptor/TibcoSoapActionInterceptor.java |    4 +-
 .../binding/soap/jms/interceptor/JMSFault.java  |    2 +-
 .../soap/jms/interceptor/JMSFaultFactory.java   |    6 +-
 .../soap/jms/interceptor/JMSFaultType.java      |   10 +-
 .../soap/jms/interceptor/SoapFaultFactory.java  |   20 +-
 .../soap/jms/interceptor/SoapJMSConstants.java  |   16 +-
 .../jms/interceptor/SoapJMSInInterceptor.java   |   22 +-
 .../cxf/binding/soap/model/SoapBindingInfo.java |    4 +-
 .../cxf/binding/soap/model/SoapBodyInfo.java    |    8 +-
 .../cxf/binding/soap/model/SoapHeaderInfo.java  |    6 +-
 .../binding/soap/model/SoapOperationInfo.java   |    6 +-
 .../binding/soap/saaj/SAAJFactoryResolver.java  |    6 +-
 .../binding/soap/saaj/SAAJInInterceptor.java    |   52 +-
 .../binding/soap/saaj/SAAJOutInterceptor.java   |   42 +-
 .../cxf/binding/soap/saaj/SAAJStreamWriter.java |   20 +-
 .../apache/cxf/binding/soap/saaj/SAAJUtils.java |   10 +-
 .../binding/soap/spring/NamespaceHandler.java   |    2 +-
 .../soap/spring/SoapVersionRegistrar.java       |    2 +-
 .../soap/wsdl/extensions/SoapBinding.java       |    2 +-
 .../binding/soap/wsdl/extensions/SoapBody.java  |    2 +-
 .../binding/soap/wsdl11/SoapAddressPlugin.java  |    2 +-
 .../soap/MustUnderstandInterceptorTest.java     |   14 +-
 .../cxf/binding/soap/MyComplexStruct.java       |   28 +-
 .../cxf/binding/soap/RPCInInterceptorTest.java  |    6 +-
 .../cxf/binding/soap/RPCOutInterceptorTest.java |    8 +-
 .../binding/soap/ReadHeaderInterceptorTest.java |   26 +-
 .../cxf/binding/soap/ServiceModelUtilTest.java  |   14 +-
 .../binding/soap/SoapActionInterceptorTest.java |   14 +-
 .../binding/soap/SoapBindingFactoryTest.java    |   40 +-
 .../cxf/binding/soap/SoapBindingTest.java       |    8 +-
 .../soap/SoapDestinationFactoryTest.java        |    4 +-
 .../binding/soap/SoapOutInterceptorTest.java    |   16 +-
 .../org/apache/cxf/binding/soap/TestBase.java   |    4 +-
 .../org/apache/cxf/binding/soap/TestUtil.java   |   24 +-
 .../org/apache/cxf/binding/soap/XopType.java    |   24 +-
 .../blueprint/SoapBindingBPHandlerTest.java     |    4 +-
 .../interceptor/ReadHeadersInterceptorTest.java |   12 +-
 .../SoapActionInInterceptorTest.java            |   24 +-
 .../interceptor/SoapFaultSerializerTest.java    |   86 +-
 .../SoapPreProtocolOutInterceptorTest.java      |   20 +-
 .../jms/interceptor/SoapFaultFactoryTest.java   |   28 +-
 .../cxf/binding/soap/saaj/ParseBodyTest.java    |   22 +-
 .../soap/saaj/SAAJInInterceptorTest.java        |   24 +-
 .../soap/saaj/SAAJOutInterceptorTest.java       |    6 +-
 rt/bindings/xml/pom.xml                         |   18 +
 .../org/apache/cxf/binding/xml/XMLBinding.java  |   10 +-
 .../cxf/binding/xml/XMLBindingFactory.java      |   28 +-
 .../org/apache/cxf/binding/xml/XMLFault.java    |    8 +-
 .../cxf/binding/xml/XMLFormatValidator.java     |    4 +-
 .../xml/interceptor/XMLFaultInInterceptor.java  |    4 +-
 .../xml/interceptor/XMLFaultOutInterceptor.java |   16 +-
 .../interceptor/XMLMessageInInterceptor.java    |   12 +-
 .../interceptor/XMLMessageOutInterceptor.java   |    2 +-
 .../binding/xml/wsdl11/HttpAddressPlugin.java   |    2 +-
 .../xml/wsdl11/XMLWSDLExtensionLoader.java      |   14 +-
 .../cxf/binding/xml/XMLBindingFactoryTest.java  |    6 +-
 .../cxf/binding/xml/interceptor/TestBase.java   |   28 +-
 .../interceptor/XMLFaultOutInterceptorTest.java |   12 +-
 .../XMLMessageInInterceptorTest.java            |   12 +-
 .../XMLMessageOutInterceptorTest.java           |   12 +-
 rt/databinding/aegis/pom.xml                    |    5 +
 .../apache/cxf/aegis/util/jdom/StaxBuilder.java |   22 +-
 .../apache/cxf/aegis/AbstractAegisIoImpl.java   |   14 +-
 .../java/org/apache/cxf/aegis/AegisContext.java |   76 +-
 .../cxf/aegis/AegisElementDataReader.java       |    4 +-
 .../cxf/aegis/AegisElementDataWriter.java       |    8 +-
 .../main/java/org/apache/cxf/aegis/AegisIo.java |    4 +-
 .../java/org/apache/cxf/aegis/AegisReader.java  |    2 +-
 .../java/org/apache/cxf/aegis/AegisWriter.java  |    8 +-
 .../cxf/aegis/AegisXMLStreamDataReader.java     |   12 +-
 .../cxf/aegis/AegisXMLStreamDataWriter.java     |   28 +-
 .../main/java/org/apache/cxf/aegis/Context.java |   10 +-
 .../apache/cxf/aegis/DatabindingException.java  |   16 +-
 .../cxf/aegis/databinding/AegisDatabinding.java |    6 +-
 .../aegis/databinding/ElementDataReader.java    |   10 +-
 .../InconsistentInitializationException.java    |    2 +-
 .../aegis/databinding/XMLStreamDataReader.java  |    8 +-
 .../aegis/databinding/XMLStreamDataWriter.java  |   18 +-
 .../cxf/aegis/type/AbstractTypeCreator.java     |   32 +-
 .../org/apache/cxf/aegis/type/AegisType.java    |   32 +-
 .../cxf/aegis/type/DefaultTypeCreator.java      |    2 +-
 .../cxf/aegis/type/DefaultTypeMapping.java      |   32 +-
 .../aegis/type/ParameterizedTypeFactory.java    |    2 +-
 .../cxf/aegis/type/SimpleParameterizedType.java |   10 +-
 .../apache/cxf/aegis/type/TypeClassInfo.java    |   26 +-
 .../cxf/aegis/type/TypeCreationOptions.java     |   20 +-
 .../org/apache/cxf/aegis/type/TypeCreator.java  |   16 +-
 .../org/apache/cxf/aegis/type/TypeMapping.java  |    6 +-
 .../org/apache/cxf/aegis/type/TypeUtil.java     |   50 +-
 .../apache/cxf/aegis/type/XMLTypeCreator.java   |   56 +-
 .../apache/cxf/aegis/type/basic/ArrayType.java  |    4 +-
 .../apache/cxf/aegis/type/basic/Base64Type.java |   12 +-
 .../apache/cxf/aegis/type/basic/BeanType.java   |    8 +-
 .../cxf/aegis/type/basic/BeanTypeInfo.java      |   26 +-
 .../aegis/type/basic/CharacterAsStringType.java |   12 +-
 .../type/basic/InterfaceInvocationHandler.java  |    8 +-
 .../aegis/type/basic/TimezoneLessDateType.java  |    2 +-
 .../cxf/aegis/type/basic/XMLBeanTypeInfo.java   |   26 +-
 .../aegis/type/collection/CollectionType.java   |   10 +-
 .../cxf/aegis/type/collection/MapType.java      |    2 +-
 .../cxf/aegis/type/encoded/ArrayTypeInfo.java   |   16 +-
 .../cxf/aegis/type/encoded/MarshalRegistry.java |    2 +-
 .../cxf/aegis/type/encoded/SoapArrayType.java   |   12 +-
 .../cxf/aegis/type/encoded/SoapRefRegistry.java |    2 +-
 .../cxf/aegis/type/encoded/StructType.java      |    8 +-
 .../cxf/aegis/type/encoded/TrailingBlocks.java  |    6 +-
 .../cxf/aegis/type/java5/AnnotatedTypeInfo.java |    6 +-
 .../cxf/aegis/type/java5/Java5TypeCreator.java  |   30 +-
 .../cxf/aegis/type/java5/XmlFlattenedArray.java |    2 +-
 .../cxf/aegis/type/mtom/AbstractXOPType.java    |   26 +-
 .../cxf/aegis/type/mtom/AttachmentUtil.java     |    2 +-
 .../apache/cxf/aegis/type/xml/DocumentType.java |    2 +-
 .../apache/cxf/aegis/type/xml/SourceType.java   |    2 +-
 .../apache/cxf/aegis/util/NamespaceHelper.java  |   30 +-
 .../org/apache/cxf/aegis/util/ServiceUtils.java |    2 +-
 .../java/org/apache/cxf/aegis/util/UID.java     |    2 +-
 .../util/date/TimezoneLessXsDateFormat.java     |    2 +-
 .../cxf/aegis/util/date/XsDateTimeFormat.java   |    6 +-
 .../aegis/util/stax/JDOMNamespaceContext.java   |    6 +-
 .../cxf/aegis/util/stax/JDOMStreamReader.java   |    4 +-
 .../cxf/aegis/util/stax/JDOMStreamWriter.java   |    2 +-
 .../aegis/util/stax/W3CNamespaceContext.java    |    4 +-
 .../cxf/aegis/xml/AbstractMessageWriter.java    |    6 +-
 .../org/apache/cxf/aegis/xml/MessageReader.java |    4 +-
 .../org/apache/cxf/aegis/xml/MessageWriter.java |    6 +-
 .../cxf/aegis/xml/stax/AttributeWriter.java     |    2 +-
 .../cxf/aegis/xml/stax/ElementReader.java       |    4 +-
 .../cxf/aegis/xml/stax/ElementWriter.java       |   14 +-
 .../resources/META-INF/cxf/java2wsbeans.xml     |    2 +-
 .../org/apache/cxf/aegis/AbstractAegisTest.java |   34 +-
 .../apache/cxf/aegis/client/BookService.java    |    6 +-
 .../cxf/aegis/client/BookServiceImpl.java       |    2 +-
 .../aegis/client/ClientServiceConfigTest.java   |    2 +-
 .../cxf/aegis/custom/CustomBeansTest.java       |    6 +-
 .../cxf/aegis/custom/service/Service.java       |    2 +-
 .../cxf/aegis/custom/service/ServiceImpl.java   |    8 +-
 .../cxf/aegis/exception/HelloException.java     |    8 +-
 .../cxf/aegis/inheritance/AbstractUser.java     |    2 +-
 .../apache/cxf/aegis/inheritance/Employee.java  |    2 +-
 .../inheritance/ExceptionInheritanceTest.java   |    4 +-
 .../aegis/inheritance/InheritancePOJOTest.java  |    2 +-
 .../aegis/inheritance/InheritanceService.java   |    2 +-
 .../cxf/aegis/inheritance/intf/IGrandChild.java |    2 +-
 .../inheritance/intf/IInterfaceService.java     |    4 +-
 .../inheritance/ws1/WS1ExtendedException.java   |    2 +-
 .../aegis/integration/ParameterMappingTest.java |   16 +-
 .../aegis/integration/SchemaValidationTest.java |   10 +-
 .../cxf/aegis/integration/WrappedTest.java      |   26 +-
 .../aegis/namespaces/ExplicitPrefixTest.java    |   24 +-
 .../namespaces/NamespaceConfusionTest.java      |   32 +-
 .../apache/cxf/aegis/namespaces/data/Name.java  |    2 +-
 .../aegis/namespaces/impl/NameServiceImpl.java  |    6 +-
 .../cxf/aegis/override/OverrideTypeTest.java    |   12 +-
 .../apache/cxf/aegis/services/ArrayService.java |   18 +-
 .../cxf/aegis/services/AttributeBean.java       |    2 +-
 .../apache/cxf/aegis/services/BeanWithDOM.java  |   10 +-
 .../org/apache/cxf/aegis/services/DataBean.java |    4 +-
 .../cxf/aegis/services/DocumentService.java     |    4 +-
 .../org/apache/cxf/aegis/services/Echo.java     |    4 +-
 .../cxf/aegis/services/NillableService.java     |    6 +-
 .../apache/cxf/aegis/services/SimpleBean.java   |   12 +-
 .../aegis/services/base64/BinaryDataTest.java   |    6 +-
 .../aegis/standalone/StandaloneReadTest.java    |   34 +-
 .../aegis/standalone/StandaloneWriteTest.java   |   22 +-
 .../type/TypeCreationOptionsSpringTest.java     |   18 +-
 .../type/array/BeanWithFlatCollection.java      |    2 +-
 .../type/array/DuplicateArrayReturnItem.java    |    2 +-
 .../aegis/type/array/DuplicateArrayService.java |   14 +-
 .../type/array/DuplicateArrayServiceBean.java   |    2 +-
 .../cxf/aegis/type/array/FlatArrayService.java  |   10 +-
 .../type/array/FlatArrayServiceInterface.java   |    2 +-
 .../cxf/aegis/type/array/FlatArrayTest.java     |    5 +-
 .../cxf/aegis/type/basic/BadBeanDescriptor.java |    4 +-
 .../apache/cxf/aegis/type/basic/BeanTest.java   |   10 +-
 .../cxf/aegis/type/basic/ByteDataTest.java      |    2 +-
 .../cxf/aegis/type/basic/DateTimezoneTest.java  |   38 +-
 .../cxf/aegis/type/basic/DynamicProxyTest.java  |    2 +-
 .../cxf/aegis/type/basic/QualificationTest.java |   22 +-
 .../aegis/type/encoded/AbstractEncodedTest.java |    8 +-
 .../aegis/type/encoded/SoapArrayTypeTest.java   |    6 +-
 .../cxf/aegis/type/encoded/StructTypeTest.java  |    4 +-
 .../apache/cxf/aegis/type/java5/ClassTest.java  |   26 +-
 .../cxf/aegis/type/java5/CollectionService.java |    8 +-
 .../type/java5/CollectionServiceInterface.java  |   12 +-
 .../cxf/aegis/type/java5/CollectionTest.java    |   16 +-
 .../type/java5/CollectionTestsWithService.java  |    2 +-
 .../cxf/aegis/type/java5/DualOutService.java    |    2 +-
 .../aegis/type/java5/DualOutServiceTest.java    |    4 +-
 .../cxf/aegis/type/java5/EnumTypeTest.java      |    6 +-
 .../cxf/aegis/type/java5/JaxbTypeTest.java      |    2 +-
 .../aegis/type/java5/JaxbXmlParamTypeTest.java  |    4 +-
 .../cxf/aegis/type/java5/dto/DTOService.java    |    2 +-
 .../cxf/aegis/type/java5/map/Student.java       |    4 +-
 .../aegis/type/java5/map/StudentService.java    |    4 +-
 .../java5/map/StudentServiceDocLiteral.java     |    4 +-
 .../java5/map/StudentServiceDocLiteralImpl.java |    8 +-
 .../type/java5/map/StudentServiceImpl.java      |    8 +-
 .../cxf/aegis/type/java5/map/StudentTest.java   |    7 -
 .../org/apache/cxf/aegis/type/map/MapsTest.java |   28 +-
 .../cxf/aegis/type/map/fortest/MapTest.java     |    8 +-
 .../aegis/type/map/fortest/ObjectWithAMap.java  |    2 +-
 .../aegis/type/map/ns2/ObjectWithAMapNs2.java   |    2 +-
 .../apache/cxf/aegis/type/missing/Inner.java    |    2 +-
 .../cxf/aegis/type/missing/MissingTypeImpl.java |    4 +-
 .../aegis/type/missing/MissingTypeWSDLTest.java |    2 +-
 .../apache/cxf/aegis/type/missing/Outer.java    |   22 +-
 .../streams/XMLStreamReaderMappingTest.java     |   10 +-
 .../cxf/aegis/xmlconfig/BeanWithDate.java       |    2 +-
 .../cxf/aegis/xmlconfig/TestDateMapping.java    |    8 +-
 .../java/org/apache/cxf/doclitbare/Course.java  |   10 +-
 .../apache/cxf/doclitbare/DocLitBareTest.java   |    8 +-
 .../java/org/apache/cxf/doclitbare/Teacher.java |   10 +-
 .../org/apache/cxf/doclitbare/University.java   |    6 +-
 .../apache/cxf/doclitbare/UniversityImpl.java   |    8 +-
 .../cxf/aegis/type/aegisOptionsTestBeans.xml    |    2 +-
 rt/databinding/jaxb/pom.xml                     |    2 +
 .../org/apache/cxf/jaxb/DatatypeFactory.java    |    6 +-
 .../apache/cxf/jaxb/JAXBContextInitializer.java |   56 +-
 .../java/org/apache/cxf/jaxb/JAXBDataBase.java  |   32 +-
 .../org/apache/cxf/jaxb/JAXBDataBinding.java    |   26 +-
 .../org/apache/cxf/jaxb/JAXBEncoderDecoder.java |  130 +--
 .../apache/cxf/jaxb/JAXBSchemaInitializer.java  |   94 +-
 .../org/apache/cxf/jaxb/JAXBWrapperHelper.java  |   18 +-
 .../main/java/org/apache/cxf/jaxb/Utils.java    |   32 +-
 .../apache/cxf/jaxb/WrapperHelperCompiler.java  |  110 +-
 .../attachment/JAXBAttachmentMarshaller.java    |    4 +-
 .../JAXBAttachmentSchemaValidationHack.java     |   16 +-
 .../attachment/JAXBAttachmentUnmarshaller.java  |    2 +-
 .../org/apache/cxf/jaxb/io/DataReaderImpl.java  |   58 +-
 .../org/apache/cxf/jaxb/io/DataWriterImpl.java  |   74 +-
 .../resources/META-INF/cxf/java2wsbeans.xml     |    2 +-
 .../apache/cxf/jaxb/BareInInterceptorTest.java  |   42 +-
 .../apache/cxf/jaxb/BareOutInterceptorTest.java |   24 +-
 .../DataBindingMarshallerPropertiesTest.java    |    6 +-
 .../apache/cxf/jaxb/DatatypeFactoryTest.java    |    2 +-
 .../cxf/jaxb/FixNamespacesXMLEventWriter.java   |    4 +-
 .../apache/cxf/jaxb/JAXBDataBindingTest.java    |   48 +-
 .../apache/cxf/jaxb/JAXBEncoderDecoderTest.java |  184 ++--
 .../java/org/apache/cxf/jaxb/JAXBUtilsTest.java |   86 +-
 .../apache/cxf/jaxb/JAXBWrapperHelperTest.java  |   30 +-
 .../org/apache/cxf/jaxb/OrderException.java     |   14 +-
 .../org/apache/cxf/jaxb/StaxEventFilter.java    |    2 +-
 .../test/java/org/apache/cxf/jaxb/TestBase.java |    2 +-
 .../apache/cxf/jaxb/fortest/QualifiedBean.java  |   12 +-
 .../org/apache/cxf/jaxb/io/MyCustomHandler.java |    2 +-
 .../cxf/jaxb/io/MyCustomMarshallerHandler.java  |   12 +-
 .../cxf/jaxb/io/XMLStreamDataReaderTest.java    |   42 +-
 .../cxf/jaxb/io/XMLStreamDataWriterTest.java    |   90 +-
 .../org/apache/cxf/jaxb_misc/TestJAXBClass.java |    4 +-
 rt/databinding/jibx/pom.xml                     |   96 --
 .../org/apache/cxf/jibx/JibxDataBinding.java    |  160 ---
 .../org/apache/cxf/jibx/JibxDataReader.java     |   97 --
 .../org/apache/cxf/jibx/JibxDataWriter.java     |   99 --
 .../apache/cxf/jibx/JibxNullBindingFactory.java |   58 -
 .../apache/cxf/jibx/JibxSchemaInitializer.java  |  116 --
 .../org/apache/cxf/jibx/JibxSimpleTypes.java    |  240 ----
 .../main/java/org/apache/cxf/jibx/JibxUtil.java |  236 ----
 .../org/apache/cxf/jibx/JibxWrapperHelper.java  |   46 -
 .../apache/cxf/jibx/tools/JibxSchemaHelper.java |  230 ----
 .../cxf/jibx/tools/JibxSchemaResolver.java      |   95 --
 .../cxf/jibx/tools/JibxToolingDataBinding.java  |  446 --------
 .../jibx/tools/JibxToolingProblemHandler.java   |   68 --
 .../main/resources/META-INF/tools-plugin.xml    |   22 -
 .../org/apache/cxf/jibx/AbstractJibxTest.java   |  113 --
 .../apache/cxf/jibx/PrimitiveTypesService.java  |   76 --
 .../org/apache/cxf/jibx/PrimitiveTypesTest.java |   78 --
 .../jibx/src/test/java/resources/binding.xml    |   15 -
 .../ws/library/types/BookInformation.class      |  Bin 4124 -> 0 bytes
 .../JiBX_bindingBookInformation_access.class    |  Bin 2610 -> 0 bytes
 .../JiBX_bindingBookInformation_access2.class   |  Bin 2612 -> 0 bytes
 .../ws/library/types/JiBX_bindingFactory.class  |  Bin 2133 -> 0 bytes
 .../types/JiBX_bindingMungeAdapter.class        |  Bin 1991 -> 0 bytes
 .../ws/library/types/TypeInformation.class      |  Bin 736 -> 0 bytes
 .../jibx/src/test/java/resources/types.xsd      |   32 -
 .../jibx/src/test/resources/binding.xml         |   15 -
 .../ws/library/types/BookInformation.class      |  Bin 4124 -> 0 bytes
 .../JiBX_bindingBookInformation_access.class    |  Bin 2610 -> 0 bytes
 .../JiBX_bindingBookInformation_access2.class   |  Bin 2612 -> 0 bytes
 .../ws/library/types/JiBX_bindingFactory.class  |  Bin 2133 -> 0 bytes
 .../types/JiBX_bindingMungeAdapter.class        |  Bin 1991 -> 0 bytes
 .../ws/library/types/TypeInformation.class      |  Bin 736 -> 0 bytes
 .../jibx/src/test/resources/types.xsd           |   14 -
 rt/databinding/pom.xml                          |    3 -
 rt/databinding/sdo/pom.xml                      |  202 ----
 .../java/org/apache/cxf/sdo/DataReaderImpl.java |   86 --
 .../java/org/apache/cxf/sdo/DataWriterImpl.java |   75 --
 .../org/apache/cxf/sdo/NodeDataWriterImpl.java  |   64 --
 .../org/apache/cxf/sdo/SDOClassCollector.java   |   50 -
 .../java/org/apache/cxf/sdo/SDODataBinding.java |  224 ----
 .../apache/cxf/sdo/tools/SDODatabinding.java    |  289 -----
 .../resources/META-INF/cxf/java2wsbeans.xml     |   22 -
 .../main/resources/META-INF/tools-plugin.xml    |   24 -
 .../apache/cxf/sdo/AbstractHelloWorldTest.java  |   71 --
 .../org/apache/cxf/sdo/AbstractSDOTest.java     |  214 ----
 .../apache/cxf/sdo/HelloWorldDynamicTest.java   |   87 --
 .../apache/cxf/sdo/HelloWorldStaticTest.java    |   87 --
 .../src/test/java/org/apache/cxf/sdo/bean11.xml |    9 -
 .../test/java/org/apache/cxf/sdo/structure.xml  |   15 -
 .../test/resources/wsdl_sdo/HelloService.wsdl   |  197 ----
 .../wsdl_sdo/HelloService_dynamic.wsdl          |   27 -
 .../resources/wsdl_sdo/HelloService_static.wsdl |   27 -
 rt/databinding/xmlbeans/pom.xml                 |  205 ----
 .../org/apache/cxf/xmlbeans/DataReaderImpl.java |  167 ---
 .../org/apache/cxf/xmlbeans/DataWriterImpl.java |  227 ----
 .../org/apache/cxf/xmlbeans/Message.properties  |   22 -
 .../apache/cxf/xmlbeans/NodeDataWriterImpl.java |   61 --
 .../cxf/xmlbeans/XmlBeansDataBinding.java       |  176 ---
 .../cxf/xmlbeans/XmlBeansSchemaInitializer.java |  328 ------
 .../cxf/xmlbeans/XmlBeansWrapperHelper.java     |  103 --
 .../xmlbeans/tools/XMLBeansSchemaTypeUtils.java |  123 ---
 .../tools/XMLBeansToolingDataBinding.java       |  545 ----------
 .../resources/META-INF/cxf/java2wsbeans.xml     |   22 -
 .../main/resources/META-INF/tools-plugin.xml    |   22 -
 .../cxf/xmlbeans/AbstractXmlBeansTest.java      |  218 ----
 .../apache/cxf/xmlbeans/CustomFault.aegis.xml   |    6 -
 .../org/apache/cxf/xmlbeans/CustomFault.java    |   39 -
 .../cxf/xmlbeans/DocumentStyleRequest.xml       |   12 -
 .../apache/cxf/xmlbeans/DocumentStyleTest.java  |   78 --
 .../org/apache/cxf/xmlbeans/FaultRequest.xml    |    7 -
 .../org/apache/cxf/xmlbeans/GetForecasts.xml    |    4 -
 .../org/apache/cxf/xmlbeans/GetWeatherByZip.xml |    9 -
 .../apache/cxf/xmlbeans/GreeterMineImpl.java    |   48 -
 .../org/apache/cxf/xmlbeans/IDRefRequest.xml    |    9 -
 .../org/apache/cxf/xmlbeans/IDRefService.java   |   33 -
 .../apache/cxf/xmlbeans/IDRefServiceTest.java   |   50 -
 .../cxf/xmlbeans/MultipleSchemaInNSTest.java    |   80 --
 .../cxf/xmlbeans/MultipleSchemaService.java     |   33 -
 .../apache/cxf/xmlbeans/PrimitiveTypesTest.java |   71 --
 .../org/apache/cxf/xmlbeans/TestService.java    |   66 --
 .../org/apache/cxf/xmlbeans/TypesService.java   |   77 --
 .../org/apache/cxf/xmlbeans/WeatherService.java |   47 -
 .../apache/cxf/xmlbeans/WeatherService2.java    |   59 -
 .../cxf/xmlbeans/WeatherService2Test.java       |   66 --
 .../org/apache/cxf/xmlbeans/WrappedRequest.xml  |   12 -
 .../apache/cxf/xmlbeans/WrappedStyleTest.java   |  104 --
 .../cxf/xmlbeans/XMLBeansServiceTest.java       |  107 --
 .../org/apache/cxf/xmlbeans/XmlBeansTest.java   |   94 --
 .../apache/cxf/xmlbeans/basic/BasicTest.java    |   61 --
 .../apache/cxf/xmlbeans/basic/TestService.java  |   47 -
 .../org/apache/cxf/xmlbeans/basic/bean11.xml    |   16 -
 .../test/java/org/apache/cxf/xmlbeans/cxf.xml   |   34 -
 .../test/java/org/apache/cxf/xmlbeans/cxf2.xml  |   36 -
 .../apache/cxf/xmlbeans/rpc/GetWeatherData.xml  |    6 -
 .../apache/cxf/xmlbeans/rpc/SetWeatherData.xml  |   10 -
 .../xmlbeans/rpc/WeatherServiceRPCLitTest.java  |   90 --
 .../org/apache/cxf/xmlbeans/sampleRequest.xml   |   29 -
 .../org/apache/cxf/xmlbeans/soap11fault.xml     |   11 -
 .../org/apache/cxf/xmlbeans/undeclaredns.xml    |    4 -
 .../org/apache/cxf/xmlbeans/xmlbeanstest.wsdl   |   54 -
 .../src/test/resources/wsdl/xmlbeanstest.wsdl   |   54 -
 rt/databinding/xmlbeans/src/test/xsd/Base.xsd   |   31 -
 .../xmlbeans/src/test/xsd/Request.xsd           |   35 -
 .../xmlbeans/src/test/xsd/Response.xsd          |   35 -
 .../xmlbeans/src/test/xsd/WeatherForecast.xsd   |   72 --
 .../xmlbeans/src/test/xsd/XmlBeanTest.xsd       |   60 -
 .../xmlbeans/src/test/xsd/anyschema.xsd         |   66 --
 rt/databinding/xmlbeans/src/test/xsd/idref.xsd  |   24 -
 .../xmlbeans/src/test/xsd/included.xsd          |   33 -
 rt/databinding/xmlbeans/src/test/xsd/sample.xsd |   16 -
 .../AbstractStaticFailoverStrategy.java         |   38 +-
 .../CircuitBreakerTargetSelector.java           |   82 +-
 .../cxf/clustering/FailoverFailedException.java |    6 +-
 .../apache/cxf/clustering/FailoverFeature.java  |   14 +-
 .../apache/cxf/clustering/FailoverStrategy.java |   14 +-
 .../cxf/clustering/FailoverTargetSelector.java  |  120 +-
 .../cxf/clustering/LoadDistributorFeature.java  |    6 +-
 .../LoadDistributorTargetSelector.java          |   14 +-
 .../apache/cxf/clustering/RandomStrategy.java   |   10 +-
 .../apache/cxf/clustering/RetryStrategy.java    |    8 +-
 .../cxf/clustering/SequentialStrategy.java      |    6 +-
 .../ClusteringBPBeanDefinitionParser.java       |    2 +-
 .../blueprint/ClusteringBPNamespaceHandler.java |   10 +-
 .../circuitbreaker/CircuitBreaker.java          |    4 +-
 .../CircuitBreakerFailoverFeature.java          |   22 +-
 .../circuitbreaker/ZestCircuitBreaker.java      |   12 +-
 ...cuitBreakerFailoverBeanDefinitionParser.java |    2 +-
 .../spring/FailoverBeanDefinitionParser.java    |    2 +-
 .../LoadDistributorBeanDefinitionParser.java    |    2 +-
 .../cxf/clustering/spring/NamespaceHandler.java |    2 +-
 .../src/main/resources/schemas/clustering.xsd   |   34 +-
 .../ClusteringBPNamespaceHandlerTest.java       |    4 +-
 rt/features/logging/pom.xml                     |   27 +-
 .../ext/logging/AbstractLoggingInterceptor.java |   21 +-
 .../apache/cxf/ext/logging/LoggingFeature.java  |   31 +-
 .../cxf/ext/logging/LoggingInInterceptor.java   |   40 +-
 .../cxf/ext/logging/LoggingOutInterceptor.java  |   23 +-
 .../org/apache/cxf/ext/logging/WireTapIn.java   |   18 +-
 .../logging/event/DefaultLogEventMapper.java    |   49 +-
 .../apache/cxf/ext/logging/event/LogEvent.java  |   22 +-
 .../ext/logging/event/LogMessageFormatter.java  |   67 ++
 .../ext/logging/event/PrettyLoggingFilter.java  |    8 +-
 .../logging/event/PrintWriterEventSender.java   |   45 +
 .../apache/cxf/ext/logging/osgi/Activator.java  |   13 +-
 .../cxf/ext/logging/slf4j/Slf4jEventSender.java |   49 +-
 .../logging/slf4j/Slf4jVerboseEventSender.java  |   31 +
 .../ext/logging/DefaultLogEventMapperTest.java  |   29 +-
 .../apache/cxf/ext/logging/RESTLoggingTest.java |  185 ----
 .../apache/cxf/ext/logging/SOAPLoggingTest.java |  148 ---
 .../apache/cxf/ext/logging/TestEventSender.java |   38 -
 .../org/apache/cxf/ext/logging/TestService.java |   26 -
 .../apache/cxf/ext/logging/TestServiceRest.java |   32 -
 .../cxf/ext/logging/TestServiceRestBinary.java  |   34 -
 .../org/apache/cxf/metrics/ExchangeMetrics.java |   10 +-
 .../org/apache/cxf/metrics/MetricsContext.java  |    8 +-
 .../org/apache/cxf/metrics/MetricsFeature.java  |   24 +-
 .../org/apache/cxf/metrics/MetricsProvider.java |    2 +-
 .../codahale/CodahaleMetricsContext.java        |   14 +-
 .../codahale/CodahaleMetricsProvider.java       |   16 +-
 .../AbstractMetricsInterceptor.java             |   16 +-
 .../interceptors/CountingOutInterceptor.java    |    2 +-
 .../interceptors/CountingOutputStream.java      |    2 +-
 .../MetricsMessageInOneWayInterceptor.java      |    2 +-
 .../MetricsMessageInPostInvokeInterceptor.java  |    2 +-
 .../MetricsMessageInPreInvokeInterceptor.java   |    2 +-
 .../MetricsMessageOutInterceptor.java           |    2 +-
 rt/features/pom.xml                             |    1 -
 .../cxf/throttling/SimpleThrottlingManager.java |    4 +-
 .../apache/cxf/throttling/ThrottleResponse.java |   14 +-
 .../cxf/throttling/ThrottlingFeature.java       |    6 +-
 .../cxf/throttling/ThrottlingInterceptor.java   |    8 +-
 .../cxf/throttling/ThrottlingManager.java       |   10 +-
 .../ThrottlingResponseInterceptor.java          |    8 +-
 rt/features/tracing-brave/pom.xml               |   87 --
 .../cxf/tracing/brave/CxfClientRequest.java     |   49 -
 .../cxf/tracing/brave/CxfServerRequest.java     |   48 -
 .../cxf/tracing/brave/HttpResponse200.java      |   28 -
 .../apache/cxf/tracing/brave/ParsedMessage.java |  121 ---
 .../apache/cxf/tracing/brave/TraceFeature.java  |   50 -
 .../cxf/tracing/brave/TraceInInterceptor.java   |   58 -
 .../cxf/tracing/brave/TraceOutInterceptor.java  |   57 -
 .../cxf/tracing/brave/BraveTraceTest.java       |   99 --
 .../tracing/brave/LoggingSpanNameProvider.java  |   31 -
 .../org/apache/cxf/tracing/brave/MyService.java |   26 -
 .../apache/cxf/tracing/brave/MyServiceImpl.java |   28 -
 rt/frontend/jaxrs/pom.xml                       |    6 +
 .../cxf/jaxrs/AbstractJAXRSFactoryBean.java     |  120 +-
 .../java/org/apache/cxf/jaxrs/JAXRSBinding.java |   10 +-
 .../apache/cxf/jaxrs/JAXRSBindingFactory.java   |   18 +-
 .../java/org/apache/cxf/jaxrs/JAXRSInvoker.java |   88 +-
 .../cxf/jaxrs/JAXRSServerFactoryBean.java       |  160 +--
 .../cxf/jaxrs/JAXRSServiceFactoryBean.java      |   60 +-
 .../org/apache/cxf/jaxrs/JAXRSServiceImpl.java  |   40 +-
 .../blueprint/BlueprintResourceFactory.java     |    6 +-
 .../blueprint/JAXRSBPNamespaceHandler.java      |   28 +-
 .../JAXRSServerFactoryBeanDefinitionParser.java |   24 +-
 .../apache/cxf/jaxrs/ext/MessageContext.java    |   12 +-
 .../cxf/jaxrs/ext/MessageContextImpl.java       |   84 +-
 .../java/org/apache/cxf/jaxrs/ext/Nullable.java |    6 +-
 .../java/org/apache/cxf/jaxrs/ext/Oneway.java   |    2 +-
 .../apache/cxf/jaxrs/ext/ProtocolHeaders.java   |   12 +-
 .../cxf/jaxrs/ext/ProtocolHeadersImpl.java      |    6 +-
 .../cxf/jaxrs/ext/ResourceComparator.java       |   12 +-
 .../cxf/jaxrs/ext/multipart/Attachment.java     |   58 +-
 .../jaxrs/ext/multipart/AttachmentBuilder.java  |   24 +-
 .../jaxrs/ext/multipart/ContentDisposition.java |    2 +-
 .../ext/multipart/InputStreamDataSource.java    |    6 +-
 .../cxf/jaxrs/ext/multipart/Multipart.java      |    4 +-
 .../cxf/jaxrs/ext/multipart/MultipartBody.java  |   40 +-
 .../apache/cxf/jaxrs/ext/xml/ElementClass.java  |    2 +-
 .../cxf/jaxrs/ext/xml/XMLInstruction.java       |    4 +-
 .../org/apache/cxf/jaxrs/ext/xml/XMLName.java   |    6 +-
 .../org/apache/cxf/jaxrs/ext/xml/XMLSource.java |   98 +-
 .../cxf/jaxrs/ext/xml/XSISchemaLocation.java    |   10 +-
 .../apache/cxf/jaxrs/ext/xml/XSLTTransform.java |    6 +-
 .../impl/AbstractInterceptorContextImpl.java    |    6 +-
 .../cxf/jaxrs/impl/AbstractPropertiesImpl.java  |    2 +-
 .../jaxrs/impl/AbstractRequestContextImpl.java  |    4 +-
 .../jaxrs/impl/AbstractResponseContextImpl.java |   12 +-
 .../cxf/jaxrs/impl/AsyncResponseImpl.java       |   60 +-
 .../jaxrs/impl/CacheControlHeaderProvider.java  |   40 +-
 .../apache/cxf/jaxrs/impl/ConfigurableImpl.java |   22 +-
 .../cxf/jaxrs/impl/ConfigurationImpl.java       |   36 +-
 .../jaxrs/impl/ContainerRequestContextImpl.java |   22 +-
 .../impl/ContainerResponseContextImpl.java      |   18 +-
 .../cxf/jaxrs/impl/CookieHeaderProvider.java    |   16 +-
 .../cxf/jaxrs/impl/DateHeaderProvider.java      |    4 +-
 .../cxf/jaxrs/impl/EntityTagHeaderProvider.java |   14 +-
 .../cxf/jaxrs/impl/FeatureContextImpl.java      |    4 +-
 .../apache/cxf/jaxrs/impl/HttpHeadersImpl.java  |   72 +-
 .../jaxrs/impl/HttpServletRequestFilter.java    |    8 +-
 .../jaxrs/impl/HttpServletResponseFilter.java   |    6 +-
 .../apache/cxf/jaxrs/impl/LinkBuilderImpl.java  |   40 +-
 .../cxf/jaxrs/impl/LinkHeaderProvider.java      |   22 +-
 .../cxf/jaxrs/impl/MediaTypeHeaderProvider.java |   48 +-
 .../org/apache/cxf/jaxrs/impl/MetadataMap.java  |   54 +-
 .../cxf/jaxrs/impl/NewCookieHeaderProvider.java |   36 +-
 .../apache/cxf/jaxrs/impl/PathSegmentImpl.java  |   14 +-
 .../cxf/jaxrs/impl/PropertyHolderFactory.java   |   20 +-
 .../apache/cxf/jaxrs/impl/ProvidersImpl.java    |    2 +-
 .../impl/ReaderInterceptorContextImpl.java      |    6 +-
 .../cxf/jaxrs/impl/ReaderInterceptorMBR.java    |   16 +-
 .../org/apache/cxf/jaxrs/impl/RequestImpl.java  |  117 +-
 .../cxf/jaxrs/impl/RequestPreprocessor.java     |   83 +-
 .../cxf/jaxrs/impl/ResourceContextImpl.java     |    8 +-
 .../apache/cxf/jaxrs/impl/ResourceInfoImpl.java |    4 +-
 .../cxf/jaxrs/impl/ResponseBuilderImpl.java     |   30 +-
 .../org/apache/cxf/jaxrs/impl/ResponseImpl.java |  142 +--
 .../cxf/jaxrs/impl/RuntimeDelegateImpl.java     |   24 +-
 .../cxf/jaxrs/impl/SecurityContextImpl.java     |    6 +-
 .../jaxrs/impl/ServletOutputStreamFilter.java   |    8 +-
 .../impl/ServletRequestPropertyHolder.java      |    4 +-
 .../apache/cxf/jaxrs/impl/UriBuilderImpl.java   |  274 ++---
 .../org/apache/cxf/jaxrs/impl/UriInfoImpl.java  |   28 +-
 .../cxf/jaxrs/impl/VariantListBuilderImpl.java  |   40 +-
 .../impl/WebApplicationExceptionMapper.java     |   40 +-
 .../impl/WriterInterceptorContextImpl.java      |   10 +-
 .../cxf/jaxrs/impl/WriterInterceptorMBW.java    |   34 +-
 .../jaxrs/impl/tl/AbstractThreadLocalProxy.java |    6 +-
 .../impl/tl/ThreadLocalContextResolver.java     |    4 +-
 .../jaxrs/impl/tl/ThreadLocalHttpHeaders.java   |    2 +-
 .../impl/tl/ThreadLocalHttpServletRequest.java  |    2 +-
 .../impl/tl/ThreadLocalHttpServletResponse.java |   30 +-
 .../impl/tl/ThreadLocalInvocationHandler.java   |    4 +-
 .../impl/tl/ThreadLocalMessageContext.java      |    4 +-
 .../impl/tl/ThreadLocalProtocolHeaders.java     |    4 +-
 .../cxf/jaxrs/impl/tl/ThreadLocalProviders.java |    8 +-
 .../cxf/jaxrs/impl/tl/ThreadLocalProxy.java     |    2 +-
 .../cxf/jaxrs/impl/tl/ThreadLocalRequest.java   |    2 +-
 .../impl/tl/ThreadLocalSecurityContext.java     |    2 +-
 .../jaxrs/impl/tl/ThreadLocalServletConfig.java |    6 +-
 .../impl/tl/ThreadLocalServletContext.java      |   10 +-
 .../cxf/jaxrs/impl/tl/ThreadLocalUriInfo.java   |    6 +-
 .../interceptor/AttachmentInputInterceptor.java |   12 +-
 .../AttachmentOutputInterceptor.java            |   12 +-
 .../JAXRSDefaultFaultOutInterceptor.java        |   22 +-
 .../jaxrs/interceptor/JAXRSInInterceptor.java   |   86 +-
 .../JAXRSOutExceptionMapperInterceptor.java     |    2 +-
 .../jaxrs/interceptor/JAXRSOutInterceptor.java  |  146 +--
 .../lifecycle/PerRequestResourceProvider.java   |   22 +-
 .../cxf/jaxrs/lifecycle/ResourceProvider.java   |    8 +-
 .../lifecycle/SingletonResourceProvider.java    |   48 +-
 .../cxf/jaxrs/model/AbstractResourceInfo.java   |  139 +--
 .../apache/cxf/jaxrs/model/ApplicationInfo.java |    6 +-
 .../apache/cxf/jaxrs/model/BeanParamInfo.java   |    2 +-
 .../cxf/jaxrs/model/BeanResourceInfo.java       |   30 +-
 .../cxf/jaxrs/model/ClassResourceInfo.java      |   98 +-
 .../model/ClassResourceInfoComparator.java      |   10 +-
 .../cxf/jaxrs/model/FilterProviderInfo.java     |    8 +-
 .../cxf/jaxrs/model/MethodDispatcher.java       |   18 +-
 .../cxf/jaxrs/model/MethodInvocationInfo.java   |   10 +-
 .../cxf/jaxrs/model/OperationResourceInfo.java  |   62 +-
 .../model/OperationResourceInfoComparator.java  |   30 +-
 .../org/apache/cxf/jaxrs/model/Parameter.java   |   42 +-
 .../apache/cxf/jaxrs/model/ParameterType.java   |    2 +-
 .../apache/cxf/jaxrs/model/ProviderInfo.java    |   20 +-
 .../apache/cxf/jaxrs/model/SubresourceKey.java  |   10 +-
 .../org/apache/cxf/jaxrs/model/URITemplate.java |   60 +-
 .../apache/cxf/jaxrs/model/UserApplication.java |   14 +-
 .../apache/cxf/jaxrs/model/UserOperation.java   |   36 +-
 .../apache/cxf/jaxrs/model/UserResource.java    |   34 +-
 .../cxf/jaxrs/model/doc/JavaDocProvider.java    |  134 +--
 .../cxf/jaxrs/nio/DelegatingNioInputStream.java |   85 ++
 .../jaxrs/nio/DelegatingNioOutputStream.java    |   10 +-
 .../cxf/jaxrs/nio/NioMessageBodyWriter.java     |    8 +-
 .../org/apache/cxf/jaxrs/nio/NioReadEntity.java |   47 +
 .../cxf/jaxrs/nio/NioReadListenerImpl.java      |   60 +
 .../apache/cxf/jaxrs/nio/NioWriteEntity.java    |    6 +-
 .../AbstractCachingMessageProvider.java         |   16 +-
 .../provider/AbstractConfigurableProvider.java  |   50 +-
 .../jaxrs/provider/AbstractJAXBProvider.java    |  316 +++---
 .../cxf/jaxrs/provider/BinaryDataProvider.java  |   86 +-
 .../provider/CachingMessageBodyReader.java      |   22 +-
 .../provider/CachingMessageBodyWriter.java      |   24 +-
 .../cxf/jaxrs/provider/DataBindingProvider.java |   20 +-
 .../cxf/jaxrs/provider/DataSourceProvider.java  |   32 +-
 .../jaxrs/provider/FormEncodingProvider.java    |   86 +-
 .../provider/JAXBAttachmentMarshaller.java      |   10 +-
 .../provider/JAXBAttachmentUnmarshaller.java    |    4 +-
 .../cxf/jaxrs/provider/JAXBElementProvider.java |  212 ++--
 .../provider/JAXBElementTypedProvider.java      |   12 +-
 .../cxf/jaxrs/provider/JAXRSDataBinding.java    |   48 +-
 .../cxf/jaxrs/provider/MultipartProvider.java   |  136 +--
 .../jaxrs/provider/PrimitiveTextProvider.java   |   18 +-
 .../cxf/jaxrs/provider/ProviderCache.java       |   16 +-
 .../cxf/jaxrs/provider/ProviderFactory.java     |  469 ++++----
 .../provider/RequestDispatcherProvider.java     |  146 +--
 .../jaxrs/provider/ServerProviderFactory.java   |  198 ++--
 .../cxf/jaxrs/provider/SourceProvider.java      |   58 +-
 .../provider/StreamingResponseProvider.java     |   18 +-
 .../cxf/jaxrs/provider/StringTextProvider.java  |    4 +-
 .../cxf/jaxrs/provider/XPathProvider.java       |   26 +-
 .../cxf/jaxrs/provider/XSLTJaxbProvider.java    |  176 +--
 .../security/JAASAuthenticationFilter.java      |   45 +-
 .../security/KerberosAuthOutInterceptor.java    |   16 +-
 .../security/KerberosAuthenticationFilter.java  |   69 +-
 .../jaxrs/security/SimpleAuthorizingFilter.java |    3 +-
 .../servlet/CXFJaxrsRuntimeDelegateServlet.java |    8 +-
 .../jaxrs/servlet/CXFNonSpringJaxrsServlet.java |  192 ++--
 .../spring/AbstractJaxrsClassesScanServer.java  |   14 +-
 .../AbstractSpringComponentScanServer.java      |   52 +-
 .../AbstractSpringConfigurationFactory.java     |   22 +-
 .../JAXRSServerFactoryBeanDefinitionParser.java |   58 +-
 .../cxf/jaxrs/spring/NamespaceHandler.java      |   10 +-
 .../jaxrs/spring/SpringComponentScanServer.java |    2 +-
 .../spring/SpringJaxrsClassesScanServer.java    |    2 +-
 .../cxf/jaxrs/spring/SpringResourceFactory.java |   36 +-
 .../apache/cxf/jaxrs/utils/AnnotationUtils.java |   10 +-
 .../apache/cxf/jaxrs/utils/ExceptionUtils.java  |   64 +-
 .../org/apache/cxf/jaxrs/utils/FormUtils.java   |   71 +-
 .../org/apache/cxf/jaxrs/utils/HttpUtils.java   |  196 ++--
 .../apache/cxf/jaxrs/utils/InjectionUtils.java  |  439 ++++----
 .../org/apache/cxf/jaxrs/utils/JAXBUtils.java   |   28 +-
 .../org/apache/cxf/jaxrs/utils/JAXRSUtils.java  |  728 ++++++-------
 .../utils/ParameterizedCollectionType.java      |    2 +-
 .../apache/cxf/jaxrs/utils/ResourceUtils.java   |  309 +++---
 .../apache/cxf/jaxrs/utils/SpecExceptions.java  |   46 +-
 .../jaxrs/utils/multipart/AttachmentUtils.java  |   90 +-
 .../utils/multipart/MultipartReadException.java |   10 +-
 .../cxf/jaxrs/utils/schemas/SchemaHandler.java  |   44 +-
 .../JAXRSBeanValidationInInterceptor.java       |    8 +-
 .../validation/JAXRSBeanValidationInvoker.java  |   24 +-
 .../JAXRSBeanValidationOutInterceptor.java      |    8 +-
 .../validation/JAXRSParameterNameProvider.java  |   14 +-
 .../validation/ValidationExceptionMapper.java   |   39 +-
 .../cxf/jaxrs/validation/ValidationUtils.java   |    4 +-
 .../org/apache/cxf/jaxrs/AbstractCustomer.java  |   30 +-
 .../java/org/apache/cxf/jaxrs/Customer.java     |  228 ++--
 .../java/org/apache/cxf/jaxrs/Customer2.java    |    8 +-
 .../apache/cxf/jaxrs/CustomerApplication.java   |    2 +-
 .../org/apache/cxf/jaxrs/CustomerGender.java    |    2 +-
 .../java/org/apache/cxf/jaxrs/CustomerInfo.java |    6 +-
 .../apache/cxf/jaxrs/DefaultMethodResource.java |    6 +-
 .../apache/cxf/jaxrs/JAXBContextProvider.java   |    2 +-
 .../apache/cxf/jaxrs/JAXBContextProvider2.java  |    2 +-
 .../cxf/jaxrs/JAXRSServerFactoryBeanTest.java   |   26 +-
 .../cxf/jaxrs/JAXRSServiceFactoryBeanTest.java  |   36 +-
 .../cxf/jaxrs/SelectMethodCandidatesTest.java   |  416 +++----
 .../org/apache/cxf/jaxrs/SimpleFactory.java     |    4 +-
 .../java/org/apache/cxf/jaxrs/Timezone.java     |    4 +-
 .../blueprint/JAXRSBPNamespaceHandlerTest.java  |    4 +-
 .../cxf/jaxrs/ext/MessageContextImplTest.java   |   40 +-
 .../cxf/jaxrs/ext/multipart/AttachmentTest.java |    6 +-
 .../ext/multipart/ContentDispositionTest.java   |    6 +-
 .../jaxrs/ext/multipart/MultipartBodyTest.java  |   10 +-
 .../apache/cxf/jaxrs/ext/xml/XMLSourceTest.java |   70 +-
 .../cxf/jaxrs/fortest/AbstractEntity.java       |   16 +-
 .../jaxrs/fortest/AbstractRestController.java   |    2 +-
 .../jaxrs/fortest/ConcreteRestController.java   |    4 +-
 .../apache/cxf/jaxrs/fortest/GenericEntity.java |    4 +-
 .../cxf/jaxrs/fortest/GenericEntityImpl.java    |    4 +-
 .../cxf/jaxrs/fortest/GenericEntityImpl2.java   |    4 +-
 .../cxf/jaxrs/fortest/GenericEntityImpl3.java   |    4 +-
 .../cxf/jaxrs/fortest/GenericEntityImpl4.java   |    4 +-
 .../org/apache/cxf/jaxrs/fortest/jaxb/Book.java |   10 +-
 .../cxf/jaxrs/fortest/jaxb/ObjectFactory.java   |    8 +-
 .../cxf/jaxrs/fortest/jaxb/SuperBook.java       |    6 +-
 .../cxf/jaxrs/fortest/jaxb/SuperBook2.java      |    6 +-
 .../jaxrs/fortest/jaxb/index/SuperBook3.java    |    6 +-
 .../fortest/jaxb/jaxbelement/ObjectFactory.java |    8 +-
 .../jaxb/jaxbelement/ParamJAXBElement.java      |    4 +-
 .../fortest/jaxb/jaxbelement/ParamType.java     |    4 +-
 .../fortest/jaxb/jaxbelement/package-info.java  |    2 +-
 .../jaxrs/fortest/jaxb/packageinfo/Book2.java   |    8 +-
 .../jaxb/packageinfo/Book2NoRootElement.java    |    8 +-
 .../cxf/jaxrs/impl/AsyncResponseImplTest.java   |   56 +-
 .../impl/CacheControlHeaderProviderTest.java    |   40 +-
 .../cxf/jaxrs/impl/ConfigurationImplTest.java   |   14 +-
 .../jaxrs/impl/CookieHeaderProviderTest.java    |   26 +-
 .../cxf/jaxrs/impl/DateHeaderProviderTest.java  |    8 +-
 .../jaxrs/impl/EntityTagHeaderProviderTest.java |   10 +-
 .../jaxrs/impl/EvaluatePreconditionsTest.java   |    4 +-
 .../cxf/jaxrs/impl/HttpHeadersImplTest.java     |  174 +--
 .../cxf/jaxrs/impl/LinkBuilderImplTest.java     |   24 +-
 .../cxf/jaxrs/impl/LinkHeaderProviderTest.java  |   12 +-
 .../jaxrs/impl/MediaTypeHeaderProviderTest.java |   76 +-
 .../apache/cxf/jaxrs/impl/MetadataMapTest.java  |  114 +-
 .../jaxrs/impl/NewCookieHeaderProviderTest.java |   30 +-
 .../cxf/jaxrs/impl/PathSegmentImplTest.java     |   12 +-
 .../apache/cxf/jaxrs/impl/RequestImplTest.java  |  164 +--
 .../cxf/jaxrs/impl/RequestPreprocessorTest.java |   28 +-
 .../cxf/jaxrs/impl/ResponseBuilderImplTest.java |   90 +-
 .../apache/cxf/jaxrs/impl/ResponseImplTest.java |  108 +-
 .../cxf/jaxrs/impl/RuntimeDelegateImplTest.java |    8 +-
 .../cxf/jaxrs/impl/SecurityContextImplTest.java |    4 +-
 .../cxf/jaxrs/impl/UriBuilderImplTest.java      |  404 +++----
 .../apache/cxf/jaxrs/impl/UriInfoImplTest.java  |  134 +--
 .../jaxrs/impl/VariantListBuilderImplTest.java  |   36 +-
 .../PerRequestResourceProviderTest.java         |    4 +-
 .../cxf/jaxrs/model/ClassResourceInfoTest.java  |  102 +-
 .../jaxrs/model/OperationResourceInfoTest.java  |   70 +-
 .../apache/cxf/jaxrs/model/URITemplateTest.java |   80 +-
 .../jaxrs/model/doc/JavaDocProviderTest.java    |   12 +-
 .../cxf/jaxrs/model/wadl/petstore/PetStore.java |   20 +-
 .../jaxrs/provider/BinaryDataProviderTest.java  |   44 +-
 .../jaxrs/provider/DataSourceProviderTest.java  |   52 +-
 .../provider/FormEncodingProviderTest.java      |  166 +--
 .../jaxrs/provider/JAXBElementProviderTest.java |  604 +++++------
 .../provider/PrimitiveTextProviderTest.java     |   92 +-
 .../cxf/jaxrs/provider/ProviderFactoryTest.java |  418 +++----
 .../provider/RequestDispatcherProviderTest.java |   10 +-
 .../cxf/jaxrs/provider/SourceProviderTest.java  |   56 +-
 .../cxf/jaxrs/provider/XPathProviderTest.java   |    6 +-
 .../jaxrs/provider/XSLTJaxbProviderTest.java    |   60 +-
 .../org/apache/cxf/jaxrs/resources/Book.java    |   26 +-
 .../cxf/jaxrs/resources/BookInterface.java      |    4 +-
 .../cxf/jaxrs/resources/BookNoRootElement.java  |   10 +-
 .../cxf/jaxrs/resources/BookNoSubResource.java  |   10 +-
 .../apache/cxf/jaxrs/resources/BookStore.java   |    6 +-
 .../jaxrs/resources/BookStoreNoAnnotations.java |    6 +-
 .../jaxrs/resources/BookStoreNoSubResource.java |   10 +-
 .../resources/BookStoreSubresourcesOnly.java    |   14 +-
 .../cxf/jaxrs/resources/BookStoreTemplates.java |    6 +-
 .../cxf/jaxrs/resources/BookSuperClass.java     |    2 +-
 .../org/apache/cxf/jaxrs/resources/Chapter.java |    8 +-
 .../jaxrs/resources/CollectionsResource.java    |   28 +-
 .../apache/cxf/jaxrs/resources/ManyTags.java    |   10 +-
 .../apache/cxf/jaxrs/resources/SuperBook.java   |    6 +-
 .../org/apache/cxf/jaxrs/resources/TagVO.java   |   18 +-
 .../org/apache/cxf/jaxrs/resources/TagVO2.java  |    6 +-
 .../org/apache/cxf/jaxrs/resources/Tags.java    |   12 +-
 .../cxf/jaxrs/resources/TestResource.java       |   26 +-
 .../spring/JAXRSServerFactoryBeanTest.java      |   16 +-
 .../jaxrs/spring/SpringResourceFactoryTest.java |   14 +-
 .../org/apache/cxf/jaxrs/spring/servers.xml     |    2 +-
 .../org/apache/cxf/jaxrs/spring/servers2.xml    |    2 +-
 .../jaxrs/utils/AnnotationTestUtilsTest.java    |   24 +-
 .../apache/cxf/jaxrs/utils/FormUtilsTest.java   |   24 +-
 .../apache/cxf/jaxrs/utils/HttpUtilsTest.java   |   66 +-
 .../cxf/jaxrs/utils/InjectionUtilsTest.java     |   78 +-
 .../apache/cxf/jaxrs/utils/JAXRSUtilsTest.java  |  988 ++++++++---------
 .../cxf/jaxrs/utils/ResourceUtilsTest.java      |   64 +-
 rt/frontend/jaxws/pom.xml                       |    6 +
 .../cxf/jaxws/AbstractJAXWSMethodInvoker.java   |   44 +-
 .../java/org/apache/cxf/jaxws/CXFService.java   |   16 +-
 .../java/org/apache/cxf/jaxws/DispatchImpl.java |   92 +-
 .../java/org/apache/cxf/jaxws/EndpointImpl.java |  154 +--
 .../cxf/jaxws/EndpointReferenceBuilder.java     |   18 +-
 .../org/apache/cxf/jaxws/EndpointUtils.java     |   12 +-
 .../apache/cxf/jaxws/JAXWSMethodDispatcher.java |   14 +-
 .../apache/cxf/jaxws/JAXWSMethodInvoker.java    |   30 +-
 .../jaxws/JAXWSProviderMethodDispatcher.java    |    6 +-
 .../cxf/jaxws/JaxWsClientFactoryBean.java       |    8 +-
 .../org/apache/cxf/jaxws/JaxWsClientProxy.java  |   44 +-
 .../cxf/jaxws/JaxWsConfigurationException.java  |    2 +-
 .../apache/cxf/jaxws/JaxWsProxyFactoryBean.java |   38 +-
 .../cxf/jaxws/JaxWsServerFactoryBean.java       |   72 +-
 .../apache/cxf/jaxws/JaxwsClientCallback.java   |    8 +-
 .../apache/cxf/jaxws/JaxwsResponseCallback.java |    2 +-
 .../apache/cxf/jaxws/JaxwsServiceBuilder.java   |   20 +-
 .../apache/cxf/jaxws/ServerAsyncResponse.java   |    8 +-
 .../java/org/apache/cxf/jaxws/ServiceImpl.java  |  142 +--
 .../apache/cxf/jaxws/WrapperClassGenerator.java |   66 +-
 .../cxf/jaxws/binding/AbstractBindingImpl.java  |   10 +-
 .../cxf/jaxws/binding/DefaultBindingImpl.java   |    2 +-
 .../cxf/jaxws/binding/http/HTTPBindingImpl.java |   10 +-
 .../soap/JaxWsSoapBindingConfiguration.java     |    8 +-
 .../cxf/jaxws/binding/soap/SOAPBindingImpl.java |   18 +-
 .../apache/cxf/jaxws/blueprint/Activator.java   |    2 +-
 .../blueprint/EndpointDefinitionParser.java     |   16 +-
 .../blueprint/JAXWSBPNamespaceHandler.java      |   27 +-
 .../jaxws/context/WebServiceContextImpl.java    |   16 +-
 .../WebServiceContextResourceResolver.java      |   10 +-
 .../cxf/jaxws/context/WrappedAttachments.java   |   22 +-
 .../jaxws/context/WrappedMessageContext.java    |   98 +-
 .../dynamic/JaxWsDynamicClientFactory.java      |   12 +-
 .../AbstractJAXWSHandlerInterceptor.java        |   42 +-
 .../AbstractProtocolHandlerInterceptor.java     |   12 +-
 .../handler/AnnotationHandlerChainBuilder.java  |   54 +-
 .../cxf/jaxws/handler/HandlerChainBuilder.java  |   24 +-
 .../cxf/jaxws/handler/HandlerChainInvoker.java  |   16 +-
 .../cxf/jaxws/handler/HandlerResolverImpl.java  |   24 +-
 .../handler/InitParamResourceResolver.java      |   20 +-
 .../LogicalHandlerFaultInInterceptor.java       |   12 +-
 .../LogicalHandlerFaultOutInterceptor.java      |   58 +-
 .../logical/LogicalHandlerInInterceptor.java    |   22 +-
 .../logical/LogicalHandlerOutInterceptor.java   |   60 +-
 .../logical/LogicalMessageContextImpl.java      |    4 +-
 .../handler/logical/LogicalMessageImpl.java     |   20 +-
 .../soap/SOAPHandlerFaultInInterceptor.java     |    8 +-
 .../soap/SOAPHandlerFaultOutInterceptor.java    |   18 +-
 .../handler/soap/SOAPHandlerInterceptor.java    |   34 +-
 .../handler/soap/SOAPMessageContextImpl.java    |   20 +-
 .../apache/cxf/jaxws/handler/types/CString.java |   10 +-
 .../jaxws/handler/types/DescriptionType.java    |    6 +-
 .../jaxws/handler/types/DisplayNameType.java    |    6 +-
 .../handler/types/FullyQualifiedClassType.java  |    2 +-
 .../cxf/jaxws/handler/types/IconType.java       |   18 +-
 .../cxf/jaxws/handler/types/ParamValueType.java |   20 +-
 .../cxf/jaxws/handler/types/PathType.java       |    2 +-
 .../handler/types/PortComponentHandlerType.java |   44 +-
 .../cxf/jaxws/handler/types/XsdQNameType.java   |   10 +-
 .../cxf/jaxws/handler/types/XsdStringType.java  |   10 +-
 .../cxf/jaxws/handler/types/package-info.java   |    2 +-
 .../jaxws/interceptors/HolderInInterceptor.java |    6 +-
 .../interceptors/HolderOutInterceptor.java      |   10 +-
 .../interceptors/MessageModeInInterceptor.java  |   24 +-
 .../interceptors/MessageModeOutInterceptor.java |   60 +-
 .../jaxws/interceptors/SwAInInterceptor.java    |   24 +-
 .../jaxws/interceptors/SwAOutInterceptor.java   |   70 +-
 .../interceptors/WebFaultOutInterceptor.java    |   22 +-
 .../interceptors/WrapperClassInInterceptor.java |   48 +-
 .../WrapperClassOutInterceptor.java             |   26 +-
 .../org/apache/cxf/jaxws/spi/ProviderImpl.java  |   70 +-
 .../jaxws/spring/EndpointDefinitionParser.java  |   24 +-
 .../JaxWsProxyFactoryBeanDefinitionParser.java  |    8 +-
 ...xWsWebServicePublisherBeanPostProcessor.java |   68 +-
 .../org/apache/cxf/jaxws/support/BindingID.java |   12 +-
 .../jaxws/support/JaxWsClientEndpointImpl.java  |    8 +-
 .../cxf/jaxws/support/JaxWsEndpointImpl.java    |  136 +--
 .../jaxws/support/JaxWsEndpointImplFactory.java |    4 +-
 .../cxf/jaxws/support/JaxWsImplementorInfo.java |   52 +-
 .../support/JaxWsServiceConfiguration.java      |  144 +--
 .../jaxws/support/JaxWsServiceFactoryBean.java  |   10 +-
 .../jaxws/support/ServiceDelegateAccessor.java  |   10 +-
 .../WebServiceProviderConfiguration.java        |    6 +-
 .../org/apache/cxf/jaxws22/EndpointImpl.java    |    4 +-
 .../org/apache/cxf/jaxws22/JAXWS22Invoker.java  |    2 +-
 .../apache/cxf/jaxws22/spi/ProviderImpl.java    |    2 +-
 .../HttpServletRequestAdapter.java              |   12 +-
 .../HttpServletResponseAdapter.java             |   10 +-
 .../http_jaxws_spi/JAXWSHttpSpiDestination.java |   16 +-
 .../JAXWSHttpSpiTransportFactory.java           |    2 +-
 .../META-INF/cxf/cxf-extension-jaxws.xml        |    2 +-
 .../org/apache/cxf/jaxws/AbstractJaxWsTest.java |    6 +-
 .../org/apache/cxf/jaxws/CodeFirstTest.java     |  205 ++--
 .../org/apache/cxf/jaxws/CodeFirstWSDLTest.java |   84 +-
 .../cxf/jaxws/ConfiguredEndpointTest.java       |  112 +-
 .../org/apache/cxf/jaxws/EndpointImplTest.java  |   70 +-
 .../apache/cxf/jaxws/EndpointReferenceTest.java |  100 +-
 .../java/org/apache/cxf/jaxws/GreeterTest.java  |   16 +-
 .../java/org/apache/cxf/jaxws/HeaderTest.java   |   24 +-
 .../cxf/jaxws/JAXWSMethodInvokerTest.java       |   60 +-
 .../org/apache/cxf/jaxws/JaxWsClientTest.java   |    8 +-
 .../cxf/jaxws/JaxWsServerFactoryBeanTest.java   |   16 +-
 .../apache/cxf/jaxws/MessageReplayObserver.java |    8 +-
 .../apache/cxf/jaxws/SEIWithJAXBAnnoTest.java   |   16 +-
 .../org/apache/cxf/jaxws/SOAPBindingTest.java   |   40 +-
 .../org/apache/cxf/jaxws/SchemaFirstTest.java   |    2 +-
 .../cxf/jaxws/SchemaFirstXmlConfigTest.java     |    8 +-
 .../org/apache/cxf/jaxws/ServiceImplTest.java   |   94 +-
 .../apache/cxf/jaxws/ServiceModelUtilsTest.java |   34 +-
 .../org/apache/cxf/jaxws/SoapFaultTest.java     |    6 +-
 .../cxf/jaxws/WrapperClassGeneratorTest.java    |   58 +-
 .../blueprint/JAXWSBPNamespaceHandlerTest.java  |    4 +-
 .../apache/cxf/jaxws/configured-endpoints.xml   |    2 +-
 .../context/WebServiceContextImplTest.java      |   26 +-
 .../jaxws/context/WrappedAttachmentsTest.java   |   20 +-
 .../context/WrappedMessageContextTest.java      |   18 +-
 .../cxf/jaxws/dispatch/DispatchOpTest.java      |   16 +-
 .../apache/cxf/jaxws/dispatch/DispatchTest.java |   18 +-
 .../apache/cxf/jaxws/dispatch/bus-dispatch.xml  |    4 +-
 .../AbstractProtocolHandlerInterceptorTest.java |   24 +-
 .../AnnotationHandlerChainBuilderTest.java      |   16 +-
 .../jaxws/handler/HandlerChainBuilderTest.java  |    2 +-
 .../jaxws/handler/HandlerChainInvokerTest.java  |  285 +++--
 .../handler/InitParamResourceResolverTest.java  |   40 +-
 .../handler/LogicalHandlerInterceptorTest.java  |    4 +-
 .../jaxws/handler/LogicalMessageImplTest.java   |   12 +-
 .../soap/SOAPHandlerInterceptorTest.java        |  102 +-
 .../jaxws/header/HeaderClientServerTest.java    |  100 +-
 .../header/ProviderHeaderClientServerTest.java  |    7 +-
 .../cxf/jaxws/header/TestRPCHeaderProvider.java |    6 +-
 .../apache/cxf/jaxws/holder/HolderService.java  |    4 +-
 .../org/apache/cxf/jaxws/holder/HolderTest.java |    8 +-
 .../WebFaultOutInterceptorTestCase.java         |    6 +-
 .../cxf/jaxws/logging/SOAPLoggingTest.java      |  178 +++
 .../cxf/jaxws/logging/TestEventSender.java      |   38 +
 .../apache/cxf/jaxws/logging/TestService.java   |   26 +
 .../provider/ProviderServiceFactoryTest.java    |   26 +-
 .../apache/cxf/jaxws/provider/ProviderTest.java |   22 +-
 .../java/org/apache/cxf/jaxws/schemaFirst.xml   |    2 +-
 ...chemavalidationtype-configured-endpoints.xml |    2 +-
 .../cxf/jaxws/service/AddNumbersException.java  |    8 +-
 .../cxf/jaxws/service/AddNumbersImpl.java       |    2 +-
 .../jaxws/service/AddNumbersSubException.java   |    6 +-
 .../cxf/jaxws/service/AnnotationFeature.java    |   12 +-
 .../service/AnnotationInterceptorTest.java      |  118 +-
 .../apache/cxf/jaxws/service/ArrayService.java  |    2 +-
 .../org/apache/cxf/jaxws/service/Entity.java    |    4 +-
 .../apache/cxf/jaxws/service/FooService.java    |    2 +-
 .../cxf/jaxws/service/GenericsService.java      |    4 +-
 .../cxf/jaxws/service/GenericsService2.java     |   14 +-
 .../cxf/jaxws/service/GreeterImplDoc.java       |   10 +-
 .../org/apache/cxf/jaxws/service/Hello.java     |   16 +-
 .../org/apache/cxf/jaxws/service/Hello2.java    |    4 +-
 .../org/apache/cxf/jaxws/service/Hello3.java    |    6 +-
 .../cxf/jaxws/service/HelloExcludeImpl.java     |    4 +-
 .../jaxws/service/HelloExcludeOnInterface.java  |    6 +-
 .../apache/cxf/jaxws/service/QueryResult.java   |    6 +-
 .../apache/cxf/jaxws/service/QuerySummary.java  |    2 +-
 .../org/apache/cxf/jaxws/service/SayHiImpl.java |    8 +-
 .../cxf/jaxws/service/Test2Interceptor.java     |    4 +-
 .../cxf/jaxws/service/TestInterceptor.java      |    4 +-
 .../org/apache/cxf/jaxws/soapServiceConfig.xml  |    2 +-
 .../apache/cxf/jaxws/spi/ProviderImplTest.java  |   38 +-
 .../cxf/jaxws/spring/ClientHolderBean.java      |   10 +-
 .../jaxws/spring/PostConstructCalledCount.java  |    8 +-
 .../cxf/jaxws/spring/SpringBeansTest.java       |   38 +-
 .../java/org/apache/cxf/jaxws/spring/child.xml  |    2 +-
 .../org/apache/cxf/jaxws/spring/clients.xml     |    8 +-
 .../org/apache/cxf/jaxws/spring/cxf3959a.xml    |    2 +-
 .../org/apache/cxf/jaxws/spring/cxf3959b.xml    |    2 +-
 .../org/apache/cxf/jaxws/spring/cxf3959c.xml    |    2 +-
 .../org/apache/cxf/jaxws/spring/endpoints.xml   |    6 +-
 .../org/apache/cxf/jaxws/spring/endpoints2.xml  |    2 +-
 .../org/apache/cxf/jaxws/spring/endpoints3.xml  |    2 +-
 .../org/apache/cxf/jaxws/spring/servers.xml     |    2 +-
 .../support/ContextPropertiesMappingTest.java   |   38 +-
 .../jaxws/support/JaxWsImplementorInfoTest.java |    6 +-
 .../support/JaxWsServiceConfigurationTest.java  |   26 +-
 .../support/JaxWsServiceFactoryBeanTest.java    |  112 +-
 .../cxf/jaxws/ws/PolicyAnnotationTest.java      |   52 +-
 .../apache/cxf/jaxws/ws/PolicyFeatureTest.java  |   66 +-
 .../java/org/apache/cxf/jaxws/ws/server.xml     |    2 +-
 .../http_jaxws_spi/HttpHandlerImplTest.java     |   12 +-
 .../JAXWSHttpSpiDestinationTest.java            |   26 +-
 .../JAXWSHttpSpiTransportFactoryTest.java       |   18 +-
 .../cxf/js/rhino/AbstractDOMProvider.java       |    6 +-
 .../apache/cxf/js/rhino/DOMMessageProvider.java |    2 +-
 .../cxf/js/rhino/JsServiceFactoryBean.java      |   18 +-
 .../apache/cxf/js/rhino/ProviderFactory.java    |    2 +-
 .../org/apache/cxf/js/rhino/ServerAppTest.java  |    6 +-
 rt/frontend/simple/pom.xml                      |    6 +
 .../endpoint/dynamic/DynamicClientFactory.java  |  148 +--
 .../endpoint/dynamic/TypeClassInitializer.java  |   50 +-
 .../cxf/frontend/AbstractServiceFactory.java    |   10 +-
 .../AbstractWSDLBasedEndpointFactory.java       |   81 +-
 .../apache/cxf/frontend/ClientFactoryBean.java  |    8 +-
 .../org/apache/cxf/frontend/ClientProxy.java    |    6 +-
 .../cxf/frontend/ClientProxyFactoryBean.java    |   24 +-
 .../apache/cxf/frontend/FaultInfoException.java |    2 +-
 .../apache/cxf/frontend/ServerFactoryBean.java  |   44 +-
 .../apache/cxf/frontend/WSDLGetInterceptor.java |   22 +-
 .../cxf/frontend/WSDLGetOutInterceptor.java     |    6 +-
 .../org/apache/cxf/frontend/WSDLGetUtils.java   |    6 +-
 .../cxf/frontend/blueprint/Activator.java       |    4 +-
 .../ClientProxyFactoryBeanDefinitionParser.java |    8 +-
 .../ServerFactoryBeanDefinitionParser.java      |   22 +-
 .../blueprint/SimpleBPNamespaceHandler.java     |   17 +-
 .../ClientProxyFactoryBeanDefinitionParser.java |   12 +-
 .../cxf/frontend/spring/NamespaceHandler.java   |    4 +-
 .../ServerFactoryBeanDefinitionParser.java      |   26 +-
 .../apache/cxf/simple/SimpleServiceBuilder.java |    2 +-
 .../blueprint/SimpleBPNamespaceHandlerTest.java |    4 +-
 .../frontend/soap/SoapBindingSelectionTest.java |   34 +-
 .../cxf/frontend/spring/ClientServerTest.java   |   20 +-
 .../cxf/frontend/spring/SpringBeansTest.java    |   12 +-
 .../org/apache/cxf/frontend/spring/clients.xml  |    6 +-
 .../org/apache/cxf/frontend/spring/rountrip.xml |    2 +-
 .../org/apache/cxf/frontend/spring/servers.xml  |    2 +-
 .../factory/AbstractSimpleFrontendTest.java     |   10 +-
 .../service/factory/ClientFactoryBeanTest.java  |   24 +-
 .../cxf/service/factory/HelloService.java       |    2 +-
 .../cxf/service/factory/HelloServiceImpl.java   |    2 +-
 .../factory/HelloServiceInterceptor.java        |    6 +-
 .../factory/HelloServiceProxyFactory.java       |    8 +-
 .../factory/ReflectionServiceFactoryTest.java   |   78 +-
 .../cxf/service/factory/RountripTest.java       |   21 +-
 .../cxf/service/factory/ServerFactoryTest.java  |   12 +-
 .../cxf/service/stax/StaxDatabindingTest.java   |   22 +-
 .../apache/cxf/javascript/BasicNameManager.java |   26 +-
 .../javascript/JavascriptGetInterceptor.java    |   14 +-
 .../javascript/JavascriptOptionsFeature.java    |    2 +-
 .../apache/cxf/javascript/JavascriptPrefix.java |    6 +-
 .../javascript/JavascriptServerListener.java    |    2 +-
 .../apache/cxf/javascript/JavascriptUtils.java  |   86 +-
 .../javascript/NamespacePrefixAccumulator.java  |   18 +-
 .../cxf/javascript/UnsupportedConstruct.java    |    8 +-
 .../service/ServiceJavascriptBuilder.java       |   20 +-
 .../org/apache/cxf/javascript/AegisTest.java    |   34 +-
 .../java/org/apache/cxf/javascript/AnyTest.java |   34 +-
 .../cxf/javascript/BasicNameManagerTest.java    |    2 +-
 .../cxf/javascript/DocLitBareClientTest.java    |   70 +-
 .../cxf/javascript/DocLitWrappedClientTest.java |   80 +-
 .../apache/cxf/javascript/GenericAegisTest.java |    2 +-
 .../cxf/javascript/GreeterClientTest.java       |   34 +-
 .../cxf/javascript/JavascriptRhinoTest.java     |    8 +-
 .../cxf/javascript/JavascriptTestUtilities.java |   16 +-
 .../cxf/javascript/JsHttpRequestTest.java       |   32 +-
 .../apache/cxf/javascript/JsNamedNodeMap.java   |   22 +-
 .../apache/cxf/javascript/JsSimpleDomNode.java  |    6 +-
 .../apache/cxf/javascript/JsXMLHttpRequest.java |   70 +-
 .../org/apache/cxf/javascript/MtoMTest.java     |   22 +-
 .../apache/cxf/javascript/QueryHandlerTest.java |   18 +-
 .../apache/cxf/javascript/RPCClientTest.java    |   48 +-
 .../javascript/fortest/AegisServiceImpl.java    |   10 +-
 .../apache/cxf/javascript/fortest/AnyImpl.java  |   22 +-
 .../javascript/fortest/AttributeTestBean.java   |    4 +-
 .../fortest/AttributeTestService.java           |    2 +-
 .../fortest/AttributeTestServiceImpl.java       |    6 +-
 .../BasicTypeFunctionReturnStringWrapper.java   |    2 +-
 .../javascript/fortest/BeanRequestWrapper.java  |    4 +-
 .../javascript/fortest/GenericGenericClass.java |    4 +-
 .../javascript/fortest/InheritanceTestBase.java |    2 +-
 .../fortest/InheritanceTestDerived.java         |    2 +-
 .../org/apache/cxf/javascript/fortest/MtoM.java |    2 +-
 .../apache/cxf/javascript/fortest/MtoMImpl.java |   10 +-
 .../fortest/MtoMParameterBeanNoDataHandler.java |    6 +-
 .../MtoMParameterBeanWithDataHandler.java       |    6 +-
 .../javascript/fortest/SimpleDocLitBare.java    |   22 +-
 .../fortest/SimpleDocLitBareImpl.java           |   20 +-
 .../javascript/fortest/SimpleDocLitWrapped.java |   48 +-
 .../fortest/SimpleDocLitWrappedImpl.java        |   14 +-
 .../cxf/javascript/fortest/SimpleRPC.java       |    2 +-
 .../cxf/javascript/fortest/SimpleRPCImpl.java   |    6 +-
 .../fortest/SpecificGenericClass.java           |    4 +-
 .../cxf/javascript/fortest/StringWrapper.java   |    2 +-
 .../cxf/javascript/fortest/TestBean1.java       |   22 +-
 .../cxf/javascript/fortest/TestBean2.java       |   12 +-
 .../cxf/javascript/fortest/TestBean3.java       |   20 +-
 .../fortest/aegis/BeanWithAnyTypeArray.java     |    2 +-
 .../cxf/javascript/fortest/aegis/Mammal.java    |    4 +-
 .../cxf/javascript/fortest/aegis/Vegetable.java |    8 +-
 .../cxf/javascript/fortest/package-info.java    |    2 +-
 .../cxf/javascript/hwdemo/GreeterImpl.java      |   12 +-
 .../cxf/javascript/types/AttributeTest.java     |    4 +-
 .../cxf/javascript/types/SerializationTest.java |    2 +-
 .../src/test/resources/AegisBeans.xml           |    2 +-
 .../src/test/resources/AnyBeans.xml             |    2 +-
 .../resources/DocLitBareClientTestBeans.xml     |    2 +-
 .../resources/DocLitWrappedClientTestBeans.xml  |    2 +-
 .../test/resources/GreeterClientTestBeans.xml   |    2 +-
 .../test/resources/HelloWorldDocLitBeans.xml    |    2 +-
 .../test/resources/HelloWorldGreeterBeans.xml   |    2 +-
 .../src/test/resources/MtoMBeans.xml            |    2 +-
 .../src/test/resources/RPCClientTestBeans.xml   |    2 +-
 .../test/resources/XMLHttpRequestTestBeans.xml  |    2 +-
 .../src/test/resources/attributeTestBeans.xml   |    2 +-
 .../test/resources/serializationTestBeans.xml   |    2 +-
 rt/management-web/README.txt                    |   18 -
 rt/management-web/pom.xml                       |  328 ------
 .../src/main/appended-resources/META-INF/NOTICE |   12 -
 .../management/web/browser/LogBrowser.gwt.xml   |   31 -
 .../browser/bootstrapping/BootstrapStorage.java |  242 -----
 .../web/browser/bootstrapping/Settings.java     |   42 -
 .../browser/bootstrapping/SettingsStorage.java  |   26 -
 .../bootstrapping/SimpleXMLSettingsStorage.java |  205 ----
 .../web/browser/bootstrapping/Subscription.java |   55 -
 .../web/browser/client/DefaultEventBus.java     |   34 -
 .../web/browser/client/Dispatcher.java          |  114 --
 .../management/web/browser/client/Injector.java |   35 -
 .../web/browser/client/LogBrowser.java          |   48 -
 .../management/web/browser/client/Module.java   |   91 --
 .../client/event/ChangedFilterOptionsEvent.java |   51 -
 .../event/ChangedFilterOptionsEventHandler.java |   26 -
 .../client/event/ChangedSubscriptionsEvent.java |   40 -
 .../event/ChangedSubscriptionsEventHandler.java |   26 -
 .../browser/client/event/GoToBrowserEvent.java  |   39 -
 .../client/event/GoToBrowserEventHandler.java   |   26 -
 .../client/event/GoToEditCriteriaEvent.java     |   39 -
 .../event/GoToEditCriteriaEventHandler.java     |   26 -
 .../browser/client/event/GoToSettingsEvent.java |   39 -
 .../client/event/GoToSettingsEventHandler.java  |   26 -
 .../client/event/SelectedSubscriptionEvent.java |   50 -
 .../event/SelectedSubscriptionEventHandler.java |   26 -
 .../client/service/AbstractCallback.java        |   51 -
 .../browser/client/service/browser/Entry.java   |  220 ----
 .../browser/client/service/browser/Feed.java    |   88 --
 .../client/service/browser/FeedProxy.java       |   26 -
 .../client/service/browser/FeedProxyImpl.java   |   86 --
 .../client/service/browser/FilterOptions.java   |   72 --
 .../browser/client/service/browser/Links.java   |  159 ---
 .../service/settings/IdentifierGenerator.java   |   23 -
 .../settings/IdentifierGeneratorImpl.java       |   26 -
 .../service/settings/RemoteStorageProxy.java    |   29 -
 .../settings/RemoteStorageProxyImpl.java        |  255 -----
 .../client/service/settings/Settings.java       |   38 -
 .../client/service/settings/SettingsFacade.java |  221 ----
 .../client/service/settings/Subscription.java   |   72 --
 .../web/browser/client/ui/AbstractDialog.java   |   37 -
 .../web/browser/client/ui/BasePresenter.java    |   69 --
 .../web/browser/client/ui/BindStrategy.java     |   30 -
 .../client/ui/DialogBindStrategyImpl.java       |   42 -
 .../web/browser/client/ui/ErrorDialog.java      |  161 ---
 .../web/browser/client/ui/Presenter.java        |   28 -
 .../web/browser/client/ui/PresenterWidget.java  |   27 -
 .../management/web/browser/client/ui/View.java  |   26 -
 .../client/ui/WidgetBindStrategyImpl.java       |   39 -
 .../client/ui/browser/BrowsePresenter.java      |   49 -
 .../browser/client/ui/browser/BrowseView.java   |   36 -
 .../browser/client/ui/browser/BrowseView.ui.xml |   41 -
 .../client/ui/browser/BrowseViewImpl.java       |   74 --
 .../ui/browser/EditCriteriaPresenter.java       |   83 --
 .../client/ui/browser/EditCriteriaView.java     |   48 -
 .../client/ui/browser/EditCriteriaView.ui.xml   |   71 --
 .../client/ui/browser/EditCriteriaViewImpl.java |  117 --
 .../browser/client/ui/browser/EntryTable.java   |   28 -
 .../ui/browser/NavigationSidebarPresenter.java  |  187 ----
 .../ui/browser/NavigationSidebarView.java       |   42 -
 .../ui/browser/NavigationSidebarView.ui.xml     |   58 -
 .../ui/browser/NavigationSidebarViewImpl.java   |  120 --
 .../client/ui/browser/SelectableTable.java      |  268 -----
 .../client/ui/browser/SubscriptionTable.java    |   28 -
 .../client/ui/browser/ViewerPresenter.java      |  154 ---
 .../browser/client/ui/browser/ViewerView.java   |   53 -
 .../browser/client/ui/browser/ViewerView.ui.xml |   83 --
 .../client/ui/browser/ViewerViewImpl.java       |  203 ----
 .../ui/common/NavigationHeaderPresenter.java    |   50 -
 .../client/ui/common/NavigationHeaderView.java  |   31 -
 .../ui/common/NavigationHeaderView.ui.xml       |   35 -
 .../ui/common/NavigationHeaderViewImpl.java     |   60 -
 .../client/ui/resources/LogBrowserConstans.java |   62 --
 .../client/ui/resources/LogBrowserCss.java      |   77 --
 .../ui/resources/LogBrowserResources.java       |   32 -
 .../web/browser/client/ui/resources/loader.gif  |  Bin 1849 -> 0 bytes
 .../browser/client/ui/resources/logbrowser.css  |  290 -----
 .../client/ui/settings/SettingsPresenter.java   |  159 ---
 .../client/ui/settings/SettingsView.java        |   47 -
 .../client/ui/settings/SettingsView.ui.xml      |   82 --
 .../client/ui/settings/SettingsViewImpl.java    |  152 ---
 .../client/ui/settings/SubscriptionDialog.java  |   50 -
 .../ui/settings/SubscriptionDialogImpl.java     |  146 ---
 .../client/ui/settings/SubscriptionEntry.ui.xml |   40 -
 .../client/ui/settings/SubscriptionForm.ui.xml  |   62 --
 .../web/browser/resources/LogBrowser.html       |   43 -
 .../management/web/browser/resources/custom.css |   16 -
 .../web/browser/resources/json2.min.js          |    7 -
 .../web/browser/resources/uuid.min.js           |    9 -
 .../cxf/management/web/logging/LogLevel.java    |   89 --
 .../cxf/management/web/logging/LogRecord.java   |  190 ----
 .../cxf/management/web/logging/LogRecords.java  |   65 --
 .../web/logging/ReadOnlyFileStorage.java        |  621 -----------
 .../web/logging/ReadWriteLogStorage.java        |   40 -
 .../web/logging/ReadableLogStorage.java         |   59 -
 .../web/logging/atom/AbstractAtomBean.java      |  180 ---
 .../web/logging/atom/AtomPullHandler.java       |   61 --
 .../web/logging/atom/AtomPullServer.java        |  622 -----------
 .../web/logging/atom/AtomPushBean.java          |  194 ----
 .../web/logging/atom/AtomPushEngine.java        |  223 ----
 .../atom/AtomPushEngineConfigurator.java        |  210 ----
 .../web/logging/atom/AtomPushHandler.java       |  191 ----
 .../atom/AtomPushOverWebSocketServer.java       |  242 -----
 .../cxf/management/web/logging/atom/Hold.java   |   35 -
 .../web/logging/atom/LoggingThread.java         |   51 -
 .../web/logging/atom/converter/Converter.java   |   38 -
 .../atom/converter/StandardConverter.java       |  356 ------
 .../web/logging/atom/deliverer/Deliverer.java   |   42 -
 .../atom/deliverer/RetryingDeliverer.java       |  143 ---
 .../atom/deliverer/WebClientDeliverer.java      |   62 --
 .../web/logging/atom/package-info.java          |   28 -
 .../management/web/logging/package-info.java    |   31 -
 .../src/test/gwt-debug/WEB-INF/web.xml          |   49 -
 .../src/test/gwt-debug/generate.html            |   67 --
 .../cxf/management/web/logging/Generate.java    |  100 --
 .../cxf/management/web/logging/MockApp.java     |   75 --
 .../web/logging/ReadOnlyFileStorageTest.java    |  288 -----
 .../web/logging/logs/2011-01-22-karaf.log       |   34 -
 .../web/logging/logs/2011-01-23-karaf.log       |   31 -
 rt/management/pom.xml                           |    2 +
 .../apache/cxf/management/counters/Counter.java |   12 +-
 .../management/counters/CounterRepository.java  |   38 +-
 .../counters/MessageHandlingTimeRecorder.java   |   24 +-
 .../counters/ResponseTimeCounter.java           |   50 +-
 .../counters/ResponseTimeCounterMBean.java      |    8 +-
 .../AbstractMessageResponseTimeInterceptor.java |   16 +-
 .../interceptor/PersistInInterceptor.java       |    2 +-
 .../interceptor/PersistOutInterceptor.java      |    2 +-
 .../interceptor/ResponseTimeFeature.java        |    8 +-
 .../ResponseTimeMessageInInterceptor.java       |   14 +-
 .../ResponseTimeMessageInvokerInterceptor.java  |    6 +-
 .../ResponseTimeMessageOutInterceptor.java      |    8 +-
 .../jmx/InstrumentationManagerImpl.java         |  134 +--
 .../jmx/MBServerConnectorFactory.java           |   66 +-
 .../jmx/export/runtime/ModelMBeanAssembler.java |  138 +--
 .../export/runtime/ModelMBeanInfoSupporter.java |  154 +--
 .../cxf/management/utils/ManagementConsole.java |   96 +-
 .../cxf/tracing/AbstractTracingProvider.java    |   18 +-
 .../org/apache/cxf/tracing/TracerContext.java   |   16 +-
 .../org/apache/cxf/tracing/TracerHeaders.java   |    2 +-
 .../management/InstrumentationManagerTest.java  |   38 +-
 .../counters/CounterRepositoryTest.java         |   48 +-
 .../AbstractMessageResponseTestBase.java        |   44 +-
 .../ResponseTimeMessageInInterceptorTest.java   |   48 +-
 ...sponseTimeMessageInvokerInterceptorTest.java |   12 +-
 .../ResponseTimeMessageOutInterceptorTest.java  |   34 +-
 .../cxf/management/jmx/BusRegistrationTest.java |   24 +-
 .../apache/cxf/management/jmx/HelloWorld.java   |    4 +-
 .../jmx/JMXManagedComponentManagerTest.java     |   74 +-
 .../management/jmx/MBServerConnectorTest.java   |   10 +-
 .../export/AnnotationTestInstrumentation.java   |    8 +-
 .../jmx/export/ModelMBeanAssemblerTest.java     |   64 +-
 .../management/utils/ManagementConsoleTest.java |   16 +-
 .../test/resources/managed-spring-twobuses.xml  |    2 +-
 .../test/resources/managed-spring-twobuses2.xml |    2 +-
 .../src/test/resources/managed-spring.xml       |    2 +-
 .../src/test/resources/managed-spring2.xml      |    2 +-
 .../src/test/resources/managed-spring3.xml      |    2 +-
 .../src/test/resources/no-connector-spring.xml  |    2 +-
 rt/pom.xml                                      |    1 -
 rt/rs/client/pom.xml                            |   50 +
 .../apache/cxf/jaxrs/client/AbstractClient.java |  390 +++----
 .../apache/cxf/jaxrs/client/AsyncClient.java    |    4 +-
 .../cxf/jaxrs/client/AsyncInvokerImpl.java      |  218 ++++
 .../org/apache/cxf/jaxrs/client/Client.java     |   84 +-
 .../cxf/jaxrs/client/ClientConfiguration.java   |   64 +-
 .../cxf/jaxrs/client/ClientMessageObserver.java |    8 +-
 .../cxf/jaxrs/client/ClientProviderFactory.java |   52 +-
 .../cxf/jaxrs/client/ClientProxyImpl.java       |  355 +++---
 .../apache/cxf/jaxrs/client/ClientState.java    |   32 +-
 .../client/CompletionStageRxInvokerImpl.java    |  163 +++
 .../cxf/jaxrs/client/FrontendClientAdapter.java |   22 +-
 .../jaxrs/client/InvocationHandlerAware.java    |    4 +-
 .../cxf/jaxrs/client/JAXRSClientFactory.java    |  102 +-
 .../jaxrs/client/JAXRSClientFactoryBean.java    |  118 +-
 .../cxf/jaxrs/client/JaxrsClientCallback.java   |   30 +-
 .../jaxrs/client/JaxrsClientStageCallback.java  |   14 +-
 .../cxf/jaxrs/client/LocalClientState.java      |   42 +-
 .../jaxrs/client/ResponseExceptionMapper.java   |    4 +-
 .../cxf/jaxrs/client/SyncInvokerImpl.java       |  161 +++
 .../jaxrs/client/ThreadLocalClientState.java    |   54 +-
 .../jaxrs/client/UrlEncodingParamConverter.java |   12 +-
 .../org/apache/cxf/jaxrs/client/WebClient.java  |  938 +++++-----------
 .../blueprint/JAXRSBPNamespaceHandler.java      |   15 +-
 .../JAXRSClientFactoryBeanDefinitionParser.java |   16 +-
 .../cxf/jaxrs/client/cache/BytesEntity.java     |    6 +-
 .../CacheControlClientReaderInterceptor.java    |   38 +-
 .../cache/CacheControlClientRequestFilter.java  |    2 +-
 .../jaxrs/client/cache/CacheControlFeature.java |    2 +-
 .../jaxrs/client/spec/ClientBuilderImpl.java    |   12 +-
 .../client/spec/ClientConfigurableImpl.java     |   10 +-
 .../cxf/jaxrs/client/spec/ClientImpl.java       |   92 +-
 .../client/spec/ClientRequestContextImpl.java   |   26 +-
 .../spec/ClientRequestFilterInterceptor.java    |   18 +-
 .../client/spec/ClientResponseContextImpl.java  |   12 +-
 .../spec/ClientResponseFilterInterceptor.java   |   20 +-
 .../client/spec/InvocationBuilderImpl.java      |   39 +-
 .../cxf/jaxrs/client/spec/TLSConfiguration.java |    4 +-
 .../AbstractJaxRsClientConfiguration.java       |   22 +-
 .../JAXRSClientFactoryBeanDefinitionParser.java |   40 +-
 .../spring/JaxRsProxyClientConfiguration.java   |   12 +-
 .../spring/JaxRsWebClientConfiguration.java     |   12 +-
 .../jaxrs/client/spring/NamespaceHandler.java   |    2 +-
 ...JAXRSClientBeanValidationOutInterceptor.java |    2 +-
 .../client/JAXRSClientFactoryBeanTest.java      |   64 +-
 .../apache/cxf/jaxrs/client/WebClientTest.java  |  104 +-
 .../blueprint/JAXRSBPNamespaceHandlerTest.java  |    4 +-
 .../cxf/jaxrs/client/cache/ClientCacheTest.java |   20 +-
 .../cxf/jaxrs/client/cache/ClientTest.java      |    4 +-
 .../jaxrs/client/logging/RESTLoggingTest.java   |  196 ++++
 .../jaxrs/client/logging/TestEventSender.java   |   38 +
 .../jaxrs/client/logging/TestServiceRest.java   |   32 +
 .../client/logging/TestServiceRestBinary.java   |   34 +
 .../spring/JAXRSClientFactoryBeanTest.java      |    8 +-
 .../apache/cxf/jaxrs/client/spring/clients.xml  |    2 +-
 .../org/apache/cxf/jaxrs/resources/Book.java    |   26 +-
 .../cxf/jaxrs/resources/BookInterface.java      |    4 +-
 .../apache/cxf/jaxrs/resources/BookStore.java   |    6 +-
 .../jaxrs/resources/BookStoreNoAnnotations.java |    6 +-
 .../resources/BookStoreSubresourcesOnly.java    |   14 +-
 .../cxf/jaxrs/resources/BookSuperClass.java     |    2 +-
 .../org/apache/cxf/jaxrs/resources/Chapter.java |    8 +-
 .../jaxrs/swagger/AbstractSwaggerFeature.java   |   16 +-
 .../jaxrs/swagger/ApplicationBeanConfig.java    |    2 +-
 .../swagger/DefaultSwagger2Serializers.java     |    5 +
 .../jaxrs/swagger/DelegatingServletConfig.java  |   10 +-
 .../cxf/jaxrs/swagger/JaxRs2Extension.java      |   13 +-
 .../jaxrs/swagger/OsgiSwaggerUiResolver.java    |   25 +-
 .../cxf/jaxrs/swagger/Swagger2Feature.java      |   88 +-
 .../cxf/jaxrs/swagger/Swagger2Serializers.java  |    2 +-
 .../cxf/jaxrs/swagger/SwaggerFeature.java       |   22 +-
 .../cxf/jaxrs/swagger/SwaggerUiResolver.java    |   18 +-
 .../apache/cxf/jaxrs/swagger/SwaggerUtils.java  |   56 +-
 .../jaxrs/swagger/SyntheticServletConfig.java   |   10 +-
 .../cxf/jaxrs/swagger/SwaggerUtilsTest.java     |   10 +-
 .../cxf/jaxrs/model/wadl/Description.java       |   10 +-
 .../cxf/jaxrs/model/wadl/Descriptions.java      |    2 +-
 .../apache/cxf/jaxrs/model/wadl/DocTarget.java  |   16 +-
 .../cxf/jaxrs/model/wadl/WadlGenerator.java     |  255 ++---
 .../cxf/jaxrs/model/wadl/AbstractStore.java     |    4 +-
 .../cxf/jaxrs/model/wadl/BookChapters.java      |    2 +-
 .../apache/cxf/jaxrs/model/wadl/BookStore.java  |   84 +-
 .../model/wadl/BookStoreWithSingleSlash.java    |    8 +-
 .../apache/cxf/jaxrs/model/wadl/Chapter.java    |    6 +-
 .../cxf/jaxrs/model/wadl/FormInterface.java     |   10 +-
 .../org/apache/cxf/jaxrs/model/wadl/Orders.java |    2 +-
 .../model/wadl/ServerProviderFactoryTest.java   |   27 +-
 .../jaxrs/model/wadl/WadlGeneratorJsonTest.java |   22 +-
 .../cxf/jaxrs/model/wadl/WadlGeneratorTest.java |  378 +++----
 .../apache/cxf/jaxrs/model/wadl/jaxb/Book.java  |   18 +-
 .../cxf/jaxrs/model/wadl/jaxb/Chapter.java      |    6 +-
 .../jaxrs/model/wadl/jaxb/ObjectFactory.java    |    6 +-
 .../model/wadl/jaxb/packageinfo/Book2.java      |    8 +-
 .../cxf/jaxrs/model/wadl/petstore/PetStore.java |   20 +-
 .../cxf/jaxrs/json/basic/JsonMapObject.java     |   14 +-
 .../json/basic/JsonMapObjectReaderWriter.java   |   46 +-
 .../basic/JsonMapObjectReaderWriterTest.java    |    2 +-
 rt/rs/extensions/providers/pom.xml              |   35 +-
 .../provider/aegis/AbstractAegisProvider.java   |   32 +-
 .../provider/aegis/AegisElementProvider.java    |   20 +-
 .../atom/AbstractAtomElementBuilder.java        |   40 +-
 .../provider/atom/AbstractAtomProvider.java     |   16 +-
 .../provider/atom/AbstractEntryBuilder.java     |   12 +-
 .../provider/atom/AbstractFeedBuilder.java      |   14 +-
 .../jaxrs/provider/atom/AtomElementReader.java  |   10 +-
 .../jaxrs/provider/atom/AtomElementWriter.java  |    8 +-
 .../jaxrs/provider/atom/AtomEntryProvider.java  |    6 +-
 .../jaxrs/provider/atom/AtomFeedProvider.java   |    2 +-
 .../jaxrs/provider/atom/AtomPojoProvider.java   |  254 ++---
 .../cxf/jaxrs/provider/dom4j/DOM4JProvider.java |    8 +-
 .../cxf/jaxrs/provider/json/JSONProvider.java   |  228 ++--
 .../provider/json/JsonMapObjectProvider.java    |    4 +-
 .../provider/json/SimpleTypeJsonProvider.java   |   14 +-
 .../jaxrs/provider/json/utils/JSONUtils.java    |  110 +-
 .../utils/PrefixCollectingXMLStreamWriter.java  |   10 +-
 .../jsonp/AbstractJsonpOutInterceptor.java      |    6 +-
 .../provider/jsonp/JsonpInInterceptor.java      |    8 +-
 .../jsonp/JsonpJaxrsWriterInterceptor.java      |   14 +-
 .../jsonp/JsonpPostStreamInterceptor.java       |    4 +-
 .../jsonp/JsonpPreStreamInterceptor.java        |    8 +-
 .../provider/jsrjsonp/JsrJsonpProvider.java     |   24 +-
 .../jaxrs/provider/ProviderFactoryAllTest.java  |   50 +-
 .../aegis/AegisElementProviderTest.java         |   16 +-
 .../provider/atom/AtomEntryProviderTest.java    |   28 +-
 .../provider/atom/AtomFeedProviderTest.java     |   20 +-
 .../provider/atom/AtomPojoProviderTest.java     |  142 +--
 .../apache/cxf/jaxrs/provider/atom/servers.xml  |    2 +-
 .../jaxrs/provider/dom4j/DOM4JProviderTest.java |   52 +-
 .../jaxrs/provider/json/JSONProviderTest.java   |  740 ++++++-------
 .../provider/jsonp/JsonpInterceptorTest.java    |   12 +-
 .../provider/jsrjsonp/JsrJsonpProviderTest.java |   78 +-
 .../cxf/jaxrs/resources/AegisTestBean.java      |    2 +-
 .../org/apache/cxf/jaxrs/resources/Book.java    |   28 +-
 .../jaxrs/resources/CollectionsResource.java    |   14 +-
 .../apache/cxf/jaxrs/resources/ManyTags.java    |   10 +-
 .../apache/cxf/jaxrs/resources/SuperBook.java   |    6 +-
 .../org/apache/cxf/jaxrs/resources/TagVO.java   |   16 +-
 .../org/apache/cxf/jaxrs/resources/TagVO2.java  |    6 +-
 .../org/apache/cxf/jaxrs/resources/Tags.java    |   12 +-
 .../apache/cxf/jaxrs/resources/jaxb/Book2.java  |    8 +-
 .../resources/jaxb/Book2NoRootElement.java      |    8 +-
 .../cxf/jaxrs/resources/sdo/SdoFactory.java     |   30 -
 .../cxf/jaxrs/resources/sdo/Structure.java      |   59 -
 .../resources/sdo/impl/SdoFactoryImpl.java      |  154 ---
 .../jaxrs/resources/sdo/impl/StructureImpl.java |  510 ---------
 .../cxf/jaxrs/resources/sdo/structure.xsd       |   29 -
 .../client/JaxrsClientObservableCallback.java   |   10 +-
 .../rx/client/ObservableRxInvokerImpl.java      |    8 +-
 .../rx/client/ObservableRxInvokerProvider.java  |   45 +
 .../cxf/jaxrs/rx/provider/ObservableReader.java |    6 +-
 .../cxf/jaxrs/rx/provider/ObservableWriter.java |   16 +-
 .../rx/server/AbstractAsyncSubscriber.java      |   10 +-
 .../rx/server/JsonStreamingAsyncSubscriber.java |    2 +-
 .../jaxrs/rx/server/ListAsyncSubscriber.java    |    4 +-
 .../rx/server/StreamingAsyncSubscriber.java     |   12 +-
 .../jaxrs/rx/provider/ObservableWriterTest.java |    4 +-
 rt/rs/extensions/search/pom.xml                 |   46 +
 .../ext/search/AbstractComplexCondition.java    |   14 +-
 .../search/AbstractSearchConditionParser.java   |  700 ++++++------
 .../jaxrs/ext/search/AndSearchCondition.java    |   12 +-
 .../cxf/jaxrs/ext/search/Beanspector.java       |   28 +-
 .../search/DefaultParamConverterProvider.java   |   44 +-
 .../cxf/jaxrs/ext/search/InterfaceProxy.java    |    2 +-
 .../cxf/jaxrs/ext/search/OrSearchCondition.java |   10 +-
 .../jaxrs/ext/search/ParamConverterUtils.java   |   36 +-
 .../ext/search/PrimitiveSearchCondition.java    |   40 +-
 .../jaxrs/ext/search/PrimitiveStatement.java    |   12 +-
 .../ext/search/PropertyNotFoundException.java   |    2 +-
 .../cxf/jaxrs/ext/search/QueryContext.java      |   48 +-
 .../jaxrs/ext/search/QueryContextProvider.java  |   18 +-
 .../apache/cxf/jaxrs/ext/search/SearchBean.java |   12 +-
 .../cxf/jaxrs/ext/search/SearchCondition.java   |   36 +-
 .../ext/search/SearchConditionVisitor.java      |    6 +-
 .../cxf/jaxrs/ext/search/SearchContext.java     |   76 +-
 .../cxf/jaxrs/ext/search/SearchContextImpl.java |  102 +-
 .../cxf/jaxrs/ext/search/SearchUtils.java       |   82 +-
 .../jaxrs/ext/search/SimpleSearchCondition.java |   86 +-
 .../ext/search/client/CompleteCondition.java    |    8 +-
 .../client/FiqlSearchConditionBuilder.java      |   88 +-
 .../ext/search/client/PartialCondition.java     |    4 +-
 .../cxf/jaxrs/ext/search/client/Property.java   |   40 +-
 .../search/client/SearchConditionBuilder.java   |    8 +-
 .../collections/CollectionCheckCondition.java   |   12 +-
 .../search/collections/CollectionCheckInfo.java |    2 +-
 .../collections/CollectionCheckStatement.java   |    2 +-
 .../cxf/jaxrs/ext/search/fiql/FiqlParser.java   |   80 +-
 .../ext/search/hbase/HBaseQueryVisitor.java     |   28 +-
 .../jpa/AbstractJPATypedQueryVisitor.java       |  112 +-
 .../ext/search/jpa/JPACriteriaQueryVisitor.java |   52 +-
 .../ext/search/jpa/JPALanguageVisitor.java      |   16 +-
 .../ext/search/jpa/JPATypedQueryVisitor.java    |   24 +-
 .../jaxrs/ext/search/ldap/LdapQueryVisitor.java |   20 +-
 .../ext/search/lucene/LuceneQueryVisitor.java   |  158 +--
 .../cxf/jaxrs/ext/search/odata/ODataParser.java |  112 +-
 .../jaxrs/ext/search/sql/SQLPrinterVisitor.java |   38 +-
 .../ext/search/tika/LuceneDocumentMetadata.java |   20 +-
 .../ext/search/tika/TikaContentExtractor.java   |  122 +--
 .../search/tika/TikaLuceneContentExtractor.java |  126 +--
 .../visitor/AbstractSearchConditionVisitor.java |   52 +-
 .../AbstractUntypedSearchConditionVisitor.java  |   14 +-
 .../ext/search/visitor/LocalVisitorState.java   |    6 +-
 .../search/visitor/ThreadLocalVisitorState.java |    4 +-
 .../cxf/jaxrs/ext/search/BeanspectorTest.java   |   12 +-
 .../org/apache/cxf/jaxrs/ext/search/Book.java   |   26 +-
 .../SearchContextImplCustomParserTest.java      |   10 +-
 .../jaxrs/ext/search/SearchContextImplTest.java |   94 +-
 .../cxf/jaxrs/ext/search/SearchUtilsTest.java   |   10 +-
 .../ext/search/SimpleSearchConditionTest.java   |    4 +-
 .../client/FiqlSearchConditionBuilderTest.java  |   78 +-
 .../ext/search/fiql/FiqlCollectionsTest.java    |   97 ++
 .../jaxrs/ext/search/fiql/FiqlParserTest.java   |   38 +-
 .../ext/search/hbase/HBaseVisitorTest.java      |   12 +-
 .../jpa/AbstractJPATypedQueryVisitorTest.java   |  114 +-
 .../apache/cxf/jaxrs/ext/search/jpa/Book.java   |    2 +-
 .../cxf/jaxrs/ext/search/jpa/BookReview.java    |    4 +-
 .../apache/cxf/jaxrs/ext/search/jpa/Book_.java  |    2 +-
 .../ext/search/jpa/JPALanguageVisitorTest.java  |    4 +-
 .../jpa/JPATypedQueryVisitorFiqlTest.java       |  734 ++++++-------
 .../jpa/JPATypedQueryVisitorODataTest.java      |  658 +++++------
 .../cxf/jaxrs/ext/search/jpa/Library.java       |    6 +-
 .../apache/cxf/jaxrs/ext/search/jpa/Name.java   |    8 +-
 .../cxf/jaxrs/ext/search/jpa/OwnerAddress.java  |    6 +-
 .../cxf/jaxrs/ext/search/jpa/OwnerInfo.java     |    6 +-
 .../ext/search/ldap/LdapQueryVisitorTest.java   |   24 +-
 .../lucene/AbstractLuceneQueryVisitorTest.java  |  404 +++----
 .../LuceneQueryVisitorAnalyzerFiqlTest.java     |   28 +-
 .../lucene/LuceneQueryVisitorFiqlTest.java      |  110 +-
 .../lucene/LuceneQueryVisitorODataTest.java     |  392 +++----
 .../jaxrs/ext/search/odata/ODataParserTest.java |   44 +-
 .../ext/search/sql/SQLPrinterVisitorTest.java   |   34 +-
 .../search/tika/TikaContentExtractorTest.java   |   22 +-
 .../tika/TikaLuceneContentExtractorTest.java    |   66 +-
 .../sci/JaxrsServletContainerInitializer.java   |   46 +-
 .../cors/CrossOriginResourceSharing.java        |   24 +-
 .../cors/CrossOriginResourceSharingFilter.java  |  168 +--
 .../cxf/rs/security/cors/LocalPreflight.java    |    4 +-
 .../jose/jaxrs/AbstractJweDecryptingFilter.java |    6 +-
 .../jaxrs/AbstractJweJsonDecryptingFilter.java  |   12 +-
 .../jaxrs/AbstractJweJsonWriterProvider.java    |   18 +-
 .../jaxrs/AbstractJwsJsonReaderProvider.java    |   20 +-
 .../jaxrs/AbstractJwsJsonWriterProvider.java    |   18 +-
 .../jose/jaxrs/AbstractJwsReaderProvider.java   |   10 +-
 .../jose/jaxrs/AbstractJwsWriterProvider.java   |   16 +-
 .../jaxrs/AbstractJwtAuthenticationFilter.java  |  108 ++
 .../jose/jaxrs/JsonWebKeysProvider.java         |    6 +-
 .../jose/jaxrs/JweJsonWriterInterceptor.java    |   28 +-
 .../jose/jaxrs/JweWriterInterceptor.java        |   30 +-
 .../jose/jaxrs/JwsContainerRequestFilter.java   |   10 +-
 .../jose/jaxrs/JwsJsonClientResponseFilter.java |    2 +-
 .../jaxrs/JwsJsonContainerRequestFilter.java    |    4 +-
 .../jose/jaxrs/JwsJsonWriterInterceptor.java    |   26 +-
 .../jose/jaxrs/JwsWriterInterceptor.java        |   16 +-
 .../jaxrs/JwtAuthenticationClientFilter.java    |   24 +-
 .../jose/jaxrs/JwtAuthenticationFilter.java     |   99 +-
 .../jaxrs/JwtCookieAuthenticationFilter.java    |   41 +
 .../jose/jaxrs/JwtTokenSecurityContext.java     |    4 +-
 .../cxf/rs/security/jose/jaxrs/Priorities.java  |    8 +-
 .../jose/common/AbstractJoseConsumer.java       |   14 +-
 .../jose/common/AbstractJoseProducer.java       |   10 +-
 .../rs/security/jose/common/JoseConstants.java  |  135 +--
 .../rs/security/jose/common/JoseHeaders.java    |   66 +-
 .../cxf/rs/security/jose/common/JoseType.java   |    4 +-
 .../cxf/rs/security/jose/common/JoseUtils.java  |   40 +-
 .../jose/common/KeyManagementUtils.java         |   96 +-
 .../jose/common/PrivateKeyPasswordProvider.java |    2 +-
 .../rs/security/jose/jwa/AlgorithmUtils.java    |   72 +-
 .../rs/security/jose/jwa/ContentAlgorithm.java  |   16 +-
 .../cxf/rs/security/jose/jwa/KeyAlgorithm.java  |   14 +-
 .../security/jose/jwa/SignatureAlgorithm.java   |   26 +-
 .../jwe/AbstractContentEncryptionAlgorithm.java |   12 +-
 ...stractContentEncryptionCipherProperties.java |    4 +-
 .../jose/jwe/AbstractJweDecryption.java         |   16 +-
 .../jose/jwe/AbstractJweEncryption.java         |   70 +-
 .../jwe/AbstractWrapKeyEncryptionAlgorithm.java |   10 +-
 .../jose/jwe/AesCbcHmacJweDecryption.java       |   14 +-
 .../jose/jwe/AesCbcHmacJweEncryption.java       |   42 +-
 .../jwe/AesGcmContentEncryptionAlgorithm.java   |   20 +-
 .../jwe/AesGcmWrapKeyDecryptionAlgorithm.java   |   12 +-
 .../jwe/AesGcmWrapKeyEncryptionAlgorithm.java   |   10 +-
 .../jose/jwe/AesWrapKeyDecryptionAlgorithm.java |   16 +-
 .../jose/jwe/AesWrapKeyEncryptionAlgorithm.java |   10 +-
 .../jose/jwe/DirectKeyDecryptionAlgorithm.java  |    6 +-
 .../jose/jwe/DirectKeyJweDecryption.java        |    4 +-
 .../jwe/EcdhAesWrapKeyDecryptionAlgorithm.java  |   14 +-
 .../jwe/EcdhAesWrapKeyEncryptionAlgorithm.java  |   18 +-
 .../jose/jwe/EcdhDirectKeyJweDecryption.java    |    8 +-
 .../jose/jwe/EcdhDirectKeyJweEncryption.java    |   18 +-
 .../security/jose/jwe/JweCompactConsumer.java   |   26 +-
 .../security/jose/jwe/JweCompactProducer.java   |   46 +-
 .../cxf/rs/security/jose/jwe/JweDecryption.java |    4 +-
 .../security/jose/jwe/JweDecryptionInput.java   |    2 +-
 .../cxf/rs/security/jose/jwe/JweEncryption.java |    4 +-
 .../security/jose/jwe/JweEncryptionInput.java   |    4 +-
 .../security/jose/jwe/JweEncryptionOutput.java  |   12 +-
 .../jose/jwe/JweEncryptionProvider.java         |    2 +-
 .../cxf/rs/security/jose/jwe/JweHeaders.java    |   26 +-
 .../rs/security/jose/jwe/JweJsonConsumer.java   |   32 +-
 .../rs/security/jose/jwe/JweJsonProducer.java   |   48 +-
 .../jose/jwe/JweJwtCompactConsumer.java         |    8 +-
 .../jose/jwe/JweJwtCompactProducer.java         |    2 +-
 .../rs/security/jose/jwe/JweOutputStream.java   |   22 +-
 .../cxf/rs/security/jose/jwe/JweUtils.java      |  292 ++---
 .../PbesHmacAesWrapKeyDecryptionAlgorithm.java  |   20 +-
 .../PbesHmacAesWrapKeyEncryptionAlgorithm.java  |   44 +-
 .../jose/jwe/RSAKeyDecryptionAlgorithm.java     |    6 +-
 .../jose/jwe/RSAKeyEncryptionAlgorithm.java     |    2 +-
 .../jose/jwe/WrappedKeyDecryptionAlgorithm.java |   18 +-
 .../cxf/rs/security/jose/jwk/JsonWebKey.java    |   54 +-
 .../cxf/rs/security/jose/jwk/JsonWebKeys.java   |   16 +-
 .../cxf/rs/security/jose/jwk/JwkUtils.java      |   74 +-
 .../cxf/rs/security/jose/jwk/KeyOperation.java  |    4 +-
 .../cxf/rs/security/jose/jwk/KeyType.java       |    6 +-
 .../cxf/rs/security/jose/jwk/PublicKeyUse.java  |    8 +-
 .../jose/jws/AbstractJwsSignatureProvider.java  |   10 +-
 .../jose/jws/EcDsaJwsSignatureProvider.java     |   98 +-
 .../jose/jws/EcDsaJwsSignatureVerifier.java     |   85 +-
 .../jose/jws/HmacJwsSignatureProvider.java      |    8 +-
 .../jose/jws/HmacJwsSignatureVerifier.java      |   18 +-
 .../security/jose/jws/JwsCompactConsumer.java   |    2 +-
 .../security/jose/jws/JwsCompactProducer.java   |   36 +-
 .../cxf/rs/security/jose/jws/JwsHeaders.java    |   10 +-
 .../rs/security/jose/jws/JwsJsonConsumer.java   |   50 +-
 .../security/jose/jws/JwsJsonOutputStream.java  |   10 +-
 .../rs/security/jose/jws/JwsJsonProducer.java   |   34 +-
 .../jose/jws/JwsJsonSignatureEntry.java         |    8 +-
 .../jose/jws/JwsJwtCompactConsumer.java         |    2 +-
 .../jose/jws/JwsJwtCompactProducer.java         |    8 +-
 .../rs/security/jose/jws/JwsOutputStream.java   |    4 +-
 .../cxf/rs/security/jose/jws/JwsUtils.java      |  193 ++--
 .../jose/jws/NoneJwsSignatureProvider.java      |    9 +-
 .../jose/jws/NoneJwsSignatureVerifier.java      |    2 +-
 .../jws/PrivateKeyJwsSignatureProvider.java     |   14 +-
 .../jose/jws/PublicKeyJwsSignatureVerifier.java |   12 +-
 .../rs/security/jose/jwt/JoseJwtConsumer.java   |   46 +-
 .../rs/security/jose/jwt/JoseJwtProducer.java   |   12 +-
 .../cxf/rs/security/jose/jwt/JwtClaims.java     |   42 +-
 .../cxf/rs/security/jose/jwt/JwtConstants.java  |   10 +-
 .../cxf/rs/security/jose/jwt/JwtToken.java      |    8 +-
 .../cxf/rs/security/jose/jwt/JwtUtils.java      |   32 +-
 .../jose/cookbook/JwsJoseCookBookTest.java      |   14 +-
 .../jose/jwe/JweCompactReaderWriterTest.java    |  128 +--
 .../security/jose/jwe/JweJsonConsumerTest.java  |  134 ++-
 .../security/jose/jwe/JweJsonProducerTest.java  |  108 +-
 .../jose/jwe/JwePbeHmacAesWrapTest.java         |   20 +-
 .../rs/security/jose/jwk/JsonWebKeyTest.java    |   22 +-
 .../cxf/rs/security/jose/jwk/JwkUtilsTest.java  |   22 +-
 .../security/jose/jws/JwsCompactHeaderTest.java |   46 +-
 .../jose/jws/JwsCompactReaderWriterTest.java    |   92 +-
 .../security/jose/jws/JwsJsonConsumerTest.java  |   22 +-
 .../security/jose/jws/JwsJsonProducerTest.java  |   22 +-
 .../cxf/rs/security/jose/jws/JwsUtilsTest.java  |   23 +-
 .../cxf/rs/security/jose/jwt/JwtUtilsTest.java  |   36 +-
 .../security/oauth/client/OAuthClientUtils.java |   74 +-
 .../cxf/rs/security/oauth/data/AccessToken.java |    2 +-
 .../oauth/data/AccessTokenRegistration.java     |    4 +-
 .../security/oauth/data/AuthorizationInput.java |    4 +-
 .../cxf/rs/security/oauth/data/Client.java      |   18 +-
 .../oauth/data/OAuthAuthorizationData.java      |    4 +-
 .../rs/security/oauth/data/OAuthContext.java    |    8 +-
 .../rs/security/oauth/data/OAuthPermission.java |    6 +-
 .../cxf/rs/security/oauth/data/Permission.java  |   10 +-
 .../rs/security/oauth/data/RequestToken.java    |   10 +-
 .../oauth/data/RequestTokenRegistration.java    |   10 +-
 .../cxf/rs/security/oauth/data/Token.java       |    8 +-
 .../cxf/rs/security/oauth/data/UserSubject.java |    8 +-
 .../oauth/filters/AbstractAuthFilter.java       |   90 +-
 .../rs/security/oauth/filters/OAuthInfo.java    |   12 +-
 .../oauth/filters/OAuthRequestFilter.java       |    9 +-
 .../oauth/filters/OAuthServletFilter.java       |   12 +-
 .../oauth/provider/DefaultOAuthValidator.java   |    6 +-
 .../oauth/provider/OAuthDataProvider.java       |   18 +-
 .../oauth/provider/OAuthServiceException.java   |    4 +-
 .../oauth/services/AbstractOAuthService.java    |   14 +-
 .../oauth/services/AccessTokenHandler.java      |   16 +-
 .../oauth/services/AccessTokenService.java      |    8 +-
 .../services/AuthorizationRequestHandler.java   |   64 +-
 .../services/AuthorizationRequestService.java   |   20 +-
 .../oauth/services/OAuthDefaultServices.java    |   20 +-
 .../oauth/services/OOBResponseProvider.java     |   32 +-
 .../oauth/services/RequestTokenHandler.java     |   26 +-
 .../oauth/services/RequestTokenService.java     |   10 +-
 .../rs/security/oauth/utils/OAuthConstants.java |   12 +-
 .../cxf/rs/security/oauth/utils/OAuthUtils.java |   64 +-
 .../rs/security/oauth/utils/OAuthUtilsTest.java |    2 +-
 .../auth/saml/Saml2BearerAuthHandler.java       |   41 +-
 .../saml/Saml2BearerAuthOutInterceptor.java     |    2 +-
 .../grants/saml/AbstractSaml2BearerGrant.java   |    8 +-
 .../oauth2/grants/saml/Saml2BearerGrant.java    |    8 +-
 .../grants/saml/Saml2BearerGrantHandler.java    |   69 +-
 .../saml/SamlBearerClientCredentialsGrant.java  |    4 +-
 .../oauth2/grants/saml/SamlUserSubject.java     |    2 +-
 .../cxf/rs/security/oauth2/saml/Constants.java  |   10 +-
 .../oauth2/saml/SamlOAuthValidator.java         |   52 +-
 rt/rs/security/oauth-parent/oauth2/pom.xml      |   91 +-
 .../oauth2/client/AccessTokenClientFilter.java  |    6 +-
 .../oauth2/client/AccessTokenGrantWriter.java   |    2 +-
 .../oauth2/client/BearerAuthSupplier.java       |   22 +-
 .../oauth2/client/ClientCodeRequestFilter.java  |   90 +-
 .../oauth2/client/ClientCodeStateManager.java   |    4 +-
 .../oauth2/client/ClientTokenContextImpl.java   |    4 +-
 .../oauth2/client/CodeAuthSupplier.java         |    4 +-
 .../cxf/rs/security/oauth2/client/Consumer.java |    6 +-
 .../oauth2/client/HttpRequestProperties.java    |   16 +-
 .../client/JoseClientCodeStateManager.java      |   44 +-
 .../client/MemoryClientCodeStateManager.java    |    8 +-
 .../client/MemoryClientTokenContextManager.java |    6 +-
 .../oauth2/client/OAuthClientUtils.java         |  144 +--
 .../rs/security/oauth2/client/OAuthInvoker.java |   22 +-
 .../oauth2/client/StaticClientTokenContext.java |    6 +-
 .../common/AbstractAuthorizationResponse.java   |    2 +-
 .../rs/security/oauth2/common/AccessToken.java  |   28 +-
 .../oauth2/common/AccessTokenGrant.java         |    8 +-
 .../oauth2/common/AccessTokenRegistration.java  |   32 +-
 .../oauth2/common/AccessTokenValidation.java    |   20 +-
 .../cxf/rs/security/oauth2/common/Client.java   |   19 +-
 .../oauth2/common/ClientAccessToken.java        |   12 +-
 .../oauth2/common/OAuthAuthorizationData.java   |   32 +-
 .../rs/security/oauth2/common/OAuthContext.java |   18 +-
 .../rs/security/oauth2/common/OAuthError.java   |   34 +-
 .../security/oauth2/common/OAuthPermission.java |   18 +-
 .../oauth2/common/OAuthRedirectionState.java    |   14 +-
 .../oauth2/common/OOBAuthorizationResponse.java |    4 +-
 .../oauth2/common/ServerAccessToken.java        |    2 +-
 .../oauth2/common/TokenIntrospection.java       |    8 +-
 .../filters/AccessTokenIntrospectionClient.java |    8 +-
 .../filters/AccessTokenValidatorClient.java     |    8 +-
 .../oauth2/filters/ConfidentialClient.java      |    2 +-
 .../oauth2/filters/JwtAccessTokenValidator.java |   19 +-
 .../oauth2/filters/OAuthRequestFilter.java      |   80 +-
 .../oauth2/filters/OAuthRequestInterceptor.java |   14 +-
 .../oauth2/filters/OAuthScopesFilter.java       |   20 +-
 .../cxf/rs/security/oauth2/filters/Scopes.java  |    4 +-
 .../security/oauth2/grants/AbstractGrant.java   |   16 +-
 .../oauth2/grants/AbstractGrantHandler.java     |   62 +-
 .../clientcred/ClientCredentialsGrant.java      |   12 +-
 .../ClientCredentialsGrantHandler.java          |    6 +-
 .../AbstractAuthorizationCodeDataProvider.java  |   10 +-
 .../grants/code/AbstractCodeDataProvider.java   |   16 +-
 .../code/AuthorizationCodeDataProvider.java     |    8 +-
 .../grants/code/AuthorizationCodeGrant.java     |   14 +-
 .../code/AuthorizationCodeGrantHandler.java     |   53 +-
 .../code/AuthorizationCodeRegistration.java     |   18 +-
 .../grants/code/CodeVerifierTransformer.java    |    2 +-
 .../code/DefaultEHCacheCodeDataProvider.java    |   34 +-
 .../code/DefaultEncryptingCodeDataProvider.java |   24 +-
 .../oauth2/grants/code/DigestCodeVerifier.java  |    4 +-
 .../grants/code/JCacheCodeDataProvider.java     |   10 +-
 .../grants/code/JwtRequestCodeFilter.java       |   24 +-
 .../oauth2/grants/code/JwtRequestCodeGrant.java |   16 +-
 .../oauth2/grants/code/PlainCodeVerifier.java   |    2 +-
 .../grants/jwt/AbstractJwtBearerGrant.java      |    8 +-
 .../oauth2/grants/jwt/AbstractJwtHandler.java   |   24 +-
 .../security/oauth2/grants/jwt/Constants.java   |    8 +-
 .../oauth2/grants/jwt/JwtBearerAuthHandler.java |   72 +-
 .../jwt/JwtBearerClientCredentialsGrant.java    |    4 +-
 .../oauth2/grants/jwt/JwtBearerGrant.java       |    8 +-
 .../grants/jwt/JwtBearerGrantHandler.java       |   18 +-
 .../owner/JAASResourceOwnerLoginHandler.java    |   14 +-
 .../oauth2/grants/owner/ResourceOwnerGrant.java |   12 +-
 .../grants/owner/ResourceOwnerGrantHandler.java |    6 +-
 .../grants/owner/ResourceOwnerLoginHandler.java |    2 +-
 .../grants/refresh/RefreshTokenGrant.java       |    6 +-
 .../refresh/RefreshTokenGrantHandler.java       |    6 +-
 .../provider/AbstractOAuthDataProvider.java     |  127 +--
 .../oauth2/provider/AccessTokenValidator.java   |    2 +-
 .../provider/AuthorizationRequestFilter.java    |    2 +-
 .../oauth2/provider/ClientIdProvider.java       |    4 +-
 .../provider/ClientRegistrationProvider.java    |    4 +-
 .../provider/ClientSecretHashVerifier.java      |    2 +-
 .../oauth2/provider/ClientSecretVerifier.java   |    4 +-
 .../DefaultEHCacheOAuthDataProvider.java        |   60 +-
 .../DefaultEncryptingOAuthDataProvider.java     |   18 +-
 .../oauth2/provider/DefaultSubjectCreator.java  |    4 +-
 .../provider/JCacheOAuthDataProvider.java       |   38 +-
 .../oauth2/provider/JPAOAuthDataProvider.java   |    4 +-
 .../provider/JoseSessionTokenProvider.java      |   26 +-
 .../oauth2/provider/OAuthDataProvider.java      |   44 +-
 .../oauth2/provider/OAuthJSONProvider.java      |   34 +-
 .../oauth2/provider/OAuthJoseJwtConsumer.java   |   21 +-
 .../oauth2/provider/OAuthJoseJwtProducer.java   |    6 +-
 .../provider/OAuthServerJoseJwtConsumer.java    |   68 ++
 .../provider/OAuthServerJoseJwtProducer.java    |   20 +-
 .../oauth2/provider/OAuthServiceException.java  |   16 +-
 .../SessionAuthenticityTokenProvider.java       |   16 +-
 .../oauth2/provider/SubjectCreator.java         |    4 +-
 .../services/AbstractAccessTokenValidator.java  |   36 +-
 .../services/AbstractImplicitGrantService.java  |   66 +-
 .../oauth2/services/AbstractOAuthService.java   |   50 +-
 .../oauth2/services/AbstractTokenService.java   |   71 +-
 .../oauth2/services/AccessTokenService.java     |   50 +-
 .../services/AccessTokenValidatorService.java   |    4 +-
 .../services/AuthorizationCodeGrantService.java |   50 +-
 .../services/AuthorizationMetadataService.java  |   22 +-
 .../oauth2/services/AuthorizationService.java   |   20 +-
 .../oauth2/services/ClientRegistration.java     |   16 +-
 .../services/ClientRegistrationResponse.java    |    8 +-
 .../services/DirectAuthorizationService.java    |   30 +-
 .../services/DynamicRegistrationService.java    |   78 +-
 .../ImplicitConfidentialGrantService.java       |    8 +-
 .../oauth2/services/ImplicitGrantService.java   |   10 +-
 .../services/RedirectionBasedGrantService.java  |  188 ++--
 .../services/TokenIntrospectionService.java     |   20 +-
 .../oauth2/services/TokenRevocationService.java |   10 +-
 .../oauth2/tokens/bearer/BearerAccessToken.java |   18 +-
 .../hawk/AbstractHawkAccessTokenValidator.java  |   34 +-
 .../oauth2/tokens/hawk/HawkAccessToken.java     |   34 +-
 .../tokens/hawk/HawkAccessTokenValidator.java   |   14 +-
 .../hawk/HawkAccessTokenValidatorClient.java    |   18 +-
 .../tokens/hawk/HawkAuthorizationScheme.java    |   48 +-
 .../oauth2/tokens/hawk/HmacAlgorithm.java       |    4 +-
 .../rs/security/oauth2/tokens/hawk/Nonce.java   |    4 +-
 .../oauth2/tokens/hawk/NonceHistory.java        |    4 +-
 .../oauth2/tokens/hawk/NonceVerifier.java       |    2 +-
 .../oauth2/tokens/hawk/NonceVerifierImpl.java   |    6 +-
 .../oauth2/utils/AuthorizationUtils.java        |   20 +-
 .../rs/security/oauth2/utils/EHCacheUtil.java   |    8 +-
 .../rs/security/oauth2/utils/JwtTokenUtils.java |   37 +-
 .../security/oauth2/utils/OAuthConstants.java   |   50 +-
 .../oauth2/utils/OAuthContextUtils.java         |    2 +-
 .../rs/security/oauth2/utils/OAuthUtils.java    |   78 +-
 .../utils/crypto/ModelEncryptionSupport.java    |  158 +--
 .../oauth2/grants/OAuthDataProviderImpl.java    |    2 +-
 .../oauth2/grants/TokenGrantHandlerTest.java    |   40 +-
 .../grants/code/JCacheCodeDataProviderTest.java |   20 +-
 .../grants/code/JPACodeDataProviderTest.java    |   28 +-
 .../grants/jwt/AbstractJwtHandlerTest.java      |    2 +-
 .../provider/JCacheOAuthDataProviderTest.java   |   54 +-
 .../provider/JPAOAuthDataProviderTest.java      |    6 +-
 .../oauth2/provider/OAuthJSONProviderTest.java  |   92 +-
 .../hawk/HawkAccessTokenValidatorTest.java      |   22 +-
 .../oauth2/utils/AuthorizationUtilsTest.java    |    8 +-
 .../security/oauth2/utils/OAuthUtilsTest.java   |    6 +-
 .../crypto/CodeGrantEncryptingDataProvider.java |    8 +-
 .../oauth2/utils/crypto/CryptoUtilsTest.java    |   99 +-
 .../utils/crypto/EncryptingDataProvider.java    |   36 +-
 .../grants/code/JPACMTCodeDataProvider.xml      |    8 +-
 rt/rs/security/sso/oidc/pom.xml                 |  101 +-
 .../security/oidc/common/AbstractUserInfo.java  |   34 +-
 .../security/oidc/common/AggregatedClaims.java  |    2 +-
 .../rs/security/oidc/common/ClaimsRequest.java  |   14 +-
 .../oidc/common/DistributedClaimSource.java     |    4 +-
 .../security/oidc/common/DistributedClaims.java |    2 +-
 .../cxf/rs/security/oidc/common/IdToken.java    |   10 +-
 .../rs/security/oidc/common/UserAddress.java    |    6 +-
 .../oidc/idp/IdTokenResponseFilter.java         |   22 +-
 .../oidc/idp/OidcAuthorizationCodeService.java  |   16 +-
 .../oidc/idp/OidcClientRegistration.java        |   27 -
 .../oidc/idp/OidcConfigurationService.java      |   39 +-
 .../idp/OidcDynamicRegistrationService.java     |   58 +-
 .../rs/security/oidc/idp/OidcHybridService.java |   38 +-
 .../security/oidc/idp/OidcImplicitService.java  |   54 +-
 .../rs/security/oidc/idp/OidcKeysService.java   |    6 +-
 .../rs/security/oidc/idp/UserInfoService.java   |   30 +-
 .../cxf/rs/security/oidc/rp/IdTokenReader.java  |    6 +-
 .../security/oidc/rp/OidcClaimsValidator.java   |   48 +-
 .../oidc/rp/OidcClientCodeRequestFilter.java    |   38 +-
 .../oidc/rp/OidcClientTokenContextImpl.java     |    2 +-
 .../security/oidc/rp/OidcIdTokenProvider.java   |    4 +-
 .../oidc/rp/OidcIdTokenRequestFilter.java       |   14 +-
 .../cxf/rs/security/oidc/rp/OidcInvoker.java    |   12 +-
 .../oidc/rp/OidcRpAuthenticationFilter.java     |   14 +-
 .../oidc/rp/OidcRpAuthenticationService.java    |   10 +-
 .../security/oidc/rp/OidcSecurityContext.java   |   14 +-
 .../security/oidc/rp/OidcUserInfoProvider.java  |    6 +-
 .../cxf/rs/security/oidc/rp/UserInfoClient.java |    4 +-
 .../cxf/rs/security/oidc/utils/OidcUtils.java   |   22 +-
 .../oidc/idp/JPAOidcUserSubjectTest.java        |   24 +-
 .../oidc/idp/JPAOidcUserSubjectCMTTest.xml      |    8 +-
 ...AbstractRequestAssertionConsumerHandler.java |   92 +-
 .../security/saml/sso/AbstractSSOSpHandler.java |   68 +-
 .../saml/sso/AbstractServiceProviderFilter.java |   94 +-
 .../security/saml/sso/AuthnRequestBuilder.java  |    4 +-
 .../saml/sso/DefaultAuthnRequestBuilder.java    |   26 +-
 .../saml/sso/EHCacheTokenReplayCache.java       |   40 +-
 .../cxf/rs/security/saml/sso/EHCacheUtil.java   |    8 +-
 .../rs/security/saml/sso/LogoutResponse.java    |    8 +-
 .../cxf/rs/security/saml/sso/LogoutService.java |   18 +-
 .../rs/security/saml/sso/MetadataService.java   |   32 +-
 .../rs/security/saml/sso/MetadataWriter.java    |   54 +-
 .../sso/RequestAssertionConsumerFilter.java     |   14 +-
 .../sso/RequestAssertionConsumerService.java    |    4 +-
 .../saml/sso/SAMLProtocolResponseValidator.java |    8 +-
 .../saml/sso/SAMLSSOResponseValidator.java      |   76 +-
 .../cxf/rs/security/saml/sso/SSOConstants.java  |   16 +-
 .../security/saml/sso/SSOValidatorResponse.java |    8 +-
 .../saml/sso/SamlPostBindingFilter.java         |   39 +-
 .../saml/sso/SamlRedirectBindingFilter.java     |   41 +-
 .../rs/security/saml/sso/SamlRequestInfo.java   |    2 +-
 .../saml/sso/SamlSSOAssertionValidator.java     |   10 +-
 .../saml/sso/SamlpRequestComponentBuilder.java  |   48 +-
 .../rs/security/saml/sso/TokenReplayCache.java  |    2 +-
 .../saml/sso/state/EHCacheSPStateManager.java   |   48 +-
 .../saml/sso/state/HTTPSPStateManager.java      |   10 +-
 .../saml/sso/state/MemorySPStateManager.java    |    8 +-
 .../security/saml/sso/state/RequestState.java   |    8 +-
 .../security/saml/sso/state/ResponseState.java  |   16 +-
 .../security/saml/sso/state/SPStateManager.java |   16 +-
 .../saml/sso/AbstractSAMLCallbackHandler.java   |   46 +-
 .../saml/sso/AuthnRequestBuilderTest.java       |   38 +-
 .../saml/sso/CombinedValidatorTest.java         |  142 +--
 .../rs/security/saml/sso/EHCacheUtilTest.java   |   16 +-
 .../saml/sso/KeystorePasswordCallback.java      |   10 +-
 .../security/saml/sso/SAML2CallbackHandler.java |   12 +-
 .../sso/SAML2PResponseComponentBuilder.java     |   48 +-
 .../saml/sso/SAMLResponseValidatorTest.java     |  340 +++---
 .../saml/sso/SAMLSSOResponseValidatorTest.java  |  208 ++--
 .../cxf/rs/security/common/CryptoLoader.java    |   30 +-
 .../cxf/rs/security/common/RSSecurityUtils.java |   70 +-
 .../cxf/rs/security/common/TrustValidator.java  |    8 +-
 .../saml/AbstractSamlBase64InHandler.java       |   16 +-
 .../rs/security/saml/AbstractSamlInHandler.java |  127 +--
 .../saml/AbstractSamlOutInterceptor.java        |   14 +-
 .../rs/security/saml/DeflateEncoderDecoder.java |   18 +-
 .../cxf/rs/security/saml/SAMLConstants.java     |    6 +-
 .../apache/cxf/rs/security/saml/SAMLUtils.java  |   64 +-
 .../security/saml/SamlEnvelopedInHandler.java   |   21 +-
 .../saml/SamlEnvelopedOutInterceptor.java       |   38 +-
 .../cxf/rs/security/saml/SamlFormInHandler.java |   25 +-
 .../security/saml/SamlFormOutInterceptor.java   |   20 +-
 .../rs/security/saml/SamlHeaderInHandler.java   |   19 +-
 .../security/saml/SamlHeaderOutInterceptor.java |   28 +-
 .../cxf/rs/security/saml/assertion/Subject.java |   10 +-
 .../authorization/ClaimsAuthorizingFilter.java  |    9 +-
 .../SecurityContextProviderImpl.java            |   34 +-
 .../saml/authorization/SubjectPrincipal.java    |   20 +-
 .../security/xml/AbstractXmlEncInHandler.java   |   78 +-
 .../security/xml/AbstractXmlSecInHandler.java   |   24 +-
 .../xml/AbstractXmlSecOutInterceptor.java       |   44 +-
 .../security/xml/AbstractXmlSigInHandler.java   |   96 +-
 .../rs/security/xml/EncryptionProperties.java   |    4 +-
 .../cxf/rs/security/xml/EncryptionUtils.java    |   34 +-
 .../rs/security/xml/SignatureProperties.java    |    4 +-
 .../cxf/rs/security/xml/XmlEncInHandler.java    |    7 +-
 .../rs/security/xml/XmlEncInInterceptor.java    |    2 +-
 .../rs/security/xml/XmlEncOutInterceptor.java   |  152 +--
 .../rs/security/xml/XmlSecInInterceptor.java    |  124 +--
 .../rs/security/xml/XmlSecOutInterceptor.java   |  150 +--
 .../cxf/rs/security/xml/XmlSigInHandler.java    |    7 +-
 .../rs/security/xml/XmlSigInInterceptor.java    |    4 +-
 .../rs/security/xml/XmlSigOutInterceptor.java   |  116 +-
 .../saml/DeflateEncoderDecoderTest.java         |    8 +-
 .../jaxrs/sse/OutboundSseEventBodyWriter.java   |   36 +-
 .../cxf/jaxrs/sse/OutboundSseEventImpl.java     |    6 +-
 .../cxf/jaxrs/sse/SseBroadcasterImpl.java       |   72 +-
 .../cxf/jaxrs/sse/SseContextProvider.java       |   31 +
 .../cxf/jaxrs/sse/SseEventOutputProvider.java   |   53 -
 .../org/apache/cxf/jaxrs/sse/SseFeature.java    |    6 +-
 .../java/org/apache/cxf/jaxrs/sse/SseImpl.java  |   38 +
 .../SseAtmosphereContextProvider.java           |   57 -
 .../SseAtmosphereEventOutputImpl.java           |  121 ---
 .../SseAtmosphereEventSinkContextProvider.java  |   61 ++
 .../atmosphere/SseAtmosphereEventSinkImpl.java  |  144 +++
 .../atmosphere/SseAtmosphereInterceptor.java    |   20 +-
 .../SseAtmosphereResourceContext.java           |   60 -
 .../transport/sse/SseHttpTransportFactory.java  |   10 +-
 .../AtmosphereSseServletDestination.java        |   44 +-
 .../cxf/rt/security/saml/claims/ClaimBean.java  |   12 +-
 .../cxf/rt/security/saml/claims/SAMLClaim.java  |   32 +-
 .../saml/claims/SAMLSecurityContext.java        |   30 +-
 .../ClaimsAuthorizingInterceptor.java           |   62 +-
 .../interceptor/WSS4JBasicAuthValidator.java    |   22 +-
 .../cxf/rt/security/saml/utils/SAMLUtils.java   |   38 +-
 .../security/saml/xacml/CXFMessageParser.java   |    6 +-
 .../rt/security/saml/xacml/XACMLConstants.java  |   94 +-
 .../AbstractXACMLAuthorizingInterceptor.java    |   34 +-
 .../saml/xacml2/DefaultXACMLRequestBuilder.java |   48 +-
 .../saml/xacml2/PolicyDecisionPoint.java        |    4 +-
 .../saml/xacml2/RequestComponentBuilder.java    |   46 +-
 .../xacml2/SamlRequestComponentBuilder.java     |   30 +-
 .../xacml2/XACMLAuthorizingInterceptor.java     |   10 +-
 .../saml/xacml2/XACMLRequestBuilder.java        |    6 +-
 .../rt/security/saml/claims/SAMLClaimsTest.java |   82 +-
 .../saml/claims/SamlCallbackHandler.java        |   16 +-
 .../ClaimsAuthorizingInterceptorTest.java       |  114 +-
 .../cxf/rt/security/saml/xacml2/DummyPDP.java   |   26 +-
 .../xacml2/RequestComponentBuilderTest.java     |   88 +-
 .../xacml2/SamlRequestComponentBuilderTest.java |   54 +-
 .../xacml2/XACMLAuthorizingInterceptorTest.java |   22 +-
 .../saml/xacml2/XACMLRequestBuilderTest.java    |  102 +-
 .../cxf/rt/security/SecurityConstants.java      |  176 +--
 .../apache/cxf/rt/security/claims/Claim.java    |   14 +-
 .../cxf/rt/security/claims/ClaimCollection.java |   14 +-
 .../security/claims/ClaimsSecurityContext.java  |    4 +-
 .../security/crypto/BouncyCastleInstaller.java  |    4 +-
 .../cxf/rt/security/crypto/CryptoUtils.java     |  215 ++--
 .../cxf/rt/security/crypto/HmacUtils.java       |   42 +-
 .../cxf/rt/security/crypto/KeyProperties.java   |   10 +-
 .../rt/security/crypto/MessageDigestUtils.java  |   22 +-
 .../cxf/rt/security/utils/SecurityUtils.java    |   44 +-
 .../cxf/rt/security/claims/ClaimTest.java       |   12 +-
 .../transport/http/asyncclient/Activator.java   |   10 +-
 .../http/asyncclient/AsyncHTTPConduit.java      |  192 ++--
 .../asyncclient/AsyncHTTPConduitFactory.java    |   64 +-
 .../asyncclient/AsyncHttpTransportFactory.java  |   30 +-
 .../CXFHttpAsyncRequestProducer.java            |   20 +-
 .../CXFHttpAsyncResponseConsumer.java           |    4 +-
 .../http/asyncclient/CXFHttpRequest.java        |    8 +-
 .../http/asyncclient/CXFResponseCallback.java   |    2 +-
 .../http/asyncclient/SharedInputBuffer.java     |   16 +-
 .../http/asyncclient/SharedOutputBuffer.java    |   16 +-
 .../http/asyncclient/AsyncHTTPConduitTest.java  |   50 +-
 rt/transports/http-jetty/pom.xml                |    2 +
 .../http_jetty/JettyHTTPDestination.java        |  125 ++-
 .../transport/http_jetty/JettyHTTPHandler.java  |    2 +-
 .../http_jetty/JettyHTTPServerEngine.java       |  524 ++++-----
 .../JettyHTTPServerEngineFactory.java           |  123 +--
 .../cxf/transport/http_jetty/ServerEngine.java  |   10 +-
 .../http_jetty/ThreadingParameters.java         |   14 +-
 .../HTTPJettyTransportNamespaceHandler.java     |   10 +-
 .../JettyHTTPServerEngineFactoryHolder.java     |   30 +-
 .../JettyServerEngineFactoryParser.java         |   18 +-
 .../JettyContinuationProvider.java              |   12 +-
 .../JettyContinuationProviderFactory.java       |   14 +-
 .../continuations/JettyContinuationWrapper.java |   24 +-
 .../osgi/HTTPJettyTransportActivator.java       |   28 +-
 ...ttyHTTPServerEngineBeanDefinitionParser.java |   98 +-
 ...ServerEngineFactoryBeanDefinitionParser.java |   46 +-
 .../spring/JettySpringTypesFactory.java         |   66 +-
 .../http_jetty/spring/NamespaceHandler.java     |    2 +-
 .../http_jetty/JettyHTTPDestinationTest.java    |  238 ++--
 .../JettyHTTPServerEngineFactoryTest.java       |   86 +-
 .../http_jetty/JettyHTTPServerEngineTest.java   |  131 ++-
 .../http_jetty/JettyHTTPTestHandler.java        |    2 +-
 .../HTTPJettyTransportNamespaceHandlerTest.java |    4 +-
 .../transport/http_jetty/invalid-engines.xml    |    2 +-
 .../server-engine-factory-jetty9-connector.xml  |   46 +
 .../http_jetty/server-engine-factory.xml        |    2 +-
 .../spring/ApplicationContextTest.java          |   68 +-
 .../spring/BeanDefinitionParsersTest.java       |   16 +-
 .../transport/http_jetty/spring/beans-props.xml |    2 +-
 .../cxf/transport/http_jetty/spring/beans.xml   |    2 +-
 .../http_jetty/spring/invalid-beans.xml         |    2 +-
 .../netty/client/NettyHttpClientHandler.java    |   16 +-
 .../client/NettyHttpClientPipelineFactory.java  |   18 +-
 .../netty/client/NettyHttpClientRequest.java    |    6 +-
 .../http/netty/client/NettyHttpConduit.java     |   48 +-
 .../netty/client/NettyHttpConduitFactory.java   |   24 +-
 .../netty/client/NettyHttpTransportFactory.java |   42 +-
 .../client/NettyHttpConduitFactoryTest.java     |   14 +-
 .../client/integration/NettyClientTest.java     |    8 +-
 .../client/integration/SSLNettyClientTest.java  |   24 +-
 .../netty/client/integration/ServerConfig.xml   |    2 +-
 rt/transports/http-netty/netty-server/pom.xml   |    2 +
 .../http/netty/server/NettyHttpDestination.java |   20 +-
 .../server/NettyHttpDestinationFactory.java     |    2 +-
 .../netty/server/NettyHttpServerEngine.java     |   56 +-
 .../server/NettyHttpServerEngineFactory.java    |   30 +-
 .../netty/server/NettyHttpServletHandler.java   |   30 +-
 .../server/NettyHttpServletPipelineFactory.java |   24 +-
 .../netty/server/NettyHttpTransportFactory.java |   32 +-
 .../http/netty/server/ThreadingParameters.java  |   10 +-
 .../http/netty/server/blueprint/Activator.java  |    2 +-
 .../HttpNettyTransportNamespaceHandler.java     |   14 +-
 .../NettyHttpServerEngineFactoryHolder.java     |   16 +-
 .../NettyServerEngineFactoryParser.java         |    2 +-
 .../interceptor/HttpSessionInterceptor.java     |   14 +-
 .../server/interceptor/NettyInterceptor.java    |    2 +-
 .../server/servlet/ChannelThreadLocal.java      |    2 +-
 .../server/servlet/HttpSessionThreadLocal.java  |    2 +-
 .../server/servlet/NettyHttpServletRequest.java |   24 +-
 .../server/servlet/NettyServletInputStream.java |    4 +-
 .../servlet/NettyServletOutputStream.java       |    6 +-
 .../server/servlet/NettyServletResponse.java    |    9 -
 .../server/session/DefaultHttpSessionStore.java |    4 +-
 .../netty/server/spring/NamespaceHandler.java   |    2 +-
 ...ttyHttpServerEngineBeanDefinitionParser.java |   96 +-
 ...ServerEngineFactoryBeanDefinitionParser.java |   48 +-
 .../server/spring/NettySpringTypesFactory.java  |   68 +-
 .../transport/http/netty/server/util/Utils.java |   32 +-
 .../netty/server/NettyHttpDestinationTest.java  |  238 ++--
 .../NettyHttpServerEngineFactoryTest.java       |   18 +-
 .../netty/server/NettyHttpServerEngineTest.java |   12 +-
 .../server/integration/NettyServerTest.java     |    6 +-
 .../server/integration/SSLNettyServerTest.java  |   26 +-
 .../server/spring/ApplicationContextTest.java   |   72 +-
 .../server/integration/ApplicationContext.xml   |    2 +-
 .../netty/server/integration/ServerConfig.xml   |    2 +-
 .../http/netty/server/spring/beans-props.xml    |    2 +-
 .../http/netty/server/spring/beans.xml          |    2 +-
 .../http/netty/server/spring/invalid-beans.xml  |    2 +-
 rt/transports/http-undertow/pom.xml             |    2 +
 .../http_undertow/CxfUndertowServlet.java       |    5 +-
 .../http_undertow/NotFoundHandler.java          |    4 +-
 .../transport/http_undertow/ServerEngine.java   |    2 +-
 .../http_undertow/ThreadingParameters.java      |   16 +-
 .../http_undertow/UndertowHTTPDestination.java  |   74 +-
 .../http_undertow/UndertowHTTPHandler.java      |   22 +-
 .../http_undertow/UndertowHTTPServerEngine.java |  162 +--
 .../UndertowHTTPServerEngineFactory.java        |  120 +-
 .../HTTPUndertowTransportNamespaceHandler.java  |    4 +-
 .../UndertowHTTPServerEngineFactoryHolder.java  |   36 +-
 .../UndertowServerEngineFactoryParser.java      |   16 +-
 .../osgi/HTTPUndertowTransportActivator.java    |   28 +-
 .../http_undertow/spring/NamespaceHandler.java  |    2 +-
 ...towHTTPServerEngineBeanDefinitionParser.java |   92 +-
 ...ServerEngineFactoryBeanDefinitionParser.java |   46 +-
 .../spring/UndertowSpringTypesFactory.java      |   66 +-
 .../UndertowHTTPDestinationTest.java            |  242 ++---
 .../UndertowHTTPServerEngineFactoryTest.java    |   50 +-
 .../UndertowHTTPServerEngineTest.java           |   76 +-
 .../http_undertow/UndertowHTTPTestHandler.java  |   14 +-
 ...TPUndertowTransportNamespaceHandlerTest.java |    4 +-
 .../transport/http_undertow/invalid-engines.xml |    2 +-
 .../http_undertow/server-engine-factory.xml     |    2 +-
 .../spring/ApplicationContextTest.java          |   72 +-
 .../http_undertow/spring/TestDummyHandler.java  |    2 +-
 .../http_undertow/spring/beans-props.xml        |    2 +-
 .../transport/http_undertow/spring/beans.xml    |    2 +-
 .../http_undertow/spring/invalid-beans.xml      |    2 +-
 rt/transports/http/pom.xml                      |    4 +-
 .../transport/http/AbstractHTTPDestination.java |  208 ++--
 .../org/apache/cxf/transport/http/Address.java  |   16 +-
 .../cxf/transport/http/CXFAuthenticator.java    |   38 +-
 .../apache/cxf/transport/http/ChunkedUtil.java  |   18 +-
 .../http/ContinuationProviderFactory.java       |    6 +-
 .../org/apache/cxf/transport/http/Cookie.java   |   12 +-
 .../org/apache/cxf/transport/http/Cookies.java  |   20 +-
 .../cxf/transport/http/DestinationRegistry.java |    8 +-
 .../transport/http/DestinationRegistryImpl.java |   24 +-
 .../apache/cxf/transport/http/HTTPConduit.java  |  524 ++++-----
 .../transport/http/HTTPConduitConfigurer.java   |    2 +-
 .../cxf/transport/http/HTTPConduitFactory.java  |    4 +-
 .../cxf/transport/http/HTTPException.java       |    6 +-
 .../transport/http/HTTPTransportFactory.java    |   70 +-
 .../transport/http/HTTPWSDLExtensionLoader.java |   12 +-
 .../org/apache/cxf/transport/http/Headers.java  |   94 +-
 .../http/HttpAuthenticationFaultHandler.java    |    8 +-
 .../cxf/transport/http/HttpConduitConfig.java   |    2 +-
 .../transport/http/HttpDestinationFactory.java  |    4 +-
 .../http/HttpServletRequestSnapshot.java        |    2 +-
 .../transport/http/HttpURLConnectionInfo.java   |   10 +-
 .../apache/cxf/transport/http/HttpUrlUtil.java  |    4 +-
 .../cxf/transport/http/MessageTrustDecider.java |   50 +-
 .../cxf/transport/http/PatternBuilder.java      |    2 +-
 .../apache/cxf/transport/http/ProxyFactory.java |   12 +-
 .../http/ReferencingAuthenticator.java          |    6 +-
 .../http/Servlet3ContinuationProvider.java      |   42 +-
 .../http/URLConnectionHTTPConduit.java          |  103 +-
 .../cxf/transport/http/URLConnectionInfo.java   |   10 +-
 .../http/UntrustedURLConnectionIOException.java |    2 +-
 .../http/auth/AbstractSpnegoAuthSupplier.java   |   44 +-
 .../http/auth/DefaultBasicAuthSupplier.java     |   19 +-
 .../transport/http/auth/DigestAuthSupplier.java |   30 +-
 .../cxf/transport/http/auth/HttpAuthHeader.java |   16 +-
 .../transport/http/auth/HttpAuthSupplier.java   |   10 +-
 .../transport/http/auth/SpnegoAuthSupplier.java |    2 +-
 .../auth/WSDLGetAuthenticatorInterceptor.java   |   18 +-
 .../transport/http/blueprint/HttpBPHandler.java |   14 +-
 .../HttpConduitBPBeanDefinitionParser.java      |   32 +-
 .../HttpDestinationBPBeanDefinitionParser.java  |   14 +-
 .../osgi/ConfigAdminHttpConduitConfigurer.java  |   38 +-
 .../http/osgi/HTTPTransportActivator.java       |   30 +-
 .../http/osgi/HttpConduitConfigApplier.java     |   12 +-
 .../transport/http/osgi/ServletExporter.java    |   44 +-
 .../http/policy/HTTPClientAssertionBuilder.java |   18 +-
 .../http/policy/HTTPServerAssertionBuilder.java |   20 +-
 .../policy/NoOpPolicyInterceptorProvider.java   |    6 +-
 .../policy/impl/ClientPolicyCalculator.java     |   10 +-
 .../policy/impl/ServerPolicyCalculator.java     |   10 +-
 .../spring/HttpConduitBeanDefinitionParser.java |   78 +-
 .../HttpDestinationBeanDefinitionParser.java    |   14 +-
 ...MessageTrustDeciderBeanDefinitionParser.java |    2 +-
 .../transport/http/spring/NamespaceHandler.java |   14 +-
 .../https/AliasedX509ExtendedKeyManager.java    |    2 +-
 .../https/AllowAllHostnameVerifier.java         |    4 +-
 .../cxf/transport/https/CertConstraints.java    |   24 +-
 .../transport/https/CertConstraintsFeature.java |   16 +-
 .../https/CertConstraintsInterceptor.java       |   15 +-
 .../https/CertConstraintsJaxBUtils.java         |   18 +-
 .../https/HttpsMessageTrustDecider.java         |    2 +-
 .../https/HttpsURLConnectionFactory.java        |   76 +-
 .../transport/https/HttpsURLConnectionInfo.java |   42 +-
 .../https/SSLSocketFactoryWrapper.java          |   36 +-
 .../apache/cxf/transport/https/SSLUtils.java    |   26 +-
 .../httpclient/DefaultHostnameVerifier.java     |   20 +-
 .../https/httpclient/InetAddressUtils.java      |    6 +-
 .../https/httpclient/PublicSuffixList.java      |    2 +-
 .../https/httpclient/PublicSuffixMatcher.java   |    6 +-
 .../httpclient/PublicSuffixMatcherLoader.java   |    8 +-
 .../transport/servlet/AbstractHTTPServlet.java  |  160 +--
 .../cxf/transport/servlet/BaseUrlHelper.java    |   10 +-
 .../transport/servlet/CXFNonSpringServlet.java  |   32 +-
 .../cxf/transport/servlet/CXFServlet.java       |   22 +-
 .../transport/servlet/ServletController.java    |   36 +-
 .../transport/servlet/ServletDestination.java   |   20 +-
 .../servlet/ServletDestinationFactory.java      |    4 +-
 .../servlet/blueprint/CXFBlueprintServlet.java  |    6 +-
 .../servicelist/FormattedServiceListWriter.java |   28 +-
 .../ServiceListGeneratorServlet.java            |   35 +-
 .../ServiceListJAASAuthenticator.java           |   10 +-
 .../servlet/servicelist/ServiceListWriter.java  |    2 +-
 .../UnformattedServiceListWriter.java           |    8 +-
 .../main/resources/META-INF/cxf/cxf-servlet.xml |    2 +-
 .../http/CXFAuthenticatorCleanupTest.java       |   36 +-
 .../http/DestinationRegistryImplTest.java       |   42 +-
 .../cxf/transport/http/HTTPConduitTest.java     |    6 +-
 .../http/HTTPConduitURLConnectionTest.java      |   36 +-
 .../http/HTTPConduitURLEasyMockTest.java        |  130 +--
 .../apache/cxf/transport/http/HeadersTest.java  |   70 +-
 .../http/auth/DigestAuthSupplierTest.java       |    8 +-
 .../http/blueprint/HttpBPHandlerTest.java       |    4 +-
 .../http/policy/ClientPolicyCalculatorTest.java |    8 +-
 .../policy/HTTPClientAssertionBuilderTest.java  |   12 +-
 .../policy/HTTPServerAssertionBuilderTest.java  |   14 +-
 .../transport/http/policy/PolicyUtilsTest.java  |   38 +-
 .../http/policy/ServerPolicyCalculatorTest.java |    6 +-
 .../spring/HttpConduitConfigurationTest.java    |   26 +-
 .../cxf/transport/http/spring/conduit-bean.xml  |    2 +-
 .../http/spring/conduit-tlsrefs-bean.xml        |    2 +-
 .../transport/https/CertConstraintsTest.java    |   46 +-
 .../httpclient/CertificatesToPlayWith.java      |    2 +-
 .../httpclient/DefaultHostnameVerifierTest.java |    4 +-
 .../transport/servlet/BaseUrlHelperTest.java    |    6 +-
 .../servlet/ServletControllerTest.java          |   42 +-
 rt/transports/jms/pom.xml                       |   48 +
 .../cxf/transport/jms/BackChannelConduit.java   |   36 +-
 .../apache/cxf/transport/jms/JMSConduit.java    |   82 +-
 .../cxf/transport/jms/JMSConfigFactory.java     |   25 +-
 .../cxf/transport/jms/JMSConfiguration.java     |   31 +-
 .../apache/cxf/transport/jms/JMSConstants.java  |   30 +-
 .../cxf/transport/jms/JMSDestination.java       |   18 +-
 .../cxf/transport/jms/JMSExchangeSender.java    |    4 +-
 .../apache/cxf/transport/jms/JMSFactory.java    |   12 +-
 .../transport/jms/JMSMessageHeadersType.java    |    2 +-
 .../cxf/transport/jms/JMSMessageUtils.java      |   84 +-
 .../cxf/transport/jms/JMSTransportFactory.java  |    8 +-
 .../cxf/transport/jms/MessageStreamUtil.java    |    8 +-
 .../cxf/transport/jms/ThrottlingCounter.java    |   12 +-
 .../jms/continuations/JMSContinuation.java      |   14 +-
 .../continuations/JMSContinuationProvider.java  |   12 +-
 .../transport/jms/spec/JMSSpecConstants.java    |   10 +-
 .../cxf/transport/jms/uri/JMSEndpoint.java      |   59 +-
 .../transport/jms/uri/JMSEndpointWSDLUtil.java  |   38 +-
 .../cxf/transport/jms/uri/JMSURIParser.java     |   10 +-
 .../util/AbstractMessageListenerContainer.java  |   20 +-
 .../cxf/transport/jms/util/JMSSender.java       |    4 +-
 .../apache/cxf/transport/jms/util/JMSUtil.java  |   10 +-
 .../jms/util/MessageListenerContainer.java      |   20 +-
 .../util/PollingMessageListenerContainer.java   |   93 +-
 .../cxf/transport/jms/util/ResourceCloser.java  |    6 +-
 .../cxf/transport/jms/util/TestReceiver.java    |   18 +-
 .../cxf/transport/jms/util/package-info.java    |    4 +-
 .../jms/wsdl11/JMSWSDLExtensionLoader.java      |   14 +-
 .../cxf/transport/jms/AbstractJMSTester.java    |   32 +-
 .../cxf/transport/jms/JMSBrokerSetup.java       |   32 +-
 .../cxf/transport/jms/JMSConduitTest.java       |    2 +-
 .../cxf/transport/jms/JMSConfigFactoryTest.java |   13 +-
 .../cxf/transport/jms/JMSDestinationTest.java   |   88 +-
 .../cxf/transport/jms/JMSMessageUtilTest.java   |   10 +-
 .../MessageIdAsCorrelationIdJMSConduitTest.java |    4 +-
 .../jms/PooledConnectionTempQueueTest.java      |   12 +-
 .../cxf/transport/jms/RequestResponseTest.java  |   14 +-
 .../transport/jms/ThrottlingCounterTest.java    |    8 +-
 .../JMSContinuationProviderTest.java            |   12 +-
 .../jms/continuations/JMSContinuationTest.java  |   38 +-
 .../cxf/transport/jms/uri/JMSEndpointTest.java  |   22 +-
 .../cxf/transport/jms/uri/MyBeanLocator.java    |   10 +-
 .../jms/uri/URIConfiguredConduitTest.java       |    8 +-
 .../cxf/transport/jms/util/JMSUtilTest.java     |   14 +-
 .../transport/jms/util/MessageListenerTest.java |    2 +-
 .../jms/src/test/resources/jms_test.wsdl        |    5 +
 .../cxf/transport/local/LocalConduit.java       |   32 +-
 .../cxf/transport/local/LocalDestination.java   |   22 +-
 .../transport/local/LocalTransportFactory.java  |   44 +-
 .../transport/local/LocalDestinationTest.java   |   10 +-
 .../local/LocalTransportFactoryTest.java        |   32 +-
 .../cxf/transport/udp/IoSessionInputStream.java |    2 +-
 .../transport/udp/IoSessionOutputStream.java    |    4 +-
 .../apache/cxf/transport/udp/UDPConduit.java    |   58 +-
 .../cxf/transport/udp/UDPDestination.java       |   54 +-
 .../cxf/transport/udp/UDPTransportFactory.java  |   12 +-
 .../cxf/transport/udp/UDPTransportTest.java     |   38 +-
 rt/transports/websocket/pom.xml                 |   14 -
 .../transport/websocket/WebSocketConstants.java |    2 +-
 .../websocket/WebSocketDestinationFactory.java  |   30 +-
 .../websocket/WebSocketDestinationService.java  |    2 +-
 .../websocket/WebSocketTransportFactory.java    |   18 +-
 .../cxf/transport/websocket/WebSocketUtils.java |   16 +-
 .../websocket/ahc/AhcWebSocketConduit.java      |    6 +-
 .../ahc/AhcWebSocketConduitRequest.java         |    2 +-
 .../websocket/atmosphere/AtmosphereUtils.java   |   10 +-
 .../AtmosphereWebSocketJettyDestination.java    |   32 +-
 .../AtmosphereWebSocketServletDestination.java  |   10 +-
 .../atmosphere/DefaultProtocolInterceptor.java  |   42 +-
 .../jetty/JettyWebSocketDestination.java        |  435 --------
 .../websocket/jetty/JettyWebSocketHandler.java  |    8 +-
 .../websocket/jetty/WebSocketServletHolder.java |    2 +-
 .../jetty/WebSocketVirtualServletRequest.java   |   10 +-
 .../jetty/WebSocketVirtualServletResponse.java  |    8 +-
 .../jetty9/Jetty9WebSocketDestination.java      |   42 +-
 .../websocket/jetty9/JettyWebSocketHandler.java |   18 +-
 .../transport/websocket/WebSocketUtilsTest.java |   18 +-
 .../websocket/ahc/AhcWebSocketConduitTest.java  |    8 +-
 ...AtmosphereWebSocketJettyDestinationTest.java |   16 +-
 ...mosphereWebSocketServletDestinationTest.java |   28 +-
 .../DefaultProtocolInterceptorTest.java         |   22 +-
 .../jetty/JettyWebSocketDestinationTest.java    |   17 +-
 .../cxf/ws/addressing/blueprint/Activator.java  |    2 +-
 .../ws/addressing/blueprint/WsBPHandler.java    |    7 +-
 .../impl/AddressingFeatureApplier.java          |   12 +-
 .../impl/AddressingWSDLExtensionLoader.java     |   12 +-
 .../addressing/impl/DefaultMessageIdCache.java  |   12 +-
 .../addressing/impl/InternalContextUtils.java   |   76 +-
 .../ws/addressing/impl/MAPAggregatorImpl.java   |  214 ++--
 .../impl/MAPAggregatorImplLoader.java           |    2 +-
 .../policy/AddressingAssertionBuilder.java      |   26 +-
 .../AddressingPolicyInterceptorProvider.java    |   14 +-
 .../ws/addressing/policy/MetadataConstants.java |   22 +-
 .../policy/UsingAddressingAssertionBuilder.java |    6 +-
 .../addressing/soap/DecoupledFaultHandler.java  |   24 +-
 .../apache/cxf/ws/addressing/soap/MAPCodec.java |  236 ++--
 .../ws/addressing/soap/VersionTransformer.java  |   20 +-
 .../ws/addressing/spring/NamespaceHandler.java  |    2 +-
 .../addressing/blueprint/WsBPHandlerTest.java   |    4 +-
 .../ws/addressing/impl/ContextUtilsTest.java    |   48 +-
 .../ws/addressing/impl/MAPAggregatorTest.java   |  250 ++---
 .../soap/DecoupledFaultHandlerTest.java         |   14 +-
 .../cxf/ws/addressing/soap/MAPCodecTest.java    |   34 +-
 rt/ws/eventing/pom.xml                          |    7 +
 .../backend/database/SubscriptionTicket.java    |    6 +-
 .../manager/SubscriptionManagerImpl.java        |    6 +-
 .../EventSinkInterfaceNotificationTask.java     |   10 +-
 .../SubscriptionEndNotificationTask.java        |    2 +-
 .../ws/eventing/shared/EventingConstants.java   |    2 +-
 .../shared/faults/CannotProcessFilter.java      |    4 +-
 .../ws/eventing/shared/utils/FilteringUtil.java |    6 +-
 .../base/SimpleEventingIntegrationTest.java     |   10 +-
 .../apache/cxf/ws/eventing/base/TestUtil.java   |    2 +-
 .../eventing/integration/NotificationTest.java  |   10 +-
 .../integration/SubscriptionEndTest.java        |    2 +-
 .../eventsink/TestingWrappedEventSinkImpl.java  |    2 +-
 rt/ws/mex/pom.xml                               |    9 +
 .../java/org/apache/cxf/ws/mex/MEXEndpoint.java |   40 +-
 .../org/apache/cxf/ws/mex/MEXInInterceptor.java |   12 +-
 .../apache/cxf/ws/mex/MEXServerListener.java    |    2 +-
 .../java/org/apache/cxf/ws/mex/MEXUtils.java    |   18 +-
 .../org/apache/cxf/ws/mex/MetadataExchange.java |   16 +-
 .../java/org/apache/cxf/ws/mex/MEXTest.java     |   12 +-
 rt/ws/policy/pom.xml                            |    3 +
 .../ws/policy/AbstractPolicyInterceptor.java    |   16 +-
 .../AbstractPolicyInterceptorProvider.java      |   10 +-
 .../cxf/ws/policy/AlternativeSelector.java      |   16 +-
 .../cxf/ws/policy/AssertionBuilderRegistry.java |    8 +-
 .../ws/policy/AssertionBuilderRegistryImpl.java |   16 +-
 .../org/apache/cxf/ws/policy/AssertionInfo.java |    8 +-
 .../apache/cxf/ws/policy/AssertionInfoMap.java  |   36 +-
 .../java/org/apache/cxf/ws/policy/Assertor.java |    4 +-
 .../policy/ClientPolicyInFaultInterceptor.java  |   40 +-
 .../apache/cxf/ws/policy/EffectivePolicy.java   |    8 +-
 .../cxf/ws/policy/EffectivePolicyImpl.java      |  110 +-
 .../apache/cxf/ws/policy/EndpointPolicy.java    |   14 +-
 .../cxf/ws/policy/EndpointPolicyImpl.java       |  110 +-
 .../IgnorablePolicyInterceptorProvider.java     |   14 +-
 .../cxf/ws/policy/PolicyAnnotationListener.java |   94 +-
 .../apache/cxf/ws/policy/PolicyAssertion.java   |    8 +-
 .../org/apache/cxf/ws/policy/PolicyBean.java    |    6 +-
 .../org/apache/cxf/ws/policy/PolicyBuilder.java |   18 +-
 .../apache/cxf/ws/policy/PolicyBuilderImpl.java |   14 +-
 .../apache/cxf/ws/policy/PolicyConstants.java   |   24 +-
 .../cxf/ws/policy/PolicyDataEngineImpl.java     |   24 +-
 .../org/apache/cxf/ws/policy/PolicyEngine.java  |   66 +-
 .../apache/cxf/ws/policy/PolicyEngineImpl.java  |   86 +-
 .../apache/cxf/ws/policy/PolicyException.java   |    4 +-
 .../cxf/ws/policy/PolicyInInterceptor.java      |   36 +-
 .../ws/policy/PolicyInterceptorProvider.java    |   16 +-
 .../PolicyInterceptorProviderRegistry.java      |   10 +-
 .../PolicyInterceptorProviderRegistryImpl.java  |   16 +-
 .../cxf/ws/policy/PolicyOutInterceptor.java     |   34 +-
 .../apache/cxf/ws/policy/PolicyProvider.java    |   12 +-
 .../cxf/ws/policy/PolicyRegistryImpl.java       |    6 +-
 .../org/apache/cxf/ws/policy/PolicyUtils.java   |   66 +-
 .../PolicyVerificationInFaultInterceptor.java   |   36 +-
 .../policy/PolicyVerificationInInterceptor.java |   30 +-
 .../PolicyVerificationOutInterceptor.java       |   18 +-
 .../policy/ServerPolicyOutFaultInterceptor.java |   38 +-
 .../ws/policy/ServiceModelPolicyUpdater.java    |    6 +-
 .../apache/cxf/ws/policy/WSPolicyFeature.java   |   72 +-
 .../attachment/AbstractPolicyProvider.java      |   28 +-
 .../attachment/external/DomainExpression.java   |    2 +-
 .../external/DomainExpressionBuilder.java       |   12 +-
 .../DomainExpressionBuilderRegistry.java        |   12 +-
 .../EndpointReferenceDomainExpression.java      |    6 +-
 ...ndpointReferenceDomainExpressionBuilder.java |   22 +-
 .../external/ExternalAttachmentProvider.java    |   82 +-
 .../attachment/external/PolicyAttachment.java   |   12 +-
 .../external/URIDomainExpression.java           |  112 +-
 .../LocalDocumentReferenceResolver.java         |    6 +-
 .../LocalServiceModelReferenceResolver.java     |    8 +-
 .../attachment/reference/ReferenceResolver.java |    6 +-
 .../reference/RemoteReferenceResolver.java      |   12 +-
 .../wsdl11/Wsdl11AttachmentPolicyProvider.java  |  102 +-
 .../cxf/ws/policy/blueprint/Activator.java      |    2 +-
 .../ws/policy/blueprint/PolicyBPHandler.java    |    7 +-
 .../ws/policy/builder/jaxb/JaxbAssertion.java   |   20 +-
 .../builder/jaxb/JaxbAssertionBuilder.java      |   32 +-
 .../builder/primitive/PrimitiveAssertion.java   |   12 +-
 .../primitive/PrimitiveAssertionBuilder.java    |   12 +-
 .../ws/policy/mtom/MTOMAssertionBuilder.java    |    4 +-
 .../mtom/MTOMPolicyInterceptorProvider.java     |   14 +-
 .../cxf/ws/policy/mtom/MetadataConstants.java   |    4 +-
 .../selector/BaseAlternativeSelector.java       |   12 +-
 .../selector/FirstAlternativeSelector.java      |    8 +-
 .../selector/MaximalAlternativeSelector.java    |    8 +-
 .../selector/MinimalAlternativeSelector.java    |   16 +-
 ...lAttachmentProviderBeanDefinitionParser.java |    4 +-
 .../cxf/ws/policy/spring/NamespaceHandler.java  |    4 +-
 .../spring/PolicyBeanDefinitionParser.java      |    8 +-
 .../PolicyEngineBeanDefinitionParser.java       |   16 +-
 .../PolicyFeatureBeanDefinitionParser.java      |   12 +-
 .../policy/spring/PolicyNamespaceHandler.java   |    2 +-
 .../AssertionBuilderRegistryImplTest.java       |   18 +-
 .../cxf/ws/policy/AssertionInfoMapTest.java     |   94 +-
 .../cxf/ws/policy/EffectivePolicyImplTest.java  |  130 +--
 .../cxf/ws/policy/EndpointPolicyImplTest.java   |    8 +-
 .../IgnorablePolicyInterceptorProviderTest.java |    2 +-
 .../org/apache/cxf/ws/policy/NormalizeTest.java |   34 +-
 .../apache/cxf/ws/policy/PolicyBuilderTest.java |   30 +-
 .../cxf/ws/policy/PolicyDataEngineImplTest.java |   18 +-
 .../cxf/ws/policy/PolicyEngineImplInitTest.java |    2 +-
 .../apache/cxf/ws/policy/PolicyEngineTest.java  |  238 ++--
 .../cxf/ws/policy/PolicyExtensionsTest.java     |   30 +-
 ...licyInterceptorProviderRegistryImplTest.java |    4 +-
 .../cxf/ws/policy/PolicyInterceptorsTest.java   |  150 +--
 .../cxf/ws/policy/PolicyRegistryImplTest.java   |    4 +-
 ...olicyVerificationInFaultInterceptorTest.java |   54 +-
 .../PolicyVerificationInInterceptorTest.java    |   42 +-
 .../PolicyVerificationOutInterceptorTest.java   |   30 +-
 .../org/apache/cxf/ws/policy/TestAssertion.java |   10 +-
 .../DomainExpressionBuilderRegistryTest.java    |   32 +-
 .../EndpointReferenceDomainExpressionTest.java  |   26 +-
 .../ExternalAttachmentProviderTest.java         |   70 +-
 .../external/PolicyAttachmentTest.java          |   50 +-
 .../external/URIDomainExpressionTest.java       |   34 +-
 .../reference/ReferenceResolverTest.java        |   44 +-
 .../Wsdl11AttachmentPolicyProviderTest.java     |  154 +--
 .../policy/blueprint/PolicyBPHandlerTest.java   |    8 +-
 .../builder/jaxb/JaxbAssertionBuilderTest.java  |   22 +-
 .../policy/builder/jaxb/JaxbAssertionTest.java  |   30 +-
 .../apache/cxf/ws/policy/disable-policy-bus.xml |    2 +-
 .../apache/cxf/ws/policy/ignorable-policy.xml   |    2 +-
 .../apache/cxf/ws/policy/ignorable-policy2.xml  |    2 +-
 .../org/apache/cxf/ws/policy/policy-bus.xml     |    2 +-
 .../selector/FirstAlternativeSelectorTest.java  |   38 +-
 .../MinimalMaximalAlternativeSelectorTest.java  |   50 +-
 .../cxf/ws/policy/spring/PolicyBeansTest.java   |   18 +-
 .../org/apache/cxf/ws/policy/spring/beans.xml   |    2 +-
 .../policy/PolicyEngineImplInitTest-context.xml |    2 +-
 rt/ws/rm/pom.xml                                |    9 +
 .../org/apache/cxf/ws/rm/AbstractEndpoint.java  |   20 +-
 .../apache/cxf/ws/rm/AbstractRMInterceptor.java |   24 +-
 .../org/apache/cxf/ws/rm/AbstractSequence.java  |   20 +-
 .../cxf/ws/rm/AcknowledgementNotification.java  |    2 +-
 .../apache/cxf/ws/rm/BindingFaultFactory.java   |    8 +-
 .../apache/cxf/ws/rm/CapturingXMLWriter.java    |   76 +-
 .../java/org/apache/cxf/ws/rm/Destination.java  |   26 +-
 .../apache/cxf/ws/rm/DestinationSequence.java   |  138 +--
 .../org/apache/cxf/ws/rm/EncoderDecoder.java    |  106 +-
 .../apache/cxf/ws/rm/EncoderDecoder10AImpl.java |   14 +-
 .../apache/cxf/ws/rm/EncoderDecoder10Impl.java  |   12 +-
 .../apache/cxf/ws/rm/EncoderDecoder11Impl.java  |   14 +-
 .../apache/cxf/ws/rm/InternalContextUtils.java  |   40 +-
 .../org/apache/cxf/ws/rm/ManagedRMEndpoint.java |  178 +--
 .../org/apache/cxf/ws/rm/ManagedRMManager.java  |   14 +-
 .../org/apache/cxf/ws/rm/MessageCallback.java   |    2 +-
 .../cxf/ws/rm/MessageCountingCallback.java      |   14 +-
 .../org/apache/cxf/ws/rm/ProtocolVariation.java |   14 +-
 .../main/java/org/apache/cxf/ws/rm/Proxy.java   |  130 +--
 .../org/apache/cxf/ws/rm/RM10Constants.java     |  138 +--
 .../org/apache/cxf/ws/rm/RM11Constants.java     |  162 +--
 .../cxf/ws/rm/RMCaptureInInterceptor.java       |    6 +-
 .../cxf/ws/rm/RMCaptureOutInterceptor.java      |   72 +-
 .../org/apache/cxf/ws/rm/RMConfiguration.java   |   26 +-
 .../java/org/apache/cxf/ws/rm/RMConstants.java  |   98 +-
 .../org/apache/cxf/ws/rm/RMContextUtils.java    |   16 +-
 .../apache/cxf/ws/rm/RMDeliveryInterceptor.java |   12 +-
 .../java/org/apache/cxf/ws/rm/RMEndpoint.java   |   62 +-
 .../java/org/apache/cxf/ws/rm/RMException.java  |    2 +-
 .../org/apache/cxf/ws/rm/RMInInterceptor.java   |   64 +-
 .../java/org/apache/cxf/ws/rm/RMManager.java    |  148 +--
 .../apache/cxf/ws/rm/RMMessageConstants.java    |   24 +-
 .../org/apache/cxf/ws/rm/RMOutInterceptor.java  |   52 +-
 .../java/org/apache/cxf/ws/rm/RMProperties.java |   40 +-
 .../main/java/org/apache/cxf/ws/rm/RMUtils.java |   50 +-
 .../org/apache/cxf/ws/rm/RedeliveryQueue.java   |   24 +-
 .../cxf/ws/rm/RetransmissionInterceptor.java    |   20 +-
 .../apache/cxf/ws/rm/RetransmissionQueue.java   |   34 +-
 .../java/org/apache/cxf/ws/rm/RetryStatus.java  |   12 +-
 .../apache/cxf/ws/rm/RewindableInputStream.java |   22 +-
 .../org/apache/cxf/ws/rm/SequenceFault.java     |   24 +-
 .../apache/cxf/ws/rm/SequenceFaultFactory.java  |   16 +-
 .../cxf/ws/rm/SequenceIdentifierGenerator.java  |    2 +-
 .../org/apache/cxf/ws/rm/SequenceMonitor.java   |   12 +-
 .../main/java/org/apache/cxf/ws/rm/Servant.java |  114 +-
 .../main/java/org/apache/cxf/ws/rm/Source.java  |   60 +-
 .../org/apache/cxf/ws/rm/SourceSequence.java    |   24 +-
 .../apache/cxf/ws/rm/VersionTransformer.java    |  146 +--
 .../org/apache/cxf/ws/rm/WrappedEndpoint.java   |   16 +-
 .../org/apache/cxf/ws/rm/WrappedService.java    |   20 +-
 .../apache/cxf/ws/rm/blueprint/Activator.java   |    2 +-
 .../rm/blueprint/RMBPBeanDefinitionParser.java  |   18 +-
 .../apache/cxf/ws/rm/blueprint/RMBPHandler.java |    7 +-
 .../RMBPTxStoreBeanDefinitionParser.java        |   10 +-
 .../org/apache/cxf/ws/rm/feature/RMFeature.java |    2 +-
 .../cxf/ws/rm/persistence/PersistenceUtils.java |   16 +-
 .../apache/cxf/ws/rm/persistence/RMMessage.java |   16 +-
 .../apache/cxf/ws/rm/persistence/RMStore.java   |   56 +-
 .../cxf/ws/rm/persistence/RMStoreException.java |    4 +-
 .../cxf/ws/rm/persistence/jdbc/RMTxStore.java   |  300 ++---
 .../cxf/ws/rm/policy/MC11AssertionBuilder.java  |    6 +-
 .../cxf/ws/rm/policy/MC11PolicyLoader.java      |    6 +-
 .../cxf/ws/rm/policy/RM10AssertionBuilder.java  |   16 +-
 .../cxf/ws/rm/policy/RM12AssertionBuilder.java  |   24 +-
 .../rm/policy/RMPolicyInterceptorProvider.java  |    4 +-
 .../cxf/ws/rm/policy/RMPolicyUtilities.java     |   82 +-
 .../cxf/ws/rm/policy/RSPAssertionBuilder.java   |    6 +-
 .../cxf/ws/rm/policy/RSPPolicyLoader.java       |    6 +-
 .../cxf/ws/rm/policy/WSRMP12PolicyLoader.java   |    6 +-
 .../cxf/ws/rm/soap/RMSoapInInterceptor.java     |  104 +-
 .../cxf/ws/rm/soap/RMSoapOutInterceptor.java    |   32 +-
 .../cxf/ws/rm/soap/RedeliveryQueueImpl.java     |   86 +-
 .../cxf/ws/rm/soap/RetransmissionQueueImpl.java |  128 +--
 .../apache/cxf/ws/rm/soap/SoapFaultFactory.java |   26 +-
 .../cxf/ws/rm/spring/NamespaceHandler.java      |    2 +-
 .../spring/RMFeatureBeanDefinitionParser.java   |   30 +-
 .../spring/RMManagerBeanDefinitionParser.java   |   28 +-
 .../spring/RMTxStoreBeanDefinitionParser.java   |    4 +-
 .../main/resources/schemas/wsdl/wsrm-1.0.xjb    |    2 +-
 .../apache/cxf/ws/rm/AbstractEndpointTest.java  |   14 +-
 .../cxf/ws/rm/AbstractRMInterceptorTest.java    |   40 +-
 .../apache/cxf/ws/rm/AbstractSequenceTest.java  |   12 +-
 .../cxf/ws/rm/DestinationSequenceTest.java      |  242 ++---
 .../org/apache/cxf/ws/rm/DestinationTest.java   |   50 +-
 .../apache/cxf/ws/rm/ManagedRMManagerTest.java  |  174 +--
 .../apache/cxf/ws/rm/ProtocolVariationTest.java |    6 +-
 .../java/org/apache/cxf/ws/rm/ProxyTest.java    |  120 +-
 .../apache/cxf/ws/rm/RMContextUtilsTest.java    |   46 +-
 .../org/apache/cxf/ws/rm/RMEndpointTest.java    |   14 +-
 .../apache/cxf/ws/rm/RMInInterceptorTest.java   |  136 +--
 .../cxf/ws/rm/RMManagerConfigurationTest.java   |   36 +-
 .../org/apache/cxf/ws/rm/RMManagerTest.java     |  258 ++---
 .../apache/cxf/ws/rm/RMOutInterceptorTest.java  |   56 +-
 .../java/org/apache/cxf/ws/rm/RMUtilsTest.java  |   20 +-
 .../java/org/apache/cxf/ws/rm/ServantTest.java  |  120 +-
 .../apache/cxf/ws/rm/SourceSequenceTest.java    |  148 +--
 .../cxf/ws/rm/blueprint/RMBPHandlerTest.java    |    4 +-
 .../org/apache/cxf/ws/rm/custom-rmmanager.xml   |    2 +-
 .../java/org/apache/cxf/ws/rm/exactly-once.xml  |    2 +-
 .../test/java/org/apache/cxf/ws/rm/feature.xml  |    2 +-
 .../apache/cxf/ws/rm/managed-manager-bean.xml   |    2 +-
 .../java/org/apache/cxf/ws/rm/manager-bean.xml  |    2 +-
 .../ws/rm/persistence/PersistenceUtilsTest.java |   16 +-
 .../ws/rm/persistence/RMLargeMessageTest.java   |    4 +-
 .../cxf/ws/rm/persistence/RMMessageTest.java    |   14 +-
 .../jdbc/RMTxStoreConfigurationTest.java        |   30 +-
 .../jdbc/RMTxStorePooledConnectionTest.java     |   10 +-
 .../ws/rm/persistence/jdbc/RMTxStoreTest.java   |   30 +-
 .../rm/persistence/jdbc/RMTxStoreTestBase.java  |  356 +++---
 .../jdbc/RMTxStoreTwoSchemasTest.java           |  274 ++---
 .../persistence/jdbc/RMTxStoreUpgradeTest.java  |   60 +-
 .../cxf/ws/rm/persistence/jdbc/txstore-bean.xml |    2 +-
 .../jdbc/txstore-custom-error-bean.xml          |    2 +-
 .../jdbc/txstore-custom-error-bean2.xml         |    2 +-
 .../ws/rm/persistence/jdbc/txstore-ds-bean.xml  |    2 +-
 .../ws/rm/persistence/jdbc/txstore-ds-bean2.xml |    2 +-
 .../cxf/ws/rm/policy/PolicyUtilsTest.java       |   46 +-
 .../java/org/apache/cxf/ws/rm/rmmanager.xml     |    2 +-
 .../cxf/ws/rm/soap/RMSoapInInterceptorTest.java |   12 +-
 .../ws/rm/soap/RMSoapOutInterceptorTest.java    |   58 +-
 .../ws/rm/soap/RetransmissionQueueImplTest.java |  132 +--
 .../cxf/ws/rm/soap/SoapFaultFactoryTest.java    |   62 +-
 rt/ws/security/pom.xml                          |    8 +
 .../cxf/ws/security/SecurityConstants.java      |  218 ++--
 .../security/cache/CXFEHCacheReplayCache.java   |    6 +-
 .../ws/security/cache/CacheCleanupListener.java |   12 +-
 .../cxf/ws/security/cache/EHCacheUtils.java     |    8 +-
 .../ws/security/kerberos/KerberosClient.java    |   18 +-
 .../cxf/ws/security/kerberos/KerberosUtils.java |   38 +-
 .../cxf/ws/security/policy/PolicyUtils.java     |   20 +-
 .../security/policy/WSSecurityPolicyLoader.java |   44 +-
 .../policy/custom/AlgorithmSuiteBuilder.java    |    6 +-
 .../custom/DefaultAlgorithmSuiteLoader.java     |   22 +-
 .../HttpsTokenInterceptorProvider.java          |  106 +-
 .../IssuedTokenInterceptorProvider.java         |   56 +-
 .../KerberosTokenInterceptorProvider.java       |   88 +-
 .../policy/interceptors/NegotiationUtils.java   |   46 +-
 .../policy/interceptors/STSInvoker.java         |   44 +-
 .../interceptors/STSTokenOutInterceptor.java    |   85 +-
 .../SamlTokenInterceptorProvider.java           |    8 +-
 .../SecureConversationInInterceptor.java        |   96 +-
 .../SecureConversationOutInterceptor.java       |   28 +-
 ...ureConversationTokenInterceptorProvider.java |   20 +-
 .../SecurityVerificationOutInterceptor.java     |   26 +-
 .../SpnegoContextTokenInInterceptor.java        |  118 +-
 .../SpnegoContextTokenOutInterceptor.java       |   36 +-
 .../SpnegoTokenInterceptorProvider.java         |   20 +-
 .../UsernameTokenInterceptorProvider.java       |   10 +-
 .../WSSecurityInterceptorProvider.java          |   12 +-
 .../WSSecurityPolicyInterceptorProvider.java    |    8 +-
 .../ws/security/sts/provider/STSException.java  |   28 +-
 .../sts/provider/SecurityTokenService.java      |   50 +-
 .../sts/provider/SecurityTokenServiceImpl.java  |   12 +-
 .../provider/SecurityTokenServiceProvider.java  |   82 +-
 .../sts/provider/operation/CancelOperation.java |    2 +-
 .../sts/provider/operation/IssueOperation.java  |    2 +-
 .../provider/operation/ValidateOperation.java   |    2 +-
 .../security/tokenstore/EHCacheTokenStore.java  |   26 +-
 .../tokenstore/EHCacheTokenStoreFactory.java    |    4 +-
 .../security/tokenstore/MemoryTokenStore.java   |   32 +-
 .../tokenstore/MemoryTokenStoreFactory.java     |    4 +-
 .../ws/security/tokenstore/SecurityToken.java   |  142 +--
 .../cxf/ws/security/tokenstore/TokenStore.java  |   10 +-
 .../security/tokenstore/TokenStoreFactory.java  |   14 +-
 .../ws/security/tokenstore/TokenStoreUtils.java |    6 +-
 .../ws/security/trust/AbstractSTSClient.java    |  329 +++---
 .../trust/AuthPolicyValidatingInterceptor.java  |   16 +-
 .../security/trust/DefaultSymmetricBinding.java |    8 +-
 .../cxf/ws/security/trust/STSAuthParams.java    |   90 ++
 .../apache/cxf/ws/security/trust/STSClient.java |   30 +-
 .../cxf/ws/security/trust/STSLoginModule.java   |   90 +-
 .../trust/STSSamlAssertionValidator.java        |   16 +-
 .../security/trust/STSStaxTokenValidator.java   |  136 +--
 .../ws/security/trust/STSTokenRetriever.java    |   10 +-
 .../ws/security/trust/STSTokenValidator.java    |   56 +-
 .../apache/cxf/ws/security/trust/STSUtils.java  |  144 ++-
 .../cxf/ws/security/trust/TrustException.java   |    4 +-
 .../security/trust/claims/ClaimsCallback.java   |   20 +-
 .../trust/claims/RoleClaimsCallbackHandler.java |   12 +-
 .../trust/delegation/DelegationCallback.java    |   20 +-
 .../ReceivedTokenCallbackHandler.java           |   30 +-
 .../delegation/WSSUsernameCallbackHandler.java  |   16 +-
 .../wss4j/AbstractTokenInterceptor.java         |   48 +-
 ...tUsernameTokenAuthenticatingInterceptor.java |   86 +-
 .../wss4j/AbstractWSS4JInterceptor.java         |   40 +-
 .../wss4j/AbstractWSS4JStaxInterceptor.java     |   98 +-
 .../wss4j/AlgorithmSuiteTranslater.java         |   46 +-
 .../wss4j/AttachmentCallbackHandler.java        |   40 +-
 .../wss4j/BinarySecurityTokenInterceptor.java   |   34 +-
 .../ws/security/wss4j/CXFCallbackLookup.java    |    6 +-
 .../cxf/ws/security/wss4j/CXFRequestData.java   |    8 +-
 .../security/wss4j/CryptoCoverageChecker.java   |  114 +-
 .../ws/security/wss4j/CryptoCoverageUtil.java   |   92 +-
 .../wss4j/DefaultCryptoCoverageChecker.java     |   86 +-
 .../DefaultWSS4JSecurityContextCreator.java     |   52 +-
 .../wss4j/DelegatingCallbackHandler.java        |    6 +-
 .../wss4j/KerberosTokenInterceptor.java         |    6 +-
 .../wss4j/PolicyBasedWSS4JInInterceptor.java    |  150 +--
 .../wss4j/PolicyBasedWSS4JOutInterceptor.java   |   52 +-
 .../PolicyBasedWSS4JStaxInInterceptor.java      |  106 +-
 .../PolicyBasedWSS4JStaxOutInterceptor.java     |   48 +-
 .../ws/security/wss4j/SamlTokenInterceptor.java |   66 +-
 .../security/wss4j/StaxActionInInterceptor.java |   44 +-
 .../wss4j/StaxCryptoCoverageChecker.java        |  140 +--
 .../wss4j/StaxSecurityContextInInterceptor.java |   64 +-
 .../cxf/ws/security/wss4j/StaxSerializer.java   |   41 +-
 .../wss4j/TokenStoreCallbackHandler.java        |    4 +-
 .../wss4j/UsernameTokenInterceptor.java         |  124 ++-
 .../ws/security/wss4j/WSS4JInInterceptor.java   |  184 ++--
 .../ws/security/wss4j/WSS4JOutInterceptor.java  |   93 +-
 .../ws/security/wss4j/WSS4JPolicyAsserter.java  |    8 +-
 .../wss4j/WSS4JSecurityContextCreator.java      |    4 +-
 .../security/wss4j/WSS4JStaxInInterceptor.java  |  162 ++-
 .../security/wss4j/WSS4JStaxOutInterceptor.java |   83 +-
 .../ws/security/wss4j/WSS4JTokenConverter.java  |    8 +-
 .../cxf/ws/security/wss4j/WSS4JUtils.java       |   78 +-
 .../policyhandlers/AbstractBindingBuilder.java  |  691 ++++++------
 .../AbstractCommonBindingHandler.java           |   88 +-
 .../AbstractStaxBindingHandler.java             |  286 ++---
 .../AsymmetricBindingHandler.java               |  176 +--
 .../StaxAsymmetricBindingHandler.java           |  124 +--
 .../StaxSymmetricBindingHandler.java            |  176 +--
 .../StaxTransportBindingHandler.java            |  110 +-
 .../policyhandlers/SymmetricBindingHandler.java |  236 ++--
 .../policyhandlers/TransportBindingHandler.java |  157 +--
 .../policyhandlers/WSSecurityTokenHolder.java   |    6 +-
 .../AbstractBindingPolicyValidator.java         |  106 +-
 .../AbstractSamlPolicyValidator.java            |    4 +-
 .../AbstractSecurityPolicyValidator.java        |    4 +-
 .../AbstractSupportingTokenPolicyValidator.java |  213 ++--
 .../AlgorithmSuitePolicyValidator.java          |   80 +-
 .../AsymmetricBindingPolicyValidator.java       |   54 +-
 .../policyvalidators/ClaimsPolicyValidator.java |    6 +-
 .../ConcreteSupportingTokenPolicyValidator.java |   24 +-
 .../DefaultClaimsPolicyValidator.java           |   44 +-
 .../EncryptedTokenPolicyValidator.java          |   28 +-
 .../EndorsingEncryptedTokenPolicyValidator.java |   30 +-
 .../EndorsingTokenPolicyValidator.java          |   24 +-
 .../IssuedTokenPolicyValidator.java             |   54 +-
 .../KerberosTokenPolicyValidator.java           |   54 +-
 .../policyvalidators/LayoutPolicyValidator.java |   66 +-
 .../PolicyValidatorParameters.java              |   24 +-
 .../RequiredElementsPolicyValidator.java        |   14 +-
 .../RequiredPartsPolicyValidator.java           |   12 +-
 .../SamlTokenPolicyValidator.java               |   30 +-
 .../SecuredElementsPolicyValidator.java         |   30 +-
 .../SecuredPartsPolicyValidator.java            |   38 +-
 .../SecurityContextTokenPolicyValidator.java    |   14 +-
 .../SecurityPolicyValidator.java                |    6 +-
 .../SignedEncryptedTokenPolicyValidator.java    |   30 +-
 ...dEndorsingEncryptedTokenPolicyValidator.java |   28 +-
 .../SignedEndorsingTokenPolicyValidator.java    |   24 +-
 .../SignedTokenPolicyValidator.java             |   22 +-
 .../SymmetricBindingPolicyValidator.java        |   36 +-
 .../TransportBindingPolicyValidator.java        |   18 +-
 .../UsernameTokenPolicyValidator.java           |   36 +-
 .../wss4j/policyvalidators/ValidatorUtils.java  |   24 +-
 .../policyvalidators/WSS11PolicyValidator.java  |   22 +-
 .../X509TokenPolicyValidator.java               |   52 +-
 .../cxf/ws/security/cache/EHCacheUtilsTest.java |   24 +-
 .../cxf/ws/security/sts/STSClientTest.java      |   26 +-
 .../tokenstore/EHCacheTokenStoreTest.java       |   12 +-
 .../tokenstore/MemoryTokenStoreTest.java        |   16 +-
 .../AuthPolicyValidatingInterceptorTest.java    |   34 +-
 .../wss4j/AbstractPolicySecurityTest.java       |  246 ++---
 .../ws/security/wss4j/AbstractSecurityTest.java |   14 +-
 .../wss4j/CryptoCoverageCheckerTest.java        |   60 +-
 .../wss4j/CustomPolicyAlgorithmsTest.java       |    4 +-
 .../cxf/ws/security/wss4j/CustomProcessor.java  |   14 +-
 .../DOMToStaxEncryptionIdentifierTest.java      |   84 +-
 .../security/wss4j/DOMToStaxRoundTripTest.java  |  224 ++--
 .../wss4j/DOMToStaxSignatureIdentifierTest.java |   82 +-
 .../wss4j/DefaultCryptoCoverageCheckerTest.java |   38 +-
 .../wss4j/KeystorePasswordCallback.java         |   10 +-
 .../wss4j/PluggablePolicyValidatorTest.java     |   20 +-
 .../wss4j/PolicyBasedWss4JInOutTest.java        |  108 +-
 .../cxf/ws/security/wss4j/RoundTripTest.java    |    8 +-
 .../security/wss4j/SecurityActionTokenTest.java |   38 +-
 .../wss4j/SecurityVerificationOutTest.java      |   20 +-
 .../wss4j/SignatureConfirmationTest.java        |   28 +-
 .../wss4j/SimpleSubjectCreatingInterceptor.java |    8 +-
 .../wss4j/StaxCryptoCoverageCheckerTest.java    |  160 +--
 .../security/wss4j/StaxRoundTripActionTest.java |  260 ++---
 .../ws/security/wss4j/StaxRoundTripTest.java    |  404 +++----
 .../StaxToDOMEncryptionIdentifierTest.java      |   84 +-
 .../security/wss4j/StaxToDOMRoundTripTest.java  |  432 ++++----
 .../wss4j/StaxToDOMSignatureIdentifierTest.java |   82 +-
 .../wss4j/UserNameTokenAuthorizationTest.java   |   38 +-
 .../ws/security/wss4j/WSS4JFaultCodeTest.java   |   36 +-
 .../cxf/ws/security/wss4j/WSS4JInOutTest.java   |  136 +--
 .../security/wss4j/WSS4JOutInterceptorTest.java |   28 +-
 .../wss4j/WSS4JPrincipalInterceptor.java        |   12 +-
 .../wss4j/saml/AbstractSAMLCallbackHandler.java |   34 +-
 .../wss4j/saml/CustomSamlValidator.java         |   22 +-
 .../wss4j/saml/CustomStaxSamlValidator.java     |   20 +-
 .../security/wss4j/saml/DOMToStaxSamlTest.java  |  110 +-
 .../wss4j/saml/PasswordCallbackHandler.java     |    2 +-
 .../wss4j/saml/PolicyBasedSamlTest.java         |   22 +-
 .../wss4j/saml/SAML1CallbackHandler.java        |   16 +-
 .../wss4j/saml/SAML2CallbackHandler.java        |   18 +-
 .../ws/security/wss4j/saml/SamlTokenTest.java   |  192 ++--
 .../security/wss4j/saml/StaxToDOMSamlTest.java  |  220 ++--
 rt/ws/transfer/pom.xml                          |    4 +
 .../apache/cxf/ws/transfer/dialect/Dialect.java |   10 +-
 .../dialect/fragment/FragmentDialect.java       |    4 +-
 .../fragment/FragmentDialectConstants.java      |   26 +-
 .../language/FragmentDialectLanguage.java       |    4 +-
 .../language/FragmentDialectLanguageQName.java  |    8 +-
 .../FragmentDialectLanguageXPath10.java         |   12 +-
 .../ws/transfer/manager/ResourceManager.java    |   10 +-
 .../cxf/ws/transfer/resource/ResourceLocal.java |   22 +-
 .../ws/transfer/resource/ResourceRemote.java    |    2 +-
 .../resourcefactory/ResourceFactoryImpl.java    |   26 +-
 .../resolver/ResourceReference.java             |   12 +-
 .../resolver/ResourceResolver.java              |    6 +-
 .../resolver/SimpleResourceResolver.java        |   16 +-
 .../ws/transfer/shared/TransferConstants.java   |   16 +-
 .../ResourceTransformer.java                    |    2 +-
 .../ResourceTypeIdentifierResult.java           |   12 +-
 .../ResourceValidator.java                      |    2 +-
 .../ValidAndTransformHelper.java                |    8 +-
 .../src/main/resources/schemas/transfer.xjb     |    3 +-
 .../integration/FragmentGetQNameTest.java       |   52 +-
 .../integration/FragmentGetXPath10Test.java     |  112 +-
 .../integration/FragmentPutAddTest.java         |   48 +-
 .../integration/FragmentPutInsertAfterTest.java |   40 +-
 .../FragmentPutInsertBeforeTest.java            |   40 +-
 .../integration/FragmentPutRemoveTest.java      |   24 +-
 .../integration/FragmentPutReplaceTest.java     |   82 +-
 .../integration/IntegrationBaseTest.java        |   44 +-
 .../integration/ResourceFactoryTest.java        |   36 +-
 .../ws/transfer/integration/ResourceTest.java   |   44 +-
 .../unit/MemoryResourceManagerTest.java         |   52 +-
 .../transfer/unit/XSDResourceValidatorTest.java |    8 +-
 .../unit/XSLTResourceTransformerTest.java       |    6 +-
 rt/wsdl/pom.xml                                 |    2 +
 .../cxf/wsdl/JAXBExtensibilityElement.java      |    2 +-
 .../apache/cxf/wsdl/JAXBExtensionHelper.java    |  126 +--
 .../cxf/wsdl/TExtensibilityElementImpl.java     |    4 +-
 .../cxf/wsdl/WSAEndpointReferenceUtils.java     |   28 +-
 .../java/org/apache/cxf/wsdl/WSDLConstants.java |   24 +-
 .../apache/cxf/wsdl/WSDLExtensionLoader.java    |    2 +-
 .../java/org/apache/cxf/wsdl/WSDLHelper.java    |   10 +-
 .../java/org/apache/cxf/wsdl/WSDLLibrary.java   |    8 +-
 .../java/org/apache/cxf/wsdl/WSDLManager.java   |   30 +-
 .../binding/AbstractWSDLBindingFactory.java     |   12 +-
 .../AbstractEndpointSelectionInterceptor.java   |    4 +-
 .../wsdl/interceptors/BareInInterceptor.java    |   10 +-
 .../wsdl/interceptors/BareOutInterceptor.java   |    6 +-
 .../interceptors/DocLiteralInInterceptor.java   |   80 +-
 .../interceptors/WrappedOutInterceptor.java     |    6 +-
 .../factory/AbstractServiceConfiguration.java   |   56 +-
 .../cxf/wsdl/service/factory/ClassReader.java   |    6 +-
 .../factory/DefaultServiceConfiguration.java    |   42 +-
 ...ethodNameSoapActionServiceConfiguration.java |    2 +-
 .../cxf/wsdl/service/factory/ParamReader.java   |   12 +-
 .../factory/ReflectionServiceFactoryBean.java   |   38 +-
 .../factory/WSDLBasedServiceConfiguration.java  |    2 +-
 .../factory/XercesSchemaValidationUtils.java    |   28 +-
 .../factory/XercesXsdValidationImpl.java        |    2 +-
 .../cxf/wsdl11/AbstractWrapperWSDLLocator.java  |    8 +-
 .../apache/cxf/wsdl11/CatalogWSDLLocator.java   |   10 +-
 .../java/org/apache/cxf/wsdl11/NSManager.java   |    4 +-
 .../apache/cxf/wsdl11/PartialWSDLProcessor.java |   44 +-
 .../cxf/wsdl11/ResourceManagerWSDLLocator.java  |    4 +-
 .../org/apache/cxf/wsdl11/SOAPBindingUtil.java  |    8 +-
 .../org/apache/cxf/wsdl11/SchemaSerializer.java |    2 +-
 .../java/org/apache/cxf/wsdl11/SchemaUtil.java  |   40 +-
 .../apache/cxf/wsdl11/ServiceWSDLBuilder.java   |  130 +--
 .../apache/cxf/wsdl11/WSDLEndpointFactory.java  |    2 +-
 .../org/apache/cxf/wsdl11/WSDLManagerImpl.java  |   58 +-
 .../apache/cxf/wsdl11/WSDLRuntimeException.java |    4 +-
 .../apache/cxf/wsdl11/WSDLServiceBuilder.java   |   42 +-
 .../apache/cxf/wsdl11/WSDLServiceFactory.java   |   14 +-
 .../cxf/wsdl/JAXBExtensionHelperTest.java       |   10 +-
 .../DocLiteralInInterceptorTest.java            |   74 +-
 .../ReflectionServiceFactorBeanTest.java        |   18 +-
 .../cxf/wsdl11/ServiceWSDLBuilderTest.java      |   76 +-
 .../apache/cxf/wsdl11/WSDLManagerImplTest.java  |   28 +-
 .../cxf/wsdl11/WSDLServiceBuilderTest.java      |  104 +-
 services/sts/sts-core/pom.xml                   |    6 +-
 .../java/org/apache/cxf/sts/IdentityMapper.java |    2 +-
 .../java/org/apache/cxf/sts/QNameConstants.java |   74 +-
 .../java/org/apache/cxf/sts/RealmParser.java    |    6 +-
 .../java/org/apache/cxf/sts/STSConstants.java   |   64 +-
 .../org/apache/cxf/sts/STSPropertiesMBean.java  |   58 +-
 .../org/apache/cxf/sts/SignatureProperties.java |   18 +-
 .../org/apache/cxf/sts/StaticSTSProperties.java |   88 +-
 .../cxf/sts/cache/AbstractIdentityCache.java    |   28 +-
 .../org/apache/cxf/sts/cache/CacheUtils.java    |   12 +-
 .../sts/cache/DefaultInMemoryTokenStore.java    |    2 +-
 .../cxf/sts/cache/EHCacheIdentityCache.java     |   28 +-
 .../cxf/sts/cache/HazelCastTokenStore.java      |   26 +-
 .../org/apache/cxf/sts/cache/IdentityCache.java |   10 +-
 .../cxf/sts/cache/MemoryIdentityCache.java      |   26 +-
 .../cache/MemoryIdentityCacheStatistics.java    |   12 +-
 .../org/apache/cxf/sts/claims/ClaimTypes.java   |   80 +-
 .../ClaimsAttributeStatementProvider.java       |   14 +-
 .../apache/cxf/sts/claims/ClaimsHandler.java    |    1 -
 .../apache/cxf/sts/claims/ClaimsManager.java    |   78 +-
 .../org/apache/cxf/sts/claims/ClaimsMapper.java |    2 +-
 .../apache/cxf/sts/claims/ClaimsParameters.java |   24 +-
 .../org/apache/cxf/sts/claims/ClaimsParser.java |    2 +-
 .../org/apache/cxf/sts/claims/ClaimsUtils.java  |    8 +-
 .../cxf/sts/claims/IdentityClaimsParser.java    |   14 +-
 .../cxf/sts/claims/LdapClaimsHandler.java       |   52 +-
 .../cxf/sts/claims/LdapGroupClaimsHandler.java  |   64 +-
 .../org/apache/cxf/sts/claims/LdapUtils.java    |   54 +-
 .../apache/cxf/sts/claims/ProcessedClaim.java   |    6 +-
 .../sts/claims/ProcessedClaimCollection.java    |    2 +-
 .../cxf/sts/claims/StaticClaimsHandler.java     |   12 +-
 .../sts/claims/StaticEndpointClaimsHandler.java |   12 +-
 .../cxf/sts/claims/mapper/ClaimUtils.java       |   24 +-
 .../cxf/sts/claims/mapper/JexlClaimsMapper.java |    4 +-
 .../claims/mapper/PassThroughClaimsMapper.java  |    4 +-
 .../apache/cxf/sts/event/AbstractSTSEvent.java  |    4 +-
 .../cxf/sts/event/AbstractSTSFailureEvent.java  |    8 +-
 .../cxf/sts/event/AbstractSTSSuccessEvent.java  |    4 +-
 .../cxf/sts/event/LoggerPatternLayoutLog4J.java |   16 +-
 .../sts/event/LoggerPatternLayoutLogback.java   |    6 +-
 .../cxf/sts/event/STSCancelFailureEvent.java    |    4 +-
 .../cxf/sts/event/STSCancelSuccessEvent.java    |    8 +-
 .../apache/cxf/sts/event/STSEventListener.java  |    2 +-
 .../apache/cxf/sts/event/STSFailureEvent.java   |    2 +-
 .../cxf/sts/event/STSIssueFailureEvent.java     |    8 +-
 .../cxf/sts/event/STSIssueSuccessEvent.java     |    4 +-
 .../cxf/sts/event/STSRenewFailureEvent.java     |   10 +-
 .../cxf/sts/event/STSRenewSuccessEvent.java     |    6 +-
 .../cxf/sts/event/STSValidateFailureEvent.java  |    8 +-
 .../cxf/sts/event/STSValidateSuccessEvent.java  |    8 +-
 .../event/TokenCancellerParametersSupport.java  |    4 +-
 .../event/TokenProviderParametersSupport.java   |    4 +-
 .../event/TokenRenewerParametersSupport.java    |    4 +-
 .../event/TokenValidatorParametersSupport.java  |    4 +-
 .../apache/cxf/sts/event/map/EventMapper.java   |    8 +-
 .../org/apache/cxf/sts/event/map/MapEvent.java  |    2 +-
 .../cxf/sts/event/map/MapEventLogger.java       |    6 +-
 .../cxf/sts/interceptor/SCTInInterceptor.java   |    8 +-
 .../cxf/sts/interceptor/SCTOutInterceptor.java  |    6 +-
 .../cxf/sts/operation/AbstractOperation.java    |  162 +--
 .../cxf/sts/operation/DefaultTokenWrapper.java  |    4 +-
 .../cxf/sts/operation/TokenCancelOperation.java |   44 +-
 .../cxf/sts/operation/TokenIssueOperation.java  |   98 +-
 .../cxf/sts/operation/TokenRenewOperation.java  |   72 +-
 .../TokenRequestCollectionOperation.java        |   22 +-
 .../sts/operation/TokenValidateOperation.java   |   90 +-
 .../apache/cxf/sts/operation/TokenWrapper.java  |    6 +-
 .../DefaultSecurityTokenServiceProvider.java    |   34 +-
 .../apache/cxf/sts/request/BinarySecret.java    |    8 +-
 .../org/apache/cxf/sts/request/Entropy.java     |    8 +-
 .../apache/cxf/sts/request/KeyRequirements.java |   44 +-
 .../org/apache/cxf/sts/request/Lifetime.java    |    6 +-
 .../apache/cxf/sts/request/Participants.java    |   10 +-
 .../org/apache/cxf/sts/request/ReceivedKey.java |    6 +-
 .../apache/cxf/sts/request/ReceivedToken.java   |   22 +-
 .../org/apache/cxf/sts/request/Renewing.java    |    2 +-
 .../apache/cxf/sts/request/RequestParser.java   |  153 +--
 .../cxf/sts/request/RequestRequirements.java    |   10 +-
 .../cxf/sts/request/TokenRequirements.java      |   52 +-
 .../cxf/sts/rest/RESTSecurityTokenService.java  |   12 +-
 .../sts/rest/RESTSecurityTokenServiceImpl.java  |   98 +-
 .../cxf/sts/service/EncryptionProperties.java   |   28 +-
 .../apache/cxf/sts/service/ServiceMBean.java    |   18 +-
 .../apache/cxf/sts/service/StaticService.java   |   22 +-
 .../cxf/sts/token/canceller/SCTCanceller.java   |   40 +-
 .../cxf/sts/token/canceller/TokenCanceller.java |    4 +-
 .../canceller/TokenCancellerParameters.java     |   14 +-
 .../token/canceller/TokenCancellerResponse.java |    4 +-
 .../token/delegation/HOKDelegationHandler.java  |    8 +-
 .../token/delegation/SAMLDelegationHandler.java |   28 +-
 .../delegation/TokenDelegationHandler.java      |    6 +-
 .../delegation/TokenDelegationParameters.java   |   16 +-
 .../delegation/TokenDelegationResponse.java     |    8 +-
 .../UsernameTokenDelegationHandler.java         |    8 +-
 .../provider/AbstractSAMLTokenProvider.java     |   14 +-
 .../ActAsAttributeStatementProvider.java        |   18 +-
 .../provider/AttributeStatementProvider.java    |    2 +-
 .../provider/AuthDecisionStatementProvider.java |    2 +-
 .../AuthenticationStatementProvider.java        |    2 +-
 .../sts/token/provider/ConditionsProvider.java  |    6 +-
 .../DefaultAttributeStatementProvider.java      |   12 +-
 .../provider/DefaultConditionsProvider.java     |   54 +-
 .../token/provider/DefaultSubjectProvider.java  |    2 +-
 .../sts/token/provider/SAMLTokenProvider.java   |  130 +--
 .../cxf/sts/token/provider/SCTProvider.java     |   50 +-
 .../sts/token/provider/SamlCallbackHandler.java |   30 +-
 .../sts/token/provider/SamlCustomHandler.java   |   64 +-
 .../cxf/sts/token/provider/SubjectProvider.java |    2 +-
 .../provider/SubjectProviderParameters.java     |   26 +-
 .../sts/token/provider/SymmetricKeyHandler.java |   42 +-
 .../cxf/sts/token/provider/TokenProvider.java   |    4 +-
 .../token/provider/TokenProviderParameters.java |   22 +-
 .../token/provider/TokenProviderResponse.java   |   24 +-
 .../sts/token/provider/TokenProviderUtils.java  |   50 +-
 .../cxf/sts/token/provider/TokenReference.java  |   24 +-
 .../provider/jwt/DefaultJWTClaimsProvider.java  |   84 +-
 .../token/provider/jwt/JWTClaimsProvider.java   |    2 +-
 .../jwt/JWTClaimsProviderParameters.java        |    8 +-
 .../token/provider/jwt/JWTTokenProvider.java    |   70 +-
 .../sts/token/realm/CertConstraintsParser.java  |   10 +-
 .../cxf/sts/token/realm/JWTRealmCodec.java      |    4 +-
 .../cxf/sts/token/realm/RealmProperties.java    |   46 +-
 .../cxf/sts/token/realm/RealmSupport.java       |    3 +-
 .../cxf/sts/token/realm/Relationship.java       |   28 +-
 .../sts/token/realm/RelationshipResolver.java   |   16 +-
 .../apache/cxf/sts/token/realm/SAMLRealm.java   |    2 +-
 .../cxf/sts/token/realm/SAMLRealmCodec.java     |    4 +-
 .../token/realm/UsernameTokenRealmCodec.java    |    4 +-
 .../cxf/sts/token/renewer/SAMLTokenRenewer.java |  141 +--
 .../cxf/sts/token/renewer/TokenRenewer.java     |    8 +-
 .../token/renewer/TokenRenewerParameters.java   |   22 +-
 .../sts/token/renewer/TokenRenewerResponse.java |   24 +-
 .../token/validator/DefaultSAMLRoleParser.java  |   16 +-
 .../validator/DefaultSubjectRoleParser.java     |   18 +-
 .../cxf/sts/token/validator/SAMLRoleParser.java |    2 +-
 .../sts/token/validator/SAMLTokenValidator.java |   92 +-
 .../cxf/sts/token/validator/SCTValidator.java   |   20 +-
 .../sts/token/validator/SubjectRoleParser.java  |    6 +-
 .../cxf/sts/token/validator/TokenValidator.java |    4 +-
 .../validator/TokenValidatorParameters.java     |   16 +-
 .../token/validator/TokenValidatorResponse.java |   16 +-
 .../token/validator/UsernameTokenValidator.java |   64 +-
 .../sts/token/validator/X509TokenValidator.java |   28 +-
 .../validator/jwt/DefaultJWTRoleParser.java     |   10 +-
 .../sts/token/validator/jwt/JWTRoleParser.java  |    2 +-
 .../token/validator/jwt/JWTTokenValidator.java  |   48 +-
 .../cxf/sts/cache/CacheIdentityMapper.java      |   10 +-
 .../cxf/sts/cache/EhCacheIdentityCacheTest.java |   38 +-
 .../cxf/sts/cache/HazelCastTokenStoreTest.java  |   16 +-
 .../cxf/sts/cache/MemoryIdentityCacheTest.java  |   32 +-
 .../sts/claims/mapper/JexlClaimsMapperTest.java |   12 +-
 .../claims/mapper/JexlIssueSamlClaimsTest.java  |   12 +-
 .../cxf/sts/common/CustomAttributeProvider.java |   30 +-
 .../cxf/sts/common/CustomClaimParser.java       |   12 +-
 .../cxf/sts/common/CustomClaimsHandler.java     |   36 +-
 .../cxf/sts/common/CustomUserClaimsHandler.java |   24 +-
 .../sts/common/RealmSupportClaimsHandler.java   |   26 +-
 .../org/apache/cxf/sts/common/TestUtils.java    |    4 +-
 .../cxf/sts/operation/CancelSCTUnitTest.java    |   66 +-
 .../cxf/sts/operation/CustomClaimsMapper.java   |    6 +-
 .../cxf/sts/operation/CustomRealmParser.java    |    4 +-
 .../CustomUsernameTokenRealmCodec.java          |    4 +-
 .../cxf/sts/operation/DummyTokenProvider.java   |   26 +-
 .../cxf/sts/operation/DummyTokenValidator.java  |   18 +-
 .../sts/operation/IssueEncryptedUnitTest.java   |  204 ++--
 .../sts/operation/IssueJWTClaimsUnitTest.java   |  262 ++---
 .../operation/IssueJWTOnbehalfofUnitTest.java   |  128 +--
 .../sts/operation/IssueJWTRealmUnitTest.java    |  158 +--
 .../cxf/sts/operation/IssueJWTUnitTest.java     |   58 +-
 .../sts/operation/IssueOnbehalfofUnitTest.java  |  344 +++---
 .../cxf/sts/operation/IssueSCTUnitTest.java     |  114 +-
 .../sts/operation/IssueSamlClaimsUnitTest.java  |  348 +++---
 .../sts/operation/IssueSamlRealmUnitTest.java   |  194 ++--
 .../cxf/sts/operation/IssueSamlUnitTest.java    |  616 +++++------
 .../apache/cxf/sts/operation/IssueUnitTest.java |  206 ++--
 .../cxf/sts/operation/RenewSamlUnitTest.java    |  198 ++--
 .../ValidateJWTTransformationTest.java          |  164 +--
 .../cxf/sts/operation/ValidateJWTUnitTest.java  |   66 +-
 .../cxf/sts/operation/ValidateSCTUnitTest.java  |   70 +-
 .../cxf/sts/operation/ValidateSamlUnitTest.java |   80 +-
 .../ValidateTokenTransformationUnitTest.java    |  344 +++---
 .../cxf/sts/operation/ValidateUnitTest.java     |  132 +--
 .../ValidateUsernameTokenUnitTest.java          |   84 +-
 .../operation/ValidateX509TokenUnitTest.java    |   90 +-
 .../cxf/sts/request/RequestParserUnitTest.java  |   62 +-
 .../sts/token/canceller/SCTCancellerTest.java   |   64 +-
 .../provider/CustomAuthDecisionProvider.java    |    4 +-
 .../provider/CustomAuthenticationProvider.java  |    6 +-
 .../token/provider/CustomSubjectProvider.java   |   14 +-
 .../cxf/sts/token/provider/JWTClaimsTest.java   |  106 +-
 .../token/provider/JWTProviderActAsTest.java    |   62 +-
 .../token/provider/JWTProviderLifetimeTest.java |  156 +--
 .../provider/JWTProviderOnBehalfOfTest.java     |   62 +-
 .../provider/JWTTokenProviderRealmTest.java     |   32 +-
 .../token/provider/JWTTokenProviderTest.java    |  160 +--
 .../cxf/sts/token/provider/SAMLClaimsTest.java  |  172 +--
 .../token/provider/SAMLProviderActAsTest.java   |  162 +--
 .../token/provider/SAMLProviderCustomTest.java  |  132 +--
 .../token/provider/SAMLProviderKeyTypeTest.java |  216 ++--
 .../provider/SAMLProviderLifetimeTest.java      |  142 +--
 .../provider/SAMLProviderOnBehalfOfTest.java    |   86 +-
 .../token/provider/SAMLProviderRealmTest.java   |   48 +-
 .../cxf/sts/token/provider/SCTProviderTest.java |   76 +-
 .../cxf/sts/token/realm/RealmSupportTest.java   |   92 +-
 .../renewer/SAMLTokenRenewerLifetimeTest.java   |  120 +-
 .../token/renewer/SAMLTokenRenewerPOPTest.java  |   98 +-
 .../renewer/SAMLTokenRenewerRealmTest.java      |  102 +-
 .../sts/token/renewer/SAMLTokenRenewerTest.java |  200 ++--
 .../token/validator/CacheSAMLRealmCodec.java    |    2 +-
 .../token/validator/IssuerSAMLRealmCodec.java   |    4 +-
 .../validator/JWTTokenValidatorRealmTest.java   |   86 +-
 .../token/validator/JWTTokenValidatorTest.java  |  158 +--
 .../SAMLTokenValidatorCachedRealmTest.java      |   72 +-
 .../validator/SAMLTokenValidatorRealmTest.java  |   74 +-
 .../token/validator/SAMLTokenValidatorTest.java |  244 ++---
 .../sts/token/validator/SCTValidatorTest.java   |   68 +-
 .../validator/UsernameTokenValidatorTest.java   |   88 +-
 .../token/validator/X509TokenValidatorTest.java |   62 +-
 services/sts/systests/advanced/pom.xml          |    6 +
 .../AsymmetricEncryptionTest.java               |   22 +-
 .../systest/sts/asymmetric_encr/STSServer.java  |    2 +-
 .../sts/asymmetric_encr/StaxSTSServer.java      |    2 +-
 .../sts/basic_auth/DoubleItPortTypeImpl.java    |   10 +-
 .../sts/basic_auth/JaxrsBasicAuthTest.java      |   16 +-
 .../sts/basic_auth/JaxwsBasicAuthTest.java      |   36 +-
 .../cxf/systest/sts/batch/BatchRequest.java     |    6 +-
 .../systest/sts/batch/SAMLBatchUnitTest.java    |   50 +-
 .../apache/cxf/systest/sts/batch/STSServer.java |    2 +-
 .../systest/sts/batch/SimpleBatchSTSClient.java |  146 +--
 .../cxf/systest/sts/batch/StaxSTSServer.java    |    2 +-
 .../BinarySecurityTokenTest.java                |   40 +-
 .../cxf/systest/sts/caching/CachingTest.java    |   50 +-
 .../sts/caching/DoubleItPortTypeImpl.java       |   12 +-
 .../systest/sts/caching/ServerCachingTest.java  |   64 +-
 .../sts/claims/ClaimsCallbackHandler.java       |   12 +-
 .../cxf/systest/sts/claims/ClaimsTest.java      |  124 +--
 .../cxf/systest/sts/claims/ClaimsValidator.java |   22 +-
 .../systest/sts/claims/StaxClaimsValidator.java |   28 +-
 .../sts/common/DoubleItPortTypeImpl.java        |   14 +-
 .../systest/sts/common/SecurityTestUtil.java    |    8 +-
 .../cxf/systest/sts/common/TestParam.java       |    8 +-
 .../cxf/systest/sts/common/TokenTestUtils.java  |   12 +-
 .../sts/cross_domain/CrossDomainTest.java       |   34 +-
 .../sts/cross_domain/CrossDomainValidator.java  |    4 +-
 .../cxf/systest/sts/cross_domain/STSServer.java |    2 +-
 .../systest/sts/cross_domain/STSServer2.java    |    2 +-
 .../systest/sts/custom/CustomClaimsHandler.java |   95 ++
 .../systest/sts/custom/CustomParameterTest.java |  269 +++++
 .../systest/sts/custom/CustomUTValidator.java   |   76 ++
 .../cxf/systest/sts/custom/STSServer.java       |   50 +
 .../apache/cxf/systest/sts/custom/Server.java   |   46 +
 .../CustomBSTTokenValidator.java                |    6 +-
 .../custom_onbehalfof/CustomOnBehalfOfTest.java |   14 +-
 .../sts/custom_onbehalfof/STSServer.java        |    2 +-
 .../CustomAttributeStatementProvider.java       |   14 +-
 .../sts/deployment/CustomBSTTokenProvider.java  |   16 +-
 .../sts/deployment/CustomBSTTokenValidator.java |   16 +-
 .../sts/deployment/CustomClaimsHandler.java     |   18 +-
 .../sts/deployment/CustomClaimsParser.java      |   16 +-
 .../cxf/systest/sts/deployment/STSServer.java   |    2 +-
 .../systest/sts/deployment/StaxSTSServer.java   |    2 +-
 .../CustomUsernameTokenProvider.java            |   16 +-
 .../DistributedCachingTest.java                 |   24 +-
 .../distributed_caching/SCTTokenValidator.java  |   16 +-
 .../sts/distributed_caching/STSServer.java      |    2 +-
 .../sts/distributed_caching/STSServer2.java     |    2 +-
 .../systest/sts/jwt/DoubleItPortTypeImpl.java   |   10 +-
 .../apache/cxf/systest/sts/jwt/JWTUnitTest.java |   22 +-
 .../cxf/systest/sts/jwt/JaxrsJWTTest.java       |   34 +-
 .../sts/kerberos/DoubleItPortTypeImpl.java      |   14 +-
 .../sts/kerberos/IntermediaryPortTypeImpl.java  |   26 +-
 .../kerberos/JAXRSIntermediaryPortTypeImpl.java |   20 +-
 .../kerberos/KerberosDelegationTokenTest.java   |   34 +-
 .../systest/sts/realms/DifferentRealmTest.java  |   34 +-
 .../sts/realms/DifferentRealmValidator.java     |    6 +-
 .../sts/realms/IssuerSAMLRealmCodec.java        |    4 +-
 .../cxf/systest/sts/realms/STSServer.java       |    2 +-
 .../cxf/systest/sts/realms/STSServer2.java      |    2 +-
 .../cxf/systest/sts/realms/URLRealmParser.java  |    4 +-
 .../cxf/systest/sts/renew/SAMLRenewTest.java    |   58 +-
 .../systest/sts/renew/SAMLRenewUnitTest.java    |  124 +--
 .../apache/cxf/systest/sts/renew/STSServer.java |    2 +-
 .../cxf/systest/sts/renew/STSServerPOP.java     |    2 +-
 .../cxf/systest/sts/renew/StaxSTSServer.java    |    2 +-
 .../sts/renew/UsernameTokenValidator.java       |   12 +-
 .../sts/secure_conv/DoubleItPortTypeImpl.java   |   10 +-
 .../sts/secure_conv/SCTSAMLTokenProvider.java   |   18 +-
 .../sts/secure_conv/SCTTokenValidator.java      |   13 +-
 .../cxf/systest/sts/secure_conv/STSServer.java  |    2 +-
 .../sts/secure_conv/SecureConversationTest.java |   30 +-
 .../SecurityContextTokenCancelTest.java         |   32 +-
 .../SecurityContextTokenUnitTest.java           |   58 +-
 .../systest/sts/secure_conv/StaxSTSServer.java  |    2 +-
 .../cxf/systest/sts/soap12/Soap12Test.java      |   56 +-
 .../STSSenderVouchesTest.java                   |   28 +-
 .../sts/sts_sender_vouches/STSServer.java       |    2 +-
 .../sts_sender_vouches/SVSubjectProvider.java   |    6 +-
 .../sts/sts_sender_vouches/StaxSTSServer.java   |    2 +-
 .../transformation/DoubleItPortTypeImpl.java    |   16 +-
 .../sts/transformation/TransformationTest.java  |   26 +-
 .../sts/usernametoken/UsernameTokenTest.java    |   58 +-
 .../src/test/resources/logging.properties       |    2 +-
 .../systest/sts/asymmetric_encr/cxf-client.xml  |    2 +-
 .../cxf/systest/sts/asymmetric_encr/cxf-sts.xml |    2 +-
 .../sts/asymmetric_encr/stax-cxf-sts.xml        |    2 +-
 .../systest/sts/basic_auth/cxf-bad-client.xml   |    2 +-
 .../cxf/systest/sts/basic_auth/cxf-client.xml   |    2 +-
 .../cxf/systest/sts/basic_auth/cxf-service.xml  |    2 +-
 .../systest/sts/basic_auth/stax-cxf-service.xml |    2 +-
 .../cxf/systest/sts/batch/cxf-client-unit.xml   |    2 +-
 .../apache/cxf/systest/sts/batch/cxf-sts.xml    |    2 +-
 .../cxf/systest/sts/batch/stax-cxf-sts.xml      |    2 +-
 .../sts/binarysecuritytoken/cxf-bad-client.xml  |    2 +-
 .../sts/binarysecuritytoken/cxf-client.xml      |    2 +-
 .../sts/binarysecuritytoken/cxf-service.xml     |    2 +-
 .../binarysecuritytoken/stax-cxf-service.xml    |    2 +-
 .../systest/sts/caching/cxf-caching-service.xml |    2 +-
 .../cxf/systest/sts/caching/cxf-client.xml      |    2 +-
 .../cxf/systest/sts/caching/cxf-service.xml     |    2 +-
 .../cxf/systest/sts/claims/cxf-bad-client.xml   |    2 +-
 .../systest/sts/claims/cxf-client-cbhandler.xml |    2 +-
 .../cxf/systest/sts/claims/cxf-client.xml       |    2 +-
 .../cxf/systest/sts/claims/cxf-service.xml      |    2 +-
 .../cxf/systest/sts/claims/stax-cxf-service.xml |    2 +-
 .../cxf/systest/sts/cross_domain/cxf-client.xml |    2 +-
 .../systest/sts/cross_domain/cxf-service.xml    |    2 +-
 .../systest/sts/cross_domain/cxf-sts-saml1.xml  |    2 +-
 .../systest/sts/cross_domain/cxf-sts-saml2.xml  |    2 +-
 .../apache/cxf/systest/sts/custom/DoubleIt.wsdl |  239 ++++
 .../cxf/systest/sts/custom/cxf-client.xml       |   45 +
 .../cxf/systest/sts/custom/cxf-service.xml      |   47 +
 .../cxf/systest/sts/custom/cxf-sts-common.xml   |  129 +++
 .../apache/cxf/systest/sts/custom/cxf-sts.xml   |   48 +
 .../sts/custom_onbehalfof/cxf-client.xml        |    2 +-
 .../sts/custom_onbehalfof/cxf-service.xml       |    2 +-
 .../systest/sts/custom_onbehalfof/cxf-sts.xml   |    2 +-
 .../systest/sts/deployment/cxf-sts-common.xml   |    2 +-
 .../cxf/systest/sts/deployment/cxf-sts.xml      |    2 +-
 .../cxf/systest/sts/deployment/stax-cxf-sts.xml |    2 +-
 .../sts/deployment/ws-trust-1.4-service.wsdl    |   41 +
 .../sts/distributed_caching/cxf-client.xml      |    2 +-
 .../sts/distributed_caching/cxf-service.xml     |    2 +-
 .../sts/distributed_caching/cxf-sts-1.xml       |    2 +-
 .../sts/distributed_caching/cxf-sts-2.xml       |    2 +-
 .../apache/cxf/systest/sts/jwt/cxf-client.xml   |    2 +-
 .../apache/cxf/systest/sts/jwt/cxf-service.xml  |    2 +-
 .../sts/kerberos/cxf-intermediary-client.xml    |    2 +-
 .../kerberos/cxf-intermediary-jaxrs-client.xml  |    2 +-
 .../systest/sts/kerberos/cxf-intermediary.xml   |    2 +-
 .../cxf/systest/sts/kerberos/cxf-service.xml    |    2 +-
 .../cxf/systest/sts/realms/cxf-client.xml       |    2 +-
 .../cxf/systest/sts/realms/cxf-service.xml      |    2 +-
 .../cxf/systest/sts/realms/cxf-sts-saml1.xml    |    2 +-
 .../cxf/systest/sts/realms/cxf-sts-saml2.xml    |    2 +-
 .../cxf/systest/sts/renew/cxf-client-unit.xml   |    2 +-
 .../apache/cxf/systest/sts/renew/cxf-client.xml |    2 +-
 .../cxf/systest/sts/renew/cxf-service.xml       |    2 +-
 .../cxf/systest/sts/renew/cxf-sts-pop.xml       |    2 +-
 .../apache/cxf/systest/sts/renew/cxf-sts.xml    |    2 +-
 .../cxf/systest/sts/renew/stax-cxf-sts.xml      |    2 +-
 .../cxf/systest/sts/secure_conv/cxf-client.xml  |    2 +-
 .../cxf/systest/sts/secure_conv/cxf-service.xml |    2 +-
 .../cxf/systest/sts/secure_conv/cxf-sts.xml     |    2 +-
 .../systest/sts/secure_conv/stax-cxf-sts.xml    |    2 +-
 .../cxf/systest/sts/soap12/cxf-client.xml       |    2 +-
 .../cxf/systest/sts/soap12/cxf-service.xml      |    2 +-
 .../cxf/systest/sts/soap12/stax-cxf-service.xml |    2 +-
 .../sts/sts_sender_vouches/cxf-client.xml       |    2 +-
 .../sts/sts_sender_vouches/cxf-service.xml      |    2 +-
 .../systest/sts/sts_sender_vouches/cxf-sts.xml  |    2 +-
 .../sts/sts_sender_vouches/stax-cxf-sts.xml     |    2 +-
 .../systest/sts/transformation/cxf-client.xml   |    2 +-
 .../systest/sts/transformation/cxf-service.xml  |    2 +-
 .../sts/usernametoken/cxf-bad-client.xml        |    2 +-
 .../systest/sts/usernametoken/cxf-client.xml    |    2 +-
 .../systest/sts/usernametoken/cxf-service.xml   |    2 +-
 .../sts/usernametoken/stax-cxf-service.xml      |    2 +-
 services/sts/systests/basic/pom.xml             |    6 +
 .../sts/asymmetric/AsymmetricBindingTest.java   |   70 +-
 .../cxf/systest/sts/bearer/BearerTest.java      |   44 +-
 .../sts/bearer/Saml2CallbackHandler.java        |   12 +-
 .../cxf/systest/sts/common/DoubleItImpl.java    |   10 +-
 .../sts/common/DoubleItPortTypeImpl.java        |   12 +-
 .../systest/sts/common/SecurityTestUtil.java    |    8 +-
 .../cxf/systest/sts/common/TestParam.java       |    8 +-
 .../cxf/systest/sts/common/TokenTestUtils.java  |   12 +-
 .../cxf/systest/sts/common/UriRealmParser.java  |    8 +-
 .../sts/delegation/SAMLDelegationTest.java      |  114 +-
 .../sts/deployment/CustomClaimsHandler.java     |   18 +-
 .../cxf/systest/sts/deployment/STSServer.java   |    4 +-
 .../systest/sts/deployment/StaxSTSServer.java   |    4 +-
 .../IntermediaryCachingPortTypeImpl.java        |   26 +-
 .../IntermediaryPortTypeImpl.java               |   22 +-
 .../IntermediaryTransformationCachingTest.java  |   36 +-
 .../IntermediaryTransformationTest.java         |   38 +-
 .../OnBehalfOfValidator.java                    |   12 +-
 .../cxf/systest/sts/issuer/IssuerTest.java      |   34 +-
 .../systest/sts/issueunit/IssueUnitTest.java    |  197 ++--
 .../systest/sts/jaas/DoubleItPortTypeImpl.java  |   10 +-
 .../apache/cxf/systest/sts/jaas/JAASTest.java   |  128 +--
 .../cxf/systest/sts/rest/STSRESTTest.java       |  501 +++++----
 .../sts/sendervouches/DoubleItPortTypeImpl.java |   20 +-
 .../sts/sendervouches/Saml2CallbackHandler.java |   18 +-
 .../sts/sendervouches/SenderVouchesTest.java    |   26 +-
 .../systest/sts/stsclient/STSClientTest.java    |   24 +-
 .../stsclient/STSTokenOutInterceptorTest.java   |   90 +-
 .../sts/stsclient/STSTokenRetrieverTest.java    |   42 +-
 .../sts/symmetric/SymmetricBindingTest.java     |  116 +-
 .../cxf/systest/sts/template/TemplateTest.java  |  104 +-
 .../sts/transport/TransportBindingTest.java     |  136 +--
 .../sts/username_actas/ActAsValidator.java      |   12 +-
 .../UsernameActAsCachingTest.java               |  128 +--
 .../sts/username_actas/UsernameActAsTest.java   |   48 +-
 .../UsernameOnBehalfOfCachingTest.java          |  140 +--
 .../UsernameOnBehalfOfTest.java                 |   46 +-
 .../UsernameTokenValidator.java                 |   12 +-
 .../cxf/systest/sts/x509/AsymmetricServer.java  |    2 +-
 .../x509/CustomWSS4JSecurityContextCreator.java |   30 +-
 .../org/apache/cxf/systest/sts/x509/Server.java |    2 +-
 .../apache/cxf/systest/sts/x509/StaxServer.java |    2 +-
 .../sts/x509/X509AsymmetricBindingTest.java     |   22 +-
 .../sts/x509/X509SymmetricBindingTest.java      |   84 +-
 .../cxf/systest/sts/asymmetric/cxf-client.xml   |    2 +-
 .../cxf/systest/sts/asymmetric/cxf-service.xml  |    2 +-
 .../systest/sts/asymmetric/cxf-stax-service.xml |    2 +-
 .../cxf/systest/sts/bearer/cxf-client.xml       |    2 +-
 .../cxf/systest/sts/bearer/cxf-service.xml      |    2 +-
 .../cxf/systest/sts/bearer/cxf-stax-service.xml |    2 +-
 .../systest/sts/bearer/cxf-unsigned-client.xml  |    2 +-
 .../cxf/systest/sts/delegation/cxf-client.xml   |    2 +-
 .../sts/delegation/cxf-sts-transport.xml        |    2 +-
 .../systest/sts/deployment/cxf-transport.xml    |    2 +-
 .../systest/sts/deployment/cxf-ut-encrypted.xml |    2 +-
 .../cxf/systest/sts/deployment/cxf-ut.xml       |    2 +-
 .../cxf/systest/sts/deployment/cxf-x509.xml     |    2 +-
 .../sts/deployment/stax-cxf-transport.xml       |    2 +-
 .../sts/deployment/stax-cxf-ut-encrypted.xml    |    2 +-
 .../cxf/systest/sts/deployment/stax-cxf-ut.xml  |    2 +-
 .../systest/sts/deployment/stax-cxf-x509.xml    |    2 +-
 .../cxf/systest/sts/deployment/sts/cxf-sts.xml  |    2 +-
 .../cxf/systest/sts/deployment/sts/realms.xml   |    2 +-
 .../cxf-bad-client.xml                          |    2 +-
 .../intermediary_transformation/cxf-client.xml  |    2 +-
 .../cxf-intermediary-caching.xml                |    2 +-
 .../cxf-intermediary.xml                        |    2 +-
 .../intermediary_transformation/cxf-service.xml |    2 +-
 .../cxf/systest/sts/issuer/cxf-client.xml       |    2 +-
 .../sts/issuer/cxf-issuer-sts-transport.xml     |    2 +-
 .../cxf/systest/sts/issuer/cxf-service.xml      |    2 +-
 .../cxf/systest/sts/issueunit/cxf-client.xml    |    2 +-
 .../apache/cxf/systest/sts/jaas/cxf-client.xml  |    2 +-
 .../apache/cxf/systest/sts/jaas/cxf-service.xml |    2 +-
 .../cxf/systest/sts/jaas/cxf-service2.xml       |    2 +-
 .../cxf/systest/sts/jaas/cxf-sts-client.xml     |    2 +-
 .../apache/cxf/systest/sts/rest/cxf-client.xml  |    2 +-
 .../cxf/systest/sts/rest/cxf-rest-sts.xml       |    2 +-
 .../systest/sts/sendervouches/cxf-client.xml    |    2 +-
 .../sts/sendervouches/cxf-intermediary.xml      |    2 +-
 .../systest/sts/sendervouches/cxf-service.xml   |    2 +-
 .../sts/sendervouches/cxf-stax-intermediary.xml |    2 +-
 .../sts/sendervouches/cxf-stax-service.xml      |    2 +-
 .../systest/sts/stsclient/cxf-client-name.xml   |    2 +-
 .../sts/stsclient/cxf-default-client.xml        |    2 +-
 .../cxf/systest/sts/stsclient/cxf-service.xml   |    2 +-
 .../cxf/systest/sts/symmetric/cxf-client.xml    |    2 +-
 .../cxf/systest/sts/symmetric/cxf-service.xml   |    2 +-
 .../systest/sts/symmetric/cxf-stax-service.xml  |    2 +-
 .../cxf/systest/sts/template/cxf-client.xml     |    2 +-
 .../cxf/systest/sts/template/cxf-service.xml    |    2 +-
 .../systest/sts/template/cxf-stax-service.xml   |    2 +-
 .../systest/sts/transport/cxf-bad-client.xml    |    2 +-
 .../cxf/systest/sts/transport/cxf-client.xml    |    2 +-
 .../cxf/systest/sts/transport/cxf-service.xml   |    2 +-
 .../systest/sts/transport/cxf-stax-service.xml  |    2 +-
 .../systest/sts/username_actas/cxf-client.xml   |    2 +-
 .../systest/sts/username_actas/cxf-service.xml  |    2 +-
 .../systest/sts/username_actas/cxf-service2.xml |    2 +-
 .../sts/username_onbehalfof/cxf-client.xml      |    2 +-
 .../sts/username_onbehalfof/cxf-service.xml     |    2 +-
 .../sts/username_onbehalfof/cxf-service2.xml    |    2 +-
 .../systest/sts/x509/cxf-asymmetric-service.xml |    2 +-
 .../apache/cxf/systest/sts/x509/cxf-client.xml  |    2 +-
 .../apache/cxf/systest/sts/x509/cxf-service.xml |    2 +-
 .../cxf/systest/sts/x509/cxf-stax-service.xml   |    2 +-
 .../src/main/resources/features.xml             |    1 +
 .../sts/itests/BasicSTSIntegrationTest.java     |    4 +-
 .../systest/sts/itests/unit/STSUnitTest.java    |   37 +-
 .../org/apache/cxf/ws/discovery/WSDVersion.java |   24 +-
 .../cxf/ws/discovery/WSDiscoveryClient.java     |   74 +-
 .../cxf/ws/discovery/WSDiscoveryService.java    |    8 +-
 .../internal/WSDiscoveryServiceImpl.java        |   90 +-
 .../listeners/WSDiscoveryServerListener.java    |   16 +-
 .../cxf/ws/discovery/WSDiscoveryClientTest.java |   55 +-
 .../org/apache/cxf/wsn/client/Consumer.java     |    4 +-
 .../apache/cxf/wsn/client/CreatePullPoint.java  |   10 +-
 .../cxf/wsn/client/NotificationBroker.java      |   64 +-
 .../org/apache/cxf/wsn/client/Publisher.java    |   18 +-
 .../org/apache/cxf/wsn/client/PullPoint.java    |    2 +-
 .../org/apache/cxf/wsn/util/CXFWSNHelper.java   |   17 +-
 .../org/apache/cxf/wsn/util/IdGenerator.java    |   14 +-
 .../java/org/apache/cxf/wsn/util/WSNHelper.java |   30 +-
 .../org/apache/cxf/wsn/wsdl/WSNWSDLLocator.java |    6 +-
 services/wsn/wsn-core/pom.xml                   |    2 -
 .../apache/cxf/wsn/AbstractCreatePullPoint.java |   16 +-
 .../org/apache/cxf/wsn/AbstractEndpoint.java    |    4 +-
 .../cxf/wsn/AbstractNotificationBroker.java     |   64 +-
 .../org/apache/cxf/wsn/AbstractPublisher.java   |   16 +-
 .../org/apache/cxf/wsn/AbstractPullPoint.java   |   28 +-
 .../apache/cxf/wsn/AbstractSubscription.java    |   66 +-
 .../apache/cxf/wsn/CreatePullPointMBean.java    |    6 +-
 .../java/org/apache/cxf/wsn/EndpointMBean.java  |    6 +-
 .../apache/cxf/wsn/NotificationBrokerMBean.java |   10 +-
 .../apache/cxf/wsn/jms/JmsCreatePullPoint.java  |    4 +-
 .../cxf/wsn/jms/JmsNotificationBroker.java      |    8 +-
 .../org/apache/cxf/wsn/jms/JmsPublisher.java    |    8 +-
 .../org/apache/cxf/wsn/jms/JmsPullPoint.java    |   52 +-
 .../org/apache/cxf/wsn/jms/JmsSubscription.java |   10 +-
 .../cxf/wsn/services/JaxwsCreatePullPoint.java  |    2 +-
 .../cxf/wsn/services/JaxwsEndpointManager.java  |   16 +-
 .../wsn/services/JaxwsNotificationBroker.java   |    4 +-
 .../services/JaxwsNotificationBrokerMBean.java  |    2 +-
 .../cxf/wsn/services/JaxwsSubscription.java     |    2 +-
 .../wsn/services/OSGiJaxwsEndpointManager.java  |   12 +-
 .../org/apache/cxf/wsn/services/Service.java    |   18 +-
 .../test/java/org/apache/cxf/wsn/RiTest.java    |    2 +-
 .../java/org/apache/cxf/wsn/WsnBrokerTest.java  |   56 +-
 .../org/apache/cxf/wsn/types/CustomType.java    |   16 +-
 services/wsn/wsn-osgi/pom.xml                   |    2 +-
 .../org/apache/cxf/xkms/cache/EHCacheUtil.java  |    8 +-
 .../cxf/xkms/cache/EHCacheXKMSClientCache.java  |   38 +-
 .../apache/cxf/xkms/cache/XKMSCacheToken.java   |   10 +-
 .../apache/cxf/xkms/cache/XKMSClientCache.java  |    2 +-
 .../cxf/xkms/client/XKMSClientFactory.java      |    8 +-
 .../org/apache/cxf/xkms/client/XKMSInvoker.java |   12 +-
 .../crypto/provider/CryptoProviderUtils.java    |    2 +-
 .../crypto/provider/XkmsCryptoProvider.java     |   60 +-
 .../provider/XkmsCryptoProviderFactory.java     |   10 +-
 .../cxf/xkms/cache/XKMSClientCacheTest.java     |   48 +-
 .../cxf/xkms/crypto/CryptoProviderFactory.java  |  158 +--
 .../cxf/xkms/exception/XKMSException.java       |    2 +-
 .../apache/cxf/xkms/handlers/Applications.java  |    4 +-
 .../org/apache/cxf/xkms/handlers/DnUtils.java   |    6 +-
 .../cxf/xkms/handlers/HandlerContext.java       |    2 +-
 .../org/apache/cxf/xkms/handlers/Register.java  |    2 +-
 .../src/main/resources/features.xml             |    1 +
 .../cxf/xkms/itests/BasicIntegrationTest.java   |    2 +-
 .../handlers/validator/ValidatorCRLTest.java    |   16 +-
 .../handlers/validator/ValidatorTest.java       |   10 +-
 .../xkms/itests/service/XKMSServiceTest.java    |    6 +-
 .../xkms/itests/service/XKRSSDisableTest.java   |    2 +-
 .../service/CertificateRepoProxyFactory.java    |    4 +-
 .../apache/cxf/xkms/service/XKMSService.java    |    8 +-
 .../org/apache/cxf/xkms/service/CheckXKRSS.java |    2 +-
 .../src/main/webapp/WEB-INF/cxf-servlet.xml     |    2 +-
 .../src/main/webapp/WEB-INF/xkms-endpoint.xml   |    2 +-
 .../main/webapp/WEB-INF/xkms-key-handlers.xml   |    2 +-
 services/xkms/xkms-x509-handlers/pom.xml        |    2 +-
 .../cxf/xkms/x509/handlers/X509Locator.java     |    4 +-
 .../x509/repo/file/FileCertificateRepo.java     |   16 +-
 .../apache/cxf/xkms/x509/utils/X509Utils.java   |    2 +-
 .../x509/validator/DirectTrustValidator.java    |    2 +-
 .../validator/TrustedAuthorityValidator.java    |   16 +-
 .../cxf/xkms/x509/handlers/X509LocatorTest.java |    2 +-
 .../TrustedAuthorityValidatorCRLTest.java       |    6 +-
 .../x509/repo/ldap/LdapCertificateRepo.java     |   20 +-
 .../cxf/xkms/x509/repo/ldap/LdapSearch.java     |   16 +-
 .../x509/repo/ldap/LDAPCertificateRepoTest.java |    6 +-
 .../cdi/base/AbstractCdiMultiAppTest.java       |    6 +-
 .../cdi/base/AbstractCdiSingleAppTest.java      |    2 +-
 .../systests/cdi/base/BookStoreVersioned.java   |    2 +-
 .../cdi/base/jetty/AbstractJettyServer.java     |   26 +-
 .../cdi/base/tomcat/AbstractTomcatServer.java   |   22 +-
 .../jaxrs/cdi/jetty/JettyEmbeddedTest.java      |    4 +-
 .../systest/jaxrs/cdi/jetty/JettyWarTest.java   |    4 +-
 .../systest/jaxrs/cdi/tomcat/TomcatWarTest.java |    4 +-
 .../jaxrs/cdi/jetty/JettyEmbeddedTest.java      |    4 +-
 .../systest/jaxrs/cdi/jetty/JettyWarTest.java   |    4 +-
 .../systest/jaxrs/cdi/tomcat/TomcatWarTest.java |    4 +-
 systests/cdi/cdi-owb/pom.xml                    |   53 +
 .../jaxrs/cdi/WeldDiscoverableContainer.java    |    4 +-
 .../jaxrs/cdi/jetty/JettyEmbeddedTest.java      |    4 +-
 .../systest/jaxrs/cdi/jetty/JettyWarTest.java   |    4 +-
 .../systest/jaxrs/cdi/tomcat/TomcatWarTest.java |    4 +-
 .../jaxrs/cdi/WeldDiscoverableContainer.java    |    4 +-
 .../jaxrs/cdi/jetty/JettyEmbeddedTest.java      |    4 +-
 .../systest/jaxrs/cdi/jetty/JettyWarTest.java   |    4 +-
 .../systest/jaxrs/cdi/tomcat/TomcatWarTest.java |    4 +-
 systests/cdi/pom.xml                            |    2 -
 .../cxf/systest/grizzly/EndpointAPITest.java    |   12 +-
 .../webapp/src/main/webapp/WEB-INF/beans.xml    |    2 +-
 systests/databinding/pom.xml                    |   38 +-
 .../jaxb/service/TestServiceException.java      |    4 +-
 .../systest/aegis/AegisClientServerTest.java    |   49 +-
 .../apache/cxf/systest/aegis/AegisJaxWs.java    |   10 +-
 .../cxf/systest/aegis/AegisJaxWsImpl.java       |    8 +-
 .../cxf/systest/aegis/AegisJaxWsTest.java       |   36 +-
 .../cxf/systest/aegis/AegisJaxWsWsdlNs.java     |    4 +-
 .../cxf/systest/aegis/AegisJaxWsWsdlNsImpl.java |    6 +-
 .../apache/cxf/systest/aegis/AegisServer.java   |    6 +-
 .../cxf/systest/aegis/AegisWSDLNSTest.java      |   28 +-
 .../apache/cxf/systest/aegis/AttributeBean.java |    2 +-
 .../cxf/systest/aegis/CharacterSchemaTest.java  |   16 +-
 .../systest/aegis/ServerPasswordCallback.java   |    2 +-
 .../apache/cxf/systest/aegis/SportsService.java |   12 +-
 .../cxf/systest/aegis/SportsServiceImpl.java    |   26 +-
 .../java/org/apache/cxf/systest/aegis/Team.java |    6 +-
 .../org/apache/cxf/systest/aegis/bean/Item.java |    2 +-
 .../apache/cxf/systest/jaxb/HashMapAdapter.java |   10 +-
 .../apache/cxf/systest/jaxb/MTOMBase64Test.java |   22 +-
 .../org/apache/cxf/systest/jaxb/MTOMTest.java   |   18 +-
 .../jaxb/MultipleServiceShareClassTest.java     |   20 +-
 .../cxf/systest/jaxb/TestServiceTest.java       |   10 +-
 .../cxf/systest/jaxb/model/ExtendedWidget.java  |    8 +-
 .../jaxb/model/ExtendedWidgetWithMime.java      |    2 +-
 .../apache/cxf/systest/jaxb/model/Widget.java   |    6 +-
 .../cxf/systest/jaxb/service/TestService.java   |    2 +-
 .../systest/jaxb/service/TestServiceImpl.java   |    2 +-
 .../jaxb/shareclasses/model/NameElement.java    |   84 +-
 .../jaxb/shareclasses/model/bar/BarName.java    |   56 +-
 .../jaxb/shareclasses/model/foo/FooName.java    |   58 +-
 .../shareclasses/server/bar/BarServiceImpl.java |   62 +-
 .../shareclasses/server/foo/FooServiceImpl.java |   62 +-
 .../jaxb/shareclasses/service/Getter.java       |   50 +-
 .../shareclasses/service/bar/BarService.java    |   54 +-
 .../shareclasses/service/foo/FooService.java    |   54 +-
 .../validators/CustomValidatorJAXBTest.java     |   20 +-
 .../cxf/systest/jaxb/validators/HelloWorld.java |    2 +-
 .../systest/jaxb/validators/HelloWorldImpl.java |    4 +-
 .../jaxb/validators/MyCustomHandler.java        |    2 +-
 .../systest/source/ClientServerSourceTest.java  |   32 +-
 .../apache/cxf/systest/source/GreeterImpl.java  |   20 +-
 .../systest/source/PutLastTradePriceImpl.java   |   10 +-
 .../org/apache/cxf/systest/source/Server.java   |    4 +-
 .../java/org/apache/cxf/systest/source/cxf.xml  |    2 +-
 .../xmlbeans/ClientServerXmlBeansTest.java      |  272 -----
 .../cxf/systest/xmlbeans/GreeterImpl.java       |   91 --
 .../systest/xmlbeans/PutLastTradePriceImpl.java |   62 --
 .../org/apache/cxf/systest/xmlbeans/Server.java |   58 -
 .../cxf/systest/xmlbeans/ServerNoWsdl.java      |   59 -
 .../org/apache/cxf/systest/xmlbeans/cxf.xml     |   32 -
 .../apache/cxf/systest/xmlbeans/cxf_no_wsdl.xml |   33 -
 .../src/test/resources/aegisJaxWsBeans.xml      |    2 +-
 .../test/resources/aegisSportsServiceBeans.xml  |    2 +-
 .../src/test/resources/aegisWSDLNSBeans.xml     |    2 +-
 .../src/test/resources/extrajaxbclass.xml       |    2 +-
 .../src/test/resources/jaxbCustomValidators.xml |    8 +-
 .../src/test/resources/mtomTestBeans.xml        |    2 +-
 .../src/test/resources/webapp/WEB-INF/beans.xml |    4 +-
 systests/jaxrs/pom.xml                          |  119 +-
 .../http/resources/BethalClientBeans.xml        |    2 +-
 .../systest/http/resources/SessionServer.xml    |    2 +-
 .../http/resources/SessionServer_Windows.xml    |    2 +-
 .../systest/http/resources/jaxws-publish.xml    |    2 +-
 .../cxf/systest/http/resources/jaxws-server.xml |    2 +-
 .../cxf/systest/http/resources/pkcs12.xml       |    2 +-
 .../http/resources/resource-key-spec-url.xml    |    2 +-
 .../http/resources/resource-key-spec.xml        |    2 +-
 .../jaxrs/AbstractGenericBookStoreSpring.java   |    6 +-
 .../jaxrs/AbstractJAXRSContinuationsTest.java   |   82 +-
 .../cxf/systest/jaxrs/AbstractSpringServer.java |   16 +-
 .../apache/cxf/systest/jaxrs/AsyncResource.java |   68 +-
 .../cxf/systest/jaxrs/AsyncResource2.java       |    6 +-
 .../org/apache/cxf/systest/jaxrs/AtomBook.java  |   14 +-
 .../cxf/systest/jaxrs/AtomBookServer.java       |   14 +-
 .../apache/cxf/systest/jaxrs/AtomBookStore.java |   50 +-
 .../cxf/systest/jaxrs/AtomBookStore2.java       |    8 +-
 .../cxf/systest/jaxrs/AtomBookStore3.java       |    2 +-
 .../org/apache/cxf/systest/jaxrs/AtomUtils.java |   16 +-
 .../cxf/systest/jaxrs/BadgerFishProvider.java   |   32 +-
 .../java/org/apache/cxf/systest/jaxrs/Book.java |   34 +-
 .../org/apache/cxf/systest/jaxrs/Book2.java     |   30 +-
 .../cxf/systest/jaxrs/BookApplication.java      |   44 +-
 .../cxf/systest/jaxrs/BookAsyncInterface.java   |    2 +-
 .../org/apache/cxf/systest/jaxrs/BookBean.java  |   34 +-
 .../systest/jaxrs/BookContinuationClient.java   |  100 +-
 .../systest/jaxrs/BookContinuationFilter.java   |    2 +-
 .../systest/jaxrs/BookContinuationServer.java   |    4 +-
 .../jaxrs/BookContinuationServlet3Server.java   |    4 +-
 .../systest/jaxrs/BookContinuationStore.java    |  106 +-
 .../jaxrs/BookCxfContinuationServer.java        |    4 +-
 .../systest/jaxrs/BookCxfContinuationStore.java |   48 +-
 .../systest/jaxrs/BookDataBindingServer.java    |   10 +-
 .../cxf/systest/jaxrs/BookExceptionMapper.java  |    8 +-
 .../apache/cxf/systest/jaxrs/BookInterface.java |    8 +-
 .../cxf/systest/jaxrs/BookNoXmlRootElement.java |   30 +-
 .../cxf/systest/jaxrs/BookNonSpringServer.java  |    2 +-
 .../cxf/systest/jaxrs/BookNotFoundFault.java    |    2 +-
 .../apache/cxf/systest/jaxrs/BookServer.java    |   91 +-
 .../apache/cxf/systest/jaxrs/BookServer20.java  |  147 +--
 .../systest/jaxrs/BookServerAsyncClient.java    |   18 +-
 .../systest/jaxrs/BookServerProxySpring.java    |   10 +-
 .../jaxrs/BookServerRequestDispatch.java        |   10 +-
 .../jaxrs/BookServerResourceCreatedOutside.java |    4 +-
 .../jaxrs/BookServerResourceCreatedSpring.java  |   10 +-
 ...ookServerResourceCreatedSpringProviders.java |   10 +-
 ...ookServerResourceJacksonSpringProviders.java |   12 +-
 .../cxf/systest/jaxrs/BookServerRestSoap.java   |   10 +-
 .../systest/jaxrs/BookServerServletFilter.java  |   10 +-
 .../cxf/systest/jaxrs/BookServerSpring.java     |   10 +-
 .../cxf/systest/jaxrs/BookServerThrottled.java  |   12 +-
 .../org/apache/cxf/systest/jaxrs/BookStore.java |  572 +++++-----
 .../cxf/systest/jaxrs/BookStoreDispatch.java    |    8 +-
 .../systest/jaxrs/BookStoreNoAnnotations.java   |   14 +-
 .../jaxrs/BookStoreNoAnnotationsImpl.java       |   16 +-
 .../jaxrs/BookStoreNoAnnotationsInterface.java  |    8 +-
 .../cxf/systest/jaxrs/BookStorePerRequest.java  |   32 +-
 .../cxf/systest/jaxrs/BookStoreSimple.java      |   16 +-
 .../cxf/systest/jaxrs/BookStoreSpring.java      |   98 +-
 .../cxf/systest/jaxrs/BookStoreStorage.java     |    6 +-
 .../systest/jaxrs/BookStoreWithInterface.java   |    8 +-
 .../systest/jaxrs/BookStoreWithInterface2.java  |   16 +-
 .../cxf/systest/jaxrs/BookSubresource.java      |   20 +-
 .../cxf/systest/jaxrs/BookSubresourceImpl.java  |   34 +-
 .../org/apache/cxf/systest/jaxrs/BookType.java  |   34 +-
 .../apache/cxf/systest/jaxrs/BookWrapper.java   |    8 +-
 .../org/apache/cxf/systest/jaxrs/Books.java     |    6 +-
 .../java/org/apache/cxf/systest/jaxrs/CD.java   |   14 +-
 .../org/apache/cxf/systest/jaxrs/Chapter.java   |   22 +-
 .../cxf/systest/jaxrs/ChapterNoAnnotations.java |    8 +-
 .../systest/jaxrs/CustomAtomFeedProvider.java   |    6 +-
 .../systest/jaxrs/CustomFaultInInterceptor.java |    6 +-
 .../jaxrs/CustomInFaultyInterceptor.java        |    4 +-
 .../cxf/systest/jaxrs/CustomJAXRSInvoker.java   |    6 +-
 .../jaxrs/CustomJaxbElementProvider.java        |    8 +-
 .../jaxrs/CustomOutFaultInterceptor.java        |    8 +-
 .../cxf/systest/jaxrs/CustomOutInterceptor.java |    6 +-
 .../cxf/systest/jaxrs/CustomResponse.java       |    2 +-
 .../systest/jaxrs/CustomXmlStreamReader.java    |    2 +-
 .../systest/jaxrs/CustomXmlStreamWriter.java    |    6 +-
 .../cxf/systest/jaxrs/FaultyRequestHandler.java |   11 +-
 .../systest/jaxrs/FormatResponseHandler.java    |    6 +-
 .../jaxrs/GenericBookServiceInterface.java      |    2 +-
 .../systest/jaxrs/GenericBookStoreSpring2.java  |   10 +-
 .../cxf/systest/jaxrs/GenericHandler.java       |    6 +-
 .../cxf/systest/jaxrs/GenericHandlerWriter.java |   14 +-
 .../cxf/systest/jaxrs/GlobalNameBinding.java    |    4 +-
 .../InternalServerErrorExceptionMapper.java     |    2 +-
 .../jaxrs/JAXRS20ClientServerBookTest.java      |  348 +++---
 .../cxf/systest/jaxrs/JAXRSAsyncClientTest.java |  122 ++-
 .../cxf/systest/jaxrs/JAXRSAtomBookTest.java    |   96 +-
 .../jaxrs/JAXRSClientServerBookTest.java        |  850 +++++++--------
 .../JAXRSClientServerNonSpringBookTest.java     |  100 +-
 .../jaxrs/JAXRSClientServerODataSearchTest.java |  110 +-
 .../JAXRSClientServerProxySpringBookTest.java   |   80 +-
 ...entServerResourceCreatedOutsideBookTest.java |   60 +-
 ...ientServerResourceCreatedSpringBookTest.java |   44 +-
 ...ServerResourceCreatedSpringProviderTest.java |  134 +--
 ...ServerResourceJacksonSpringProviderTest.java |  192 ++--
 .../jaxrs/JAXRSClientServerSpringBookTest.java  |  406 +++----
 .../jaxrs/JAXRSClientServerStreamingTest.java   |   28 +-
 .../jaxrs/JAXRSClientServerThrottledTest.java   |    4 +-
 ...AXRSClientServerUserResourceDefaultTest.java |   52 +-
 .../JAXRSClientServerUserResourceTest.java      |   44 +-
 .../jaxrs/JAXRSContinuationsServlet3Test.java   |   66 +-
 .../systest/jaxrs/JAXRSContinuationsTest.java   |   10 +-
 .../jaxrs/JAXRSCxfContinuationsTest.java        |   32 +-
 .../cxf/systest/jaxrs/JAXRSDataBindingTest.java |   25 -
 .../systest/jaxrs/JAXRSLocalTransportTest.java  |   86 +-
 .../jaxrs/JAXRSLoggingAtomPullSpringTest.java   |  615 -----------
 .../jaxrs/JAXRSLoggingAtomPushSpringTest.java   |  446 --------
 .../systest/jaxrs/JAXRSLoggingAtomPushTest.java |  266 -----
 .../cxf/systest/jaxrs/JAXRSMultipartTest.java   |  406 +++----
 .../jaxrs/JAXRSMultithreadedClientTest.java     |  100 +-
 .../jaxrs/JAXRSOverlappingDestinationsTest.java |   64 +-
 .../jaxrs/JAXRSRequestDispatcherTest.java       |   30 +-
 .../systest/jaxrs/JAXRSServletFilterTest.java   |    8 +-
 .../jaxrs/JAXRSSimpleRequestDispatcherTest.java |   20 +-
 .../cxf/systest/jaxrs/JAXRSSoapBookTest.java    |  442 ++++----
 .../jaxrs/JAXRSSoapRestBlueprintTest.java       |   20 +-
 .../cxf/systest/jaxrs/JAXRSUriInfoTest.java     |   12 +-
 .../apache/cxf/systest/jaxrs/JMSBookStore.java  |   40 +-
 .../cxf/systest/jaxrs/MultipartServer.java      |   10 +-
 .../cxf/systest/jaxrs/MultipartStore.java       |  224 ++--
 .../org/apache/cxf/systest/jaxrs/OrderBean.java |   10 +-
 .../org/apache/cxf/systest/jaxrs/PetStore.java  |   22 +-
 .../systest/jaxrs/ResponseCheckInterceptor.java |    2 +-
 .../systest/jaxrs/RuntimeExceptionMapper.java   |    4 +-
 .../cxf/systest/jaxrs/SimpleBookStore.java      |    6 +-
 .../cxf/systest/jaxrs/SimpleLoggingAspect.java  |    6 +-
 .../systest/jaxrs/SpringServletConfigStore.java |    2 +-
 .../cxf/systest/jaxrs/StringTextWriter.java     |   14 +-
 .../org/apache/cxf/systest/jaxrs/SuperBook.java |    6 +-
 .../apache/cxf/systest/jaxrs/SuperBook2.java    |    6 +-
 .../jaxrs/XMLStreamReaderInInterceptor.java     |    4 +-
 .../jaxrs/XMLStreamWriterOutInterceptor.java    |    4 +-
 .../systest/jaxrs/XmlStreamReaderProvider.java  |    8 +-
 .../systest/jaxrs/XmlStreamWriterProvider.java  |    2 +-
 .../org/apache/cxf/systest/jaxrs/XopType.java   |   10 +-
 .../systest/jaxrs/cors/AnnotatedCorsServer.java |    8 +-
 .../cxf/systest/jaxrs/cors/ConfigServer.java    |    6 +-
 .../jaxrs/cors/CrossOriginSimpleTest.java       |   82 +-
 .../jaxrs/cors/UnannotatedCorsServer.java       |   20 +-
 .../AbstractSwagger2ServiceDescriptionTest.java |   46 +-
 .../AbstractSwaggerServiceDescriptionTest.java  |   36 +-
 .../jaxrs/description/BookStoreSwagger.java     |   18 +-
 .../jaxrs/description/BookStoreSwagger2.java    |   18 +-
 .../Swagger2FilterServiceDescriptionTest.java   |   10 +-
 ...gger2NonAnnotatedServiceDescriptionTest.java |   17 +-
 .../Swagger2RegularServiceDescriptionTest.java  |   10 +-
 .../SwaggerFilterServiceDescriptionTest.java    |   10 +-
 .../SwaggerRegularServiceDescriptionTest.java   |   10 +-
 .../jaxrs/description/group1/BookStore.java     |    2 +-
 .../cxf/systest/jaxrs/discovery/BookStore.java  |    6 +-
 .../JAXRSServerSpringDiscoveryTest.java         |   18 +-
 .../jaxrs/discovery/sub/BookStoreInterface.java |    2 +-
 .../systest/jaxrs/extraction/BookCatalog.java   |   40 +-
 .../extraction/JAXRSClientServerTikaTest.java   |   42 +-
 .../jaxrs/failover/AbstractFailoverTest.java    |  138 +--
 .../failover/CircuitBreakerFailoverTest.java    |   52 +-
 .../systest/jaxrs/failover/FailoverTest.java    |   24 +-
 .../jaxrs/failover/LoadDistributorTest.java     |   60 +-
 .../cxf/systest/jaxrs/failover/Server.java      |   12 +-
 .../systest/jaxrs/jaxws/BookSoapService.java    |    8 +-
 .../cxf/systest/jaxrs/jaxws/BookStoreJaxrs.java |    2 +-
 .../jaxrs/jaxws/BookStoreJaxrsJaxws.java        |   10 +-
 .../cxf/systest/jaxrs/jaxws/BookStoreJaxws.java |    2 +-
 .../jaxrs/jaxws/BookStoreSoapRestImpl.java      |   30 +-
 .../jaxrs/jaxws/BookStoreSoapRestImpl2.java     |    2 +-
 .../cxf/systest/jaxrs/jaxws/HelloWorld.java     |    6 +-
 .../cxf/systest/jaxrs/jaxws/IntegerUserMap.java |    2 +-
 .../jaxrs/jaxws/IntegerUserMapAdapter.java      |    2 +-
 .../cxf/systest/jaxrs/jaxws/UserImpl.java       |    4 +-
 .../cxf/systest/jaxrs/jms/JAXRSJmsTest.java     |  108 +-
 .../apache/cxf/systest/jaxrs/jms/JMSServer.java |    4 +-
 .../cxf/systest/jaxrs/jms/jms_server_config.xml |    2 +-
 .../cxf/systest/jaxrs/nio/NioBookStore.java     |   61 +-
 .../systest/jaxrs/nio/NioBookStoreServer.java   |   12 +-
 .../cxf/systest/jaxrs/nio/NioBookStoreTest.java |   33 +-
 .../apache/cxf/systest/jaxrs/provider/Book.java |   12 +-
 .../cxf/systest/jaxrs/provider/BookChapter.java |    8 +-
 .../systest/jaxrs/provider/BookJsonStore.java   |   24 +-
 .../jaxrs/provider/JAXBProviderTest.java        |    2 +-
 .../jaxrs/provider/JsrJsonpProviderTest.java    |   42 +-
 .../systest/jaxrs/reactive/HelloWorldBean.java  |    2 +-
 .../jaxrs/reactive/JAXRSReactiveTest.java       |   35 +-
 .../systest/jaxrs/reactive/ReactiveServer.java  |   12 +-
 .../systest/jaxrs/reactive/ReactiveService.java |   20 +-
 .../cxf/systest/jaxrs/sdo/SDOResource.java      |   46 -
 .../cxf/systest/jaxrs/sdo/SDOResource2.java     |   26 -
 .../cxf/systest/jaxrs/sdo/SdoFactory.java       |   30 -
 .../apache/cxf/systest/jaxrs/sdo/Structure.java |   59 -
 .../systest/jaxrs/sdo/impl/SdoFactoryImpl.java  |  184 ----
 .../systest/jaxrs/sdo/impl/StructureImpl.java   |  511 ---------
 .../jaxrs/security/AbstractSecureBookStore.java |    6 +-
 .../security/AbstractSpringSecurityTest.java    |   24 +-
 .../security/AllowAllHostnameVerifier.java      |    4 +-
 .../systest/jaxrs/security/BookHttpsServer.java |   12 +-
 .../systest/jaxrs/security/BookLoginModule.java |   10 +-
 .../jaxrs/security/BookServerJaasSecurity.java  |    4 +-
 .../security/BookServerSecuritySpringClass.java |    2 +-
 .../BookServerSecuritySpringInterface.java      |    4 +-
 .../BookServerSecuritySpringNoAnnotations.java  |    2 +-
 .../security/BookServerSimpleSecurity.java      |    6 +-
 .../jaxrs/security/JAXRS20HttpsBookTest.java    |   46 +-
 .../jaxrs/security/JAXRSHttpsBookTest.java      |   99 +-
 .../JAXRSJaasConfigurationSecurityTest.java     |   24 +-
 .../jaxrs/security/JAXRSJaasSecurityTest.java   |   50 +-
 .../jaxrs/security/JAXRSSimpleSecurityTest.java |   24 +-
 .../security/JAXRSSpringSecurityClassTest.java  |   50 +-
 .../JAXRSSpringSecurityInterfaceTest.java       |   58 +-
 .../JAXRSSpringSecurityNoAnnotationsTest.java   |   26 +-
 .../systest/jaxrs/security/JettyJAASFilter.java |    2 +-
 .../cxf/systest/jaxrs/security/SecureBook.java  |   16 +-
 .../jaxrs/security/SecureBookInterface.java     |   12 +-
 .../systest/jaxrs/security/SecureBookStore.java |   14 +-
 .../jaxrs/security/SecureBookStoreGenerics.java |    4 +-
 .../security/SecureBookStoreNoAnnotations.java  |    6 +-
 .../security/SecureBookStoreNoInterface.java    |   14 +-
 .../security/SecurityOutFaultInterceptor.java   |    8 +-
 .../jaxrs/security/jaxrs-https-client1.xml      |    2 +-
 .../jaxrs/security/jaxrs-https-client2.xml      |    2 +-
 .../jaxrs/security/jaxrs-https-client3.xml      |    2 +-
 .../jaxrs/security/jaxrs-https-client4.xml      |    2 +-
 .../jaxrs/security/jaxrs-https-client5.xml      |    2 +-
 .../jaxrs/security/jaxrs-https-client_old.xml   |    2 +-
 .../jaxrs/security/jaxrs-https-server.xml       |    2 +-
 .../validation/AbstractJAXRSValidationTest.java |    2 +-
 .../validation/BookStoreWithValidation.java     |   28 +-
 .../BookStoreWithValidationPerRequest.java      |   12 +-
 .../jaxrs/validation/BookWithValidation.java    |   12 +-
 .../JAXRSClientServerValidationTest.java        |   50 +-
 .../JAXRSPerRequestValidationTest.java          |   16 +-
 .../spring/BookStoreWithValidation.java         |   10 +-
 .../JAXRSClientServerValidationSpringTest.java  |   32 +-
 .../jaxrs/websocket/BookServerWebSocket.java    |   12 +-
 .../jaxrs/websocket/BookStoreWebSocket.java     |   18 +-
 .../JAXRSClientConduitWebSocketTest.java        |   18 +-
 ...ntServerWebSocketSpringNoAtmosphereTest.java |    2 +-
 .../JAXRSClientServerWebSocketSpringTest.java   |    4 +-
 ...RSClientServerWebSocketSpringWebAppTest.java |    8 +-
 .../JAXRSClientServerWebSocketTest.java         |   50 +-
 .../jaxrs/websocket/WebSocketTestClient.java    |   48 +-
 .../jaxrs/src/test/resources/files/books.txt    |  245 +++++
 .../src/test/resources/jaxrs/WEB-INF/beans.xml  |    2 +-
 .../resources/jaxrs_async/WEB-INF/beans.xml     |    2 +-
 .../test/resources/jaxrs_atom/WEB-INF/beans.xml |    4 +-
 .../test/resources/jaxrs_cors/WEB-INF/beans.xml |    2 +-
 .../jaxrs_databinding/WEB-INF/beans.xml         |   21 +-
 .../resources/jaxrs_dispatch/WEB-INF/beans.xml  |    4 +-
 .../jaxrs_dispatch_simple/WEB-INF/beans.xml     |    4 +-
 .../jaxrs_jaas_security/WEB-INF/beans.xml       |    2 +-
 .../jaxrs_jackson_provider/WEB-INF/beans.xml    |    2 +-
 .../jaxrs_logging_atompull/WEB-INF/beans.xml    |  162 ---
 .../jaxrs_logging_atompull/WEB-INF/web.xml      |   45 -
 .../jaxrs_logging_atompush/WEB-INF/beans.xml    |  126 ---
 .../jaxrs_logging_atompush/WEB-INF/web.xml      |   45 -
 .../jaxrs_many_destinations/WEB-INF/beans.xml   |    4 +-
 .../test/resources/jaxrs_nio/WEB-INF/beans.xml  |    2 +-
 .../resources/jaxrs_proxy/WEB-INF/beans.xml     |    4 +-
 .../resources/jaxrs_security/WEB-INF/beans.xml  |    4 +-
 .../jaxrs_security_cglib/WEB-INF/beans.xml      |    4 +-
 .../WEB-INF/beans.xml                           |    4 +-
 .../jaxrs_simple_security/WEB-INF/beans.xml     |    4 +-
 .../resources/jaxrs_soap_rest/WEB-INF/beans.xml |    2 +-
 .../resources/jaxrs_spring/WEB-INF/beans.xml    |    2 +-
 .../jaxrs_spring_discovery/WEB-INF/beans.xml    |    2 +-
 .../jaxrs_spring_providers/WEB-INF/beans.xml    |    2 +-
 .../jaxrs_spring_validation/WEB-INF/beans.xml   |    2 +-
 .../resources/jaxrs_uriinfo/WEB-INF/beans.xml   |    4 +-
 .../resources/jaxrs_websocket/WEB-INF/beans.xml |    4 +-
 .../jaxrs_websocket/beans-embedded.xml          |    4 +-
 .../jaxrs_websocket/beans-embedded2.xml         |    4 +-
 .../jaxrs/discovery/jaxrs-http-client.xml       |    2 +-
 .../servlet_as_filter/WEB-INF/beans.xml         |    2 +-
 systests/jaxws/pom.xml                          |   55 +-
 .../dispatch/DispatchClientServerTest.java      |  184 ++--
 ...ispatchClientServerWithHugeResponseTest.java |   70 +-
 ...chClientServerWithMalformedResponseTest.java |   36 +-
 .../dispatch/DispatchXMLClientServerTest.java   |   32 +-
 .../dispatch/HugeResponseInterceptor.java       |    8 +-
 .../dispatch/MalformedResponseInterceptor.java  |    4 +-
 .../org/apache/cxf/systest/dispatch/Server.java |    4 +-
 .../systest/dispatch/TestDispatchFeature.java   |    6 +-
 .../cxf/systest/dispatch/client-config.xml      |    2 +-
 .../cxf/systest/handlers/AddNumbersImpl.java    |    8 +-
 .../systest/handlers/AddNumbersNoHandlers.java  |    8 +-
 .../handlers/AddNumbersServiceUnwrap.java       |   14 +-
 .../AddNumbersServiceWithAnnotation.java        |   10 +-
 .../cxf/systest/handlers/AddNumbersUnwrap.java  |    6 +-
 .../handlers/DispatchHandlerInvocationTest.java |   64 +-
 .../systest/handlers/HandlerInvocationTest.java |  248 ++---
 .../HandlerInvocationUsingAddNumbersTest.java   |   34 +-
 .../cxf/systest/handlers/HandlerServer.java     |    8 +-
 .../cxf/systest/handlers/HandlerTestImpl.java   |    4 +-
 .../HandlerTestServiceWithAnnotation.java       |   12 +-
 .../handlers/MessageContextSecondHandler.java   |    2 +-
 .../systest/handlers/ModifyNumberHandler.java   |    2 +-
 .../org/apache/cxf/systest/handlers/Server.java |   10 +-
 .../systest/handlers/SmallNumberHandler.java    |   36 +-
 .../systest/handlers/SoapFaultHandlerTest.java  |   14 +-
 ...ingConfiguredAutoRewriteSoapAddressTest.java |    2 +-
 .../handlers/SpringConfiguredHandlerTest.java   |    6 +-
 .../cxf/systest/handlers/TestHandler.java       |   64 +-
 .../cxf/systest/handlers/TestHandlerBase.java   |   80 +-
 .../handlers/TestMustUnderstandHandler.java     |   12 +-
 .../systest/handlers/TestResourceResolver.java  |    2 +-
 .../cxf/systest/handlers/TestSOAPHandler.java   |  122 +--
 .../cxf/systest/handlers/TestUnusedHandler.java |   26 +-
 .../TrivialSOAPHandlerAnnotatedGreeterImpl.java |    2 +-
 .../handlers/TrivialSOAPHandlerTest.java        |   26 +-
 .../org/apache/cxf/systest/handlers/beans.xml   |    2 +-
 .../handlers/beans_autoRewriteSoapAddress.xml   |    2 +-
 .../beans_no_autoRewriteSoapAddress.xml         |    2 +-
 .../cxf/systest/handlers/soap_fault_beans.xml   |    2 +-
 .../cxf/systest/handlers/types/AddNumbers.java  |   16 +-
 .../handlers/types/AddNumbersResponse.java      |   12 +-
 .../systest/handlers/types/package-info.java    |    2 +-
 .../cxf/systest/jaxws/AnyClientServerTest.java  |   24 +-
 .../cxf/systest/jaxws/ArrayServiceImpl.java     |    2 +-
 .../apache/cxf/systest/jaxws/CXF5061Test.java   |    9 +-
 .../apache/cxf/systest/jaxws/CXF6655Test.java   |    6 +-
 .../ClientServerGreeterBaseNoWsdlTest.java      |    4 +-
 .../jaxws/ClientServerGreeterBaseTest.java      |    4 +-
 .../jaxws/ClientServerGreeterNoWsdlTest.java    |    8 +-
 .../cxf/systest/jaxws/ClientServerMiscTest.java |  295 ++---
 .../jaxws/ClientServerMixedStyleTest.java       |   22 +-
 .../jaxws/ClientServerPartialWsdlTest.java      |   24 +-
 .../ClientServerRPCLitDefatulAnnoTest.java      |    2 +-
 .../systest/jaxws/ClientServerRPCLitTest.java   |   80 +-
 .../cxf/systest/jaxws/ClientServerTest.java     |  302 +++---
 .../cxf/systest/jaxws/ClientServerXMLTest.java  |   18 +-
 .../cxf/systest/jaxws/ComplexException.java     |   12 +-
 .../cxf/systest/jaxws/CustomException.java      |    2 +-
 .../jaxws/DocLitBareCodeFirstService.java       |   68 +-
 .../jaxws/DocLitBareCodeFirstServiceImpl.java   |    4 +-
 .../DocLitWrappedCodeFirstBaseService.java      |    6 +-
 .../jaxws/DocLitWrappedCodeFirstService.java    |  104 +-
 .../DocLitWrappedCodeFirstServiceImpl.java      |   36 +-
 ...DocLitWrappedCodeFirstServiceMissingOps.java |    4 +-
 .../java/org/apache/cxf/systest/jaxws/Echo.java |    8 +-
 .../apache/cxf/systest/jaxws/EchoResponse.java  |    8 +-
 .../org/apache/cxf/systest/jaxws/HelloImpl.java |    2 +-
 .../apache/cxf/systest/jaxws/HelloService.java  |    8 +-
 .../systest/jaxws/JaxWsClientThreadTest.java    |   32 +-
 .../systest/jaxws/JaxWsDynamicClientTest.java   |   30 +-
 .../systest/jaxws/JaxwsAsyncFailOverTest.java   |   30 +-
 .../cxf/systest/jaxws/JaxwsExecutorTest.java    |   44 +-
 .../systest/jaxws/LocatorClientServerTest.java  |   18 +-
 .../cxf/systest/jaxws/LocatorServiceImpl.java   |   24 +-
 .../cxf/systest/jaxws/OASISCatalogTest.java     |   24 +-
 .../systest/jaxws/RpcLitCodeFirstService.java   |   20 +-
 .../jaxws/RpcLitCodeFirstServiceImpl.java       |   14 +-
 .../jaxws/SchemaValidationClientServerTest.java |   36 +-
 .../org/apache/cxf/systest/jaxws/Server.java    |   58 +-
 .../systest/jaxws/ServerGreeterBaseNoWsdl.java  |    6 +-
 .../apache/cxf/systest/jaxws/ServerMisc.java    |   56 +-
 .../cxf/systest/jaxws/ServerMixedStyle.java     |   42 +-
 .../cxf/systest/jaxws/ServerXMLBinding.java     |    8 +-
 .../cxf/systest/jaxws/ServicePortTypeImpl.java  |    2 +-
 .../cxf/systest/jaxws/ServiceTestFault.java     |    8 +-
 .../apache/cxf/systest/jaxws/TestService.java   |   70 +-
 .../cxf/systest/jaxws/TestServiceImpl.java      |   72 +-
 .../cxf/systest/jaxws/WsdlGetUtilsTest.java     |   12 +-
 .../cxf/systest/jaxws/base/WrapperString.java   |  128 +--
 .../BeanPostProcessorTest.java                  |    4 +-
 .../CustomizedfBeanPostProcessorTest.java       |    8 +-
 .../jaxws/beanpostprocessor/WebServiceRUs.java  |   12 +-
 .../cxf/systest/jaxws/cxf5064/HeaderObj.java    |    2 +-
 .../systest/jaxws/cxf5064/SOAPHeaderSEI.java    |    2 +-
 .../jaxws/cxf5064/SOAPHeaderServiceImpl.java    |    2 +-
 .../cxf/systest/jaxws/fault-stack-trace.xml     |    2 +-
 .../JavaFirstSchemaValidationTest.java          |   80 +-
 .../PersonServiceAnnotatedImpl.java             |    4 +-
 .../schemavalidation/PersonServiceImpl.java     |    4 +-
 .../schemavalidation/PersonServiceRPCImpl.java  |    4 +-
 .../PersonServiceWithRequestResponseAnns.java   |    2 +-
 ...ersonServiceWithRequestResponseAnnsImpl.java |    4 +-
 .../jaxws/schemavalidation/package-info.java    |    2 +-
 .../org/apache/cxf/systest/jaxws/types/Bar.java |    4 +-
 .../apache/cxf/systest/jaxws/types/BarImpl.java |    6 +-
 .../websocket/ClientServerWebSocketTest.java    |   96 +-
 .../cxf/systest/jaxws/websocket/Server.java     |   10 +-
 .../provider/AbstractSourcePayloadProvider.java |   20 +-
 .../AttachmentProviderXMLClientServerTest.java  |   26 +-
 .../cxf/systest/provider/AttachmentServer.java  |    4 +-
 .../AttachmentStreamSourceXMLProvider.java      |   26 +-
 .../cxf/systest/provider/CXF4130Provider.java   |    6 +-
 .../cxf/systest/provider/CXF4130Test.java       |   12 +-
 .../cxf/systest/provider/CXF4818Test.java       |   22 +-
 .../provider/HWDOMSourceMessageProvider.java    |   12 +-
 .../provider/HWDOMSourcePayloadProvider.java    |   42 +-
 .../HWDOMSourcePayloadXMLBindingProvider.java   |    6 +-
 .../provider/HWSAXSourceMessageProvider.java    |   10 +-
 .../provider/HWSAXSourcePayloadProvider.java    |   18 +-
 .../provider/HWSoapMessageDocProvider.java      |   54 +-
 .../systest/provider/HWSoapMessageProvider.java |   28 +-
 .../provider/HWSourcePayloadProvider.java       |    4 +-
 .../provider/HWStreamSourceMessageProvider.java |    6 +-
 .../provider/HWStreamSourcePayloadProvider.java |   16 +-
 .../InterpretNullAsOnewayProviderTest.java      |   22 +-
 .../provider/NBProviderClientServerTest.java    |   24 +-
 .../provider/NBSoapMessageDocProvider.java      |   12 +-
 .../provider/ProviderClientServerTest.java      |   44 +-
 .../provider/ProviderRPCClientServerTest.java   |   34 +-
 .../provider/ProviderXMLClientServerTest.java   |    6 +-
 .../org/apache/cxf/systest/provider/Server.java |   12 +-
 .../systest/provider/TestLogicalHandler.java    |    2 +-
 .../cxf/systest/provider/TestSOAPHandler.java   |    4 +-
 .../apache/cxf/systest/provider/XMLServer.java  |    6 +-
 .../provider/datasource/AbstractProvider.java   |   16 +-
 .../datasource/DataSourceProviderTest.java      |   14 +-
 .../cxf/systest/provider/datasource/Server.java |    8 +-
 .../provider/datasource/TestProvider.java       |   12 +-
 .../provider/datasource/WebProvider.java        |    2 +-
 .../cxf/systest/swa/ClientServerSwaTest.java    |   76 +-
 .../java/org/apache/cxf/systest/swa/Server.java |    6 +-
 .../cxf/systest/swa/SwANoMimeServiceImpl.java   |   14 +-
 .../apache/cxf/systest/swa/SwAServiceImpl.java  |   22 +-
 systests/jaxws/src/test/resources/cxf6866.wsdl  |  914 ++++++++++++++++
 .../systest/jaxws/beanpostprocessor/context.xml |    2 +-
 .../beanpostprocessor/customized-context.xml    |    2 +-
 .../cxf/systest/jaxws/springWebService.xml      |    2 +-
 systests/jibx/databinding-jibx/pom.xml          |  328 ------
 .../cxf/systest/jibx/ClientServerJibxTest.java  |  144 ---
 .../apache/cxf/systest/jibx/GreeterImpl.java    |   76 --
 .../cxf/systest/jibx/PutLastTradePriceImpl.java |   62 --
 .../org/apache/cxf/systest/jibx/Server.java     |   58 -
 .../java/org/apache/cxf/systest/jibx/cxf.xml    |   32 -
 .../jibx/doc_lit_bare.wsdl                      |  114 --
 .../jibx/hello_world.wsdl                       |  169 ---
 systests/jibx/jaxrs-jibx/pom.xml                |  329 ------
 .../systest/jaxrs/BookDataBindingServer.java    |   82 --
 .../cxf/systest/jaxrs/JAXRSDataBindingTest.java |   54 -
 .../cxf/systest/jaxrs/jibx/JibxResource.java    |   37 -
 .../jaxrs_databinding/WEB-INF/beans.xml         |   39 -
 .../resources/jaxrs_databinding/WEB-INF/web.xml |   45 -
 .../src/test/resources/jibx/types.xsd           |    9 -
 systests/jibx/pom.xml                           |   38 -
 systests/kerberos/pom.xml                       |    6 +
 .../systest/kerberos/common/DoubleItImpl.java   |   10 +-
 .../kerberos/common/DoubleItPortTypeImpl.java   |   14 +-
 .../common/KerberosClientPasswordCallback.java  |    4 +-
 .../common/KerberosServicePasswordCallback.java |    6 +-
 .../common/KeystorePasswordCallback.java        |   10 +-
 .../kerberos/common/SecurityTestUtil.java       |   14 +-
 .../systest/kerberos/jaxrs/kerberos/Book.java   |   34 +-
 .../jaxrs/kerberos/BookKerberosServer.java      |   12 +-
 .../jaxrs/kerberos/BookNotFoundFault.java       |    2 +-
 .../kerberos/jaxrs/kerberos/BookStore.java      |   20 +-
 .../kerberos/jaxrs/kerberos/BookStoreImpl.java  |   18 +-
 .../kerberos/jaxrs/kerberos/Chapter.java        |   22 +-
 .../jaxrs/kerberos/JAXRSKerberosBookTest.java   |   48 +-
 .../kerberos/jaxrs/kerberos/SuperBook.java      |    6 +-
 .../kerberos/jaxrs/kerberos/kerberosClient.xml  |    2 +-
 .../systest/kerberos/ldap/LDAPClaimsTest.java   |  122 +--
 .../wssec/kerberos/KerberosTokenTest.java       |  158 +--
 .../kerberos/wssec/spnego/SpnegoTokenTest.java  |   66 +-
 .../systest/kerberos/wssec/sts/STSServer.java   |    2 +-
 .../kerberos/wssec/sts/StaxSTSServer.java       |    2 +-
 systests/kerberos/src/test/resources/ldap.xml   |    2 +-
 .../systest/kerberos/wssec/kerberos/client.xml  |    2 +-
 .../systest/kerberos/wssec/kerberos/server.xml  |    2 +-
 .../kerberos/wssec/kerberos/stax-server.xml     |    2 +-
 .../kerberos/wssec/kerberos/sts-client.xml      |    2 +-
 .../systest/kerberos/wssec/spnego/client.xml    |    2 +-
 .../systest/kerberos/wssec/spnego/server.xml    |    2 +-
 .../kerberos/wssec/spnego/stax-server.xml       |    2 +-
 .../cxf/systest/kerberos/wssec/sts/cxf-sts.xml  |    2 +-
 .../systest/kerberos/wssec/sts/stax-cxf-sts.xml |    2 +-
 systests/pom.xml                                |    1 -
 systests/rs-http-sci/pom.xml                    |    2 -
 .../cxf/jaxrs/servlet/AbstractSciTest.java      |    8 +-
 .../servlet/jetty/AbstractJettyServer.java      |   36 +-
 .../jetty/JettyEmptyApplicationTest.java        |    8 +-
 .../jetty/JettyEmptyPathApplicationTest.java    |   12 +-
 .../servlet/jetty/JettyNoApplicationTest.java   |   10 +-
 .../JettySingleApplicationOnlyClassesTest.java  |    6 +-
 ...ettySingleApplicationOnlySingletonsTest.java |    6 +-
 .../jetty/JettySingleApplicationTest.java       |    6 +-
 .../applications/classes/BookApplication.java   |    2 +-
 .../applications/complete/BookApplication.java  |    4 +-
 .../applications/empty/BookApplication.java     |    2 +-
 .../applications/emptypath/BookApplication.java |    2 +-
 .../singletons/BookApplication.java             |    2 +-
 .../java/org/apache/demo/resources/Book.java    |   12 +-
 .../org/apache/demo/resources/BookStore.java    |    2 +-
 systests/rs-security/pom.xml                    |   41 +
 .../http/resources/BethalClientBeans.xml        |    2 +-
 .../systest/http/resources/SessionServer.xml    |    2 +-
 .../http/resources/SessionServer_Windows.xml    |    2 +-
 .../systest/http/resources/jaxws-publish.xml    |    2 +-
 .../cxf/systest/http/resources/jaxws-server.xml |    2 +-
 .../cxf/systest/http/resources/pkcs12.xml       |    2 +-
 .../http/resources/resource-key-spec-url.xml    |    2 +-
 .../http/resources/resource-key-spec.xml        |    2 +-
 .../apache/cxf/systest/jaxrs/security/Book.java |   12 +-
 .../cxf/systest/jaxrs/security/BookStore.java   |    8 +-
 .../jaxrs/security/SecurityTestUtil.java        |    8 +-
 .../jaxrs/security/jcs/BookJcsServer.java       |    8 +-
 .../systest/jaxrs/security/jcs/BookStore.java   |   14 +-
 .../jaxrs/security/jcs/JAXRSJcsTest.java        |   24 +-
 .../systest/jaxrs/security/jose/BookStore.java  |   10 +-
 .../jose/jwejws/BookServerAlgorithms.java       |    8 +-
 .../security/jose/jwejws/BookServerJweJson.java |    8 +-
 .../security/jose/jwejws/BookServerJwsJson.java |    8 +-
 .../security/jose/jwejws/BookServerJwt.java     |    8 +-
 .../jose/jwejws/BookServerReference.java        |    8 +-
 .../security/jose/jwejws/JAXRSJweJsonTest.java  |   22 +-
 .../security/jose/jwejws/JAXRSJweJwsTest.java   |   68 +-
 .../security/jose/jwejws/JAXRSJwsJsonTest.java  |   54 +-
 .../jose/jwejws/JweJwsAlgorithmTest.java        |  134 +--
 .../jose/jwejws/JweJwsReferenceTest.java        |   82 +-
 .../jwejws/PrivateKeyPasswordProviderImpl.java  |    4 +-
 .../jose/jwt/BookServerJwtAlgorithms.java       |    8 +-
 .../jose/jwt/BookServerJwtAuthnAuthz.java       |    8 +-
 .../jose/jwt/BookServerJwtProperties.java       |    8 +-
 .../jaxrs/security/jose/jwt/BookStoreAuthn.java |   14 +-
 .../security/jose/jwt/JWTAlgorithmTest.java     |  230 ++--
 .../security/jose/jwt/JWTAuthnAuthzTest.java    |   76 +-
 .../security/jose/jwt/JWTPropertiesTest.java    |  144 +--
 .../jwt/PrivateKeyPasswordProviderImpl.java     |    4 +-
 .../security/oauth/MemoryOAuthDataProvider.java |   28 +-
 .../jaxrs/security/oauth/OAuthServer.java       |    6 +-
 .../jaxrs/security/oauth/OAuthTestUtils.java    |    2 +-
 .../oauth/TemporaryCredentialServiceTest.java   |   20 +-
 .../security/oauth2/common/OAuth2TestUtils.java |   54 +-
 .../oauth2/common/OAuthDataProviderImpl.java    |   76 +-
 .../oauth2/common/SamlCallbackHandler.java      |   50 +-
 .../oauth2/common/WSS4JBasicAuthFilter.java     |    2 +-
 .../oauth2/filters/BookServerOAuth2Filters.java |    8 +-
 .../filters/BookServerOAuth2FiltersJwt.java     |    8 +-
 .../oauth2/filters/BookServerOAuth2Service.java |    8 +-
 .../filters/BookServerOAuth2ServiceJwt.java     |    8 +-
 .../oauth2/filters/OAuth2FiltersTest.java       |  146 +--
 .../oauth2/filters/OAuth2JwtFiltersTest.java    |   30 +-
 .../grants/AuthorizationGrantNegativeTest.java  |  244 ++---
 .../oauth2/grants/AuthorizationGrantTest.java   |   82 +-
 .../oauth2/grants/BookServerOAuth2.java         |    8 +-
 .../oauth2/grants/BookServerOAuth2Grants.java   |    8 +-
 .../grants/BookServerOAuth2GrantsNegative.java  |    8 +-
 .../grants/BookServerOAuth2Introspection.java   |    8 +-
 .../grants/CallbackHandlerLoginHandler.java     |   16 +-
 .../oauth2/grants/CustomGrantHandler.java       |    4 +-
 .../oauth2/grants/IntrospectionServiceTest.java |  122 +--
 .../security/oauth2/grants/JAXRSOAuth2Test.java |  192 ++--
 .../security/oidc/IdTokenProviderImpl.java      |    4 +-
 .../security/oidc/MemoryClientDataProvider.java |    2 +-
 .../oidc/OIDCDynRegistrationServer.java         |    8 +-
 .../oidc/OIDCDynamicRegistrationTest.java       |   31 +-
 .../jaxrs/security/oidc/OIDCFlowTest.java       |  344 +++---
 .../jaxrs/security/oidc/OIDCNegativeServer.java |    8 +-
 .../jaxrs/security/oidc/OIDCNegativeTest.java   |  152 +--
 .../systest/jaxrs/security/oidc/OIDCServer.java |    8 +-
 .../security/oidc/UserInfoProviderImpl.java     |    2 +-
 .../jaxrs/security/oidc/UserInfoServer.java     |    8 +-
 .../jaxrs/security/oidc/UserInfoTest.java       |  120 +-
 .../oidc/filters/BookServerOIDCFilters.java     |    8 +-
 .../oidc/filters/BookServerOIDCService.java     |    8 +-
 .../security/oidc/filters/OIDCFiltersTest.java  |   48 +-
 .../jaxrs/security/saml/BookServerSaml.java     |    8 +-
 .../saml/CustomSecurityContextProvider.java     |    6 +-
 .../saml/JAXRSSamlAuthorizationTest.java        |   44 +-
 .../jaxrs/security/saml/JAXRSSamlTest.java      |   80 +-
 .../security/saml/KeystorePasswordCallback.java |    6 +-
 .../security/saml/SamlCallbackHandler.java      |   56 +-
 .../security/saml/SamlRetrievalInterceptor.java |   12 +-
 .../security/saml/SecureBookServerSaml.java     |    8 +-
 .../jaxrs/security/saml/SecureBookStore.java    |    6 +-
 .../security/saml/SecureClaimBookStore.java     |   12 +-
 .../samlsso/KeystorePasswordCallback.java       |    6 +-
 .../jaxrs/security/samlsso/MetadataServer.java  |    8 +-
 .../jaxrs/security/samlsso/MetadataTest.java    |   12 +-
 .../jaxrs/security/xml/BookServerXmlSec.java    |    6 +-
 .../jaxrs/security/xml/JAXRSXmlSecTest.java     |  224 ++--
 .../security/xml/StaxBookServerXmlSec.java      |    6 +-
 .../jaxrs/oauth/server/WEB-INF/oauth-beans.xml  |    2 +-
 .../cxf/systest/jaxrs/security/jcs/client.xml   |    2 +-
 .../systest/jaxrs/security/jcs/jcs-server.xml   |    2 +-
 .../security/jose/jwejws/algorithms-server.xml  |    2 +-
 .../jaxrs/security/jose/jwejws/client.xml       |    2 +-
 .../security/jose/jwejws/reference-server.xml   |    2 +-
 .../jaxrs/security/jose/jwejws/server.xml       |    2 +-
 .../security/jose/jwejws/serverJweJson.xml      |    2 +-
 .../security/jose/jwejws/serverJwsJson.xml      |    2 +-
 .../security/jose/jwt/algorithms-server.xml     |    2 +-
 .../security/jose/jwt/authn-authz-server.xml    |    2 +-
 .../systest/jaxrs/security/jose/jwt/client.xml  |    2 +-
 .../security/jose/jwt/properties-server.xml     |    2 +-
 .../jaxrs/security/oauth2/filters/client.xml    |    2 +-
 .../security/oauth2/filters/filters-server.xml  |    4 +-
 .../oauth2/filters/filters-serverJwt.xml        |    4 +-
 .../security/oauth2/filters/oauth20-server.xml  |    4 +-
 .../oauth2/filters/oauth20-serverJwt.xml        |    4 +-
 .../jaxrs/security/oauth2/grants/client.xml     |    2 +-
 .../oauth2/grants/grants-negative-server.xml    |    4 +-
 .../security/oauth2/grants/grants-server.xml    |    4 +-
 .../oauth2/grants/introspection-server.xml      |    4 +-
 .../jaxrs/security/oauth2/grants/server.xml     |    4 +-
 .../cxf/systest/jaxrs/security/oidc/client.xml  |    2 +-
 .../jaxrs/security/oidc/filters/client.xml      |    2 +-
 .../security/oidc/filters/filters-server.xml    |    4 +-
 .../jaxrs/security/oidc/filters/oidc-server.xml |    4 +-
 .../security/oidc/oidc-negative-server.xml      |    4 +-
 .../jaxrs/security/oidc/oidc-server-dynreg.xml  |    4 +-
 .../systest/jaxrs/security/oidc/oidc-server.xml |    4 +-
 .../jaxrs/security/oidc/userinfo-server.xml     |    4 +-
 .../cxf/systest/jaxrs/security/saml/client.xml  |    2 +-
 .../jaxrs/security/saml/secureServer.xml        |    2 +-
 .../cxf/systest/jaxrs/security/saml/server.xml  |    2 +-
 .../systest/jaxrs/security/samlsso/client.xml   |    2 +-
 .../jaxrs/security/samlsso/metadata-server.xml  |    2 +-
 .../cxf/systest/jaxrs/security/xml/client.xml   |    2 +-
 .../cxf/systest/jaxrs/security/xml/server.xml   |    2 +-
 .../systest/jaxrs/security/xml/stax-server.xml  |    2 +-
 systests/rs-sse/pom.xml                         |    7 +-
 .../jaxrs/sse/AbstractBroadcasterSseTest.java   |   16 +-
 .../systest/jaxrs/sse/AbstractSseBaseTest.java  |   10 +-
 .../cxf/systest/jaxrs/sse/AbstractSseTest.java  |   10 +-
 .../org/apache/cxf/systest/jaxrs/sse/Book.java  |   12 +-
 .../apache/cxf/systest/jaxrs/sse/BookStore.java |   84 +-
 .../cxf/systest/jaxrs/sse/BookStore2.java       |  136 +++
 .../cxf/systest/jaxrs/sse/SseApplication.java   |   38 +
 .../jaxrs/sse/jetty/AbstractJettyServer.java    |   28 +-
 .../jaxrs/sse/jetty/JettyBroadcasterTest.java   |    4 +-
 .../jaxrs/sse/jetty/JettyEmbeddedTest.java      |    4 +-
 .../systest/jaxrs/sse/jetty/JettyWarTest.java   |    6 +-
 .../jaxrs/sse/tomcat/AbstractTomcatServer.java  |   26 +-
 .../jaxrs/sse/tomcat/TomcatBroadcasterTest.java |    6 +-
 .../jaxrs/sse/tomcat/TomcatEmbeddedTest.java    |    6 +-
 .../systest/jaxrs/sse/tomcat/TomcatWarTest.java |    6 +-
 .../META-INF/cxf/org.apache.cxf.Logger          |    1 +
 .../test/resources/jaxrs_sse/WEB-INF/web.xml    |    8 +-
 systests/rs-sse/src/test/resources/logback.xml  |   12 +
 systests/tracing/pom.xml                        |   58 +-
 .../test/java/org/apache/cxf/systest/Book.java  |   14 +-
 .../apache/cxf/systest/TestSpanReceiver.java    |    6 +-
 .../apache/cxf/systest/TestSpanReporter.java    |   42 +
 .../cxf/systest/jaxrs/tracing/BookStore.java    |   37 +-
 .../jaxrs/tracing/brave/BraveTracingTest.java   |  334 ++++++
 .../systest/jaxrs/tracing/brave/HasSpan.java    |   71 ++
 .../tracing/brave/IsAnnotationContaining.java   |   47 +
 .../brave/IsBinaryAnnotationContaining.java     |   51 +
 .../htrace/HTraceTracingCustomHeadersTest.java  |   29 +-
 .../jaxrs/tracing/htrace/HTraceTracingTest.java |  119 +-
 .../systest/jaxrs/tracing/htrace/HasSpan.java   |   70 ++
 .../tracing/htrace/IsTimelineContaining.java    |   47 +
 .../jaxrs/tracing/htrace/IsTimelineEmpty.java   |   39 +
 .../cxf/systest/jaxws/tracing/BookStore.java    |   43 -
 .../systest/jaxws/tracing/BookStoreService.java |    1 +
 .../systest/jaxws/tracing/brave/BookStore.java  |   68 ++
 .../jaxws/tracing/brave/BraveTracingTest.java   |  309 ++++++
 .../systest/jaxws/tracing/htrace/BookStore.java |   49 +
 .../jaxws/tracing/htrace/HTraceTracingTest.java |   69 +-
 systests/transport-jms/pom.xml                  |   48 +
 .../jms/testsuite/services/GreeterSpecImpl.java |    4 +-
 .../services/GreeterSpecWithPortError.java      |    4 +-
 .../jms/testsuite/services/Test0001Impl.java    |    2 +-
 .../jms/testsuite/services/Test0003Impl.java    |    2 +-
 .../jms/testsuite/services/Test0005Impl.java    |    2 +-
 .../jms/testsuite/services/Test0006Impl.java    |    2 +-
 .../jms/testsuite/services/Test0008Impl.java    |    2 +-
 .../jms/testsuite/services/Test0009Impl.java    |    2 +-
 .../jms/testsuite/services/Test0010Impl.java    |    2 +-
 .../jms/testsuite/services/Test0011Impl.java    |    2 +-
 .../jms/testsuite/services/Test0012Impl.java    |    2 +-
 .../jms/testsuite/services/Test0013Impl.java    |    2 +-
 .../jms/testsuite/services/Test0014Impl.java    |    2 +-
 .../jms/testsuite/services/Test0101Impl.java    |    2 +-
 .../jms/testsuite/services/Test1001Impl.java    |    2 +-
 .../jms/testsuite/services/Test1002Impl.java    |    2 +-
 .../jms/testsuite/services/Test1003Impl.java    |    2 +-
 .../jms/testsuite/services/Test1004Impl.java    |    2 +-
 .../jms/testsuite/services/Test1006Impl.java    |    2 +-
 .../jms/testsuite/services/Test1007Impl.java    |    2 +-
 .../jms/testsuite/services/Test1008Impl.java    |    2 +-
 .../jms/testsuite/services/Test1101Impl.java    |    2 +-
 .../jms/testsuite/services/Test1102Impl.java    |    2 +-
 .../jms/testsuite/services/Test1103Impl.java    |    2 +-
 .../jms/testsuite/services/Test1104Impl.java    |    2 +-
 .../jms/testsuite/services/Test1105Impl.java    |    2 +-
 .../jms/testsuite/services/Test1106Impl.java    |    2 +-
 .../jms/testsuite/services/Test1107Impl.java    |    2 +-
 .../jms/testsuite/services/Test1108Impl.java    |    2 +-
 .../jms/testsuite/services/TestSuiteServer.java |    4 +-
 .../testcases/JavaFirstNoWsdlTest.java          |    2 +-
 .../testcases/SOAPJMSTestSuiteTest.java         |   84 +-
 .../testsuite/testcases/SoapJmsSpecTest.java    |    8 +-
 .../cxf/jms/testsuite/util/JMSTestUtil.java     |   14 +-
 .../cxf/systest/jms/AbstractVmJMSTest.java      |   20 +-
 .../cxf/systest/jms/GreeterByteMessageImpl.java |    6 +-
 .../apache/cxf/systest/jms/GreeterImplDoc.java  |    4 +-
 .../cxf/systest/jms/GreeterImplDocBase.java     |    4 +-
 .../jms/GreeterImplQueueDecoupledOneWays.java   |   20 +-
 ...rImplQueueDecoupledOneWaysDeferredReply.java |    8 +-
 .../cxf/systest/jms/GreeterImplQueueOneWay.java |    4 +-
 .../cxf/systest/jms/GreeterImplSoap12.java      |    4 +-
 .../cxf/systest/jms/GreeterImplTopicOneWay.java |    4 +-
 .../cxf/systest/jms/GreeterImplTwoWayJMS.java   |    6 +-
 .../org/apache/cxf/systest/jms/HelloImpl.java   |    2 +-
 .../systest/jms/JMSClientServerSoap12Test.java  |   10 +-
 .../cxf/systest/jms/JMSClientServerTest.java    |   92 +-
 .../org/apache/cxf/systest/jms/JMSClients.xml   |    2 +-
 .../org/apache/cxf/systest/jms/JMSMTOMImpl.java |   10 +-
 .../org/apache/cxf/systest/jms/JMSTestMtom.java |   20 +-
 .../apache/cxf/systest/jms/JaxWsAPITest.java    |    2 +-
 .../cxf/systest/jms/JmsDestPubSubImpl.java      |    4 +-
 .../java/org/apache/cxf/systest/jms/Server.java |    8 +-
 .../systest/jms/SoapService6SoapPort6Impl.java  |    4 +-
 .../systest/jms/SoapService7SoapPort7Impl.java  |    4 +-
 .../cxf/systest/jms/TwoWayJMSImplBase.java      |   22 +-
 .../GreeterImplWithContinuationsJMS.java        |   28 +-
 .../continuations/HWSoapMessageDocProvider.java |   32 +-
 .../jms/continuations/HelloContinuation.java    |    4 +-
 .../continuations/HelloContinuationService.java |   10 +-
 .../systest/jms/continuations/HelloWorker.java  |   14 +-
 ...HelloWorldContinuationsClientServerTest.java |   14 +-
 .../HelloWorldContinuationsThrottleTest.java    |   18 +-
 .../HelloWorldWithContinuationsJMS.java         |   52 +-
 .../HelloWorldWithContinuationsJMS2.java        |   52 +-
 .../IncomingMessageCounterInterceptor.java      |    8 +-
 .../JMSContinuationsClientServerTest.java       |    6 +-
 .../ProviderJMSContinuationTest.java            |   10 +-
 .../jms/continuations/jms_test_config.xml       |    2 +-
 .../java/org/apache/cxf/systest/jms/gzipBus.xml |    2 +-
 .../MultiTransportClientServerTest.java         |    2 +-
 .../systest/jms/security/JMSWSSecurityTest.java |   80 +-
 .../jms/security/KeystorePasswordCallback.java  |   10 +-
 .../jms/security/SamlCallbackHandler.java       |   30 +-
 .../security/SecurityGreeterImplTwoWayJMS.java  |    6 +-
 .../apache/cxf/systest/jms/security/Server.java |   14 +-
 .../systest/jms/security/TwoWayJMSImplBase.java |   22 +-
 ...GreeterImplTwoWayJMSAppCorrelationIDEng.java |    6 +-
 ...erImplTwoWayJMSAppCorrelationIDNoPrefix.java |    6 +-
 ...eeterImplTwoWayJMSAppCorrelationIDSales.java |    6 +-
 ...woWayJMSAppCorrelationIDStaticPrefixEng.java |    6 +-
 ...WayJMSAppCorrelationIDStaticPrefixSales.java |    6 +-
 ...WayJMSRuntimeCorrelationIDDynamicPrefix.java |    6 +-
 ...yJMSRuntimeCorrelationIDStaticPrefixEng.java |    6 +-
 ...MSRuntimeCorrelationIDStaticPrefixSales.java |    6 +-
 .../systest/jms/shared/JMSSharedQueueTest.java  |    8 +-
 .../org/apache/cxf/systest/jms/soap12Bus.xml    |    2 +-
 .../systest/jms/swa/ClientServerSwaTest.java    |   22 +-
 .../apache/cxf/systest/jms/swa/SwAService.java  |    2 +-
 .../cxf/systest/jms/swa/SwAServiceImpl.java     |   22 +-
 .../jms/tx/GreeterImplWithTransaction.java      |    8 +-
 .../cxf/systest/jms/tx/JMSTransactionTest.java  |   24 +-
 .../cxf/systest/jms/tx/MyBeanLocator.java       |   10 +-
 systests/transport-undertow/pom.xml             |    6 +
 .../http_undertow/ClientServerSessionTest.java  |   86 +-
 .../cxf/systest/http_undertow/GreeterImpl.java  |   74 +-
 .../http_undertow/GreeterSessionImpl.java       |   36 +-
 .../http_undertow/MapIdentityManager.java       |    2 +-
 .../PerRequestAnnotationGreeterImpl.java        |   10 +-
 .../cxf/systest/http_undertow/Server.java       |   12 +-
 .../SessionAnnotationGreeterImpl.java           |   12 +-
 .../systest/http_undertow/SessionServer.java    |    6 +-
 .../SpringAnnotationGreeterImpl.java            |   12 +-
 .../http_undertow/StatefulGreeterImpl.java      |   10 +-
 .../systest/http_undertow/ThreadPoolTest.java   |   10 +-
 .../http_undertow/UndertowBasicAuthHandler.java |   10 +-
 .../http_undertow/UndertowBasicAuthServer.java  |   14 +-
 .../http_undertow/UndertowBasicAuthTest.java    |   16 +-
 .../UndertowDigestAuthHandler.java              |   10 +-
 .../http_undertow/UndertowDigestAuthTest.java   |   32 +-
 .../ClientServerWrappedContinuationTest.java    |   44 +-
 .../continuations/ControlWorker.java            |    8 +-
 .../continuations/HelloContinuation.java        |    4 +-
 .../continuations/HelloContinuationService.java |   10 +-
 .../HelloImplWithWrapppedContinuation.java      |   40 +-
 .../continuations/HelloWorker.java              |   14 +-
 .../cxf/systest/http_undertow/SessionServer.xml |    2 +-
 .../systest/http_undertow/continuations/cxf.xml |    2 +-
 .../http_undertow/continuations/cxf_https.xml   |    2 +-
 .../continuations/jaxws-server.xml              |    2 +-
 .../apache/cxf/systest/http_undertow/cxf.xml    |    2 +-
 .../http_undertow/server-lifecycle-beans.xml    |    2 +-
 .../apache/cxf/systest/http_undertow/server.xml |    2 +-
 .../systest/http_undertow/undertow-engine.xml   |    2 +-
 .../http_undertow/undertowBasicAuthServer.xml   |    2 +-
 .../http_undertow/undertowDigestServer.xml      |    2 +-
 .../org/apache/cxf/https/ssl3/GreeterImpl.java  |   18 +-
 .../org/apache/cxf/https/ssl3/SSLv3Test.java    |  144 +--
 .../cxf/https/ssl3/sslv3-client-allow.xml       |    2 +-
 .../org/apache/cxf/https/ssl3/sslv3-client.xml  |    2 +-
 .../org/apache/cxf/https/ssl3/sslv3-server.xml  |    2 +-
 systests/transports/pom.xml                     |   17 +
 .../org/apache/cxf/systest/http/BareServer.java |    6 +-
 .../org/apache/cxf/systest/http/BusServer.java  |    4 +-
 .../systest/http/ClientServerSessionTest.java   |   86 +-
 .../apache/cxf/systest/http/GreeterImpl.java    |   18 +-
 .../cxf/systest/http/GreeterSessionImpl.java    |   36 +-
 .../cxf/systest/http/HTTPConduitTest.java       |   82 +-
 .../systest/http/HTTPProxyAuthConduitTest.java  |   18 +-
 .../cxf/systest/http/HTTPProxyConduitTest.java  |   18 +-
 .../http/PerRequestAnnotationGreeterImpl.java   |   10 +-
 .../systest/http/PublishedEndpointUrlTest.java  |   16 +-
 .../org/apache/cxf/systest/http/Server.java     |   16 +-
 .../http/SessionAnnotationGreeterImpl.java      |   12 +-
 .../apache/cxf/systest/http/SessionServer.java  |    6 +-
 .../http/SpringAnnotationGreeterImpl.java       |   12 +-
 .../cxf/systest/http/StatefulGreeterImpl.java   |   10 +-
 .../systest/http/WSDLAddressRewriteTest.java    |    4 +-
 .../cxf/systest/http/auth/DigestAuthTest.java   |   26 +-
 .../cxf/systest/http/auth/DigestServer.java     |   12 +-
 .../systest/http_jetty/EngineLifecycleTest.java |   86 +-
 .../cxf/systest/http_jetty/GreeterImpl.java     |   74 +-
 .../http_jetty/JettyBasicAuthServer.java        |   14 +-
 .../systest/http_jetty/JettyBasicAuthTest.java  |   16 +-
 .../JettyCachedOutDigestAuthTest.java           |    4 +-
 .../systest/http_jetty/JettyDigestAuthTest.java |   32 +-
 .../apache/cxf/systest/http_jetty/Server.java   |   12 +-
 .../cxf/systest/http_jetty/ThreadPoolTest.java  |   10 +-
 .../ClientServerWrappedContinuationTest.java    |   38 +-
 .../http_jetty/continuations/ControlWorker.java |    8 +-
 .../continuations/HelloContinuation.java        |    4 +-
 .../continuations/HelloContinuationService.java |   10 +-
 .../HelloImplWithWrapppedContinuation.java      |   40 +-
 .../http_jetty/continuations/HelloWorker.java   |   14 +-
 .../org/apache/cxf/systest/https/BusServer.java |    4 +-
 .../https/ciphersuites/CipherSuiteChecker.java  |    8 +-
 .../https/ciphersuites/CipherSuitesTest.java    |  282 ++---
 .../https/clientauth/ClientAuthTest.java        |  110 +-
 .../systest/https/conduit/HTTPSClientTest.java  |   64 +-
 .../systest/https/conduit/HTTPSConduitTest.java |  254 ++---
 .../conduit/HTTPSProxyAuthConduitTest.java      |   18 +-
 .../https/conduit/HTTPSProxyConduitTest.java    |   18 +-
 .../cxf/systest/https/conduit/PushBack401.java  |   44 +-
 .../cxf/systest/https/conduit/Server.java       |   16 +-
 .../https/constraints/CertConstraintsTest.java  |   34 +-
 .../hostname/HostnameVerificationTest.java      |   68 +-
 .../systest/https/trust/TrustManagerTest.java   |  137 ++-
 .../DirectDispatchClientTest.java               |   36 +-
 .../cxf/systest/local_transport/Server.java     |   12 +-
 .../systest/servlet/AbstractServletTest.java    |    8 +-
 .../cxf/systest/servlet/CXFFilterTest.java      |   18 +-
 .../cxf/systest/servlet/CXFServletTest.java     |  148 +--
 .../systest/servlet/ErrorContextSerletTest.java |   10 +-
 .../servlet/ExternalServicesServletTest.java    |   34 +-
 .../servlet/GetMethodQueryWebRequest.java       |   14 +-
 .../apache/cxf/systest/servlet/HelloImpl.java   |    2 +-
 .../cxf/systest/servlet/JaxRsServletTest.java   |   24 +-
 .../systest/servlet/JsFrontEndServletTest.java  |   14 +-
 .../servlet/NoSpringServletClientTest.java      |   10 +-
 .../systest/servlet/NoSpringServletServer.java  |    6 +-
 .../servlet/SpringAutoPublishServletTest.java   |   40 +-
 .../cxf/systest/servlet/SpringServletTest.java  |   52 +-
 .../apache/cxf/systest/servlet/TestServlet.java |    2 +-
 .../systest/servlet/resolver/ResolverTest.java  |    8 +-
 .../org/apache/cxf/systest/soap_udp/Server.java |   14 +-
 .../cxf/systest/soap_udp/SoapUDPTest.java       |   18 +-
 .../test/resources/digestauth/WEB-INF/beans.xml |    2 +-
 .../apache/cxf/systest/http/SessionServer.xml   |    2 +-
 .../systest/http_jetty/continuations/cxf.xml    |    2 +-
 .../http_jetty/continuations/cxf_https.xml      |    2 +-
 .../http_jetty/continuations/jaxws-server.xml   |    2 +-
 .../http_jetty/continuations/jetty-engine.xml   |    2 +-
 .../org/apache/cxf/systest/http_jetty/cxf.xml   |    2 +-
 .../cxf/systest/http_jetty/jetty-engine.xml     |    2 +-
 .../systest/http_jetty/jettyBasicAuthServer.xml |    2 +-
 .../systest/http_jetty/jettyDigestServer.xml    |    2 +-
 .../http_jetty/server-lifecycle-beans.xml       |    2 +-
 .../apache/cxf/systest/http_jetty/server.xml    |    2 +-
 .../ciphersuites-client-expired-cert.xml        |    2 +-
 .../ciphersuites-client-noconfig.xml            |    2 +-
 .../ciphersuites/ciphersuites-client-tlsv12.xml |    2 +-
 .../https/ciphersuites/ciphersuites-client.xml  |    2 +-
 .../ciphersuites-explicit-client.xml            |    2 +-
 .../ciphersuites/ciphersuites-null-client.xml   |    2 +-
 .../ciphersuites/ciphersuites-rc4-client.xml    |    2 +-
 .../https/ciphersuites/ciphersuites-server.xml  |    2 +-
 .../https/clientauth/client-auth-chain.xml      |    2 +-
 .../https/clientauth/client-auth-invalid.xml    |    2 +-
 .../https/clientauth/client-auth-invalid2.xml   |    2 +-
 .../https/clientauth/client-auth-server.xml     |    2 +-
 .../systest/https/clientauth/client-auth.xml    |    2 +-
 .../systest/https/clientauth/client-no-auth.xml |    2 +-
 .../systest/https/conduit/BethalClientBeans.xml |    2 +-
 .../https/conduit/jaxws-publish-callback.xml    |    2 +-
 .../cxf/systest/https/conduit/jaxws-publish.xml |    2 +-
 .../cxf/systest/https/conduit/jaxws-server.xml  |    2 +-
 .../https/conduit/jaxws-tlsrefs-publish.xml     |    2 +-
 .../apache/cxf/systest/https/conduit/pkcs12.xml |    2 +-
 .../https/conduit/resource-key-spec-url.xml     |    4 +-
 .../systest/https/conduit/resource-key-spec.xml |    2 +-
 .../constraints/jaxws-server-constraints.xml    |    2 +-
 .../systest/https/hostname/hostname-client.xml  |    2 +-
 .../systest/https/hostname/hostname-server.xml  |    2 +-
 .../cxf/systest/https/trust/client-trust.xml    |    2 +-
 .../cxf/systest/https/trust/trust-server.xml    |   18 +-
 .../apache/cxf/systest/servlet/cxf-jaxrs.xml    |    2 +-
 .../apache/cxf/systest/servlet/cxf-servlet.xml  |    2 +-
 .../cxf/systest/servlet/spring-auto-launch.xml  |    2 +-
 .../apache/cxf/systest/servlet/spring-error.xml |    3 +-
 .../apache/cxf/systest/servlet/spring-js.xml    |    2 +-
 .../org/apache/cxf/systest/servlet/spring.xml   |    3 +-
 .../test/resources/resolver/WEB-INF/beans.xml   |    2 +-
 systests/uncategorized/pom.xml                  |   98 +-
 .../java/org/apache/cxf/cxf1226/HelloWorld.java |    4 +-
 .../org/apache/cxf/cxf1226/HelloWorldImpl.java  |   14 +-
 .../cxf1226/MissingQualification1226Test.java   |    4 +-
 .../test/java/org/apache/cxf/cxf1226/beans.xml  |    2 +-
 .../org/apache/cxf/cxf1226/package-info.java    |    2 +-
 .../org/apache/cxf/cxf1332/Cxf1332Impl.java     |    4 +-
 .../org/apache/cxf/cxf1332/Cxf1332Test.java     |    6 +-
 .../test/java/org/apache/cxf/cxf1332/beans.xml  |    2 +-
 .../RespectBindingFeatureClientServerTest.java  |   26 +-
 .../java/org/apache/cxf/cxf2006/Server.java     |   20 +-
 .../basicDOCBare/DOCBareClientServerTest.java   |   14 +-
 .../basicDOCBare/PutLastTradedPriceImpl.java    |   10 +-
 .../apache/cxf/systest/basicDOCBare/Server.java |    8 +-
 .../AddNumbersPortType.java                     |    2 +-
 .../BeanInCreationExceptionTest.java            |    4 +-
 .../systest/beanincreationexception/beans.xml   |    2 +-
 .../systest/bus/BusExtensionLoadingTest.java    |    8 +-
 .../apache/cxf/systest/bus/BusShutdownTest.java |   30 +-
 .../cxf/systest/bus/SpringBusFactoryTest.java   |   84 +-
 .../java/org/apache/cxf/systest/bus/basic.xml   |    2 +-
 .../java/org/apache/cxf/systest/bus/servlet.xml |    2 +-
 .../callback/CallbackClientServerTest.java      |   26 +-
 .../cxf/systest/callback/CallbackImpl.java      |   12 +-
 .../org/apache/cxf/systest/callback/Server.java |    8 +-
 .../apache/cxf/systest/callback/ServerImpl.java |   44 +-
 .../clustering/CircuitBreakerFailoverTest.java  |   10 +-
 .../cxf/systest/clustering/ControlImpl.java     |   26 +-
 .../clustering/FailoverAddressOverrideTest.java |   46 +-
 .../cxf/systest/clustering/FailoverTest.java    |  126 +--
 .../cxf/systest/clustering/GreeterImplA.java    |    8 +-
 .../cxf/systest/clustering/GreeterImplB.java    |    8 +-
 .../cxf/systest/clustering/GreeterImplC.java    |    6 +-
 .../cxf/systest/clustering/GreeterImplD.java    |    6 +-
 .../cxf/systest/clustering/GreeterImplE.java    |    6 +-
 .../LoadDistributorAddressOverrideTest.java     |   10 +-
 .../LoadDistributorSequentialStrategy.java      |   10 +-
 .../LoadDistributorStaticStrategy.java          |    8 +-
 .../systest/clustering/LoadDistributorTest.java |   20 +-
 .../apache/cxf/systest/clustering/Server.java   |    8 +-
 .../clustering/circuit_breaker_failover.xml     |    8 +-
 .../apache/cxf/systest/clustering/failover.xml  |    2 +-
 .../clustering/failover_address_override.xml    |    2 +-
 .../cxf/systest/clustering/load_distributor.xml |    2 +-
 .../load_distributor_address_override.xml       |    2 +-
 .../apache/cxf/systest/clustering/targets.xml   |    2 +-
 .../cxf/systest/coloc/AbstractColocTest.java    |    2 +-
 .../coloc/AbstractHeaderServiceDocLitTest.java  |    4 +-
 .../coloc/AbstractHeaderServiceRpcLitTest.java  |   20 +-
 .../coloc/AbstractWrappedDocLitTest.java        |    4 +-
 .../coloc/BaseHeaderTesterDocLitImpl.java       |    2 +-
 .../coloc/BaseHeaderTesterRpcLitImpl.java       |   26 +-
 .../systest/coloc/ColocHeaderDocLitTest.java    |    2 +-
 .../systest/coloc/ColocHeaderRpcLitTest.java    |    2 +-
 .../systest/coloc/ColocWrappedDocLitTest.java   |    2 +-
 .../cxf/systest/coloc/HeaderTesterUtil.java     |    4 +-
 .../systest/coloc/ThrowFaultInterceptor.java    |    2 +-
 .../org/apache/cxf/systest/coloc/coloc_rpc.xml  |    2 +-
 .../java/org/apache/cxf/systest/coloc/cxf.xml   |    2 +-
 .../cxf/systest/corba/BaseGreeterImpl.java      |    4 +-
 .../CorbaBindingFactoryConfigurerTest.java      |   38 +-
 .../org/apache/cxf/systest/corba/CorbaTest.java |   15 +-
 .../cxf/systest/corba/CorbaTimeoutTest.java     |    3 +-
 .../org/apache/cxf/systest/corba/Server.java    |    2 +-
 .../corba/corba_binding_factory_configurer.xml  |    2 +-
 .../cxf/systest/corba/hello_world_client.xml    |    2 +-
 .../cxf/systest/corba/hello_world_server.xml    |    2 +-
 .../apache/cxf/systest/cxf6319/ServiceImpl.java |    2 +-
 .../apache/cxf/systest/cxf993/Cxf993Impl.java   |    2 +-
 .../apache/cxf/systest/cxf993/Cxf993Test.java   |    4 +-
 .../systest/exception/GenericExceptionTest.java |    8 +-
 .../cxf/systest/exception/GenericsEchoImpl.java |    8 +-
 .../systest/exception/ObjectWithGenerics.java   |   12 +-
 .../factory_pattern/HttpNumberFactoryImpl.java  |   22 +-
 .../systest/factory_pattern/HttpNumberImpl.java |    4 +-
 .../ManualHttpMulitplexClientServerTest.java    |   58 +-
 .../ManualNumberFactoryImpl.java                |   12 +-
 .../factory_pattern/ManualNumberImpl.java       |    8 +-
 .../MultiplexClientServerTest.java              |   54 +-
 .../MultiplexHttpAddressClientServerTest.java   |   82 +-
 .../factory_pattern/NumberFactoryImpl.java      |   20 +-
 .../cxf/systest/factory_pattern/NumberImpl.java |   16 +-
 .../apache/cxf/systest/factory_pattern/cxf.xml  |    2 +-
 .../systest/factory_pattern/cxf_multiplex.xml   |    2 +-
 .../apache/cxf/systest/fault/GreeterImpl.java   |   12 +-
 .../systest/fault/IntFaultClientServerTest.java |   10 +-
 .../interceptor/FaultHandlingInterceptor.java   |   12 +-
 .../cxf/systest/interceptor/GreeterImpl.java    |    2 +-
 .../interceptor/InterceptorFaultTest.java       |  117 +-
 .../org/apache/cxf/systest/interceptor/addr.xml |    2 +-
 .../apache/cxf/systest/interceptor/no-addr.xml  |    2 +-
 .../cxf/systest/jca/OutBoundConnectionTest.java |   42 +-
 .../cxf/systest/js/JSClientServerTest.java      |    6 +-
 .../java/org/apache/cxf/systest/js/Server.java  |    8 +-
 .../cxf/systest/lifecycle/LifeCycleTest.java    |   66 +-
 .../org/apache/cxf/systest/lifecycle/cxf.xml    |    2 +-
 .../management/CountersClientServerTest.java    |   76 +-
 .../cxf/systest/management/ManagedBusTest.java  |   60 +-
 .../management/ManagedClientServerTest.java     |    8 +-
 .../cxf/systest/management/counter-spring.xml   |    2 +-
 .../cxf/systest/management/managed-bus.xml      |    2 +-
 .../cxf/systest/management/managed-spring.xml   |    2 +-
 .../cxf/systest/management/persistent-id.xml    |    2 +-
 .../cxf/systest/mtom/ClientMtomXopTest.java     |   62 +-
 .../apache/cxf/systest/mtom/EchoService.java    |    8 +-
 .../apache/cxf/systest/mtom/MtomPolicyTest.java |   34 +-
 .../apache/cxf/systest/mtom/MtomServerTest.java |    2 +-
 .../mtom/TestAttachmentOutInterceptor.java      |    2 +-
 .../cxf/systest/mtom/TestMtomJMSImpl.java       |    8 +-
 .../apache/cxf/systest/mtom/package-info.java   |    4 +-
 .../cxf/systest/mtom_bindingtype/HelloImpl.java |    2 +-
 .../mtom_bindingtype/MTOMBindingTypeTest.java   |   10 +-
 .../cxf/systest/mtom_bindingtype/Server.java    |    2 +-
 .../cxf/systest/mtom_feature/HelloImpl.java     |    2 +-
 .../MtomFeatureClientServerTest.java            |   37 +-
 .../apache/cxf/systest/mtom_feature/Server.java |    2 +-
 .../mtom_schema_validation/ExceptionType.java   |    4 +-
 .../ExceptionTypeException.java                 |    6 +-
 .../systest/mtom_schema_validation/Hello.java   |   24 +-
 .../mtom_schema_validation/HelloResponse.java   |   16 +-
 .../systest/mtom_schema_validation/HelloWS.java |    4 +-
 .../systest/mtom_schema_validation/Server.java  |    8 +-
 .../CallbackClientServerTest.java               |   42 +-
 .../systest/nested_callback/CallbackImpl.java   |    8 +-
 .../cxf/systest/nested_callback/Server.java     |   10 +-
 .../cxf/systest/nested_callback/ServerImpl.java |   44 +-
 .../outofband/header/OOBHdrServiceImpl.java     |   28 +-
 .../systest/outofband/header/OOBHeaderTest.java |  100 +-
 .../cxf/systest/outofband/header/Server.java    |   26 +-
 .../apache/cxf/systest/outofband/header/cxf.xml |    2 +-
 .../cxf/systest/resolver/JarResolverTest.java   |    8 +-
 .../resolver/JarServiceContractResolver.java    |    2 +-
 .../org/apache/cxf/systest/resolver/Server.java |    4 +-
 .../schema_validation/SchemaValidationImpl.java |    6 +-
 .../ValidationClientServerTest.java             |   74 +-
 .../schema_validation/ValidationServer.java     |   22 +-
 .../cxf/systest/schemaimport/RequestType.java   |    4 +-
 .../cxf/systest/schemaimport/ResponseType.java  |    4 +-
 .../apache/cxf/systest/schemaimport/SayHi.java  |   16 +-
 .../cxf/systest/schemaimport/SayHiImpl.java     |   22 +-
 .../cxf/systest/schemaimport/SayHiImpl2.java    |   22 +-
 .../systest/schemaimport/SchemaImportTest.java  |    6 +-
 .../cxf/systest/schemaimport/ServiceV1Port.java |    4 +-
 .../systest/schemaimport/TestEndpointImpl.java  |    4 +-
 .../systest/schemaimport/sayhi2/SayHiArray.java |    2 +-
 .../schemaimport/sayhi2/SayHiArrayResponse.java |    2 +-
 .../cxf/systest/simple/SimpleFrontendTest.java  |   16 +-
 .../cxf/systest/simple/impl/WSSimpleImpl.java   |    2 +-
 .../cxf/systest/simple/intf/WSSimple.java       |    2 +-
 .../soap/RPCEncodedSoapActionGreeterImpl.java   |    2 +-
 .../soap/RPCLitSoapActionGreeterImpl.java       |    2 +-
 .../cxf/systest/soap/SoapActionGreeterImpl.java |    2 +-
 .../apache/cxf/systest/soap/SoapActionTest.java |  116 +-
 .../WrappedEncodedSoapActionGreeterImpl.java    |    2 +-
 .../soap/WrappedSoapActionGreeterImpl.java      |    2 +-
 .../apache/cxf/systest/soap12/GreeterImpl.java  |   12 +-
 .../org/apache/cxf/systest/soap12/Server.java   |    6 +-
 .../systest/soap12/Soap12ClientServerTest.java  |   24 +-
 .../cxf/systest/soapfault/SOAPFaultImpl.java    |    2 +-
 .../apache/cxf/systest/soapfault/Server.java    |    2 +-
 .../soapfault/details/GreeterImpl11.java        |    4 +-
 .../soapfault/details/GreeterImpl12.java        |   12 +-
 .../cxf/systest/soapfault/details/Server11.java |    2 +-
 .../cxf/systest/soapfault/details/Server12.java |    2 +-
 .../details/Soap11ClientServerTest.java         |   36 +-
 .../details/Soap12ClientServerTest.java         |    6 +-
 .../soapheader/HeaderClientServerTest.java      |   10 +-
 .../ExtSoapHeaderClientServerTest.java          |   32 +-
 .../StaxTransformFeatureTest.java               |  109 +-
 .../apache/cxf/systest/stringarray/Server.java  |    4 +-
 .../systest/stringarray/StringArrayTest.java    |   37 +-
 .../cxf/systest/transform/feature/Echo.java     |   58 +-
 .../cxf/systest/transform/feature/EchoImpl.java |   70 +-
 .../systest/transform/feature/EchoServer.java   |   96 +-
 .../transform/feature/TransformFeatureTest.java |  158 +--
 .../cxf/systest/type_substitution/Apple.java    |    2 +-
 .../AppleFindClientServerTest.java              |    8 +-
 .../type_substitution/AppleFinderImpl.java      |    8 +-
 .../type_substitution/CarDealerImpl.java        |    2 +-
 .../cxf/systest/type_substitution/Server.java   |    2 +-
 .../TypeSubClientServerTest.java                |   18 +-
 .../type_test/AbstractTypeTestClient.java       |   10 +-
 .../type_test/AbstractTypeTestClient2.java      |  104 +-
 .../type_test/AbstractTypeTestClient3.java      |   60 +-
 .../type_test/AbstractTypeTestClient4.java      |   46 +-
 .../type_test/AbstractTypeTestClient5.java      |   18 +-
 .../cxf/systest/type_test/I18NStrings.java      |    4 +-
 .../corba/CORBADocLitClientTypeTest.java        |   22 +-
 .../type_test/corba/CORBADocLitServerImpl.java  |    8 +-
 .../type_test/databinding-schema-validation.xml |    2 +-
 .../soap/SOAPDocLitClientTypeTest.java          |   24 +-
 .../type_test/soap/SOAPDocLitServerImpl.java    |    8 +-
 .../soap/SOAPRpcLitClientTypeTest.java          |    6 +-
 .../type_test/xml/XMLClientTypeTest.java        |    4 +-
 .../systest/type_test/xml/XMLServerImpl.java    |    8 +-
 .../versioning/ClientServerVersioningTest.java  |    2 +-
 .../versioning/MediatorInInterceptor.java       |   28 +-
 .../apache/cxf/systest/versioning/Server.java   |    6 +-
 .../systest/wsdl/CrossSchemaImportsTests.java   |   10 +-
 .../systest/wsdl/LifeCycleListenerTester.java   |   10 +-
 .../src/test/resources/crossSchemaBeans.xml     |    2 +-
 systests/ws-rm/pom.xml                          |    6 +
 .../ws/rm/AbstractClientPersistenceTest.java    |  104 +-
 .../ws/rm/AbstractServerPersistenceTest.java    |   86 +-
 .../ws/rm/CachedOutClientPersistenceTest.java   |    8 +-
 .../cxf/systest/ws/rm/CachedOutMessageTest.java |   30 +-
 .../ws/rm/CachedOutServerPersistenceTest.java   |    6 +-
 .../systest/ws/rm/ClientPersistenceTest.java    |    8 +-
 .../apache/cxf/systest/ws/rm/ControlImpl.java   |   22 +-
 .../cxf/systest/ws/rm/DecoupledBareTest.java    |   18 +-
 .../ws/rm/DecoupledClientServerOnewayTest.java  |   26 +-
 .../ws/rm/DecoupledClientServerTest.java        |   40 +-
 .../ws/rm/DeliveryAssuranceOnewayTest.java      |  112 +-
 .../apache/cxf/systest/ws/rm/GreeterImpl.java   |    2 +-
 .../cxf/systest/ws/rm/ManagedEndpointsTest.java |  202 ++--
 .../ws/rm/MessageCallbackOnewayTest.java        |  100 +-
 .../cxf/systest/ws/rm/MessageLossSimulator.java |   28 +-
 .../systest/ws/rm/PersistentGreeterImpl.java    |    2 +-
 .../systest/ws/rm/ProtocolVariationsTest.java   |  140 +--
 .../systest/ws/rm/RetransmissionGZIPTest.java   |   46 +-
 .../systest/ws/rm/RetransmissionQueueTest.java  |   44 +-
 .../ws/rm/RobustServiceAtMostOnceTest.java      |   22 +-
 .../ws/rm/RobustServiceWithFaultTest.java       |   44 +-
 .../apache/cxf/systest/ws/rm/SequenceTest.java  |  502 ++++-----
 .../org/apache/cxf/systest/ws/rm/Server.java    |   16 +-
 .../systest/ws/rm/ServerPersistenceTest.java    |    6 +-
 .../systest/ws/rm/ServiceInvocationAckBase.java |   46 +-
 .../rm/ServiceInvocationAckPersistenceTest.java |    2 +-
 .../systest/ws/rm/ServiceInvocationAckTest.java |    4 +-
 .../rm/ServiceInvocationAtMostOnceAckTest.java  |    2 +-
 .../systest/ws/rm/SlowProcessingSimulator.java  |   12 +-
 .../systest/ws/rm/WSRMPolicyResolveTest.java    |    2 +-
 .../apache/cxf/systest/ws/rm/atleastonce.xml    |    2 +-
 .../cxf/systest/ws/rm/atmostonce-inorder.xml    |    2 +-
 .../org/apache/cxf/systest/ws/rm/atmostonce.xml |    2 +-
 .../org/apache/cxf/systest/ws/rm/decoupled.xml  |    2 +-
 .../apache/cxf/systest/ws/rm/decoupled_bare.xml |    2 +-
 .../org/apache/cxf/systest/ws/rm/deferred.xml   |    2 +-
 .../ws/rm/exactlyonce-inorder-decoupled.xml     |    2 +-
 .../cxf/systest/ws/rm/exactlyonce-inorder.xml   |    2 +-
 .../apache/cxf/systest/ws/rm/exactlyonce.xml    |    2 +-
 .../cxf/systest/ws/rm/expire-fast-seq.xml       |    2 +-
 .../apache/cxf/systest/ws/rm/gzip-enabled.xml   |    2 +-
 .../cxf/systest/ws/rm/inactivity-timeout.xml    |    2 +-
 .../org/apache/cxf/systest/ws/rm/inorder.xml    |    2 +-
 .../org/apache/cxf/systest/ws/rm/limit-seqs.xml |    2 +-
 .../apache/cxf/systest/ws/rm/managed-client.xml |    2 +-
 .../apache/cxf/systest/ws/rm/managed-server.xml |    2 +-
 .../cxf/systest/ws/rm/message-loss-server.xml   |    2 +-
 .../apache/cxf/systest/ws/rm/message-loss.xml   |    2 +-
 .../org/apache/cxf/systest/ws/rm/no-offer.xml   |    2 +-
 .../ws/rm/persistent-message-loss-server.xml    |    2 +-
 .../org/apache/cxf/systest/ws/rm/persistent.xml |    2 +-
 .../cxf/systest/ws/rm/policy/Greeting.java      |    2 +-
 .../systest/ws/rm/policy/GreetingService.java   |    4 +-
 .../apache/cxf/systest/ws/rm/rminterceptors.xml |    2 +-
 .../systest/ws/rm/rminterceptors_provider.xml   |    2 +-
 .../systest/ws/rm/sec/UTPasswordCallback.java   |   10 +-
 .../ws/rm/sec/WSRMWithWSSecurityPolicyTest.java |   99 +-
 .../cxf/systest/ws/rm/sec/client-policy.xml     |    2 +-
 .../cxf/systest/ws/rm/sec/server-policy.xml     |    2 +-
 .../org/apache/cxf/systest/ws/rm/seqlength1.xml |    2 +-
 .../apache/cxf/systest/ws/rm/seqlength10.xml    |    2 +-
 .../org/apache/cxf/systest/ws/rm/suppressed.xml |    2 +-
 .../ws/rm/sync-ack-atmostonce-server.xml        |    2 +-
 .../ws/rm/sync-ack-persistent-server.xml        |    2 +-
 .../cxf/systest/ws/rm/sync-ack-server.xml       |    2 +-
 .../cxf/systest/ws/rm/terminate-on-shutdown.xml |    2 +-
 .../systest/ws/rm/twoway-endpoint-specific.xml  |    2 +-
 .../cxf/systest/ws/rm/wsrm-policy-resolve.xml   |    2 +-
 .../cxf/systest/ws/util/ConnectionHelper.java   |    4 +-
 .../apache/cxf/systest/ws/util/MessageFlow.java |  126 +--
 .../examples/common/CommonPasswordCallback.java |   10 +-
 .../wssec/examples/common/DoubleItImpl.java     |   10 +-
 .../examples/common/DoubleItPortTypeImpl.java   |   14 +-
 .../wssec/examples/common/SecurityTestUtil.java |    8 +-
 .../wssec/examples/common/TestParam.java        |    8 +-
 .../examples/saml/SamlCallbackHandler.java      |   30 +-
 .../wssec/examples/saml/SamlTokenTest.java      |  110 +-
 .../secconv/SecureConversationTest.java         |   22 +-
 .../wssec/examples/ut/UsernameTokenTest.java    |   78 +-
 .../wssec/examples/x509/X509TokenTest.java      |   56 +-
 .../cxf/systest/wssec/examples/saml/client.xml  |    2 +-
 .../cxf/systest/wssec/examples/saml/server.xml  |    2 +-
 .../systest/wssec/examples/saml/stax-server.xml |    2 +-
 .../systest/wssec/examples/secconv/client.xml   |    2 +-
 .../systest/wssec/examples/secconv/server.xml   |    2 +-
 .../wssec/examples/secconv/stax-server.xml      |    2 +-
 .../wssec/examples/sts/cxf-symmetric.xml        |    2 +-
 .../cxf/systest/wssec/examples/ut/client.xml    |    2 +-
 .../cxf/systest/wssec/examples/ut/server.xml    |    2 +-
 .../systest/wssec/examples/ut/stax-server.xml   |    2 +-
 .../cxf/systest/wssec/examples/x509/client.xml  |    2 +-
 .../cxf/systest/wssec/examples/x509/server.xml  |    2 +-
 .../systest/wssec/examples/x509/stax-server.xml |    2 +-
 systests/ws-security/pom.xml                    |    6 +
 .../cxf/systest/ws/action/ActionTest.java       |   92 +-
 .../ws/action/SecretKeyPasswordCallback.java    |    6 +-
 .../systest/ws/action/SignatureStaxServer.java  |   41 +
 .../ws/action/SignatureWhitespaceTest.java      |   94 +-
 .../systest/ws/algsuite/AlgorithmSuiteTest.java |   94 +-
 .../ws/algsuite/StaxAlgorithmSuiteTest.java     |   32 +-
 .../ws/bindings/BindingPropertiesTest.java      |  184 ++--
 .../cxf/systest/ws/cache/CachingTest.java       |   70 +-
 .../cxf/systest/ws/common/DoubleIt2Impl.java    |   10 +-
 .../cxf/systest/ws/common/DoubleItImpl.java     |   10 +-
 .../systest/ws/common/DoubleItPortTypeImpl.java |   14 +-
 .../ws/common/KeystorePasswordCallback.java     |   10 +-
 .../cxf/systest/ws/common/SecurityTestUtil.java |   12 +-
 .../apache/cxf/systest/ws/common/TestParam.java |    8 +-
 .../systest/ws/common/UTPasswordCallback.java   |   10 +-
 .../CryptoCoverageCheckerTest.java              |  258 ++---
 .../fault/AbstractModifyRequestInterceptor.java |   24 +-
 .../systest/ws/fault/DoubleItPortTypeImpl.java  |   16 +-
 .../ws/fault/DoubleItPortTypeImplJavaFirst.java |   16 +-
 .../apache/cxf/systest/ws/fault/FaultTest.java  |   60 +-
 .../systest/ws/fault/ModifiedRequestTest.java   |  130 +--
 .../org/apache/cxf/systest/ws/gcm/GCMTest.java  |  100 +-
 .../ws/gcm/MGF256AlgorithmSuiteLoader.java      |   16 +-
 .../cxf/systest/ws/httpget/HTTPGetTest.java     |   50 +-
 .../cxf/systest/ws/https/HttpsTokenTest.java    |   44 +-
 .../cxf/systest/ws/mtom/DoubleIt4Impl.java      |   14 +-
 .../cxf/systest/ws/mtom/MTOMSecurityTest.java   |  122 ++-
 .../cxf/systest/ws/parts/DoubleIt3Impl.java     |   14 +-
 .../apache/cxf/systest/ws/parts/PartsTest.java  |  198 ++--
 .../JavaFirstAttachmentPolicyService.java       |    6 +-
 .../JavaFirstAttachmentPolicyServiceImpl.java   |    4 +-
 .../ws/policy/JavaFirstPolicyServer.java        |    2 +-
 .../ws/policy/JavaFirstPolicyService.java       |   16 +-
 .../ws/policy/JavaFirstPolicyServiceImpl.java   |    4 +-
 .../ws/policy/JavaFirstPolicyServiceTest.java   |   20 +-
 .../ws/policy/JavaFirstUriDomainExpression.java |   12 +-
 .../ws/policy/PolicyAlternativeTest.java        |   78 +-
 .../SslUsernamePasswordAttachmentService.java   |    2 +-
 ...slUsernamePasswordAttachmentServiceImpl.java |    4 +-
 .../ws/policy/UriDomainFactoryBeanListener.java |    2 +-
 .../policy/handler/CommonPasswordCallback.java  |  114 +-
 .../systest/ws/policy/handler/DummyHandler.java |  108 +-
 .../systest/ws/policy/handler/HelloService.java |   84 +-
 .../ws/policy/handler/HelloServiceImpl.java     |   90 +-
 .../cxf/systest/ws/policy/handler/MyFault.java  |   74 +-
 .../javafirst/BindingSimpleServiceImpl.java     |    6 +-
 .../NoAlternativesOperationSimpleService.java   |    4 +-
 ...oAlternativesOperationSimpleServiceImpl.java |   10 +-
 .../javafirst/OperationSimpleService.java       |    2 +-
 .../javafirst/OperationSimpleServiceImpl.java   |    8 +-
 .../systest/ws/saml/CustomSaml2Validator.java   |   12 +-
 .../ws/saml/PolicyDecisionPointMockImpl.java    |   42 +-
 .../cxf/systest/ws/saml/SamlTokenTest.java      |  324 +++---
 .../ws/saml/client/SamlCallbackHandler.java     |   30 +-
 .../saml/client/SamlElementCallbackHandler.java |   12 +-
 .../ws/saml/client/SamlRoleCallbackHandler.java |   32 +-
 .../saml/subjectconf/SamlSubjectConfTest.java   |  114 +-
 .../cxf/systest/ws/security/GreeterImpl.java    |   18 +-
 .../systest/ws/security/SecurityPolicyTest.java |  254 ++---
 .../apache/cxf/systest/ws/security/Server.java  |    8 +-
 .../cxf/systest/ws/security/StaxServer.java     |    8 +-
 .../cxf/systest/ws/security/TestOutHandler.java |    4 +-
 .../ws/security/WSSecurityClientTest.java       |   58 +-
 .../ws/security/handler/HelloWorldImpl.java     |    2 +-
 .../systest/ws/security/handler/WSSecTest.java  |    4 +-
 .../cxf/systest/ws/swa/DoubleIt3Impl.java       |   14 +-
 .../cxf/systest/ws/swa/SWAActionTest.java       |   52 +-
 .../cxf/systest/ws/swa/SWAPolicyTest.java       |   98 +-
 .../ws/tokens/BinarySecurityTokenTest.java      |   22 +-
 .../cxf/systest/ws/tokens/DoubleItBSTImpl.java  |   30 +-
 .../ws/tokens/EndorsingSupportingTokenTest.java |   56 +-
 .../systest/ws/tokens/SupportingTokenTest.java  |  106 +-
 .../systest/ws/ut/CustomStaxUTValidator.java    |    8 +-
 .../cxf/systest/ws/ut/CustomUTValidator.java    |   10 +-
 .../ws/ut/SecurityHeaderCacheInterceptor.java   |   26 +-
 .../systest/ws/ut/UsernameTokenDerivedTest.java |   66 +-
 .../systest/ws/ut/UsernameTokenPolicyTest.java  |  104 +-
 .../cxf/systest/ws/ut/UsernameTokenTest.java    |  146 +--
 .../cxf/systest/ws/wssc/PingServiceImpl.java    |    4 +-
 .../org/apache/cxf/systest/ws/wssc/Server.java  |  188 ++--
 .../apache/cxf/systest/ws/wssc/StaxServer.java  |  188 ++--
 .../apache/cxf/systest/ws/wssc/WSSCTest.java    |   46 +-
 .../cxf/systest/ws/wssc/WSSCUnitTest.java       |  118 +-
 .../systest/ws/wssec10/WSSecurity10Test.java    |   40 +-
 ...curity10UsernameAuthorizationLegacyTest.java |   24 +-
 .../WSSecurity10UsernameAuthorizationTest.java  |   48 +-
 .../ws/wssec10/server/AuthorizedServer.java     |    6 +-
 .../ws/wssec10/server/AuthorizedServer2.java    |    6 +-
 .../server/CustomUsernameTokenInterceptor.java  |   24 +-
 .../server/MutualCertificate10SignEncrypt.java  |    8 +-
 ...utualCertificate10SignEncryptRestricted.java |    8 +-
 ...lCertificate10SignEncryptRsa15TripleDes.java |    8 +-
 ...te10SignEncryptRsa15TripleDesRestricted.java |    8 +-
 .../ws/wssec10/server/PingServiceBase.java      |    6 +-
 .../cxf/systest/ws/wssec10/server/Server.java   |    8 +-
 .../SimpleSubjectCreatingInterceptor.java       |    8 +-
 .../server/SimpleUsernameTokenInterceptor.java  |   18 +-
 .../systest/ws/wssec10/server/StaxServer.java   |    8 +-
 .../wssec10/server/UserNameOverTransport.java   |    9 +-
 .../server/UserNameOverTransportRestricted.java |    9 +-
 .../wssec11/RestrictedAlgorithmSuiteLoader.java |   12 +-
 .../systest/ws/wssec11/WSSecurity111Test.java   |   30 +-
 .../systest/ws/wssec11/WSSecurity112Test.java   |   30 +-
 .../systest/ws/wssec11/WSSecurity11Common.java  |   16 +-
 .../ws/wssec11/server/AbstractServer.java       |  160 +--
 .../server/AbstractServerRestricted.java        |  154 +--
 .../systest/ws/wssec11/server/PingService.java  |    4 +-
 .../cxf/systest/ws/wssec11/server/Server11.java |    6 +-
 .../ws/wssec11/server/Server11Restricted.java   |    6 +-
 .../cxf/systest/ws/wssec11/server/Server12.java |    6 +-
 .../ws/wssec11/server/Server12Restricted.java   |    6 +-
 .../systest/ws/wssec11/server/StaxServer11.java |    6 +-
 .../wssec11/server/StaxServer11Restricted.java  |    6 +-
 .../systest/ws/wssec11/server/StaxServer12.java |    6 +-
 .../wssec11/server/StaxServer12Restricted.java  |    6 +-
 .../ws/x509/DoubleItIntermediaryImpl.java       |   22 +-
 .../systest/ws/x509/DoubleItPropertiesImpl.java |   12 +-
 .../cxf/systest/ws/x509/SHA512PolicyLoader.java |   16 +-
 .../cxf/systest/ws/x509/X509TokenTest.java      |  581 +++++-----
 .../apache/cxf/systest/ws/xkms/XKMSTest.java    |   38 +-
 .../org/apache/cxf/systest/ws/action/client.xml |    2 +-
 .../org/apache/cxf/systest/ws/action/server.xml |   54 +-
 .../cxf/systest/ws/action/signature-server.xml  |  113 +-
 .../systest/ws/action/signature-stax-server.xml |   81 ++
 .../apache/cxf/systest/ws/algsuite/client.xml   |    2 +-
 .../apache/cxf/systest/ws/algsuite/server.xml   |    2 +-
 .../cxf/systest/ws/algsuite/stax-server.xml     |    2 +-
 .../apache/cxf/systest/ws/bindings/client.xml   |    2 +-
 .../apache/cxf/systest/ws/bindings/server.xml   |    2 +-
 .../cxf/systest/ws/bindings/stax-server.xml     |    2 +-
 .../org/apache/cxf/systest/ws/cache/client.xml  |    2 +-
 .../org/apache/cxf/systest/ws/cache/server.xml  |    2 +-
 .../cxf/systest/ws/coverage_checker/client.xml  |    2 +-
 .../cxf/systest/ws/coverage_checker/server.xml  |    2 +-
 .../systest/ws/coverage_checker/stax-server.xml |    2 +-
 .../cxf/systest/ws/fault/client-untrusted.xml   |    2 +-
 .../org/apache/cxf/systest/ws/fault/client.xml  |    2 +-
 .../cxf/systest/ws/fault/modified-server.xml    |    2 +-
 .../org/apache/cxf/systest/ws/fault/server.xml  |    2 +-
 .../org/apache/cxf/systest/ws/gcm/client.xml    |    2 +-
 .../apache/cxf/systest/ws/gcm/mgf-client.xml    |    2 +-
 .../apache/cxf/systest/ws/gcm/mgf-server.xml    |    2 +-
 .../cxf/systest/ws/gcm/mgf-stax-server.xml      |    2 +-
 .../org/apache/cxf/systest/ws/gcm/server.xml    |    2 +-
 .../apache/cxf/systest/ws/gcm/stax-server.xml   |    2 +-
 .../apache/cxf/systest/ws/httpget/client.xml    |    2 +-
 .../apache/cxf/systest/ws/httpget/server.xml    |    2 +-
 .../org/apache/cxf/systest/ws/https/client.xml  |    2 +-
 .../org/apache/cxf/systest/ws/https/server.xml  |    2 +-
 .../apache/cxf/systest/ws/https/stax-server.xml |    2 +-
 .../cxf/systest/ws/mtom/DoubleItMtom.wsdl       |   96 +-
 .../org/apache/cxf/systest/ws/mtom/client.xml   |   25 +-
 .../org/apache/cxf/systest/ws/mtom/server.xml   |   27 +-
 .../org/apache/cxf/systest/ws/parts/client.xml  |    2 +-
 .../org/apache/cxf/systest/ws/parts/server.xml  |    2 +-
 .../apache/cxf/systest/ws/parts/stax-server.xml |    2 +-
 .../org/apache/cxf/systest/ws/policy/client.xml |    2 +-
 .../cxf/systest/ws/policy/javafirstclient.xml   |    2 +-
 .../cxf/systest/ws/policy/javafirstserver.xml   |    2 +-
 .../org/apache/cxf/systest/ws/policy/server.xml |    2 +-
 .../cxf/systest/ws/policy/sslcertclient.xml     |    2 +-
 .../cxf/systest/ws/policy/sslnocertclient.xml   |    2 +-
 .../org/apache/cxf/systest/ws/saml/client.xml   |    2 +-
 .../org/apache/cxf/systest/ws/saml/server.xml   |    2 +-
 .../apache/cxf/systest/ws/saml/stax-server.xml  |    2 +-
 .../systest/ws/saml/subjectconf/client-auth.xml |    2 +-
 .../ws/saml/subjectconf/client-noauth.xml       |    2 +-
 .../cxf/systest/ws/saml/subjectconf/server.xml  |    2 +-
 .../systest/ws/saml/subjectconf/stax-server.xml |    2 +-
 .../apache/cxf/systest/ws/security/client.xml   |    2 +-
 .../cxf/systest/ws/security/handler/client.xml  |    2 +-
 .../cxf/systest/ws/security/handler/server.xml  |    2 +-
 .../cxf/systest/ws/security/https_config.xml    |    2 +-
 .../systest/ws/security/https_config_client.xml |    2 +-
 .../apache/cxf/systest/ws/security/server.xml   |    2 +-
 .../cxf/systest/ws/security/stax-server.xml     |    2 +-
 .../org/apache/cxf/systest/ws/swa/client.xml    |    2 +-
 .../apache/cxf/systest/ws/swa/policy-client.xml |    2 +-
 .../apache/cxf/systest/ws/swa/policy-server.xml |    2 +-
 .../org/apache/cxf/systest/ws/swa/server.xml    |    2 +-
 .../cxf/systest/ws/swa/stax-policy-server.xml   |    2 +-
 .../apache/cxf/systest/ws/tokens/bst-server.xml |    2 +-
 .../org/apache/cxf/systest/ws/tokens/client.xml |    2 +-
 .../cxf/systest/ws/tokens/endorsing-client.xml  |    2 +-
 .../cxf/systest/ws/tokens/endorsing-server.xml  |    2 +-
 .../org/apache/cxf/systest/ws/tokens/server.xml |    2 +-
 .../systest/ws/tokens/stax-endorsing-server.xml |    2 +-
 .../cxf/systest/ws/tokens/stax-server.xml       |    2 +-
 .../apache/cxf/systest/ws/tokens/tls-client.xml |    2 +-
 .../apache/cxf/systest/ws/tokens/tls-server.xml |    2 +-
 .../cxf/systest/ws/tokens/tls-stax-server.xml   |    2 +-
 .../apache/cxf/systest/ws/ut/client-derived.xml |    2 +-
 .../org/apache/cxf/systest/ws/ut/client.xml     |    2 +-
 .../apache/cxf/systest/ws/ut/policy-client.xml  |    2 +-
 .../apache/cxf/systest/ws/ut/policy-server.xml  |    2 +-
 .../apache/cxf/systest/ws/ut/server-derived.xml |    2 +-
 .../org/apache/cxf/systest/ws/ut/server.xml     |    2 +-
 .../cxf/systest/ws/ut/stax-policy-server.xml    |    2 +-
 .../apache/cxf/systest/ws/ut/stax-server.xml    |    2 +-
 .../org/apache/cxf/systest/ws/wssc/client.xml   |    2 +-
 .../org/apache/cxf/systest/ws/wssc/server.xml   |    2 +-
 .../apache/cxf/systest/ws/wssc/unit-server.xml  |    2 +-
 .../apache/cxf/systest/ws/wssec10/client.xml    |    2 +-
 .../systest/ws/wssec10/client_restricted.xml    |    2 +-
 .../wssec10/client_restricted_unauthorized.xml  |    2 +-
 .../apache/cxf/systest/ws/wssec10/server.xml    |    2 +-
 .../systest/ws/wssec10/server_restricted.xml    |    2 +-
 .../ws/wssec10/server_restricted_authorized.xml |    2 +-
 .../wssec10/server_restricted_authorized_2.xml  |    2 +-
 .../cxf/systest/ws/wssec10/stax-server.xml      |    2 +-
 .../ws/wssec10/stax-server_restricted.xml       |    2 +-
 .../apache/cxf/systest/ws/wssec11/client.xml    |    2 +-
 .../systest/ws/wssec11/client_restricted.xml    |    2 +-
 .../apache/cxf/systest/ws/wssec11/server.xml    |    2 +-
 .../cxf/systest/ws/x509/DoubleItX509.wsdl       |   54 +
 .../systest/ws/x509/DoubleItX509Addressing.wsdl |  103 ++
 .../org/apache/cxf/systest/ws/x509/client.xml   |    8 +-
 .../cxf/systest/ws/x509/intermediary-client.xml |    2 +-
 .../apache/cxf/systest/ws/x509/intermediary.xml |    2 +-
 .../apache/cxf/systest/ws/x509/jaxws-client.xml |    2 +-
 .../org/apache/cxf/systest/ws/x509/server.xml   |    8 +-
 .../apache/cxf/systest/ws/x509/stax-server.xml  |    9 +-
 .../org/apache/cxf/systest/ws/xkms/client.xml   |    2 +-
 .../org/apache/cxf/systest/ws/xkms/server.xml   |    2 +-
 .../apache/cxf/systest/ws/xkms/stax-server.xml  |    2 +-
 .../apache/cxf/systest/ws/xkms/xkms-server.xml  |    2 +-
 systests/ws-specs/pom.xml                       |   44 +
 .../cxf/systest/ws/AbstractWSATestBase.java     |   49 +-
 .../cxf/systest/ws/addr_disable/Server.java     |   14 +-
 .../systest/ws/addr_disable/WSADisableTest.java |   22 +-
 .../systest/ws/addr_feature/AddNumberImpl.java  |    6 +-
 .../ws/addr_feature/FaultToEndpointServer.java  |  104 +-
 .../cxf/systest/ws/addr_feature/Server.java     |   20 +-
 .../ws/addr_feature/WSAClientServerTest.java    |   32 +-
 .../WSAFaultToClientServerTest.java             |   34 +-
 .../ws/addr_fromjava/WSAFromJavaTest.java       |   42 +-
 .../ws/addr_fromjava/server/AddNumberImpl.java  |   10 +-
 .../server/AddNumberImplNoAddr.java             |    6 +-
 .../systest/ws/addr_fromjava/server/Server.java |    6 +-
 .../systest/ws/addr_fromwsdl/AddNumberImpl.java |    4 +-
 .../cxf/systest/ws/addr_fromwsdl/Server.java    |   36 +-
 .../ws/addr_fromwsdl/WSAFromWSDLTest.java       |   24 +-
 .../systest/ws/addr_responses/HelloImpl.java    |    2 +-
 .../systest/ws/addr_responses/HelloService.java |    4 +-
 .../cxf/systest/ws/addr_responses/Server.java   |    8 +-
 .../WSAResponsesClientServerTest.java           |    2 +-
 .../cxf/systest/ws/addr_wsdl/AddNumberImpl.java |    6 +-
 .../apache/cxf/systest/ws/addr_wsdl/Server.java |   30 +-
 .../systest/ws/addr_wsdl/WSAPureWsdlTest.java   |   60 +-
 ...AddrPolicyAttachmentJaxwsMMProviderTest.java |    2 +-
 .../cxf/systest/ws/addr_wsdl/jaxwsmm/server.xml |    2 +-
 .../ws/addressing/AbstractGreeterImpl.java      |   74 +-
 .../systest/ws/addressing/DecoupledJMSTest.java |   28 +-
 .../systest/ws/addressing/HeaderVerifier.java   |   44 +-
 .../cxf/systest/ws/addressing/MAPTest.java      |   18 +-
 .../cxf/systest/ws/addressing/MAPTestBase.java  |   82 +-
 .../cxf/systest/ws/addressing/MAPVerifier.java  |   18 +-
 .../ws/addressing/NonDecoupledJMSTest.java      |   26 +-
 .../systest/ws/addressing/NonDecoupledTest.java |   24 +-
 .../cxf/systest/ws/addressing/Server.java       |   16 +-
 .../cxf/systest/ws/addressing/cxf-hpux.xml      |    2 +-
 .../apache/cxf/systest/ws/addressing/cxf.xml    |    2 +-
 .../cxf/systest/ws/addressing/jms_decoupled.xml |    2 +-
 .../apache/cxf/systest/ws/addressing/server.xml |    2 +-
 .../ws/addressing/spring/WSAFeatureTest.java    |   18 +-
 .../ws/addressing/spring/WSAFeatureXmlTest.java |   26 +-
 .../cxf/systest/ws/addressing/spring/spring.xml |    2 +-
 .../systest/ws/addressing/wsa_interceptors.xml  |    2 +-
 .../cxf/systest/ws/mex/AddNumberImpl.java       |    6 +-
 .../org/apache/cxf/systest/ws/mex/MEXTest.java  |   12 +-
 .../org/apache/cxf/systest/ws/mex/Server.java   |   16 +-
 .../policy/AddressingAnonymousPolicyTest.java   |   40 +-
 .../ws/policy/AddressingInlinePolicyTest.java   |   46 +-
 .../ws/policy/AddressingOptionalPolicyTest.java |   62 +-
 .../ws/policy/AddressingPolicy0705Test.java     |   38 +-
 ...ssingPolicyExternalAttachmentWsdl11Test.java |   32 +-
 .../systest/ws/policy/AddressingPolicyTest.java |   38 +-
 .../cxf/systest/ws/policy/GreeterImpl.java      |    2 +-
 .../systest/ws/policy/HTTPClientPolicyTest.java |   62 +-
 .../systest/ws/policy/HTTPServerPolicyTest.java |   48 +-
 .../cxf/systest/ws/policy/HttpGreeterImpl.java  |    8 +-
 .../ws/policy/NestedAddressingPolicyTest.java   |   44 +-
 .../ws/policy/PolicyLoggingInterceptor.java     |   14 +-
 .../cxf/systest/ws/policy/PolicyTestHelper.java |    8 +-
 .../systest/ws/policy/RM10PolicyWsdlTest.java   |   40 +-
 .../systest/ws/policy/RM12PolicyWsdlTest.java   |   38 +-
 .../cxf/systest/ws/policy/RMPolicyTest.java     |   42 +-
 .../systest/ws/policy/RMPolicyWsdlTestBase.java |   36 +-
 .../systest/ws/policy/ReliableGreeterImpl.java  |    2 +-
 .../systest/ws/policy/ReliableGreeterImpl2.java |    2 +-
 .../cxf/systest/ws/policy/addr-anon-client.xml  |    2 +-
 .../cxf/systest/ws/policy/addr-anon-server.xml  |    2 +-
 .../ws/policy/addr-inline-policy-old.xml        |    2 +-
 .../systest/ws/policy/addr-inline-policy.xml    |    2 +-
 .../cxf/systest/ws/policy/addr-optional.xml     |    2 +-
 .../cxf/systest/ws/policy/addr-wsdl11.xml       |    2 +-
 .../org/apache/cxf/systest/ws/policy/addr.xml   |    2 +-
 .../apache/cxf/systest/ws/policy/addr0705.xml   |    2 +-
 .../cxf/systest/ws/policy/http-addr-server.xml  |    2 +-
 .../cxf/systest/ws/policy/http-server.xml       |    2 +-
 .../org/apache/cxf/systest/ws/policy/http.xml   |    2 +-
 .../ws/policy/http_client_policy_feature.xml    |    2 +-
 .../org/apache/cxf/systest/ws/policy/rm.xml     |    2 +-
 .../cxf/systest/ws/policy/rm10wsdl_server.xml   |    2 +-
 .../cxf/systest/ws/policy/rm12wsdl_server.xml   |    2 +-
 .../org/apache/cxf/systest/ws/policy/rmwsdl.xml |    2 +-
 .../cxf/systest/ws/util/ConnectionHelper.java   |    4 +-
 .../apache/cxf/systest/ws/util/MessageFlow.java |  126 +--
 systests/ws-transfer/pom.xml                    |    6 +
 .../systest/ws/transfer/CreateStudentTest.java  |   45 +-
 .../systest/ws/transfer/CreateTeacherTest.java  |   40 +-
 .../cxf/systest/ws/transfer/DeleteTest.java     |   36 +-
 .../apache/cxf/systest/ws/transfer/GetTest.java |   32 +-
 .../apache/cxf/systest/ws/transfer/PutTest.java |   48 +-
 .../cxf/systest/ws/transfer/TestUtils.java      |   78 +-
 .../cxf/systest/ws/transfer/UIDManager.java     |   12 +-
 .../transfer/resolver/MyResourceResolver.java   |   10 +-
 .../validator/StudentPutResourceValidator.java  |   12 +-
 .../validator/TeacherResourceValidator.java     |   10 +-
 systests/wsdl_maven/java2ws/pom.xml             |    2 +
 .../java2ws/src/main/webapp/WEB-INF/beans.xml   |    2 +-
 testutils/pom.xml                               |    4 +-
 .../AnonymousComplexTypeImpl.java               |   14 +-
 .../org/apache/cxf/authservice/AuthService.java |    8 +-
 .../apache/cxf/authservice/AuthServiceImpl.java |    4 +-
 .../apache/cxf/authservice/Authenticate.java    |    4 +-
 .../apache/cxf/calculator/CalculatorImpl.java   |    6 +-
 .../java/org/apache/cxf/customer/Customer.java  |    2 +-
 .../cxf/customer/CustomerNotFoundFault.java     |    2 +-
 .../cxf/customer/bare/CustomerService.java      |   18 +-
 .../apache/cxf/customer/bare/package-info.java  |    2 +-
 .../apache/cxf/customer/book/BookService.java   |    2 +-
 .../cxf/customer/book/BookServiceImpl.java      |    6 +-
 .../cxf/customer/book/BookServiceWrapped.java   |    2 +-
 .../customer/book/BookServiceWrappedImpl.java   |    6 +-
 .../cxf/customer/book/GetAnotherBook.java       |    2 +-
 .../apache/cxf/customer/book/package-info.java  |    2 +-
 .../org/apache/cxf/customer/package-info.java   |    2 +-
 .../cxf/customer/wraped/package-info.java       |    2 +-
 .../greeter_control/AbstractGreeterImpl.java    |    8 +-
 .../apache/cxf/greeter_control/ControlImpl.java |   32 +-
 .../FaultThrowingInterceptor.java               |    8 +-
 .../cxf/greeter_control/GreeterImplBase.java    |    2 +-
 .../cxf/greeter_control/GreeterNoWsdl.java      |   30 +-
 .../jaxb_element_test/JaxbElementTestImpl.java  |    6 +-
 .../org/apache/cxf/mtom_xop/TestMtomImpl.java   |    8 +-
 .../OrderedParamHolderImpl.java                 |    8 +-
 .../apache/cxf/test/AbstractCXFSpringTest.java  |   24 +-
 .../org/apache/cxf/test/AbstractCXFTest.java    |   48 +-
 .../apache/cxf/test/TestApplicationContext.java |    4 +-
 .../java/org/apache/cxf/test/TestUtilities.java |   42 +-
 .../java/org/apache/cxf/test/XPathAssert.java   |   40 +-
 .../common/AbstractBusClientServerTestBase.java |   26 +-
 .../common/AbstractBusTestServerBase.java       |   16 +-
 .../common/AbstractClientServerTestBase.java    |   36 +-
 .../testutil/common/AbstractTestServerBase.java |   38 +-
 .../common/EmbeddedJMSBrokerLauncher.java       |   36 +-
 .../cxf/testutil/common/ServerLauncher.java     |   40 +-
 .../apache/cxf/testutil/common/TestUtil.java    |   34 +-
 .../testutil/handler/TrivialSOAPHandler.java    |   12 +-
 .../testutil/recorders/InMessageRecorder.java   |    4 +-
 .../cxf/testutil/recorders/MessageRecorder.java |   12 +-
 .../testutil/recorders/OutMessageRecorder.java  |   26 +-
 .../org/apache/header_test/TestHeaderImpl.java  |   34 +-
 .../header_test/rpc/TestRPCHeaderImpl.java      |    8 +-
 .../org/apache/headers/HeaderTesterImpl.java    |   10 +-
 .../org/apache/hello_world/GreeterImpl.java     |    6 +-
 .../hello_world_doc_lit/GreeterImplDoc.java     |    8 +-
 .../hello_world_doc_lit/HTTPGreeterImpl.java    |    4 +-
 .../hello_world_doc_lit/JMSGreeterImpl.java     |    4 +-
 .../MultiTransportGreeter.java                  |    4 +-
 .../GreeterImplMixedStyle.java                  |    4 +-
 .../AnnotatedGreeterImpl.java                   |   22 +-
 .../AnnotatedGreeterNoOverloadImpl.java         |   18 +-
 .../AnotherDerivedGreeterImpl.java              |    8 +-
 .../hello_world_soap_http/BaseGreeterImpl.java  |   20 +-
 .../DerivedGreeterImpl.java                     |    6 +-
 .../DocLitBareGreeterImpl.java                  |    8 +-
 .../hello_world_soap_http/DocLitBareImpl.java   |   16 +-
 .../HWSoapMessageProvider.java                  |    6 +-
 .../org/apache/hello_world_soap_http/Hello.java |    2 +-
 .../apache/hello_world_soap_http/HelloImpl.java |    6 +-
 .../HelloWorldServiceProvider.java              |    6 +-
 .../HelloWrongAnnotation.java                   |    4 +-
 .../NotAnnotatedGreeterImpl.java                |   80 +-
 .../NotAnnotatedGreeterImplRPCLit.java          |    2 +-
 .../RPCLitGreeterImpl.java                      |    6 +-
 .../any_types/GreeterImpl.java                  |    8 +-
 .../hello_world_xml_http/bare/GreeterImpl.java  |    6 +-
 .../wrapped/GreeterFaultImpl.java               |    6 +-
 .../wrapped/GreeterImpl.java                    |    8 +-
 .../org/apache/cxf/test/XPathAssertTest.java    |    2 +-
 .../header_test/rpc/TestRPCHeaderTest.java      |    2 +-
 .../tools/common/AbstractCXFToolContainer.java  |   20 +-
 .../org/apache/cxf/tools/common/ClassUtils.java |   28 +-
 .../cxf/tools/common/ProcessorTestBase.java     |   20 +-
 .../java/org/apache/cxf/tools/common/Tag.java   |    8 +-
 .../apache/cxf/tools/common/ToolConstants.java  |   12 +-
 .../apache/cxf/tools/common/ToolContext.java    |   36 +-
 .../cxf/tools/common/ToolErrorListener.java     |   10 +-
 .../apache/cxf/tools/common/ToolException.java  |   20 +-
 .../apache/cxf/tools/common/ToolTestBase.java   |   30 +-
 .../cxf/tools/common/VelocityGenerator.java     |   10 +-
 .../apache/cxf/tools/common/VelocityWriter.java |   12 +-
 .../common/dom/ExtendedDocumentBuilder.java     |    6 +-
 .../common/dom/SchemaValidatingSAXParser.java   |    6 +-
 .../cxf/tools/common/model/JAnnotation.java     |    6 +-
 .../tools/common/model/JAnnotationElement.java  |    4 +-
 .../cxf/tools/common/model/JavaClass.java       |   12 +-
 .../cxf/tools/common/model/JavaCodeBlock.java   |    2 +-
 .../tools/common/model/JavaExceptionClass.java  |    8 +-
 .../cxf/tools/common/model/JavaField.java       |   14 +-
 .../cxf/tools/common/model/JavaInterface.java   |   44 +-
 .../cxf/tools/common/model/JavaMethod.java      |   32 +-
 .../cxf/tools/common/model/JavaModel.java       |    6 +-
 .../cxf/tools/common/model/JavaParameter.java   |    6 +-
 .../apache/cxf/tools/common/model/JavaPort.java |   32 +-
 .../cxf/tools/common/model/JavaReturn.java      |    2 +-
 .../tools/common/model/JavaServiceClass.java    |   10 +-
 .../apache/cxf/tools/common/model/JavaType.java |   18 +-
 .../common/toolspec/AbstractToolContainer.java  |   34 +-
 .../tools/common/toolspec/ToolContainer.java    |    2 +-
 .../cxf/tools/common/toolspec/ToolRunner.java   |    8 +-
 .../cxf/tools/common/toolspec/ToolSpec.java     |   66 +-
 .../common/toolspec/parser/CommandDocument.java |    6 +-
 .../toolspec/parser/CommandLineParser.java      |   43 +-
 .../common/toolspec/parser/ErrorVisitor.java    |    2 +-
 .../cxf/tools/common/toolspec/parser/Form.java  |   30 +-
 .../tools/common/toolspec/parser/Option.java    |   48 +-
 .../common/toolspec/parser/OptionGroup.java     |   12 +-
 .../apache/cxf/tools/util/AnnotationUtil.java   |    2 +-
 .../tools/util/BuiltInTypesJavaMappingUtil.java |   10 +-
 .../apache/cxf/tools/util/ClassCollector.java   |   18 +-
 .../apache/cxf/tools/util/FileWriterUtil.java   |    2 +-
 .../org/apache/cxf/tools/util/JAXBUtils.java    |   28 +-
 .../org/apache/cxf/tools/util/NameUtil.java     |    6 +-
 .../cxf/tools/util/OutputStreamCreator.java     |    4 +-
 .../org/apache/cxf/tools/util/PropertyUtil.java |    6 +-
 .../apache/cxf/tools/util/ToolsStaxUtils.java   |   18 +-
 .../org/apache/cxf/tools/util/URLFactory.java   |    4 +-
 .../cxf/tools/common/ToolContextTest.java       |   12 +-
 .../org/apache/cxf/tools/common/model/A.java    |    2 +-
 .../cxf/tools/common/model/JAnnotationTest.java |   18 +-
 .../cxf/tools/common/model/JavaClassTest.java   |    2 +-
 .../tools/common/model/JavaParameterTest.java   |    6 +-
 .../cxf/tools/common/model/JavaTypeTest.java    |    2 +-
 .../cxf/tools/common/toolspec/ToolSpecTest.java |    4 +-
 .../tools/common/toolspec/ToolSupportTest.java  |    2 +-
 .../toolspec/parser/CommandLineParserTest.java  |   26 +-
 .../util/BuiltInTypesJavaMappingUtilTest.java   |    2 +-
 .../cxf/tools/util/FileWriterUtilTest.java      |    8 +-
 .../org/apache/cxf/tools/util/NameUtilTest.java |    2 +-
 .../org/apache/cxf/tools/util/StAXUtilTest.java |    2 +-
 .../cxf/tools/util/URIParserUtilTest.java       |    6 +-
 .../tools/corba/processors/idl/IDLLexer.java    |  238 ++--
 .../tools/corba/processors/idl/IDLParser.java   | 1026 +++++++++---------
 .../corba/processors/idl/IDLTokenTypes.java     |    2 +-
 .../org/apache/cxf/tools/corba/IDLToWSDL.java   |   20 +-
 .../org/apache/cxf/tools/corba/WSDLToIDL.java   |   12 +-
 .../tools/corba/common/CorbaPrimitiveMap.java   |   32 +-
 .../tools/corba/common/PrimitiveMapBase.java    |    2 +-
 .../corba/common/ProcessorEnvironment.java      |   14 +-
 .../tools/corba/common/ReferenceConstants.java  |    2 +-
 .../cxf/tools/corba/common/SchemaFactory.java   |    2 +-
 .../tools/corba/common/SchemaFactoryImpl.java   |   10 +-
 .../tools/corba/common/SchemaWriterImpl.java    |   12 +-
 .../tools/corba/common/ToolCorbaConstants.java  |    6 +-
 .../corba/common/WSDLCorbaFactoryImpl.java      |    6 +-
 .../tools/corba/common/WSDLCorbaWriterImpl.java |   20 +-
 .../corba/common/XmlSchemaPrimitiveMap.java     |   28 +-
 .../tools/corba/common/idltypes/CorbaUtils.java |   20 +-
 .../corba/common/idltypes/IdlAnonArray.java     |    8 +-
 .../corba/common/idltypes/IdlAnonFixed.java     |    6 +-
 .../corba/common/idltypes/IdlAnonSequence.java  |    6 +-
 .../tools/corba/common/idltypes/IdlArray.java   |    6 +-
 .../corba/common/idltypes/IdlArrayBase.java     |    8 +-
 .../corba/common/idltypes/IdlAttribute.java     |    8 +-
 .../tools/corba/common/idltypes/IdlConst.java   |    8 +-
 .../tools/corba/common/idltypes/IdlDefn.java    |    8 +-
 .../corba/common/idltypes/IdlDefnImplBase.java  |    8 +-
 .../tools/corba/common/idltypes/IdlEnum.java    |    6 +-
 .../corba/common/idltypes/IdlEnumerator.java    |    6 +-
 .../corba/common/idltypes/IdlException.java     |    6 +-
 .../tools/corba/common/idltypes/IdlField.java   |    6 +-
 .../tools/corba/common/idltypes/IdlFixed.java   |    6 +-
 .../corba/common/idltypes/IdlInterface.java     |    4 +-
 .../tools/corba/common/idltypes/IdlModule.java  |    4 +-
 .../corba/common/idltypes/IdlOperation.java     |    4 +-
 .../tools/corba/common/idltypes/IdlParam.java   |   10 +-
 .../corba/common/idltypes/IdlPrimitive.java     |    8 +-
 .../tools/corba/common/idltypes/IdlRoot.java    |    8 +-
 .../corba/common/idltypes/IdlScopeBase.java     |    8 +-
 .../corba/common/idltypes/IdlSequence.java      |    6 +-
 .../tools/corba/common/idltypes/IdlString.java  |    8 +-
 .../tools/corba/common/idltypes/IdlStruct.java  |    4 +-
 .../corba/common/idltypes/IdlStructBase.java    |    6 +-
 .../tools/corba/common/idltypes/IdlTypedef.java |    4 +-
 .../tools/corba/common/idltypes/IdlUnion.java   |    8 +-
 .../corba/common/idltypes/IdlUnionBranch.java   |    2 +-
 .../tools/corba/common/idltypes/IdlWString.java |    8 +-
 .../idlpreprocessor/DefaultIncludeResolver.java |   18 +-
 .../idlpreprocessor/IdlPreprocessorReader.java  |   30 +-
 .../idlpreprocessor/PreprocessingException.java |    2 +-
 .../processors/idl/ArrayDeferredAction.java     |   26 +-
 .../processors/idl/AttributeDeferredAction.java |   26 +-
 .../corba/processors/idl/AttributeVisitor.java  |   12 +-
 .../corba/processors/idl/ConstVisitor.java      |   36 +-
 .../processors/idl/ConstrTypeSpecVisitor.java   |   16 +-
 .../idl/DeferredActionCollection.java           |   18 +-
 .../corba/processors/idl/DefinitionVisitor.java |    8 +-
 .../processors/idl/ExceptionDeferredAction.java |   20 +-
 .../processors/idl/FixedPtConstVisitor.java     |   36 +-
 .../processors/idl/IDLModuleProcessor.java      |    2 +-
 .../corba/processors/idl/IDLProcessor.java      |    8 +-
 .../processors/idl/IDLToWSDLProcessor.java      |  226 ++--
 .../corba/processors/idl/ModuleToNSMapper.java  |   12 +-
 .../corba/processors/idl/ModuleVisitor.java     |   12 +-
 .../processors/idl/OperationDeferredAction.java |   18 +-
 .../corba/processors/idl/OperationVisitor.java  |    4 +-
 .../processors/idl/ParamTypeSpecVisitor.java    |   12 +-
 .../corba/processors/idl/PortTypeVisitor.java   |  122 +--
 .../processors/idl/PrimitiveTypesVisitor.java   |   34 +-
 .../cxf/tools/corba/processors/idl/Scope.java   |   34 +-
 .../processors/idl/ScopeNameCollection.java     |   12 +-
 .../corba/processors/idl/ScopedNameVisitor.java |  138 +--
 .../processors/idl/SimpleTypeSpecVisitor.java   |   18 +-
 .../corba/processors/idl/StringVisitor.java     |    2 +-
 .../processors/idl/StructDeferredAction.java    |   20 +-
 .../processors/idl/TemplateTypeSpecVisitor.java |   10 +-
 .../corba/processors/idl/TypeDclVisitor.java    |   10 +-
 .../processors/idl/TypedefDeferredAction.java   |   20 +-
 .../corba/processors/idl/TypedefVisitor.java    |   38 +-
 .../tools/corba/processors/idl/TypesUtils.java  |   16 +-
 .../corba/processors/idl/TypesVisitor.java      |   14 +-
 .../corba/processors/idl/TypesVisitorBase.java  |    4 +-
 .../processors/idl/UnionDeferredAction.java     |   24 +-
 .../corba/processors/idl/UnionVisitor.java      |    4 +-
 .../cxf/tools/corba/processors/idl/Visitor.java |    6 +-
 .../tools/corba/processors/idl/VisitorBase.java |   26 +-
 .../corba/processors/idl/WSDLASTVisitor.java    |    6 +-
 .../corba/processors/idl/WSDLSchemaManager.java |    2 +-
 .../corba/processors/wsdl/WSDLParameter.java    |    8 +-
 .../processors/wsdl/WSDLToCorbaBinding.java     |   14 +-
 .../processors/wsdl/WSDLToCorbaHelper.java      |   14 +-
 .../processors/wsdl/WSDLToCorbaProcessor.java   |   46 +-
 .../corba/processors/wsdl/WSDLToIDLAction.java  |  240 ++--
 .../corba/processors/wsdl/WSDLToProcessor.java  |   32 +-
 .../processors/wsdl/WSDLToTypeProcessor.java    |    2 +-
 .../corba/utils/FileOutputStreamFactory.java    |    8 +-
 .../apache/cxf/tools/corba/IDLToWSDLTest.java   |   88 +-
 .../apache/cxf/tools/corba/WSDLToIDLTest.java   |   50 +-
 .../cxf/tools/corba/common/ToolTestBase.java    |   30 +-
 .../IdlPreprocessorReaderTest.java              |    6 +-
 .../processors/IDLToWSDLGenerationTest.java     |  198 ++--
 .../processors/WSDLToCorbaBindingTest.java      |  222 ++--
 .../processors/WSDLToCorbaBindingTypeTest.java  |  352 +++---
 .../processors/WSDLToIDLGenerationTest.java     |  204 ++--
 .../apache/cxf/tools/corba/utils/TestUtils.java |    8 +-
 .../corba/utils/TestWSDLCorbaWriterImpl.java    |   38 +-
 .../tools/corba/utils/WSDLGenerationTester.java |    6 +-
 .../src/main/java/META-INF/cxf/java2wsbeans.xml |    2 +-
 .../org/apache/cxf/tools/java2js/JavaToJS.java  |    8 +-
 .../java2js/processor/JavaToJSProcessor.java    |    6 +-
 .../org/apache/cxf/tools/java2ws/JavaToWS.java  |   12 +-
 .../cxf/tools/java2ws/JavaToWSContainer.java    |   30 +-
 .../cxf/tools/java2ws/util/JavaFirstUtil.java   |    2 +-
 .../java2wsdl/generator/AbstractGenerator.java  |    8 +-
 .../generator/WSDLGeneratorFactory.java         |    4 +-
 .../generator/wsdl11/BeanGenerator.java         |   20 +-
 .../wsdl11/DateTypeCustomGenerator.java         |    4 +-
 .../generator/wsdl11/FaultBeanGenerator.java    |    8 +-
 .../generator/wsdl11/WSDL11Generator.java       |    4 +-
 .../generator/wsdl11/WrapperBeanGenerator.java  |    4 +-
 .../wsdl11/annotator/WrapperBeanAnnotator.java  |   30 +-
 .../annotator/WrapperBeanFieldAnnotator.java    |   10 +-
 .../java2wsdl/processor/FrontendFactory.java    |    8 +-
 .../processor/JavaToWSDLProcessor.java          |   34 +-
 .../processor/internal/AntGenerator.java        |   10 +-
 .../internal/ServiceBuilderFactory.java         |    4 +-
 .../internal/SpringServiceBuilderFactory.java   |   12 +-
 .../processor/internal/jaxws/FaultBean.java     |   18 +-
 .../internal/jaxws/JAXWSFrontEndProcessor.java  |   18 +-
 .../internal/jaxws/RequestWrapper.java          |    8 +-
 .../internal/jaxws/ResponseWrapper.java         |   18 +-
 .../processor/internal/jaxws/Wrapper.java       |   14 +-
 .../processor/internal/jaxws/WrapperUtil.java   |    8 +-
 .../jaxws/generator/JaxwsClientGenerator.java   |    2 +-
 .../jaxws/generator/JaxwsSEIGenerator.java      |    4 +-
 .../jaxws/generator/JaxwsServerGenerator.java   |    4 +-
 .../simple/SimpleFrontEndProcessor.java         |   12 +-
 .../generator/AbstractSimpleGenerator.java      |   10 +-
 .../simple/generator/SimpleClientGenerator.java |    4 +-
 .../simple/generator/SimpleImplGenerator.java   |    8 +-
 .../simple/generator/SimpleSEIGenerator.java    |    4 +-
 .../simple/generator/SimpleServerGenerator.java |    4 +-
 .../cxf/tools/fortest/AddNumbersImpl.java       |    8 +-
 .../org/apache/cxf/tools/fortest/HelloReq.java  |    2 +-
 .../org/apache/cxf/tools/fortest/RPCHello.java  |    4 +-
 .../tools/fortest/action/AddNumbersImpl.java    |    6 +-
 .../apache/cxf/tools/fortest/addr/WSAImpl2.java |    2 +-
 .../cxf/tools/fortest/aegis2ws/Something.java   |    2 +-
 .../classnoanno/docwrapped/Calculator.java      |    2 +-
 .../classnoanno/docwrapped/jaxws/GetPrice.java  |   16 +-
 .../docwrapped/jaxws/GetPriceResponse.java      |   12 +-
 .../docwrapped/jaxws/ObjectFactory.java         |   32 +-
 .../tools/fortest/cxf1450/WebParamService.java  |    2 +-
 .../cxf/tools/fortest/cxf1519/EndpointImpl.java |    2 +-
 .../tools/fortest/cxf1519/UserException.java    |    4 +-
 .../apache/cxf/tools/fortest/cxf188/Demo.java   |    2 +-
 .../tools/fortest/cxf2934/WebParamService.java  |    2 +-
 .../apache/cxf/tools/fortest/cxf4877/Hello.java |    2 +-
 .../apache/cxf/tools/fortest/cxf669/Hello.java  |    2 +-
 .../cxf/tools/fortest/cxf774/ListTest.java      |    8 +-
 .../cxf/tools/fortest/cxf774/ListTestImpl.java  |    4 +-
 .../cxf/tools/fortest/epr/AddNumbersImpl.java   |    6 +-
 .../cxf/tools/fortest/exception/Echo2Impl.java  |    6 +-
 .../cxf/tools/fortest/exception/Echo3Impl.java  |    4 +-
 .../cxf/tools/fortest/exception/EchoImpl.java   |    6 +-
 .../tools/fortest/exception/MyException.java    |    2 +-
 .../tools/fortest/exception/OrderEchoImpl.java  |    6 +-
 .../exception/TransientMessageException.java    |    8 +-
 .../fortest/exception/TypeAdapterException.java |    6 +-
 .../cxf/tools/fortest/headers/SomeHeaders.java  |    2 +-
 .../cxf/tools/fortest/holder/HolderService.java |    4 +-
 .../org/apache/cxf/tools/fortest/inherit/B.java |    6 +-
 .../cxf/tools/fortest/jaxws/rpc/Greeter.java    |    2 +-
 .../tools/fortest/jaxws/rpc/GreeterFault.java   |    2 +-
 .../apache/cxf/tools/fortest/simple/Hello.java  |    2 +-
 .../doc/GreeterNoWrapperBean.java               |    2 +-
 .../withannotation/doc/HelloWithNoWebParam.java |    2 +-
 .../withannotation/doc/TestDataBean.java        |   12 +-
 .../withannotation/doc/jaxws/GetPrice.java      |   16 +-
 .../doc/jaxws/GetPriceResponse.java             |   12 +-
 .../withannotation/doc/jaxws/ObjectFactory.java |   32 +-
 .../fortest/withannotation/rpc/EchoImpl.java    |    2 +-
 .../tools/fortest/withannotation/rpc/Hello.java |    4 +-
 .../tools/fortest/xmllist/AddNumberImpl.java    |    2 +-
 .../fortest/xmllist/AddNumbersPortType.java     |   22 +-
 .../processor/JavaToJSProcessorTest.java        |    7 +-
 .../org/apache/cxf/tools/java2ws/AegisTest.java |   24 +-
 .../apache/cxf/tools/java2ws/JavaToWSTest.java  |   32 +-
 .../cxf/tools/java2ws/fortest/AddException.java |    2 +-
 .../wsdl11/FaultBeanGeneratorTest.java          |    5 +-
 .../wsdl11/WrapperBeanGeneratorTest.java        |   41 +-
 .../annotator/WrapperBeanAnnotatorTest.java     |   32 +-
 .../WrapperBeanFieldAnnotatorTest.java          |    2 +-
 .../cxf/tools/java2wsdl/processor/Hello.java    |    2 +-
 .../tools/java2wsdl/processor/HelloBare.java    |    2 +-
 .../processor/JavaToProcessorTest.java          |  100 +-
 .../internal/ServiceBuilderFactoryTest.java     |    2 +-
 .../jaxws/JaxwsServiceBuilderNoAnnoTest.java    |    6 +-
 .../jaxws/JaxwsServiceBuilderRPCTest.java       |    4 +-
 .../internal/jaxws/JaxwsServiceBuilderTest.java |   22 +-
 .../internal/jaxws/RequestWrapperTest.java      |   16 +-
 .../internal/jaxws/ResponseWrapperTest.java     |   14 +-
 .../processor/internal/jaxws/WrapperTest.java   |    6 +-
 .../java/org/apache/xmladapter/Greeter.java     |    2 +-
 .../test/java/org/apache/xmladapter/Money.java  |    4 +-
 .../test/resources/revisedAegisDefaultBeans.xml |    2 +-
 .../cxf/tools/validator/AbstractValidator.java  |    2 +-
 .../cxf/tools/validator/ServiceValidator.java   |    2 +-
 .../cxf/tools/validator/WSDLValidator.java      |   12 +-
 .../internal/AbstractDefinitionValidator.java   |    4 +-
 .../internal/MIMEBindingValidator.java          |   10 +-
 .../validator/internal/SchemaValidator.java     |    6 +-
 .../cxf/tools/validator/internal/Stax2DOM.java  |    2 +-
 .../internal/UniqueBodyPartsValidator.java      |   10 +-
 .../validator/internal/ValidationResult.java    |   14 +-
 .../tools/validator/internal/ValidatorUtil.java |   34 +-
 .../validator/internal/WSDL11Validator.java     |   42 +-
 .../validator/internal/WSDLRefValidator.java    |   30 +-
 .../validator/internal/WSIBPValidator.java      |   14 +-
 .../tools/validator/internal/model/XNode.java   |   12 +-
 .../cxf/tools/validator/WSDLValidationTest.java |   10 +-
 .../validator/internal/WSDL11ValidatorTest.java |    2 +-
 .../internal/WSDLRefValidatorTest.java          |   14 +-
 .../validator/internal/model/XNodeTest.java     |    2 +-
 .../org/apache/cxf/tools/wadlto/WADLToJava.java |    6 +-
 .../cxf/tools/wadlto/WadlToolConstants.java     |   20 +-
 .../tools/wadlto/jaxb/CustomizationParser.java  |   36 +-
 .../cxf/tools/wadlto/jaxrs/JAXRSContainer.java  |   82 +-
 .../cxf/tools/wadlto/jaxrs/SourceGenerator.java |  700 ++++++------
 .../tools/wadlto/jaxrs/JAXRSContainerTest.java  |  262 ++---
 .../tools/wadlto/jaxrs/ValidateWadlTest.java    |   10 +-
 .../cxf/tools/wadlto/jaxrs/WADLToJavaTest.java  |   28 +-
 tools/wsdlto/core/pom.xml                       |    2 +
 .../org/apache/cxf/tools/wsdlto/WSDLToJava.java |    2 +-
 .../cxf/tools/wsdlto/WSDLToJavaContainer.java   |   90 +-
 .../tools/wsdlto/core/AbstractGenerator.java    |    6 +-
 .../tools/wsdlto/core/AbstractWSDLBuilder.java  |    2 +-
 .../tools/wsdlto/core/DataBindingProfile.java   |    6 +-
 .../tools/wsdlto/core/DefaultValueProvider.java |   18 +-
 .../cxf/tools/wsdlto/core/FrontEndProfile.java  |    6 +-
 .../cxf/tools/wsdlto/core/PluginLoader.java     |    4 +-
 .../tools/wsdlto/core/RandomValueProvider.java  |    8 +-
 .../wsdlto/core/WSDLDefinitionBuilder.java      |    4 +-
 .../source/SourceDatabindingProfile.java        |    8 +-
 .../tools/wsdlto/WSDLToJavaContainerTest.java   |    4 +-
 .../cxf/tools/wsdlto/core/DummyGenerator.java   |    2 +-
 .../wsdlto/core/WSDLDefinitionBuilderTest.java  |   34 +-
 .../jaxb/ClassNameAllocatorImpl.java            |    6 +-
 .../databinding/jaxb/JAXBBindErrorListener.java |   12 +-
 .../databinding/jaxb/JAXBDataBinding.java       |   36 +-
 .../databinding/jaxb/TypesCodeWriter.java       |   16 +-
 .../wsdlto/javascript/JavaScriptContainer.java  |    8 +-
 .../wsdlto/javascript/JavaScriptProfile.java    |    2 +-
 .../wsdlto/javascript/WSDLToJavaScript.java     |    2 +-
 .../javascript/WSDLToJavaScriptProcessor.java   |   20 +-
 .../wsdlto/javascript/WSDLToJavaScriptTest.java |   22 +-
 .../frontend/jaxws/CXFJAXWSContainer.java       |    2 +-
 .../wsdlto/frontend/jaxws/JAXWS21Container.java |    2 +-
 .../wsdlto/frontend/jaxws/JAXWSContainer.java   |    8 +-
 .../wsdlto/frontend/jaxws/JAXWSProfile.java     |    2 +-
 .../jaxws/customization/CustomNodeSelector.java |    8 +-
 .../customization/CustomizationParser.java      |   88 +-
 .../jaxws/customization/JAXWSBinding.java       |   28 +-
 .../jaxws/customization/JAXWSBindingParser.java |    2 +-
 .../jaxws/customization/JAXWSClass.java         |    2 +-
 .../generators/AbstractJAXWSGenerator.java      |    2 +-
 .../frontend/jaxws/generators/AntGenerator.java |   20 +-
 .../jaxws/generators/ClientGenerator.java       |   12 +-
 .../jaxws/generators/FaultGenerator.java        |   10 +-
 .../generators/HandlerConfigGenerator.java      |   20 +-
 .../jaxws/generators/ImplGenerator.java         |   18 +-
 .../frontend/jaxws/generators/SEIGenerator.java |   18 +-
 .../jaxws/generators/ServerGenerator.java       |   18 +-
 .../jaxws/generators/ServiceGenerator.java      |   34 +-
 .../jaxws/processor/WSDLToJavaProcessor.java    |   16 +-
 .../processor/internal/AbstractProcessor.java   |    2 +-
 .../processor/internal/FaultProcessor.java      |    2 +-
 .../processor/internal/OperationProcessor.java  |   36 +-
 .../processor/internal/ParameterProcessor.java  |   70 +-
 .../processor/internal/PortTypeProcessor.java   |   12 +-
 .../jaxws/processor/internal/ProcessorUtil.java |   18 +-
 .../processor/internal/ServiceProcessor.java    |   56 +-
 .../internal/annotator/BindingAnnotator.java    |   18 +-
 .../annotator/SoapBindingAnnotator.java         |   14 +-
 .../internal/annotator/WSActionAnnotator.java   |   30 +-
 .../internal/annotator/WebMethodAnnotator.java  |    2 +-
 .../internal/annotator/WebParamAnnotator.java   |   14 +-
 .../internal/annotator/WebResultAnnotator.java  |    8 +-
 .../internal/annotator/WebServiceAnnotator.java |    6 +-
 .../internal/annotator/WrapperAnnotator.java    |    6 +-
 .../annotator/XmlJavaTypeAdapterAnnotator.java  |    2 +-
 .../internal/annotator/XmlListAnotator.java     |    4 +-
 .../internal/annotator/XmlSeeAlsoAnnotator.java |    6 +-
 .../internal/mapper/InterfaceMapper.java        |    6 +-
 .../processor/internal/mapper/MethodMapper.java |    2 +-
 .../internal/mapper/ParameterMapper.java        |   16 +-
 .../jaxws/validator/UniqueBodyValidator.java    |    8 +-
 .../WrapperStyleNameCollisionValidator.java     |   18 +-
 .../jaxws/wsdl11/CustomizedWSDLLocator.java     |   26 +-
 .../jaxws/wsdl11/JAXWSDefinitionBuilder.java    |   18 +-
 .../wsdlto/frontend/jaxws/DummyDataBinding.java |    8 +-
 .../wsdlto/frontend/jaxws/JAXWSProfileTest.java |    8 +-
 .../internal/PortTypeProcessorTest.java         |    2 +-
 .../processor/internal/ProcessorUtilTest.java   |    6 +-
 .../annotator/WebParamAnnotatorTest.java        |    8 +-
 .../annotator/XmlSeeAlsoAnnotatorTest.java      |    4 +-
 .../internal/mapper/InterfaceMapperTest.java    |    8 +-
 .../internal/mapper/MethodMapperTest.java       |    4 +-
 .../wsdl11/JAXWSDefinitionBuilderTest.java      |    2 +-
 .../apache/cxf/tools/misc/WSDLToService.java    |    4 +-
 .../org/apache/cxf/tools/misc/WSDLToSoap.java   |   16 +-
 .../org/apache/cxf/tools/misc/WSDLToXML.java    |   16 +-
 .../org/apache/cxf/tools/misc/XSDToWSDL.java    |    4 +-
 .../misc/processor/AbstractWSDLToProcessor.java |   10 +-
 .../misc/processor/WSDLToSoapProcessor.java     |    4 +-
 .../misc/processor/address/AddressFactory.java  |    8 +-
 .../processor/WSDLToServiceProcessorTest.java   |    6 +-
 .../misc/processor/XSDToWSDLProcessorTest.java  |    6 +-
 tools/wsdlto/test/pom.xml                       |    6 -
 .../cxf/tools/wsdlto/AbstractCodeGenTest.java   |   10 +-
 .../cxf/tools/wsdlto/core/PluginLoaderTest.java |   22 +-
 .../wsdlto/jaxb/JAXBCodeGenOptionTest.java      |    8 +-
 .../cxf/tools/wsdlto/jaxws/CodeGenBugTest.java  |   14 +-
 .../tools/wsdlto/jaxws/CodeGenOptionTest.java   |   20 +-
 .../cxf/tools/wsdlto/jaxws/CodeGenTest.java     |  100 +-
 .../cxf/tools/wsdlto/jaxws/DummyXjcPlugin.java  |   10 +-
 .../tools/wsdlto/jaxws/JAXWSContainerTest.java  |   18 +-
 .../wsdl11/JAXWSDefinitionBuilderTest.java      |    2 +-
 .../tools/wsdlto/validator/ValidatorTest.java   |    6 +-
 .../wsdlto/xmlbeans/XmlbeansBindingTest.java    |   54 -
 6637 files changed, 98320 insertions(+), 117955 deletions(-)
----------------------------------------------------------------------



Mime
View raw message