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/13184062 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/13184062 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/13184062 Branch: refs/heads/3.1.x-fixes Commit: 13184062c28d451f10e63aaa3fe9a7cea3c3cd0e Parents: 753368b cec8828 Author: Sergey Beryozkin <[email protected]> Authored: Tue Nov 17 16:12:26 2015 +0000 Committer: Sergey Beryozkin <[email protected]> Committed: Tue Nov 17 16:12:26 2015 +0000 ---------------------------------------------------------------------- .../ws/security/trust/AbstractSTSClient.java | 4 +- .../cxf/sts/operation/TokenIssueOperation.java | 10 +- .../apache/cxf/sts/request/ReceivedToken.java | 5 - .../cxf/sts/token/realm/JWTRealmCodec.java | 36 +++ .../token/validator/jwt/JWTTokenValidator.java | 56 ++-- .../sts/operation/IssueJWTClaimsUnitTest.java | 61 ++-- .../operation/IssueJWTOnbehalfofUnitTest.java | 46 +-- .../sts/operation/IssueJWTRealmUnitTest.java | 63 +++-- .../cxf/sts/operation/IssueJWTUnitTest.java | 16 +- .../validator/JWTTokenValidatorRealmTest.java | 280 +++++++++++++++++++ .../token/validator/JWTTokenValidatorTest.java | 23 +- .../apache/cxf/systest/sts/jwt/JWTUnitTest.java | 41 ++- .../cxf/systest/sts/deployment/cxf-sts.xml | 3 + 13 files changed, 514 insertions(+), 130 deletions(-) ----------------------------------------------------------------------
