You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2013/06/13 16:00:20 UTC

svn commit: r1492678 - in /cxf/trunk/systests/ws-security/src/test: java/org/apache/cxf/systest/ws/kerberos/StaxKerberosTokenTest.java resources/org/apache/cxf/systest/ws/kerberos/DoubleItKerberos.wsdl

Author: coheigea
Date: Thu Jun 13 14:00:19 2013
New Revision: 1492678

URL: http://svn.apache.org/r1492678
Log:
Some Kerberos test updates following recent fixes in WSS4J

Modified:
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/StaxKerberosTokenTest.java
    cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/DoubleItKerberos.wsdl

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/StaxKerberosTokenTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/StaxKerberosTokenTest.java?rev=1492678&r1=1492677&r2=1492678&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/StaxKerberosTokenTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/kerberos/StaxKerberosTokenTest.java Thu Jun 13 14:00:19 2013
@@ -74,9 +74,7 @@ public class StaxKerberosTokenTest exten
         stopAllServers();
     }
 
-    // TODO See WSS-453
     @org.junit.Test
-    @org.junit.Ignore
     public void testKerberosOverTransport() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
@@ -164,9 +162,7 @@ public class StaxKerberosTokenTest exten
     }
     */
     
-    // TODO - See WSS-454
     @org.junit.Test
-    @org.junit.Ignore
     public void testKerberosOverAsymmetric() throws Exception {
         
         if (!unrestrictedPoliciesInstalled) {
@@ -199,9 +195,7 @@ public class StaxKerberosTokenTest exten
         bus.shutdown(true);
     }
     
-    // TODO See WSS-453
     @org.junit.Test
-    @org.junit.Ignore
     public void testKerberosOverTransportEndorsing() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
@@ -230,9 +224,7 @@ public class StaxKerberosTokenTest exten
         bus.shutdown(true);
     }
     
-    // TODO See WSS-453
     @org.junit.Test
-    @org.junit.Ignore
     public void testKerberosOverAsymmetricEndorsing() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
@@ -310,9 +302,7 @@ public class StaxKerberosTokenTest exten
     }
     */
     
-    // TODO - See WSS-453 WSS-454
     @org.junit.Test
-    @org.junit.Ignore
     public void testKerberosOverAsymmetricSignedEndorsing() throws Exception {
         
         if (!unrestrictedPoliciesInstalled) {
@@ -345,9 +335,7 @@ public class StaxKerberosTokenTest exten
         bus.shutdown(true);
     }
     
-    // TODO - See WSS-453 WSS-454
     @org.junit.Test
-    @org.junit.Ignore
     public void testKerberosOverAsymmetricSignedEncrypted() throws Exception {
         
         if (!unrestrictedPoliciesInstalled) {

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/DoubleItKerberos.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/DoubleItKerberos.wsdl?rev=1492678&r1=1492677&r2=1492678&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/DoubleItKerberos.wsdl (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/DoubleItKerberos.wsdl Thu Jun 13 14:00:19 2013
@@ -534,6 +534,7 @@
                   </sp:Layout>
                   <sp:IncludeTimestamp/>
                   <sp:OnlySignEntireHeadersAndBody/>
+                  <sp:ProtectTokens/>
                   <sp:AlgorithmSuite>
                      <wsp:Policy>
                         <sp:Basic128/>
@@ -840,6 +841,7 @@
                   </sp:Layout>
                   <sp:IncludeTimestamp/>
                   <sp:OnlySignEntireHeadersAndBody/>
+                  <sp:ProtectTokens/>
                   <sp:AlgorithmSuite>
                      <wsp:Policy>
                         <sp:Basic128/>