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 <cohei...@apache.org> Authored: Mon Feb 2 15:47:14 2015 +0000 Committer: Colm O hEigeartaigh <cohei...@apache.org> 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<SoapMess } } -} \ No newline at end of file +}
