Fixing build
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/48cce4ec Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/48cce4ec Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/48cce4ec Branch: refs/heads/2.7.x-fixes Commit: 48cce4ecc401f8836bb17ba8e81e355aaef49987 Parents: b5dead0 Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Tue Sep 9 17:03:21 2014 +0100 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Tue Sep 9 17:03:21 2014 +0100 ---------------------------------------------------------------------- .../apache/cxf/ws/security/trust/STSUtils.java | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/48cce4ec/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 afd131a..47eee39 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 @@ -92,12 +92,6 @@ public final class STSUtils { } public static STSClient getClient(Message message, String type, IssuedToken itok) { -<<<<<<< HEAD - // Find out first if we have an EPR to get the STS Address (possibly via WS-MEX) - if (itok != null && itok.getIssuerEpr() != null && message != null) { - EndpointReferenceType epr = itok.getIssuerEpr(); -======= - // Retrieve or create the STSClient STSClient client = (STSClient)message .getContextualProperty(SecurityConstants.STS_CLIENT); @@ -116,15 +110,9 @@ 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 && message != null) { - EndpointReferenceType epr = null; - try { - epr = VersionTransformer.parseEndpointReference(itok.getIssuer()); - } catch (JAXBException e) { - throw new IllegalArgumentException(e); - } - ->>>>>>> b535ff6... Added support + tests for creating "default" STSClients + if (itok != null && itok.getIssuerEpr() != null && message != null) { + EndpointReferenceType epr = itok.getIssuerEpr(); + String mexLocation = findMEXLocation(epr); // Configure via WS-MEX if (mexLocation != null
