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/2ec0130e Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2ec0130e Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2ec0130e Branch: refs/heads/3.1.x-fixes Commit: 2ec0130e033f59c1e5e36529a9cfb4a0b1c82b12 Parents: c87aa76 6a328a5 Author: Benson Margulies <ben...@basistech.com> Authored: Fri Dec 11 11:14:58 2015 -0500 Committer: Benson Margulies <ben...@basistech.com> Committed: Fri Dec 11 11:14:58 2015 -0500 ---------------------------------------------------------------------- .../oauth2/client/OAuthClientUtils.java | 11 +-- .../oauth2/common/ServerAccessToken.java | 9 +++ .../oauth2/grants/AbstractGrantHandler.java | 67 ++++++++-------- .../grants/code/AbstractCodeDataProvider.java | 1 + .../code/AuthorizationCodeGrantHandler.java | 40 ++++++++-- .../code/ServerAuthorizationCodeGrant.java | 9 +++ .../provider/AbstractOAuthDataProvider.java | 1 + .../oauth2/services/AbstractOAuthService.java | 9 ++- .../oauth2/services/AbstractTokenService.java | 81 ++++++++++++-------- .../oauth2/services/AccessTokenService.java | 3 +- .../services/DirectAuthorizationService.java | 41 ++++++---- .../services/RedirectionBasedGrantService.java | 79 ++++++++++--------- .../oauth2/services/TokenRevocationService.java | 3 +- .../oidc/idp/IdTokenResponseFilter.java | 3 + 14 files changed, 225 insertions(+), 132 deletions(-) ----------------------------------------------------------------------
