You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pl...@apache.org on 2017/11/01 07:33:48 UTC

[2/2] directory-kerby git commit: Merge remote-tracking branch 'asf/trunk' into trunk

Merge remote-tracking branch 'asf/trunk' into trunk


Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/45bbe2af
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/45bbe2af
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/45bbe2af

Branch: refs/heads/trunk
Commit: 45bbe2afed3e5eaf8b7d8d05520cd20f64cc3e7f
Parents: f9283ca 59c12f8
Author: plusplusjiajia <ji...@intel.com>
Authored: Wed Nov 1 15:33:30 2017 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Wed Nov 1 15:33:30 2017 +0800

----------------------------------------------------------------------
 .../kerby/kerberos/kdc/TokenKdcTestBase.java    |  5 ++
 .../kerberos/provider/token/JwtAuthToken.java   | 63 ++++++++++++--------
 .../provider/token/JwtTokenDecoder.java         | 11 ++--
 .../provider/token/JwtTokenEncoder.java         | 27 ++++++---
 .../kerby/kerberos/provider/token/JwtUtil.java  | 42 -------------
 .../kerberos/provider/token/TokenTest.java      | 22 +++++++
 pom.xml                                         | 22 +------
 7 files changed, 90 insertions(+), 102 deletions(-)
----------------------------------------------------------------------