You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by as...@apache.org on 2017/01/04 21:12:07 UTC

[1/2] cxf git commit: getTokenFromSTS: removed unused parameter

Repository: cxf
Updated Branches:
  refs/heads/master 0d797ec55 -> 33c767136


getTokenFromSTS: removed unused parameter


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/89ae972b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/89ae972b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/89ae972b

Branch: refs/heads/master
Commit: 89ae972bcc621be990531ce809ffa6f6e2c40ab8
Parents: e669509
Author: Andrei Shakirin <an...@gmail.com>
Authored: Wed Jan 4 22:09:56 2017 +0100
Committer: Andrei Shakirin <an...@gmail.com>
Committed: Wed Jan 4 22:09:56 2017 +0100

----------------------------------------------------------------------
 .../java/org/apache/cxf/ws/security/trust/STSTokenRetriever.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/89ae972b/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 41556a7..e5eaba4 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
@@ -161,7 +161,7 @@ public final class STSTokenRetriever {
                     // Check to see whether the delegated token needs to be renewed
                     secToken = renewToken(message, secToken, params);
                 } else {
-                    secToken = getTokenFromSTS(message, client, maps, appliesTo, params);
+                    secToken = getTokenFromSTS(client, maps, appliesTo, params);
                 }
                 storeDelegationTokens(
                                       message, secToken, onBehalfOfToken, actAsToken, appliesTo,
@@ -409,7 +409,7 @@ public final class STSTokenRetriever {
         }
     }
 
-    private static SecurityToken getTokenFromSTS(Message message, STSClient client,
+    private static SecurityToken getTokenFromSTS(STSClient client,
                                           AddressingProperties maps, String appliesTo,
                                           TokenRequestParams params) throws Exception {
         client.setTrust(params.getTrust10());


[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf

Posted by as...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/33c76713
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/33c76713
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/33c76713

Branch: refs/heads/master
Commit: 33c76713660c1939d17298f2f21aa7b01a126eb7
Parents: 89ae972 0d797ec
Author: Andrei Shakirin <an...@gmail.com>
Authored: Wed Jan 4 22:10:33 2017 +0100
Committer: Andrei Shakirin <an...@gmail.com>
Committed: Wed Jan 4 22:10:33 2017 +0100

----------------------------------------------------------------------
 .../org/apache/cxf/wsn/jms/JmsPullPoint.java    | 44 ++++++++++++++------
 1 file changed, 31 insertions(+), 13 deletions(-)
----------------------------------------------------------------------