Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E7B3B17984 for ; Mon, 2 Feb 2015 15:47:20 +0000 (UTC) Received: (qmail 70103 invoked by uid 500); 2 Feb 2015 15:47:21 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 69924 invoked by uid 500); 2 Feb 2015 15:47:21 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 69785 invoked by uid 99); 2 Feb 2015 15:47:21 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Feb 2015 15:47:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8CB8CE04B6; Mon, 2 Feb 2015 15:47:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: coheigea@apache.org To: commits@cxf.apache.org Date: Mon, 02 Feb 2015 15:47:23 -0000 Message-Id: <28bbdbfc39324ae397bbbe5c0d15b4fd@git.apache.org> In-Reply-To: <5dd49daa55b544cd8c3417fe493d6797@git.apache.org> References: <5dd49daa55b544cd8c3417fe493d6797@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] cxf git commit: Fixing merge Fixing merge Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b3d7a5c8 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b3d7a5c8 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b3d7a5c8 Branch: refs/heads/2.7.x-fixes Commit: b3d7a5c8e0e4e383355b8bc53c867ce7d52663b9 Parents: 72b31eb Author: Colm O hEigeartaigh Authored: Mon Feb 2 15:47:14 2015 +0000 Committer: Colm O hEigeartaigh Committed: Mon Feb 2 15:47:14 2015 +0000 ---------------------------------------------------------------------- .../policy/interceptors/SecureConversationOutInterceptor.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/b3d7a5c8/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationOutInterceptor.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationOutInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationOutInterceptor.java index e79e326..6675c51 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationOutInterceptor.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationOutInterceptor.java @@ -36,14 +36,11 @@ import org.apache.cxf.ws.addressing.AddressingProperties; import org.apache.cxf.ws.policy.AssertionInfo; import org.apache.cxf.ws.policy.AssertionInfoMap; import org.apache.cxf.ws.security.SecurityConstants; -<<<<<<< HEAD import org.apache.cxf.ws.security.policy.SP12Constants; +import org.apache.cxf.ws.security.policy.interceptors.IssuedTokenInterceptorProvider.IssuedTokenOutInterceptor; import org.apache.cxf.ws.security.policy.model.SecureConversationToken; import org.apache.cxf.ws.security.policy.model.Trust10; import org.apache.cxf.ws.security.policy.model.Trust13; -======= -import org.apache.cxf.ws.security.policy.interceptors.IssuedTokenInterceptorProvider.IssuedTokenOutInterceptor; ->>>>>>> e826987... Always add the SecureConversationOutInterceptor before the Spnego + IssuedToken ones import org.apache.cxf.ws.security.tokenstore.SecurityToken; import org.apache.cxf.ws.security.trust.STSClient; import org.apache.cxf.ws.security.trust.STSUtils; @@ -219,4 +216,4 @@ class SecureConversationOutInterceptor extends AbstractPhaseInterceptor