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 2015/02/24 20:42:15 UTC
[1/2] cxf git commit: Preparing [CXF-6267]: Refactor issuing and
renewing SAML token functionality into utility class
Repository: cxf
Updated Branches:
refs/heads/master a79bb058a -> 3ae567d26
Preparing [CXF-6267]: Refactor issuing and renewing SAML token functionality into utility class
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/54508131
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/54508131
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/54508131
Branch: refs/heads/master
Commit: 54508131155cc71099f6f54c5ee531e159d79ca2
Parents: 8077aaa
Author: Andrei Shakirin <an...@gmail.com>
Authored: Tue Feb 24 20:39:04 2015 +0100
Committer: Andrei Shakirin <an...@gmail.com>
Committed: Tue Feb 24 20:39:04 2015 +0100
----------------------------------------------------------------------
.../org/apache/cxf/ws/security/trust/STSUtils.java | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/54508131/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
index f55e73f..74a91c4 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
@@ -89,10 +89,18 @@ public final class STSUtils {
}
public static STSClient getClient(Message message, String type) {
- return getClient(message, type, null);
+ return getClientWithIssuer(message, type, null);
}
public static STSClient getClient(Message message, String type, IssuedToken itok) {
+ if (itok != null) {
+ return getClientWithIssuer(message, type, itok.getIssuer());
+ } else {
+ return getClientWithIssuer(message, type, null);
+ }
+ }
+
+ public static STSClient getClientWithIssuer(Message message, String type, Element issuer) {
// Retrieve or create the STSClient
STSClient client = (STSClient)message
@@ -112,10 +120,10 @@ public final class STSUtils {
// Find out if we have an EPR to get the STS Address (possibly via WS-MEX)
- if (itok != null && itok.getIssuer() != null) {
+ if (issuer != null) {
EndpointReferenceType epr = null;
try {
- epr = VersionTransformer.parseEndpointReference(itok.getIssuer());
+ epr = VersionTransformer.parseEndpointReference(issuer);
} catch (JAXBException e) {
throw new IllegalArgumentException(e);
}
@@ -147,6 +155,7 @@ public final class STSUtils {
return client;
}
+
public static boolean configureViaEPR(STSClient client, EndpointReferenceType epr) {
if (epr != null && client.getLocation() == null && client.getWsdlLocation() == null) {
return true;
[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/3ae567d2
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3ae567d2
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3ae567d2
Branch: refs/heads/master
Commit: 3ae567d26aa0165c41305e2d1e0cca4b65273dc8
Parents: 5450813 a79bb05
Author: Andrei Shakirin <an...@gmail.com>
Authored: Tue Feb 24 20:42:03 2015 +0100
Committer: Andrei Shakirin <an...@gmail.com>
Committed: Tue Feb 24 20:42:03 2015 +0100
----------------------------------------------------------------------
.../org/apache/cxf/jaxrs/provider/SourceProvider.java | 5 +----
.../jaxws/interceptors/MessageModeInInterceptor.java | 7 ++-----
.../java/org/apache/cxf/js/rhino/ProviderFactory.java | 9 ++-------
.../cxf/endpoint/dynamic/DynamicClientFactory.java | 8 +-------
.../persistence/FilesystemExchangeDataDAO.java | 9 +--------
.../https/httpclient/PublicSuffixMatcherLoader.java | 10 ++--------
.../apache/cxf/wsdl/service/factory/ClassReader.java | 13 +++++--------
.../apache/cxf/wsdl/service/factory/ParamReader.java | 7 +------
8 files changed, 15 insertions(+), 53 deletions(-)
----------------------------------------------------------------------