Fixing build
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8d6b79f2 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8d6b79f2 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8d6b79f2 Branch: refs/heads/3.1.x-fixes Commit: 8d6b79f20374523a4dd72efc2877ee71cd7a3c01 Parents: cc1f96b Author: Colm O hEigeartaigh <[email protected]> Authored: Tue Apr 4 17:03:33 2017 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Tue Apr 4 17:03:33 2017 +0100 ---------------------------------------------------------------------- .../ws/security/policy/interceptors/STSTokenOutInterceptor.java | 4 ---- .../java/org/apache/cxf/ws/security/trust/STSTokenRetriever.java | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/8d6b79f2/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSTokenOutInterceptor.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSTokenOutInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSTokenOutInterceptor.java index c49c364..ccf003b 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSTokenOutInterceptor.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSTokenOutInterceptor.java @@ -97,9 +97,6 @@ public class STSTokenOutInterceptor extends AbstractPhaseInterceptor<Message> { public STSClient getSTSClient() { return stsClient; } -<<<<<<< HEAD - -======= public STSTokenCacher getTokenCacher() { return tokenCacher; @@ -114,7 +111,6 @@ public class STSTokenOutInterceptor extends AbstractPhaseInterceptor<Message> { * @deprecated use {@link org.apache.cxf.ws.security.trust.STSAuthParams.AuthMode} */ @Deprecated ->>>>>>> 048b46d... CXF-7315 - Abstract the STS client token caching behaviour to allow the user to plug in a custom implementation public enum AuthMode { X509(X509_ENDPOINT, KEY_TYPE_X509), TRANSPORT(TRANSPORT_ENDPOINT, null); http://git-wip-us.apache.org/repos/asf/cxf/blob/8d6b79f2/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSTokenRetriever.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSTokenRetriever.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSTokenRetriever.java index cf25b27..4662122 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSTokenRetriever.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSTokenRetriever.java @@ -120,7 +120,7 @@ public final class STSTokenRetriever { // Check to see whether the delegated token needs to be renewed secToken = renewToken(message, secToken, params, tokenCacher); } else { - secToken = getTokenFromSTS(message, client, maps, appliesTo, params); + secToken = getTokenFromSTS(client, maps, appliesTo, params); } if (secToken != null) {
