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/1f430d4c Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1f430d4c Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1f430d4c Branch: refs/heads/master Commit: 1f430d4c717ade779a23489e3d07d4311bbc21a2 Parents: 9cffee5 9a19f69 Author: Freeman Fang <freeman.f...@gmail.com> Authored: Fri Apr 21 09:50:25 2017 +0800 Committer: Freeman Fang <freeman.f...@gmail.com> Committed: Fri Apr 21 09:50:25 2017 +0800 ---------------------------------------------------------------------- .../oauth2/filters/OAuthRequestFilter.java | 15 +++++ .../provider/AbstractOAuthDataProvider.java | 15 ++--- .../services/DynamicRegistrationService.java | 38 ++++++++++--- .../rs/security/oauth2/utils/OAuthUtils.java | 17 +++++- .../rs/security/xml/SignatureProperties.java | 8 +++ .../rs/security/xml/XmlSecOutInterceptor.java | 4 ++ .../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 +- .../ws/security/wss4j/WSS4JInInterceptor.java | 10 ++-- .../oidc/OIDCDynamicRegistrationTest.java | 58 ++++++++++---------- 12 files changed, 152 insertions(+), 69 deletions(-) ----------------------------------------------------------------------
