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/e31cf1c5 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e31cf1c5 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e31cf1c5 Branch: refs/heads/master Commit: e31cf1c5dc29f5d11dc29e3c4a63b56ed8f960a0 Parents: 49c3593 4ff4d39 Author: reta <drr...@gmail.com> Authored: Wed Nov 12 13:37:18 2014 -0500 Committer: reta <drr...@gmail.com> Committed: Wed Nov 12 13:37:18 2014 -0500 ---------------------------------------------------------------------- .../cxf/bus/spring/BusDefinitionParser.java | 16 +- parent/pom.xml | 2 +- .../cxf/jaxrs/provider/json/JsonMapObject.java | 8 + .../cxf/rs/security/jose/jwt/JwtToken.java | 6 + .../oauth2/filters/OAuthRequestFilter.java | 26 ++- .../rs/security/oidc/common/UserAddress.java | 55 ++++++ .../rs/security/oidc/common/UserIdToken.java | 61 ++++++ .../rs/security/oidc/common/UserProfile.java | 71 ++++++- .../rs/security/oidc/rp/IdTokenValidator.java | 121 ------------ .../cxf/rs/security/oidc/rp/OidcUtils.java | 15 +- .../cxf/rs/security/oidc/rp/TokenValidator.java | 190 +++++++++++++++++++ 11 files changed, 432 insertions(+), 139 deletions(-) ----------------------------------------------------------------------
