cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1546579 [2/2] - in /cxf/trunk/systests/ws-security/src/test: java/org/apache/cxf/systest/ws/swa/ java/org/apache/cxf/systest/ws/tokens/ java/org/apache/cxf/systest/ws/ut/ java/org/apache/cxf/systest/ws/wssc/ java/org/apache/cxf/systest/ws/...
Date Fri, 29 Nov 2013 15:14:27 GMT
Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10Test.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10Test.java?rev=1546579&r1=1546578&r2=1546579&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10Test.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10Test.java Fri Nov 29 15:14:27 2013
@@ -33,11 +33,11 @@ import org.apache.cxf.endpoint.Client;
 import org.apache.cxf.frontend.ClientProxy;
 import org.apache.cxf.systest.ws.common.SecurityTestUtil;
 import org.apache.cxf.systest.ws.wssec10.server.Server;
+import org.apache.cxf.systest.ws.wssec10.server.StaxServer;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.transport.http.HTTPConduit;
 import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
 import org.apache.cxf.ws.security.SecurityConstants;
-
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -48,12 +48,13 @@ import wssec.wssec10.PingService;
 
 
 /**
- * It tests both DOM + StAX clients against the DOM server
  */
 @RunWith(value = org.junit.runners.Parameterized.class)
 public class WSSecurity10Test extends AbstractBusClientServerTestBase {
     static final String PORT = allocatePort(Server.class);
+    static final String STAX_PORT = allocatePort(StaxServer.class);
     static final String SSL_PORT = allocatePort(Server.class, 1);
+    static final String STAX_SSL_PORT = allocatePort(StaxServer.class, 1);
 
     private static final String INPUT = "foo";
     private static boolean unrestrictedPoliciesInstalled;
@@ -64,7 +65,6 @@ public class WSSecurity10Test extends Ab
     
     final TestParam test;
     
-    
     public WSSecurity10Test(TestParam type) {
         this.test = type;
     }
@@ -72,28 +72,38 @@ public class WSSecurity10Test extends Ab
     static class TestParam {
         final String prefix;
         final boolean streaming;
+        final String port;
         
-        public TestParam(String p, boolean b) {
+        public TestParam(String p, String port, boolean b) {
             prefix = p;
+            this.port = port;
             streaming = b;
         }
         public String toString() {
-            return prefix + ":" + (streaming ? "streaming" : "dom");
+            return prefix + ":" + port + ":" + (streaming ? "streaming" : "dom");
         }
     }
     
     @Parameters(name = "{0}")
     public static Collection<TestParam[]> data() {
        
-        return Arrays.asList(new TestParam[][] {{new TestParam("UserName", false)},
-                                                {new TestParam("UserNameOverTransport", false)},
-                                                {new TestParam("MutualCertificate10SignEncrypt", false)},
-                                                {new TestParam("MutualCertificate10SignEncryptRsa15TripleDes", false)},
-                                                {new TestParam("UserName", true)},
-                                                {new TestParam("UserNameOverTransport", true)},
-                                                {new TestParam("MutualCertificate10SignEncrypt", true)},
-                                                {new TestParam("MutualCertificate10SignEncryptRsa15TripleDes", true)}
-        
+        return Arrays.asList(new TestParam[][] {
+            {new TestParam("UserName", PORT, false)},
+            {new TestParam("UserNameOverTransport", SSL_PORT, false)},
+            {new TestParam("MutualCertificate10SignEncrypt", PORT, false)},
+            {new TestParam("MutualCertificate10SignEncryptRsa15TripleDes", PORT, false)},
+            {new TestParam("UserName", PORT, true)},
+            {new TestParam("UserNameOverTransport", SSL_PORT, true)},
+            {new TestParam("MutualCertificate10SignEncrypt", PORT, true)},
+            {new TestParam("MutualCertificate10SignEncryptRsa15TripleDes", PORT, true)},
+            {new TestParam("UserName", STAX_PORT, false)},
+            {new TestParam("UserNameOverTransport", STAX_SSL_PORT, false)},
+            {new TestParam("MutualCertificate10SignEncrypt", STAX_PORT, false)},
+            {new TestParam("MutualCertificate10SignEncryptRsa15TripleDes", STAX_PORT, false)},
+            {new TestParam("UserName", STAX_PORT, true)},
+            {new TestParam("UserNameOverTransport", STAX_SSL_PORT, true)},
+            {new TestParam("MutualCertificate10SignEncrypt", STAX_PORT, true)},
+            {new TestParam("MutualCertificate10SignEncryptRsa15TripleDes", STAX_PORT, true)}
         });
     }
 
@@ -106,6 +116,12 @@ public class WSSecurity10Test extends Ab
             // set this to false to fork
             launchServer(Server.class, true)
         );
+        assertTrue(
+                   "Server failed to launch",
+                   // run the server in the same process
+                   // set this to false to fork
+                   launchServer(StaxServer.class, true)
+        );
         if (unrestrictedPoliciesInstalled) {
             createStaticBus("org/apache/cxf/systest/ws/wssec10/client.xml");
         } else {
@@ -120,13 +136,13 @@ public class WSSecurity10Test extends Ab
     }
 
     @Test
-    public void testClientServerDOM() {
+    public void testClientServer() {
         BusFactory.setDefaultBus(getStaticBus());
         BusFactory.setThreadDefaultBus(getStaticBus());
         URL wsdlLocation = null;
 
         PingService svc = null; 
-        wsdlLocation = getWsdlLocation(test.prefix); 
+        wsdlLocation = getWsdlLocation(test.prefix, test.port); 
         svc = new PingService(wsdlLocation);
         final IPingService port = 
             svc.getPort(
@@ -162,21 +178,16 @@ public class WSSecurity10Test extends Ab
         cl.destroy();
     }
         
-    private static URL getWsdlLocation(String portPrefix) {
+    private static URL getWsdlLocation(String portPrefix, String port) {
         try {
             if ("UserNameOverTransport".equals(portPrefix)) {
-                return new URL("https://localhost:" + SSL_PORT + "/" + portPrefix + "?wsdl");
-            } else if ("UserName".equals(portPrefix)) {
-                return new URL("http://localhost:" + PORT + "/" + portPrefix + "?wsdl");
-            } else if ("MutualCertificate10SignEncrypt".equals(portPrefix)) {
-                return new URL("http://localhost:" + PORT + "/" + portPrefix + "?wsdl");
-            } else if ("MutualCertificate10SignEncryptRsa15TripleDes".equals(portPrefix)) {
-                return new URL("http://localhost:" + PORT + "/" + portPrefix + "?wsdl");
+                return new URL("https://localhost:" + port + "/" + portPrefix + "?wsdl");
+            } else {
+                return new URL("http://localhost:" + port + "/" + portPrefix + "?wsdl");
             }
         } catch (MalformedURLException mue) {
             return null;
         }
-        return null;
     }
 
     

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity111Test.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity111Test.java?rev=1546579&r1=1546578&r2=1546579&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity111Test.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity111Test.java Fri Nov 29 15:14:27 2013
@@ -20,26 +20,52 @@
 package org.apache.cxf.systest.ws.wssec11;
 
 import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collection;
 
 import org.apache.cxf.systest.ws.common.SecurityTestUtil;
 import org.apache.cxf.systest.ws.wssec11.server.Server11;
 import org.apache.cxf.systest.ws.wssec11.server.Server11Restricted;
+import org.apache.cxf.systest.ws.wssec11.server.StaxServer11;
+import org.apache.cxf.systest.ws.wssec11.server.StaxServer11Restricted;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized.Parameters;
 
 
 /**
  * This class runs the first half of the tests, as having all in 
  * the one class causes an out of memory problem in eclipse.
- * 
- * It tests both DOM + StAX clients against the DOM server.
  */
+@RunWith(value = org.junit.runners.Parameterized.class)
 public class WSSecurity111Test extends WSSecurity11Common {
     private static boolean unrestrictedPoliciesInstalled;
     
     static {
         unrestrictedPoliciesInstalled = SecurityTestUtil.checkUnrestrictedPoliciesInstalled();
     };
+    
+    final TestParam test;
+    
+    public WSSecurity111Test(TestParam type) {
+        this.test = type;
+    }
+    
+    static class TestParam {
+        final String prefix;
+        final boolean streaming;
+        final String port;
+        
+        public TestParam(String p, String port, boolean b) {
+            prefix = p;
+            this.port = port;
+            streaming = b;
+        }
+        public String toString() {
+            return prefix + ":" + port + ":" + (streaming ? "streaming" : "dom");
+        }
+    }
 
     @BeforeClass
     public static void startServers() throws Exception {
@@ -50,6 +76,12 @@ public class WSSecurity111Test extends W
                     // set this to false to fork
                     launchServer(Server11.class, true)
             );
+            assertTrue(
+                       "Server failed to launch",
+                       // run the server in the same process
+                       // set this to false to fork
+                       launchServer(StaxServer11.class, true)
+            );
         } else {
             if (WSSecurity11Common.isIBMJDK16()) {
                 System.out.println("Not running as there is a problem with 1.6 jdk and restricted jars");
@@ -62,7 +94,78 @@ public class WSSecurity111Test extends W
                     // set this to false to fork
                     launchServer(Server11Restricted.class, true)
             );
+            assertTrue(
+                       "Server failed to launch",
+                       // run the server in the same process
+                       // set this to false to fork
+                       launchServer(StaxServer11Restricted.class, true)
+            );
+        }
+    }
+    
+    @Parameters(name = "{0}")
+    public static Collection<TestParam[]> data() {
+        String domPort = null;
+        if (unrestrictedPoliciesInstalled) {
+            domPort = Server11.PORT;
+        } else {
+            domPort = Server11Restricted.PORT;
+        }
+        
+        String staxPort = null;
+        if (unrestrictedPoliciesInstalled) {
+            staxPort = StaxServer11.PORT;
+        } else {
+            staxPort = StaxServer11Restricted.PORT;
         }
+        
+        return Arrays.asList(new TestParam[][] {
+            {new TestParam("A", domPort, false)},
+            {new TestParam("A-NoTimestamp", domPort, false)},
+            {new TestParam("AD", domPort, false)},
+            {new TestParam("A-ES", domPort, false)},
+            {new TestParam("AD-ES", domPort, false)},
+            {new TestParam("UX", domPort, false)},
+            {new TestParam("UX-NoTimestamp", domPort, false)},
+            {new TestParam("UXD", domPort, false)},
+            {new TestParam("UX-SEES", domPort, false)},
+            {new TestParam("UXD-SEES", domPort, false)},
+            
+            {new TestParam("A", domPort, true)},
+            {new TestParam("A-NoTimestamp", domPort, true)},
+            {new TestParam("AD", domPort, true)},
+            // TODO See WSS-468 EncryptBeforeSigning not working 
+            // {new TestParam("A-ES", domPort, true)},
+            // {new TestParam("AD-ES", domPort, true)},
+            {new TestParam("UX", domPort, true)},
+            {new TestParam("UX-NoTimestamp", domPort, true)},
+            {new TestParam("UXD", domPort, true)},
+            {new TestParam("UX-SEES", domPort, true)},
+            {new TestParam("UXD-SEES", domPort, true)},
+            
+            {new TestParam("A", staxPort, false)},
+            {new TestParam("A-NoTimestamp", staxPort, false)},
+            {new TestParam("AD", staxPort, false)},
+            {new TestParam("A-ES", staxPort, false)},
+            {new TestParam("AD-ES", staxPort, false)},
+            {new TestParam("UX", staxPort, false)},
+            {new TestParam("UX-NoTimestamp", staxPort, false)},
+            {new TestParam("UXD", staxPort, false)},
+            {new TestParam("UX-SEES", staxPort, false)},
+            {new TestParam("UXD-SEES", staxPort, false)},
+            
+            {new TestParam("A", staxPort, true)},
+            {new TestParam("A-NoTimestamp", staxPort, true)},
+            {new TestParam("AD", staxPort, true)},
+            // TODO See WSS-468 EncryptBeforeSigning not working 
+            // {new TestParam("A-ES", staxPort, true)},
+            // {new TestParam("AD-ES", staxPort, true)},
+            {new TestParam("UX", staxPort, true)},
+            {new TestParam("UX-NoTimestamp", staxPort, true)},
+            {new TestParam("UXD", staxPort, true)},
+            {new TestParam("UX-SEES", staxPort, true)},
+            {new TestParam("UXD-SEES", staxPort, true)},
+        });
     }
     
     @org.junit.AfterClass
@@ -78,43 +181,8 @@ public class WSSecurity111Test extends W
             System.out.println("Not running as there is a problem with 1.6 jdk and restricted jars");
             return;
         }
-        String[] argv = new String[] {
-            "A",
-            "A-NoTimestamp",
-            "AD",
-            "A-ES",
-            "AD-ES",
-            "UX",
-            "UX-NoTimestamp",
-            "UXD",
-            "UX-SEES",
-            "UXD-SEES", 
-        };
-        runClientServer(argv, unrestrictedPoliciesInstalled, false, false);
-    }
-    
-    @Test
-    public void testClientServerStreaming() throws IOException {
-        if ((!unrestrictedPoliciesInstalled)
-                && (WSSecurity11Common.isIBMJDK16())) {
-            System.out.println("Not running as there is a problem with 1.6 jdk and restricted jars");
-            return;
-        }
-        String[] argv = new String[] {
-            "A",
-            "A-NoTimestamp",
-            "AD",
-            // TODO See WSS-468 EncryptBeforeSigning not working "A-ES",
-            // TODO See WSS-468 Ordering issue as above "AD-ES",
-            "UX",
-            "UX-NoTimestamp",
-            "UXD",
-            "UX-SEES",
-            "UXD-SEES",
-        };
-        runClientServerStreaming(argv, unrestrictedPoliciesInstalled, false, false);
+        
+        runClientServer(test.prefix, test.port, unrestrictedPoliciesInstalled, test.streaming);
     }
-    
- 
         
 }

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity112Test.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity112Test.java?rev=1546579&r1=1546578&r2=1546579&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity112Test.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity112Test.java Fri Nov 29 15:14:27 2013
@@ -21,24 +21,52 @@ package org.apache.cxf.systest.ws.wssec1
 
 
 import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collection;
 
 import org.apache.cxf.systest.ws.common.SecurityTestUtil;
 import org.apache.cxf.systest.ws.wssec11.server.Server12;
 import org.apache.cxf.systest.ws.wssec11.server.Server12Restricted;
+import org.apache.cxf.systest.ws.wssec11.server.StaxServer12;
+import org.apache.cxf.systest.ws.wssec11.server.StaxServer12Restricted;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized.Parameters;
 
 
 /**
  * This class runs the second half of the tests, as having all in 
  * the one class causes an out of memory problem in eclipse
  */
+@RunWith(value = org.junit.runners.Parameterized.class)
 public class WSSecurity112Test extends WSSecurity11Common {
     private static boolean unrestrictedPoliciesInstalled;
     
     static {
         unrestrictedPoliciesInstalled = SecurityTestUtil.checkUnrestrictedPoliciesInstalled();
     };
+    
+    final TestParam test;
+    
+    public WSSecurity112Test(TestParam type) {
+        this.test = type;
+    }
+    
+    static class TestParam {
+        final String prefix;
+        final boolean streaming;
+        final String port;
+        
+        public TestParam(String p, String port, boolean b) {
+            prefix = p;
+            this.port = port;
+            streaming = b;
+        }
+        public String toString() {
+            return prefix + ":" + port + ":" + (streaming ? "streaming" : "dom");
+        }
+    }
       
     @BeforeClass
     public static void startServers() throws Exception {
@@ -49,6 +77,12 @@ public class WSSecurity112Test extends W
                     // set this to false to fork
                     launchServer(Server12.class, true)
             );
+            assertTrue(
+                       "Server failed to launch",
+                       // run the server in the same process
+                       // set this to false to fork
+                       launchServer(StaxServer12.class, true)
+            );
         } else {
             if (WSSecurity11Common.isIBMJDK16()) {
                 System.out.println("Not running as there is a problem with 1.6 jdk and restricted jars");
@@ -61,6 +95,53 @@ public class WSSecurity112Test extends W
                     // set this to false to fork
                     launchServer(Server12Restricted.class, true)
             );
+            assertTrue(
+                       "Server failed to launch",
+                       // run the server in the same process
+                       // set this to false to fork
+                       launchServer(StaxServer12Restricted.class, true)
+            );
+        }
+    }
+    
+    @Parameters(name = "{0}")
+    public static Collection<TestParam[]> data() {
+        if (unrestrictedPoliciesInstalled) {
+            return Arrays.asList(new TestParam[][] {
+                {new TestParam("X", Server12.PORT, false)},
+                {new TestParam("X-NoTimestamp", Server12.PORT, false)},
+                {new TestParam("X-AES128", Server12.PORT, false)},
+                {new TestParam("X-AES256", Server12.PORT, false)},
+                {new TestParam("X-TripleDES", Server12.PORT, false)},
+                {new TestParam("XD", Server12.PORT, false)},
+                {new TestParam("XD-ES", Server12.PORT, false)},
+                {new TestParam("XD-SEES", Server12.PORT, false)},
+                
+                {new TestParam("X", StaxServer12.PORT, false)},
+                {new TestParam("X-NoTimestamp", StaxServer12.PORT, false)},
+                {new TestParam("X-AES128", StaxServer12.PORT, false)},
+                {new TestParam("X-AES256", StaxServer12.PORT, false)},
+                {new TestParam("X-TripleDES", StaxServer12.PORT, false)},
+                {new TestParam("XD", StaxServer12.PORT, false)},
+                {new TestParam("XD-ES", StaxServer12.PORT, false)},
+                // TODO Endorsing derived streaming not working 
+                // {new TestParam("XD-SEES", StaxServer12.PORT, false)},
+            });
+        } else {
+            return Arrays.asList(new TestParam[][] {
+                {new TestParam("X", Server12Restricted.PORT, false)},
+                {new TestParam("X-NoTimestamp", Server12Restricted.PORT, false)},
+                {new TestParam("XD", Server12Restricted.PORT, false)},
+                {new TestParam("XD-ES", Server12Restricted.PORT, false)},
+                {new TestParam("XD-SEES", Server12Restricted.PORT, false)},
+                
+                {new TestParam("X", StaxServer12Restricted.PORT, false)},
+                {new TestParam("X-NoTimestamp", StaxServer12Restricted.PORT, false)},
+                {new TestParam("XD", StaxServer12Restricted.PORT, false)},
+                {new TestParam("XD-ES", StaxServer12Restricted.PORT, false)},
+                // TODO Endorsing derived streaming not working 
+                // {new TestParam("XD-SEES", StaxServer12Restricted.PORT, false)},
+            });
         }
     }
     
@@ -78,29 +159,7 @@ public class WSSecurity112Test extends W
             return;
         }
 
