[2/3] cxf git commit: Always add the SecureConversationOutInterceptor before the Spnego + IssuedToken ones

[coheigea]

Always add the SecureConversationOutInterceptor before the Spnego + IssuedToken 
ones

Conflicts:
        
rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationOutInterceptor.java


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

Branch: refs/heads/2.7.x-fixes
Commit: f4e0bb669eaba3f1233b1316a811fa5d7dfa09f9
Parents: 3b380e7
Author: Colm O hEigeartaigh <cohei...@apache.org>
Authored: Mon Feb 2 15:27:25 2015 +0000
Committer: Colm O hEigeartaigh <cohei...@apache.org>
Committed: Mon Feb 2 15:44:11 2015 +0000

----------------------------------------------------------------------
 .../policy/interceptors/SecureConversationOutInterceptor.java  | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/f4e0bb66/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 624cfd6..e79e326 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,10 +36,14 @@ 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.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;
@@ -51,6 +55,8 @@ class SecureConversationOutInterceptor extends 
AbstractPhaseInterceptor<SoapMess
     
     public SecureConversationOutInterceptor() {
         super(Phase.PREPARE_SEND);
+        addBefore(SpnegoContextTokenOutInterceptor.class.getName());
+        addBefore(IssuedTokenOutInterceptor.class.getName());
     }
     
     public void handleMessage(SoapMessage message) throws Fault {