Merge branch '3.0.x-fixes' of https://git-wip-us.apache.org/repos/asf/cxf into 3.0.x
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c26c0f71 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c26c0f71 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c26c0f71 Branch: refs/heads/3.0.x-fixes Commit: c26c0f711aa37ccfa65f65c91c9e348d63fdf595 Parents: 15693ec 2cfdd8e Author: Alessio Soldano <[email protected]> Authored: Thu Apr 9 18:29:55 2015 +0200 Committer: Alessio Soldano <[email protected]> Committed: Thu Apr 9 18:29:55 2015 +0200 ---------------------------------------------------------------------- .../java/org/apache/cxf/sts/operation/AbstractOperation.java | 8 ++++++++ .../org/apache/cxf/sts/token/canceller/SCTCanceller.java | 1 + .../cxf/sts/token/delegation/SAMLDelegationHandler.java | 4 ++++ .../org/apache/cxf/sts/token/provider/SAMLTokenProvider.java | 1 + .../java/org/apache/cxf/sts/token/provider/SCTProvider.java | 1 + .../org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java | 2 +- .../apache/cxf/sts/token/validator/SAMLTokenValidator.java | 1 + .../org/apache/cxf/sts/token/validator/SCTValidator.java | 1 + .../cxf/sts/token/validator/UsernameTokenValidator.java | 1 + .../apache/cxf/sts/token/validator/X509TokenValidator.java | 1 + 10 files changed, 20 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