-        String[] argv = null;
-        if (unrestrictedPoliciesInstalled) {
-            argv = new String[] {
-                "X",
-                "X-NoTimestamp",
-                "X-AES128",
-                "X-AES256",
-                "X-TripleDES",
-                "XD",
-                "XD-ES",
-                "XD-SEES",
-            };
-        } else {
-            argv = new String[] {
-                "X",
-                "X-NoTimestamp",
-                "XD",
-                "XD-ES",
-                "XD-SEES",
-            };
-        }
-        runClientServer(argv, unrestrictedPoliciesInstalled, true, false);
-
+        runClientServer(test.prefix, test.port, unrestrictedPoliciesInstalled, test.streaming);
     }
     
  

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity11Common.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity11Common.java?rev=1546579&r1=1546578&r2=1546579&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity11Common.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity11Common.java Fri Nov 29 15:14:27 2013
@@ -30,10 +30,6 @@ import javax.xml.ws.BindingProvider;
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
-import org.apache.cxf.systest.ws.wssec11.server.Server11;
-import org.apache.cxf.systest.ws.wssec11.server.Server12;
-import org.apache.cxf.systest.ws.wssec11.server.StaxServer11;
-import org.apache.cxf.systest.ws.wssec11.server.StaxServer12;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.ws.security.SecurityConstants;
 
