svn commit: r1533133 - in /cxf/trunk: rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/ services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/ systests/ws-security-examples/src/test/java/org/apache/c...

[coheigea]

Author: coheigea
Date: Thu Oct 17 16:21:37 2013
New Revision: 1533133

URL: http://svn.apache.org/r1533133
Log:
Fixed some streaming SecureConversation tests

Modified:
    
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java
    
cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/StaxSymmetricBindingTest.java
    
cxf/trunk/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/StaxSecureConversationTest.java

Modified: 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java?rev=1533133&r1=1533132&r2=1533133&view=diff
==============================================================================
--- 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java
 (original)
+++ 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java
 Thu Oct 17 16:21:37 2013
@@ -439,7 +439,8 @@ public class StaxSymmetricBindingHandler
             } else if (recToken.getToken() instanceof KerberosToken && 
!isRequestor()) {
                 config.put(ConfigurationConstants.ENC_KEY_ID, "KerberosSHA1");
                 config.put(ConfigurationConstants.DERIVED_TOKEN_KEY_ID, 
"KerberosSHA1");
-            } else if (recToken.getToken() instanceof IssuedToken && 
!isRequestor()) {
+            } else if ((recToken.getToken() instanceof IssuedToken 
+                || recToken.getToken() instanceof SecureConversationToken) && 
!isRequestor()) {
                 config.put(ConfigurationConstants.ENC_KEY_ID, 
"DirectReference");
             } else {
                 config.put(ConfigurationConstants.ENC_KEY_ID, 
"EncryptedKeySHA1");

Modified: 
cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/StaxSymmetricBindingTest.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/StaxSymmetricBindingTest.java?rev=1533133&r1=1533132&r2=1533133&view=diff
==============================================================================
--- 
cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/StaxSymmetricBindingTest.java
 (original)
+++ 
cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/StaxSymmetricBindingTest.java
 Thu Oct 17 16:21:37 2013
@@ -191,9 +191,7 @@ public class StaxSymmetricBindingTest ex
         bus.shutdown(true);
     }
     
-    // TODO Analyse policy error
     @org.junit.Test
-    @org.junit.Ignore
     public void testUsernameTokenSAML2SecureConversation() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();

Modified: 
cxf/trunk/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/StaxSecureConversationTest.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/StaxSecureConversationTest.java?rev=1533133&r1=1533132&r2=1533133&view=diff
==============================================================================
--- 
cxf/trunk/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/StaxSecureConversationTest.java
 (original)
+++ 
cxf/trunk/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/StaxSecureConversationTest.java
 Thu Oct 17 16:21:37 2013
@@ -65,9 +65,7 @@ public class StaxSecureConversationTest 
      * 2.4.1 (WSS 1.0) Secure Conversation bootstrapped by Mutual
      * Authentication with X.509 Certificates
      */
-    // TODO Support SecureConversation on the Stax Server side.
     @org.junit.Test
-    @org.junit.Ignore
     public void testSecureConversation() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
@@ -87,7 +85,7 @@ public class StaxSecureConversationTest 
         // DOM
         samlPort.doubleIt(25);
         
-        // Streaming
+        // TODO Streaming investigate
         // SecurityTestUtil.enableStreaming(samlPort);
         // samlPort.doubleIt(25);