Merge branch '3.1.x-fixes' of https://git-wip-us.apache.org/repos/asf/cxf into 3.1.x-fixes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9f746c97 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9f746c97 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9f746c97 Branch: refs/heads/3.1.x-fixes Commit: 9f746c97ad9566f5c9410c9d600df237c97beae0 Parents: 6e2c355 bbfe35e Author: Benson Margulies <ben...@basistech.com> Authored: Tue Dec 15 18:26:17 2015 +0200 Committer: Benson Margulies <ben...@basistech.com> Committed: Tue Dec 15 18:26:17 2015 +0200 ---------------------------------------------------------------------- .../cxf/rs/security/oidc/common/UserInfo.java | 7 --- .../cxf/rs/security/oidc/rp/IdTokenContext.java | 25 +++++++++ .../oidc/rp/IdTokenContextProvider.java | 35 ------------- .../oidc/rp/OidcClientTokenContext.java | 7 +-- .../security/oidc/rp/OidcIdTokenProvider.java | 19 +++++-- .../oidc/rp/OidcIdTokenRequestFilter.java | 3 ++ .../oidc/rp/OidcRpAuthenticationFilter.java | 8 ++- .../security/oidc/rp/OidcUserInfoProvider.java | 55 ++++++++++++++++++++ .../rs/security/oidc/rp/UserInfoContext.java | 25 +++++++++ .../oidc/rp/UserInfoContextProvider.java | 39 -------------- 10 files changed, 131 insertions(+), 92 deletions(-) ----------------------------------------------------------------------