@@ -49,8 +45,8 @@ public class WSSecurity11Common extends 
     private static final String INPUT = "foo";
 
     public void runClientServer(
-        String[] argv, boolean unrestrictedPoliciesInstalled, 
-        boolean wssecurity12, boolean streamingServer
+        String portPrefix, String portNumber, boolean unrestrictedPoliciesInstalled,
+        boolean streaming
     ) throws IOException {
         
         Bus bus = null;
@@ -63,106 +59,33 @@ public class WSSecurity11Common extends 
         BusFactory.setDefaultBus(bus);
         BusFactory.setThreadDefaultBus(bus);
 
-        String portNumber = null;
-        if (streamingServer) {
-            if (wssecurity12) {
-                portNumber = StaxServer12.PORT;
-            } else {
-                portNumber = StaxServer11.PORT;
-            }
-        } else {
-            if (wssecurity12) {
-                portNumber = Server12.PORT;
-            } else {
-                portNumber = Server11.PORT;
-            }
-        }
-        
         URL wsdlLocation = null;
-        for (String portPrefix : argv) {
-            PingService11 svc = null; 
-            wsdlLocation = getWsdlLocation(portPrefix, portNumber); 
-            svc = new PingService11(wsdlLocation);
-            final IPingService port = 
-                svc.getPort(
-                    new QName(
-                        "http://WSSec/wssec11",
-                        portPrefix + "_IPingService"
-                    ),
-                    IPingService.class
-                );
-            
-            final String output = port.echo(INPUT);
-            assertEquals(INPUT, output);
-            
-            ((java.io.Closeable)port).close();
-        }
+        PingService11 svc = null; 
+        wsdlLocation = getWsdlLocation(portPrefix, portNumber); 
+        svc = new PingService11(wsdlLocation);
+        final IPingService port = 
+            svc.getPort(
+                new QName("http://WSSec/wssec11", portPrefix + "_IPingService"),
+                IPingService.class
+            );
         
-        bus.shutdown(true);
-    }
-    
-    public void runClientServerStreaming(
-        String[] argv, boolean unrestrictedPoliciesInstalled, 
-        boolean wssecurity12, boolean streamingServer
-    ) throws IOException {
-
-        Bus bus = null;
-        if (unrestrictedPoliciesInstalled) {
-            bus = new SpringBusFactory().createBus("org/apache/cxf/systest/ws/wssec11/client.xml");
-        } else {
-            bus = new SpringBusFactory().createBus(
-                      "org/apache/cxf/systest/ws/wssec11/client_restricted.xml");
-        }
-        BusFactory.setDefaultBus(bus);
-        BusFactory.setThreadDefaultBus(bus);
-
-        String portNumber = null;
-        if (streamingServer) {
-            if (wssecurity12) {
-                portNumber = StaxServer12.PORT;
-            } else {
-                portNumber = StaxServer11.PORT;
-            }
-        } else {
-            if (wssecurity12) {
-                portNumber = Server12.PORT;
-            } else {
-                portNumber = Server11.PORT;
-            }
-        }
-
-        URL wsdlLocation = null;
-        for (String portPrefix : argv) {
-            PingService11 svc = null; 
-            wsdlLocation = getWsdlLocation(portPrefix, portNumber); 
-            svc = new PingService11(wsdlLocation);
-            final IPingService port = 
-                svc.getPort(
-                    new QName(
-                        "http://WSSec/wssec11",
-                        portPrefix + "_IPingService"
-                    ),
-                    IPingService.class
-                );
-
+        if (streaming) {
             ((BindingProvider)port).getRequestContext().put(
                 SecurityConstants.ENABLE_STREAMING_SECURITY, "true"
             );
             ((BindingProvider)port).getResponseContext().put(
-                SecurityConstants.ENABLE_STREAMING_SECURITY, "true"
+                 SecurityConstants.ENABLE_STREAMING_SECURITY, "true"
             );
-            
-            final String output = port.echo(INPUT);
-            assertEquals(INPUT, output);
-
-            ((java.io.Closeable)port).close();
         }
 
+        final String output = port.echo(INPUT);
+        assertEquals(INPUT, output);
+
+        ((java.io.Closeable)port).close();
+        
         bus.shutdown(true);
     }
-
-
-
+    
     private static URL getWsdlLocation(String portPrefix, String portNumber) {
         try {
             return new URL("http://localhost:" + portNumber + "/" + portPrefix + "PingService?wsdl");

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11Restricted.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11Restricted.java?rev=1546579&r1=1546578&r2=1546579&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11Restricted.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server11Restricted.java Fri Nov 29 15:14:27 2013
@@ -24,7 +24,7 @@ import org.apache.cxf.bus.spring.SpringB
 import org.apache.cxf.systest.ws.wssec11.RestrictedAlgorithmSuiteLoader;
 
 public class Server11Restricted extends AbstractServerRestricted {
-    static final String PORT = allocatePort(Server11.class);
+    public static final String PORT = allocatePort(Server11.class);
 
     public Server11Restricted() throws Exception {
         super("http://localhost:" + PORT);

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server12Restricted.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server12Restricted.java?rev=1546579&r1=1546578&r2=1546579&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server12Restricted.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server12Restricted.java Fri Nov 29 15:14:27 2013
@@ -24,7 +24,7 @@ import org.apache.cxf.bus.spring.SpringB
 import org.apache.cxf.systest.ws.wssec11.RestrictedAlgorithmSuiteLoader;
 
 public class Server12Restricted extends AbstractServerRestricted {
-    static final String PORT = allocatePort(Server12.class);
+    public static final String PORT = allocatePort(Server12.class);
 
     public Server12Restricted() throws Exception {
         super("http://localhost:" + PORT);

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/StaxServer11Restricted.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/StaxServer11Restricted.java?rev=1546579&r1=1546578&r2=1546579&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/StaxServer11Restricted.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/StaxServer11Restricted.java Fri Nov 29 15:14:27 2013
@@ -24,7 +24,7 @@ import org.apache.cxf.bus.spring.SpringB
 import org.apache.cxf.systest.ws.wssec11.RestrictedAlgorithmSuiteLoader;
 
 public class StaxServer11Restricted extends AbstractServerRestricted {
-    static final String PORT = allocatePort(StaxServer11.class);
+    public static final String PORT = allocatePort(StaxServer11.class);
 
     public StaxServer11Restricted() throws Exception {
         super("http://localhost:" + PORT, true);

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/StaxServer12Restricted.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/StaxServer12Restricted.java?rev=1546579&r1=1546578&r2=1546579&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/StaxServer12Restricted.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/StaxServer12Restricted.java Fri Nov 29 15:14:27 2013
@@ -24,7 +24,7 @@ import org.apache.cxf.bus.spring.SpringB
 import org.apache.cxf.systest.ws.wssec11.RestrictedAlgorithmSuiteLoader;
 
 public class StaxServer12Restricted extends AbstractServerRestricted {
-    static final String PORT = allocatePort(StaxServer12.class);
+    public static final String PORT = allocatePort(StaxServer12.class);
 
     public StaxServer12Restricted() throws Exception {
         super("http://localhost:" + PORT, true);

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java?rev=1546579&r1=1546578&r2=1546579&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java Fri Nov 29 15:14:27 2013
@@ -21,6 +21,8 @@ package org.apache.cxf.systest.ws.x509;
 
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 
 import javax.xml.namespace.QName;
@@ -34,21 +36,26 @@ import org.apache.cxf.frontend.ClientPro
 import org.apache.cxf.headers.Header;
 import org.apache.cxf.jaxb.JAXBDataBinding;
 import org.apache.cxf.systest.ws.common.SecurityTestUtil;
+import org.apache.cxf.systest.ws.common.TestParam;
 import org.apache.cxf.systest.ws.ut.SecurityHeaderCacheInterceptor;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.ws.security.SecurityConstants;
 import org.example.contract.doubleit.DoubleItPortType;
 import org.example.contract.doubleit.DoubleItPortType2;
 import org.junit.BeforeClass;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized.Parameters;
 
 /**
- * A set of tests for X.509 Tokens. It tests both DOM + StAX clients against the 
- * DOM server
+ * A set of tests for X.509 Tokens. 
  */
+@RunWith(value = org.junit.runners.Parameterized.class)
 public class X509TokenTest extends AbstractBusClientServerTestBase {
     public static final String PORT = allocatePort(Server.class);
+    public static final String STAX_PORT = allocatePort(StaxServer.class);
     public static final String INTERMEDIARY_PORT = allocatePort(Intermediary.class);
     static final String PORT2 = allocatePort(Server.class, 2);
+    static final String STAX_PORT2 = allocatePort(StaxServer.class, 2);
 
     private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt";
     private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService");
@@ -56,6 +63,12 @@ public class X509TokenTest extends Abstr
     private static boolean unrestrictedPoliciesInstalled = 
         SecurityTestUtil.checkUnrestrictedPoliciesInstalled();
 
+    final TestParam test;
+    
+    public X509TokenTest(TestParam type) {
+        this.test = type;
+    }
+    
     @BeforeClass
     public static void startServers() throws Exception {
         assertTrue(
@@ -65,6 +78,12 @@ public class X509TokenTest extends Abstr
                 launchServer(Server.class, true)
         );
         assertTrue(
+                   "Server failed to launch",
+                   // run the server in the same process
+                   // set this to false to fork
+                   launchServer(StaxServer.class, true)
+        );
+        assertTrue(
                 "Intermediary failed to launch",
                 // run the server in the same process
                 // set this to false to fork
@@ -72,6 +91,16 @@ public class X509TokenTest extends Abstr
         );
     }
     
+    @Parameters(name = "{0}")
+    public static Collection<TestParam[]> data() {
+       
+        return Arrays.asList(new TestParam[][] {{new TestParam(PORT, false)},
+                                                {new TestParam(PORT, true)},
+                                                {new TestParam(STAX_PORT, false)},
+                                                {new TestParam(STAX_PORT, true)},
+        });
+    }
+    
     @org.junit.AfterClass
     public static void cleanup() throws Exception {
         SecurityTestUtil.cleanup();
@@ -93,13 +122,12 @@ public class X509TokenTest extends Abstr
         QName portQName = new QName(NAMESPACE, "DoubleItKeyIdentifierPort");
         DoubleItPortType x509Port = 
                 service.getPort(portQName, DoubleItPortType.class);
-        updateAddressPort(x509Port, PORT);
+        updateAddressPort(x509Port, test.getPort());
         
-        // DOM
-        x509Port.doubleIt(25);
+        if (test.isStreaming()) {
+            SecurityTestUtil.enableStreaming(x509Port);
+        }
         
-        // Streaming
-        SecurityTestUtil.enableStreaming(x509Port);
         x509Port.doubleIt(25);
         
         ((java.io.Closeable)x509Port).close();
@@ -121,13 +149,12 @@ public class X509TokenTest extends Abstr
         QName portQName = new QName(NAMESPACE, "DoubleItKeyIdentifierDerivedPort");
         DoubleItPortType x509Port = 
                 service.getPort(portQName, DoubleItPortType.class);
-        updateAddressPort(x509Port, PORT);
+        updateAddressPort(x509Port, test.getPort());
         
-        // DOM
-        x509Port.doubleIt(25);
+        if (test.isStreaming()) {
+            SecurityTestUtil.enableStreaming(x509Port);
+        }
         
-        // Streaming
-        SecurityTestUtil.enableStreaming(x509Port);
         x509Port.doubleIt(25);
         
         ((java.io.Closeable)x509Port).close();
@@ -149,14 +176,16 @@ public class X509TokenTest extends Abstr
         QName portQName = new QName(NAMESPACE, "DoubleItKeyIdentifierEncryptBeforeSigningPort");
         DoubleItPortType x509Port = 
                 service.getPort(portQName, DoubleItPortType.class);
-        updateAddressPort(x509Port, PORT);
+        updateAddressPort(x509Port, test.getPort());
         
-        // DOM
-        x509Port.doubleIt(25);
+        if (test.isStreaming()) {
+            SecurityTestUtil.enableStreaming(x509Port);
+        }
         
         // TODO WSS-468 Streaming
-        // SecurityTestUtil.enableStreaming(x509Port);
-        // x509Port.doubleIt(25);
+        if (!test.isStreaming()) {
+            x509Port.doubleIt(25);
+        }
         
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
@@ -177,14 +206,16 @@ public class X509TokenTest extends Abstr
         QName portQName = new QName(NAMESPACE, "DoubleItKeyIdentifierEncryptBeforeSigningDerivedPort");
         DoubleItPortType x509Port = 
                 service.getPort(portQName, DoubleItPortType.class);
-        updateAddressPort(x509Port, PORT);
+        updateAddressPort(x509Port, test.getPort());
         
-        // DOM
-        x509Port.doubleIt(25);
+        if (test.isStreaming()) {
+            SecurityTestUtil.enableStreaming(x509Port);
+        }
         
         // TODO WSS-468 Streaming
-        // SecurityTestUtil.enableStreaming(x509Port);
-        // x509Port.doubleIt(25);
+        if (!test.isStreaming()) {
+            x509Port.doubleIt(25);
+        }
         
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
@@ -205,17 +236,16 @@ public class X509TokenTest extends Abstr
         QName portQName = new QName(NAMESPACE, "DoubleItKeyIdentifierPort");
         DoubleItPortType x509Port = 
                 service.getPort(portQName, DoubleItPortType.class);
-        updateAddressPort(x509Port, PORT);
+        updateAddressPort(x509Port, test.getPort());
+        
+        if (test.isStreaming()) {
+            SecurityTestUtil.enableStreaming(x509Port);
+        }
         
         ((BindingProvider)x509Port).getRequestContext().put(SecurityConstants.ENCRYPT_PROPERTIES,
                 "bob.properties");
         ((BindingProvider)x509Port).getRequestContext().put(SecurityConstants.ENCRYPT_USERNAME, "bob");
         
-        // DOM
-        x509Port.doubleIt(25);
-        
-        // Streaming
-        SecurityTestUtil.enableStreaming(x509Port);
         x509Port.doubleIt(25);
         
         ((java.io.Closeable)x509Port).close();
@@ -225,6 +255,10 @@ public class X509TokenTest extends Abstr
     @org.junit.Test
     public void testIntermediary() throws Exception {
 
+        if (test.isStreaming() || STAX_PORT.equals(test.getPort())) {
+            return;
+        }
+        
         SpringBusFactory bf = new SpringBusFactory();
         URL busFile = X509TokenTest.class.getResource("intermediary-client.xml");
 
@@ -239,11 +273,6 @@ public class X509TokenTest extends Abstr
                 service.getPort(portQName, DoubleItPortType.class);
         updateAddressPort(x509Port, INTERMEDIARY_PORT);
         
-        // DOM
-        x509Port.doubleIt(25);
-        
-        // Streaming
-        SecurityTestUtil.enableStreaming(x509Port);
         x509Port.doubleIt(25);
         
         ((java.io.Closeable)x509Port).close();
@@ -265,13 +294,12 @@ public class X509TokenTest extends Abstr
         QName portQName = new QName(NAMESPACE, "DoubleItIssuerSerialPort");
         DoubleItPortType x509Port = 
                 service.getPort(portQName, DoubleItPortType.class);
-        updateAddressPort(x509Port, PORT);
+        updateAddressPort(x509Port, test.getPort());
         
-        // DOM
-        x509Port.doubleIt(25);
+        if (test.isStreaming()) {
+            SecurityTestUtil.enableStreaming(x509Port);
+        }
         
-        // Streaming
-        SecurityTestUtil.enableStreaming(x509Port);
         x509Port.doubleIt(25);
         
         ((java.io.Closeable)x509Port).close();
@@ -293,13 +321,12 @@ public class X509TokenTest extends Abstr
         QName portQName = new QName(NAMESPACE, "DoubleItThumbprintPort");
         DoubleItPortType x509Port = 
                 service.getPort(portQName, DoubleItPortType.class);
-        updateAddressPort(x509Port, PORT);
+        updateAddressPort(x509Port, test.getPort());
         
-        // DOM
-        x509Port.doubleIt(25);
+        if (test.isStreaming()) {
+            SecurityTestUtil.enableStreaming(x509Port);
+        }
         
-        // Streaming
-        SecurityTestUtil.enableStreaming(x509Port);
         x509Port.doubleIt(25);
         
         ((java.io.Closeable)x509Port).close();
@@ -307,6 +334,7 @@ public class X509TokenTest extends Abstr
     }
     
     @org.junit.Test
+    @org.junit.Ignore
     public void testContentEncryptedElements() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
@@ -321,9 +349,12 @@ public class X509TokenTest extends Abstr
         QName portQName = new QName(NAMESPACE, "DoubleItContentEncryptedElementsPort");
         DoubleItPortType x509Port = 
                 service.getPort(portQName, DoubleItPortType.class);
-        updateAddressPort(x509Port, PORT);
+        updateAddressPort(x509Port, test.getPort());
+        
+        if (test.isStreaming()) {
+            SecurityTestUtil.enableStreaming(x509Port);
+        }
         
-        // DOM
         x509Port.doubleIt(25);
         
         ((java.io.Closeable)x509Port).close();
@@ -345,13 +376,12 @@ public class X509TokenTest extends Abstr
         QName portQName = new QName(NAMESPACE, "DoubleItAsymmetricIssuerSerialPort");
         DoubleItPortType x509Port = 
                 service.getPort(portQName, DoubleItPortType.class);
-        updateAddressPort(x509Port, PORT);
+        updateAddressPort(x509Port, test.getPort());
         
-        // DOM
-        x509Port.doubleIt(25);
+        if (test.isStreaming()) {
+            SecurityTestUtil.enableStreaming(x509Port);
+        }
         
-        // Streaming
-        SecurityTestUtil.enableStreaming(x509Port);
         x509Port.doubleIt(25);
         
         ((java.io.Closeable)x509Port).close();
@@ -373,13 +403,12 @@ public class X509TokenTest extends Abstr
         QName portQName = new QName(NAMESPACE, "DoubleItAsymmetricSP11Port");
         DoubleItPortType x509Port = 
                 service.getPort(portQName, DoubleItPortType.class);
-        updateAddressPort(x509Port, PORT);
+        updateAddressPort(x509Port, test.getPort());
         
-        // DOM
-        x509Port.doubleIt(25);
+        if (test.isStreaming()) {
+            SecurityTestUtil.enableStreaming(x509Port);
+        }
         
-        // Streaming
-        SecurityTestUtil.enableStreaming(x509Port);
         x509Port.doubleIt(25);
         
         ((java.io.Closeable)x509Port).close();
@@ -405,13 +434,12 @@ public class X509TokenTest extends Abstr
         QName portQName = new QName(NAMESPACE, "DoubleItAsymmetricEncryptedPasswordPort");
         DoubleItPortType x509Port = 
                 service.getPort(portQName, DoubleItPortType.class);
-        updateAddressPort(x509Port, PORT);
+        updateAddressPort(x509Port, test.getPort());
         
-        // DOM
-        x509Port.doubleIt(25);
+        if (test.isStreaming()) {
+            SecurityTestUtil.enableStreaming(x509Port);
+        }
         
-        // Streaming
-        SecurityTestUtil.enableStreaming(x509Port);
         x509Port.doubleIt(25);
         
         ((java.io.Closeable)x509Port).close();
@@ -433,13 +461,12 @@ public class X509TokenTest extends Abstr
         QName portQName = new QName(NAMESPACE, "DoubleItAsymmetricSHA256Port");
         DoubleItPortType x509Port = 
                 service.getPort(portQName, DoubleItPortType.class);
-        updateAddressPort(x509Port, PORT);
+        updateAddressPort(x509Port, test.getPort());
         
-        // DOM
-        x509Port.doubleIt(25);
+        if (test.isStreaming()) {
+            SecurityTestUtil.enableStreaming(x509Port);
+        }
         
-        // Streaming
-        SecurityTestUtil.enableStreaming(x509Port);
         x509Port.doubleIt(25);
         
         ((java.io.Closeable)x509Port).close();
@@ -461,13 +488,12 @@ public class X509TokenTest extends Abstr
         QName portQName = new QName(NAMESPACE, "DoubleItAsymmetricThumbprintPort");
         DoubleItPortType x509Port = 
                 service.getPort(portQName, DoubleItPortType.class);
-        updateAddressPort(x509Port, PORT);
+        updateAddressPort(x509Port, test.getPort());
         
-        // DOM
-        x509Port.doubleIt(25);
+        if (test.isStreaming()) {
+            SecurityTestUtil.enableStreaming(x509Port);
+        }
         
-        // Streaming
-        SecurityTestUtil.enableStreaming(x509Port);
         x509Port.doubleIt(25);
         
         ((java.io.Closeable)x509Port).close();
@@ -489,13 +515,12 @@ public class X509TokenTest extends Abstr
         QName portQName = new QName(NAMESPACE, "DoubleItAsymmetricEncryptBeforeSigningPort");
         DoubleItPortType x509Port = 
                 service.getPort(portQName, DoubleItPortType.class);
-        updateAddressPort(x509Port, PORT);
+        updateAddressPort(x509Port, test.getPort());
         
-        // DOM
-        x509Port.doubleIt(25);
+        if (test.isStreaming()) {
+            SecurityTestUtil.enableStreaming(x509Port);
+        }
         
-        // Streaming
-        SecurityTestUtil.enableStreaming(x509Port);
         x509Port.doubleIt(25);
         
         ((java.io.Closeable)x509Port).close();
@@ -517,13 +542,12 @@ public class X509TokenTest extends Abstr
         QName portQName = new QName(NAMESPACE, "DoubleItAsymmetricEncryptBeforeSigningNoEncPort");
         DoubleItPortType x509Port = 
                 service.getPort(portQName, DoubleItPortType.class);
-        updateAddressPort(x509Port, PORT);
+        updateAddressPort(x509Port, test.getPort());
         
-        // DOM
-        x509Port.doubleIt(25);
+        if (test.isStreaming()) {
+            SecurityTestUtil.enableStreaming(x509Port);
+        }
         
-        // Streaming
-        SecurityTestUtil.enableStreaming(x509Port);
         x509Port.doubleIt(25);
         
         ((java.io.Closeable)x509Port).close();
@@ -545,13 +569,12 @@ public class X509TokenTest extends Abstr
         QName portQName = new QName(NAMESPACE, "DoubleItAsymmetricEncryptSignaturePort");
         DoubleItPortType x509Port = 
                 service.getPort(portQName, DoubleItPortType.class);
-        updateAddressPort(x509Port, PORT);
+        updateAddressPort(x509Port, test.getPort());
         
-        // DOM
-        x509Port.doubleIt(25);
+        if (test.isStreaming()) {
+            SecurityTestUtil.enableStreaming(x509Port);
+        }
         
-        // Streaming
-        SecurityTestUtil.enableStreaming(x509Port);
         x509Port.doubleIt(25);
         
         ((java.io.Closeable)x509Port).close();
@@ -573,13 +596,12 @@ public class X509TokenTest extends Abstr
         QName portQName = new QName(NAMESPACE, "DoubleItAsymmetricProtectTokensPort");
         DoubleItPortType x509Port = 
                 service.getPort(portQName, DoubleItPortType.class);
-        updateAddressPort(x509Port, PORT);
+        updateAddressPort(x509Port, test.getPort());
         
-        // DOM
-        x509Port.doubleIt(25);
+        if (test.isStreaming()) {
+            SecurityTestUtil.enableStreaming(x509Port);
+        }
         
-        // Streaming
-        SecurityTestUtil.enableStreaming(x509Port);
         x509Port.doubleIt(25);
         
         ((java.io.Closeable)x509Port).close();
@@ -601,13 +623,12 @@ public class X509TokenTest extends Abstr
         QName portQName = new QName(NAMESPACE, "DoubleItAsymmetricUsernameTokenPort");
         DoubleItPortType x509Port = 
                 service.getPort(portQName, DoubleItPortType.class);
-        updateAddressPort(x509Port, PORT);
+        updateAddressPort(x509Port, test.getPort());
         
-        // DOM
-        x509Port.doubleIt(25);
+        if (test.isStreaming()) {
+            SecurityTestUtil.enableStreaming(x509Port);
+        }
         
-        // Streaming
-        SecurityTestUtil.enableStreaming(x509Port);
         x509Port.doubleIt(25);
         
         ((java.io.Closeable)x509Port).close();
@@ -629,14 +650,16 @@ public class X509TokenTest extends Abstr
         QName portQName = new QName(NAMESPACE, "DoubleItSymmetricProtectTokensPort");
         DoubleItPortType x509Port = 
                 service.getPort(portQName, DoubleItPortType.class);
-        updateAddressPort(x509Port, PORT);
+        updateAddressPort(x509Port, test.getPort());
         
-        // DOM
-        x509Port.doubleIt(25);
+        if (test.isStreaming()) {
+            SecurityTestUtil.enableStreaming(x509Port);
+        }
         
         // TODO WSS-456 Streaming
-        // SecurityTestUtil.enableStreaming(x509Port);
-        // x509Port.doubleIt(25);
+        if (!test.isStreaming()) {
+            x509Port.doubleIt(25);
+        }
         
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
@@ -657,13 +680,16 @@ public class X509TokenTest extends Abstr
         QName portQName = new QName(NAMESPACE, "DoubleItTransportEndorsingPort");
         DoubleItPortType x509Port = 
                 service.getPort(portQName, DoubleItPortType.class);
-        updateAddressPort(x509Port, PORT2);
+        String port = PORT2;
+        if (STAX_PORT.equals(test.getPort())) {
+            port = STAX_PORT2;
+        }
+        updateAddressPort(x509Port, port);
         
-        // DOM
-        x509Port.doubleIt(25);
+        if (test.isStreaming()) {
+            SecurityTestUtil.enableStreaming(x509Port);
+        }
         
-        // Streaming
-        SecurityTestUtil.enableStreaming(x509Port);
         x509Port.doubleIt(25);
         
         ((java.io.Closeable)x509Port).close();
@@ -685,13 +711,16 @@ public class X509TokenTest extends Abstr
         QName portQName = new QName(NAMESPACE, "DoubleItTransportEndorsingSP11Port");
         DoubleItPortType x509Port = 
                 service.getPort(portQName, DoubleItPortType.class);
-        updateAddressPort(x509Port, PORT2);
+        String port = PORT2;
+        if (STAX_PORT.equals(test.getPort())) {
+            port = STAX_PORT2;
+        }
+        updateAddressPort(x509Port, port);
         
-        // DOM
-        x509Port.doubleIt(25);
+        if (test.isStreaming()) {
+            SecurityTestUtil.enableStreaming(x509Port);
+        }
         
-        // Streaming
-        SecurityTestUtil.enableStreaming(x509Port);
         x509Port.doubleIt(25);
         
         ((java.io.Closeable)x509Port).close();
@@ -713,13 +742,16 @@ public class X509TokenTest extends Abstr
         QName portQName = new QName(NAMESPACE, "DoubleItTransportSignedEndorsingPort");
         DoubleItPortType x509Port = 
                 service.getPort(portQName, DoubleItPortType.class);
-        updateAddressPort(x509Port, PORT2);
+        String port = PORT2;
+        if (STAX_PORT.equals(test.getPort())) {
+            port = STAX_PORT2;
+        }
+        updateAddressPort(x509Port, port);
         
-        // DOM
-        x509Port.doubleIt(25);
+        if (test.isStreaming()) {
+            SecurityTestUtil.enableStreaming(x509Port);
+        }
         
-        // Streaming
-        SecurityTestUtil.enableStreaming(x509Port);
         x509Port.doubleIt(25);
         
         ((java.io.Closeable)x509Port).close();
@@ -741,13 +773,16 @@ public class X509TokenTest extends Abstr
         QName portQName = new QName(NAMESPACE, "DoubleItTransportEndorsingEncryptedPort");
         DoubleItPortType x509Port = 
                 service.getPort(portQName, DoubleItPortType.class);
-        updateAddressPort(x509Port, PORT2);
+        String port = PORT2;
+        if (STAX_PORT.equals(test.getPort())) {
+            port = STAX_PORT2;
+        }
+        updateAddressPort(x509Port, port);
         
-        // DOM
-        x509Port.doubleIt(25);
+        if (test.isStreaming()) {
+            SecurityTestUtil.enableStreaming(x509Port);
+        }
         
-        // Streaming
-        SecurityTestUtil.enableStreaming(x509Port);
         x509Port.doubleIt(25);
         
         ((java.io.Closeable)x509Port).close();
@@ -769,13 +804,16 @@ public class X509TokenTest extends Abstr
         QName portQName = new QName(NAMESPACE, "DoubleItTransportSignedEndorsingEncryptedPort");
         DoubleItPortType x509Port = 
                 service.getPort(portQName, DoubleItPortType.class);
-        updateAddressPort(x509Port, PORT2);
+        String port = PORT2;
+        if (STAX_PORT.equals(test.getPort())) {
+            port = STAX_PORT2;
+        }
+        updateAddressPort(x509Port, port);
         
-        // DOM
-        x509Port.doubleIt(25);
+        if (test.isStreaming()) {
+            SecurityTestUtil.enableStreaming(x509Port);
+        }
         
-        // Streaming
-        SecurityTestUtil.enableStreaming(x509Port);
         x509Port.doubleIt(25);
         
         ((java.io.Closeable)x509Port).close();
@@ -797,13 +835,12 @@ public class X509TokenTest extends Abstr
         QName portQName = new QName(NAMESPACE, "DoubleItAsymmetricSignaturePort");
         DoubleItPortType x509Port = 
                 service.getPort(portQName, DoubleItPortType.class);
-        updateAddressPort(x509Port, PORT);
+        updateAddressPort(x509Port, test.getPort());
         
-        // DOM
-        x509Port.doubleIt(25);
+        if (test.isStreaming()) {
+            SecurityTestUtil.enableStreaming(x509Port);
+        }
         
-        // Streaming
-        SecurityTestUtil.enableStreaming(x509Port);
         x509Port.doubleIt(25);
         
         ((java.io.Closeable)x509Port).close();
@@ -825,13 +862,12 @@ public class X509TokenTest extends Abstr
         QName portQName = new QName(NAMESPACE, "DoubleItAsymmetricSignatureSP11Port");
         DoubleItPortType x509Port = 
                 service.getPort(portQName, DoubleItPortType.class);
-        updateAddressPort(x509Port, PORT);
+        updateAddressPort(x509Port, test.getPort());
         
-        // DOM
-        x509Port.doubleIt(25);
+        if (test.isStreaming()) {
+            SecurityTestUtil.enableStreaming(x509Port);
+        }
         
-        // Streaming
-        SecurityTestUtil.enableStreaming(x509Port);
         x509Port.doubleIt(25);
         
         ((java.io.Closeable)x509Port).close();
@@ -853,13 +889,12 @@ public class X509TokenTest extends Abstr
         QName portQName = new QName(NAMESPACE, "DoubleItAsymmetricEncryptionPort");
         DoubleItPortType x509Port = 
                 service.getPort(portQName, DoubleItPortType.class);
-        updateAddressPort(x509Port, PORT);
+        updateAddressPort(x509Port, test.getPort());
         
-        // DOM
-        x509Port.doubleIt(25);
+        if (test.isStreaming()) {
+            SecurityTestUtil.enableStreaming(x509Port);
+        }
         
-        // Streaming
-        SecurityTestUtil.enableStreaming(x509Port);
         x509Port.doubleIt(25);
         
         ((java.io.Closeable)x509Port).close();
@@ -868,6 +903,9 @@ public class X509TokenTest extends Abstr
     
     @org.junit.Test
     public void testAsymmetricSignatureReplay() throws Exception {
+        if (test.isStreaming()) {
+            return;
+        }
 
         SpringBusFactory bf = new SpringBusFactory();
         URL busFile = X509TokenTest.class.getResource("client.xml");
@@ -881,7 +919,7 @@ public class X509TokenTest extends Abstr
         QName portQName = new QName(NAMESPACE, "DoubleItAsymmetricSignaturePort");
         DoubleItPortType x509Port = 
                 service.getPort(portQName, DoubleItPortType.class);
-        updateAddressPort(x509Port, PORT);
+        updateAddressPort(x509Port, test.getPort());
         
         Client cxfClient = ClientProxy.getClient(x509Port);
         SecurityHeaderCacheInterceptor cacheInterceptor =
@@ -895,7 +933,8 @@ public class X509TokenTest extends Abstr
             fail("Failure expected on a replayed Timestamp");
         } catch (javax.xml.ws.soap.SOAPFaultException ex) {
             String error = "A replay attack has been detected";
-            assertTrue(ex.getMessage().contains(error));
+            assertTrue(ex.getMessage().contains(error)
+                       || ex.getMessage().contains("The message has expired"));
         }
         
         ((java.io.Closeable)x509Port).close();
@@ -917,13 +956,16 @@ public class X509TokenTest extends Abstr
         QName portQName = new QName(NAMESPACE, "DoubleItTransportSupportingSignedPort");
         DoubleItPortType x509Port = 
                 service.getPort(portQName, DoubleItPortType.class);
-        updateAddressPort(x509Port, PORT2);
+        String port = PORT2;
+        if (STAX_PORT.equals(test.getPort())) {
+            port = STAX_PORT2;
+        }
+        updateAddressPort(x509Port, port);
         
-        // DOM
-        x509Port.doubleIt(25);
+        if (test.isStreaming()) {
+            SecurityTestUtil.enableStreaming(x509Port);
+        }
         
-        // Streaming
-        SecurityTestUtil.enableStreaming(x509Port);
         x509Port.doubleIt(25);
         
         ((java.io.Closeable)x509Port).close();
@@ -931,6 +973,7 @@ public class X509TokenTest extends Abstr
     }
     
     @org.junit.Test
+    @org.junit.Ignore
     public void testTransportSupportingSignedCertConstraints() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
@@ -945,7 +988,15 @@ public class X509TokenTest extends Abstr
         QName portQName = new QName(NAMESPACE, "DoubleItTransportSupportingSignedCertConstraintsPort");
         DoubleItPortType x509Port = 
                 service.getPort(portQName, DoubleItPortType.class);
-        updateAddressPort(x509Port, PORT2);
+        String port = PORT2;
+        if (STAX_PORT.equals(test.getPort())) {
+            port = STAX_PORT2;
+        }
+        updateAddressPort(x509Port, port);
+        
+        if (test.isStreaming()) {
+            SecurityTestUtil.enableStreaming(x509Port);
+        }
         
         ((BindingProvider)x509Port).getRequestContext().put(SecurityConstants.SIGNATURE_PROPERTIES,
                 "bob.properties");
@@ -983,13 +1034,16 @@ public class X509TokenTest extends Abstr
         QName portQName = new QName(NAMESPACE, "DoubleItTransportKVTPort");
         DoubleItPortType x509Port = 
                 service.getPort(portQName, DoubleItPortType.class);
-        updateAddressPort(x509Port, PORT2);
+        String port = PORT2;
+        if (STAX_PORT.equals(test.getPort())) {
+            port = STAX_PORT2;
+        }
+        updateAddressPort(x509Port, port);
         
-        // DOM
-        x509Port.doubleIt(25);
+        if (test.isStreaming()) {
+            SecurityTestUtil.enableStreaming(x509Port);
+        }
         
-        // Streaming
-        SecurityTestUtil.enableStreaming(x509Port);
         x509Port.doubleIt(25);
         
         ((java.io.Closeable)x509Port).close();
@@ -999,6 +1053,10 @@ public class X509TokenTest extends Abstr
     @org.junit.Test
     public void testKeyIdentifier2() throws Exception {
 
+        if (test.isStreaming()) {
+            return;
+        }
+        
         SpringBusFactory bf = new SpringBusFactory();
         URL busFile = X509TokenTest.class.getResource("client.xml");
 
@@ -1031,6 +1089,10 @@ public class X509TokenTest extends Abstr
     
     @org.junit.Test
     public void testSupportingToken() throws Exception {
+        if (test.isStreaming()) {
+            // Just sending an X.509 Token without a Signature is not supported in the StAX layer (yet) 
+            return;
+        }
 
         SpringBusFactory bf = new SpringBusFactory();
         URL busFile = X509TokenTest.class.getResource("client.xml");
@@ -1046,6 +1108,7 @@ public class X509TokenTest extends Abstr
         QName portQName = new QName(NAMESPACE, "DoubleItTransportSupportingTokenPort");
         DoubleItPortType port = service.getPort(portQName, DoubleItPortType.class);
         updateAddressPort(port, PORT2);
+        
         port.doubleIt(25);
         
         // This should fail, as the client is not sending an X.509 Supporting Token
@@ -1093,40 +1156,40 @@ public class X509TokenTest extends Abstr
        
         // Successful invocation
         QName portQName = new QName(NAMESPACE, "DoubleItTransportNegativeEndorsingPort");
-        DoubleItPortType port = service.getPort(portQName, DoubleItPortType.class);
-        updateAddressPort(port, PORT2);
+        DoubleItPortType x509Port = service.getPort(portQName, DoubleItPortType.class);
+        String port = PORT2;
+        if (STAX_PORT.equals(test.getPort())) {
+            port = STAX_PORT2;
+        }
+        updateAddressPort(x509Port, port);
         
-        // DOM
-        port.doubleIt(25);
+        if (test.isStreaming()) {
+            SecurityTestUtil.enableStreaming(x509Port);
+        }
         
-        // Streaming
-        SecurityTestUtil.enableStreaming(port);
-        port.doubleIt(25);
+        x509Port.doubleIt(25);
         
         // This should fail, as the client is not endorsing the token
         portQName = new QName(NAMESPACE, "DoubleItTransportNegativeEndorsingPort2");
-        port = service.getPort(portQName, DoubleItPortType.class);
-        updateAddressPort(port, PORT2);
+        x509Port = service.getPort(portQName, DoubleItPortType.class);
+        updateAddressPort(x509Port, port);
         
-        // DOM
-        try {
-            port.doubleIt(25);
-            fail("Failure expected on not endorsing the token");
-        } catch (javax.xml.ws.soap.SOAPFaultException ex) {
-            String error = "These policy alternatives can not be satisfied";
-            assertTrue(ex.getMessage().contains(error));
+        if (test.isStreaming()) {
+            SecurityTestUtil.enableStreaming(x509Port);
         }
         
-        // Streaming
         try {
-            SecurityTestUtil.enableStreaming(port);
-            port.doubleIt(25);
+            x509Port.doubleIt(25);
             fail("Failure expected on not endorsing the token");
         } catch (javax.xml.ws.soap.SOAPFaultException ex) {
-            // expected
+            if (!test.isStreaming()) {
+                String error = "These policy alternatives can not be satisfied";
+                assertTrue(ex.getMessage().contains(error)
+                           || ex.getMessage().contains("X509Token not satisfied"));
+            }
         }
         
-        ((java.io.Closeable)port).close();
+        ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
     }
   
@@ -1145,13 +1208,12 @@ public class X509TokenTest extends Abstr
         QName portQName = new QName(NAMESPACE, "DoubleItSymmetricSignaturePort");
         DoubleItPortType x509Port = 
                 service.getPort(portQName, DoubleItPortType.class);
-        updateAddressPort(x509Port, PORT);
+        updateAddressPort(x509Port, test.getPort());
         
-        // DOM
-        x509Port.doubleIt(25);
+        if (test.isStreaming()) {
+            SecurityTestUtil.enableStreaming(x509Port);
+        }
         
-        // Streaming
-        SecurityTestUtil.enableStreaming(x509Port);
         x509Port.doubleIt(25);
         
         ((java.io.Closeable)x509Port).close();

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/XKMSTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/XKMSTest.java?rev=1546579&r1=1546578&r2=1546579&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/XKMSTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/XKMSTest.java Fri Nov 29 15:14:27 2013
@@ -20,6 +20,8 @@
 package org.apache.cxf.systest.ws.xkms;
 
 import java.net.URL;
+import java.util.Arrays;
+import java.util.Collection;
 
 import javax.xml.namespace.QName;
 import javax.xml.ws.Service;
@@ -27,23 +29,31 @@ import javax.xml.ws.Service;
 import org.apache.cxf.Bus;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.systest.ws.common.SecurityTestUtil;
+import org.apache.cxf.systest.ws.common.TestParam;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.example.contract.doubleit.DoubleItPortType;
 import org.junit.BeforeClass;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized.Parameters;
 
 /**
  * A set of tests that uses XKMS with WS-Security to locate + validate X.509 tokens.
- * 
- * It tests both DOM + StAX clients against the DOM server
  */
+@RunWith(value = org.junit.runners.Parameterized.class)
 public class XKMSTest extends AbstractBusClientServerTestBase {
     public static final String PORT = allocatePort(Server.class);
-    static final String PORT2 = allocatePort(Server.class, 2);
-    static final String PORT3 = allocatePort(XKMSServer.class);
-
+    public static final String STAX_PORT = allocatePort(StaxServer.class);
+    static final String PORT2 = allocatePort(XKMSServer.class);
+    
     private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt";
     private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService");
 
+    final TestParam test;
+    
+    public XKMSTest(TestParam type) {
+        this.test = type;
+    }
+    
     @BeforeClass
     public static void startServers() throws Exception {
         assertTrue(
@@ -56,10 +66,26 @@ public class XKMSTest extends AbstractBu
                    "Server failed to launch",
                    // run the server in the same process
                    // set this to false to fork
+                   launchServer(StaxServer.class, true)
+        );
+        assertTrue(
+                   "Server failed to launch",
+                   // run the server in the same process
+                   // set this to false to fork
                    launchServer(XKMSServer.class, true)
         );
     }
     
+    @Parameters(name = "{0}")
+    public static Collection<TestParam[]> data() {
+       
+        return Arrays.asList(new TestParam[][] {{new TestParam(PORT, false)},
+                                                {new TestParam(PORT, true)},
+                                                {new TestParam(STAX_PORT, false)},
+                                                {new TestParam(STAX_PORT, true)},
+        });
+    }
+    
     @org.junit.AfterClass
     public static void cleanup() throws Exception {
         SecurityTestUtil.cleanup();
@@ -83,13 +109,12 @@ public class XKMSTest extends AbstractBu
         QName portQName = new QName(NAMESPACE, "DoubleItSymmetricPort");
         DoubleItPortType port = 
                 service.getPort(portQName, DoubleItPortType.class);
-        updateAddressPort(port, PORT);
+        updateAddressPort(port, test.getPort());
         
-        // DOM
-        port.doubleIt(25);
+        if (test.isStreaming()) {
+            SecurityTestUtil.enableStreaming(port);
+        }
         
-        // Streaming
-        SecurityTestUtil.enableStreaming(port);
         port.doubleIt(25);
         
         ((java.io.Closeable)port).close();
@@ -114,13 +139,12 @@ public class XKMSTest extends AbstractBu
         QName portQName = new QName(NAMESPACE, "DoubleItAsymmetricPort");
         DoubleItPortType port = 
                 service.getPort(portQName, DoubleItPortType.class);
-        updateAddressPort(port, PORT);
+        updateAddressPort(port, test.getPort());
         
-        // DOM
-        port.doubleIt(25);
+        if (test.isStreaming()) {
+            SecurityTestUtil.enableStreaming(port);
+        }
         
-        // Streaming
-        SecurityTestUtil.enableStreaming(port);
         port.doubleIt(25);
         
         ((java.io.Closeable)port).close();

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/server.xml?rev=1546579&r1=1546578&r2=1546579&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/server.xml Fri Nov 29 15:14:27 2013
@@ -25,28 +25,7 @@
             <cxf:logging/>
         </cxf:features>
     </cxf:bus>
-    <!-- -->
-    <!-- Any services listening on port 9009 must use the following -->
-    <!-- Transport Layer Security (TLS) settings -->
-    <!-- -->
-    <httpj:engine-factory id="tls-settings">
-        <httpj:engine port="${testutil.ports.Server.2}">
-            <httpj:tlsServerParameters>
-                <sec:keyManagers keyPassword="password">
-                    <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/Bethal.jks"/>
-                </sec:keyManagers>
-                <sec:cipherSuitesFilter>
-                    <sec:include>.*_EXPORT_.*</sec:include>
-                    <sec:include>.*_EXPORT1024_.*</sec:include>
-                    <sec:include>.*_WITH_DES_.*</sec:include>
-                    <sec:include>.*_WITH_AES_.*</sec:include>
-                    <sec:include>.*_WITH_NULL_.*</sec:include>
-                    <sec:exclude>.*_DH_anon_.*</sec:exclude>
-                </sec:cipherSuitesFilter>
-                <sec:clientAuthentication want="true" required="false"/>
-            </httpj:tlsServerParameters>
-        </httpj:engine>
-    </httpj:engine-factory>
+
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric" address="http://localhost:${testutil.ports.Server}/DoubleItXKMSSymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/xkms/DoubleItXKMS.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>

Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/stax-server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/stax-server.xml?rev=1546579&r1=1546578&r2=1546579&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/stax-server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/stax-server.xml Fri Nov 29 15:14:27 2013
@@ -25,28 +25,7 @@
             <cxf:logging/>
         </cxf:features>
     </cxf:bus>
-    <!-- -->
-    <!-- Any services listening on port 9009 must use the following -->
-    <!-- Transport Layer Security (TLS) settings -->
-    <!-- -->
-    <httpj:engine-factory id="tls-settings">
-        <httpj:engine port="${testutil.ports.StaxServer.2}">
-            <httpj:tlsServerParameters>
-                <sec:keyManagers keyPassword="password">
-                    <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/Bethal.jks"/>
-                </sec:keyManagers>
-                <sec:cipherSuitesFilter>
-                    <sec:include>.*_EXPORT_.*</sec:include>
-                    <sec:include>.*_EXPORT1024_.*</sec:include>
-                    <sec:include>.*_WITH_DES_.*</sec:include>
-                    <sec:include>.*_WITH_AES_.*</sec:include>
-                    <sec:include>.*_WITH_NULL_.*</sec:include>
-                    <sec:exclude>.*_DH_anon_.*</sec:exclude>
-                </sec:cipherSuitesFilter>
-                <sec:clientAuthentication want="true" required="false"/>
-            </httpj:tlsServerParameters>
-        </httpj:engine>
-    </httpj:engine-factory>
+
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric" address="http://localhost:${testutil.ports.StaxServer}/DoubleItXKMSSymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/xkms/DoubleItXKMS.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>



Mime
View raw message