Merge branch '3.0.x-fixes' of https://git-wip-us.apache.org/repos/asf/cxf into 3.0.x-fixes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f2e1ed38 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f2e1ed38 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f2e1ed38 Branch: refs/heads/3.0.x-fixes Commit: f2e1ed385d49f2c14643cc3b5521db0cc5f57da4 Parents: 69aff5e 2d64141 Author: Colm O hEigeartaigh <[email protected]> Authored: Thu Jul 9 17:37:08 2015 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Thu Jul 9 17:37:08 2015 +0100 ---------------------------------------------------------------------- .gitmergeinfo | 6 ++ .../org/apache/cxf/common/jaxb/JAXBUtils.java | 65 ++++++++++++++++++++ .../apache/cxf/common/security/SimpleGroup.java | 1 + .../AbstractBPBeanDefinitionParser.java | 8 ++- .../jsse/TLSClientParametersConfig.java | 8 +-- .../spring/AbstractBeanDefinitionParser.java | 11 +++- .../configuration/spring/JAXBBeanFactory.java | 26 ++++---- .../cxf/ws/addressing/VersionTransformer.java | 19 ++++-- pom.xml | 2 +- .../org/apache/cxf/jaxb/io/DataReaderImpl.java | 31 +++++++--- .../org/apache/cxf/jaxrs/ext/xml/XMLSource.java | 44 +++++++++---- .../cxf/jaxrs/provider/JAXBElementProvider.java | 4 +- .../cxf/jaxrs/provider/XSLTJaxbProvider.java | 2 + .../security/KerberosAuthenticationFilter.java | 1 + .../org/apache/cxf/jaxrs/utils/JAXBUtils.java | 16 ++++- .../handler/AnnotationHandlerChainBuilder.java | 4 +- .../handler/logical/LogicalMessageImpl.java | 5 +- .../handler/soap/SOAPMessageContextImpl.java | 5 +- .../org/apache/cxf/jaxws/spi/ProviderImpl.java | 18 ++++-- .../bootstrapping/SimpleXMLSettingsStorage.java | 9 ++- .../jaxrs/provider/atom/AtomPojoProvider.java | 4 +- .../cxf/jaxrs/provider/json/JSONProvider.java | 4 +- .../jose/jaxrs/JwtAuthenticationFilter.java | 1 + .../saml/authorization/SubjectPrincipal.java | 2 + rt/transports/http-jetty/pom.xml | 6 ++ .../JettyHTTPServerEngineFactoryHolder.java | 21 +++---- .../NettyHttpServerEngineFactoryHolder.java | 13 ++-- .../apache/cxf/ws/addressing/soap/MAPCodec.java | 6 +- ...ndpointReferenceDomainExpressionBuilder.java | 38 +++++------- .../builder/jaxb/JaxbAssertionBuilder.java | 9 ++- .../apache/cxf/wsdl/JAXBExtensionHelper.java | 4 +- .../sts/token/validator/X509TokenValidator.java | 6 +- .../internal/WSDiscoveryServiceImpl.java | 3 +- .../org/apache/cxf/wsn/jms/JmsPullPoint.java | 7 ++- .../org/apache/cxf/wsn/jms/JmsSubscription.java | 12 ++-- .../common/dom/ExtendedDocumentBuilder.java | 43 +++++++------ .../cxf/tools/common/toolspec/ToolSpec.java | 6 +- .../toolspec/parser/CommandLineParserTest.java | 8 ++- .../validator/internal/SchemaValidator.java | 5 +- .../tools/validator/internal/ValidatorUtil.java | 2 + .../cxf/tools/wsdlto/core/PluginLoader.java | 25 ++++++-- .../databinding/jaxb/NamespaceContextImpl.java | 65 -------------------- 42 files changed, 359 insertions(+), 216 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/f2e1ed38/.gitmergeinfo ----------------------------------------------------------------------
