You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by am...@apache.org on 2017/06/12 14:09:38 UTC

[4/7] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf


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

Branch: refs/heads/master
Commit: 8f38958d75d23edb9b711b6d9c77e663091412ab
Parents: eec3cd4 9a19f69
Author: Andy McCright <an...@us.ibm.com>
Authored: Thu Apr 20 15:14:20 2017 -0500
Committer: Andy McCright <an...@us.ibm.com>
Committed: Thu Apr 20 15:14:20 2017 -0500

----------------------------------------------------------------------
 .../org/apache/cxf/common/util/CacheMap.java    |  10 ++
 .../org/apache/cxf/common/util/Compiler.java    |   2 +-
 .../apache/cxf/continuations/Continuation.java  |  11 +-
 .../java/org/apache/cxf/helpers/DOMUtils.java   |  54 ++++++++
 .../cxf/staxutils/W3CDOMStreamWriter.java       |  16 ++-
 .../apache/cxf/common/util/CacheMapTest.java    |  50 +++++++
 .../src/main/resources/META-INF/beans.xml       |   2 +-
 .../src/main/resources/META-INF/beans.xml       |   2 +-
 .../cdi/src/main/resources/META-INF/beans.xml   |   2 +-
 integration/jca/pom.xml                         |  16 ++-
 integration/spring-boot/autoconfigure/pom.xml   |  37 +++++
 .../boot/autoconfigure/CxfProperties.java       |   6 +-
 .../boot/autoconfigure/CxfPropertiesTest.java   |  86 ++++++++++++
 .../features/src/main/resources/features.xml    |   2 +
 parent/pom.xml                                  |  13 +-
 pom.xml                                         |   4 +-
 .../interceptor/Soap12FaultInInterceptor.java   |   3 +-
 .../binding/soap/saaj/SAAJInInterceptor.java    |   2 +
 .../cxf/binding/soap/saaj/SAAJStreamWriter.java |   2 +-
 .../apache/cxf/binding/soap/saaj/SAAJUtils.java |  61 ++++++---
 rt/bindings/xml/pom.xml                         |   6 +
 .../apache/cxf/jaxrs/impl/ResourceInfoImpl.java |   2 +-
 .../apache/cxf/jaxrs/utils/InjectionUtils.java  |   4 +-
 .../interceptors/MessageModeOutInterceptor.java |   1 +
 .../rs/security/jose/common/JoseConstants.java  |  10 ++
 .../jose/common/KeyManagementUtils.java         |   5 +-
 .../cxf/rs/security/jose/jwe/JweUtils.java      |  34 ++++-
 .../cxf/rs/security/jose/jws/JwsUtils.java      |  31 ++++-
 .../cxf/rs/security/jose/jwt/JwtConstants.java  |   1 +
 rt/rs/security/oauth-parent/oauth2/pom.xml      |   2 +-
 .../cxf/rs/security/oauth2/client/Consumer.java |   4 +
 .../oauth2/filters/OAuthRequestFilter.java      |  15 ++
 .../code/AuthorizationCodeGrantHandler.java     |   1 +
 .../provider/AbstractOAuthDataProvider.java     |   9 ++
 .../oauth2/services/AbstractTokenService.java   | 106 +++++++-------
 .../services/DynamicRegistrationService.java    |  38 +++--
 .../rs/security/oauth2/utils/JwtTokenUtils.java |  13 +-
 .../security/oauth2/utils/OAuthConstants.java   |   3 +-
 .../rs/security/oauth2/utils/OAuthUtils.java    |  80 +++++++++++
 rt/rs/security/sso/oidc/pom.xml                 |   2 +-
 .../rs/security/xml/SignatureProperties.java    |   8 ++
 .../rs/security/xml/XmlSecOutInterceptor.java   |   4 +
 rt/rs/sse/src/main/resources/META-INF/beans.xml |   2 +-
 .../apache/cxf/transport/jms/JMSConduit.java    |  23 ++++
 .../cxf/transport/jms/JMSConfiguration.java     |  27 ++--
 .../cxf/transport/jms/JMSDestination.java       |   4 +-
 .../apache/cxf/transport/jms/JMSFactory.java    |   2 +-
 .../AtmosphereWebSocketServletDestination.java  |  22 +++
 .../ws/eventing/shared/utils/FilteringUtil.java |   2 +
 .../ws/security/wss4j/CXFCallbackLookup.java    |   3 +
 .../security/wss4j/CryptoCoverageChecker.java   |   2 +
 .../wss4j/PolicyBasedWSS4JOutInterceptor.java   |   2 +-
 .../ws/security/wss4j/SamlTokenInterceptor.java |   1 +
 .../cxf/ws/security/wss4j/StaxSerializer.java   |  50 ++++---
 .../ws/security/wss4j/WSS4JInInterceptor.java   |  71 ++++++++--
 .../policyhandlers/AbstractBindingBuilder.java  |  36 +++--
 .../AsymmetricBindingHandler.java               |   9 +-
 .../policyhandlers/TransportBindingHandler.java |   9 +-
 .../AbstractSupportingTokenPolicyValidator.java |   2 +
 .../RequiredElementsPolicyValidator.java        |   7 +-
 .../SecuredPartsPolicyValidator.java            |   7 +-
 .../wss4j/AbstractPolicySecurityTest.java       |   2 +-
 .../wss4j/PolicyBasedWss4JInOutTest.java        |   6 +
 .../main/resources/META-INF/jax-ws-catalog.xml  |   7 +
 .../apache/cxf/ws/discovery/wsdl/ws-addr.xsd    | 137 +++++++++++++++++++
 services/wsn/wsn-core/pom.xml                   |  28 ++++
 services/xkms/xkms-itests/pom.xml               |   5 +
 .../base/src/main/resources/META-INF/beans.xml  |   2 +-
 .../src/test/resources/META-INF/beans.xml       |   2 +-
 .../src/test/resources/META-INF/beans.xml       |   2 +-
 systests/cdi/cdi-owb/pom.xml                    |   4 +-
 .../src/test/resources/META-INF/beans.xml       |   2 +-
 .../src/test/resources/META-INF/beans.xml       |   2 +-
 systests/jaxrs/pom.xml                          |   4 +-
 .../jaxrs/security/JAXRSHttpsBookTest.java      |   4 +
 .../provider/ProviderRPCClientServerTest.java   |  17 ++-
 systests/rs-security/pom.xml                    |   4 +-
 .../oauth2/tls/BookServerOAuth2Tls.java         |  59 ++++++++
 .../security/oauth2/tls/JAXRSOAuth2TlsTest.java | 122 +++++++++++++++++
 .../oauth2/tls/OAuthDataProviderImpl.java       |  77 +++++++++++
 .../oidc/OIDCDynamicRegistrationTest.java       |  58 ++++----
 .../jaxrs/security/oauth2/tls/client.xml        |  38 +++++
 .../jaxrs/security/oauth2/tls/serverTls.xml     |  81 +++++++++++
 systests/transports/pom.xml                     |   2 +-
 84 files changed, 1467 insertions(+), 239 deletions(-)
----------------------------------------------------------------------