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 2014/12/11 10:56:07 UTC
[1/5] cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 75d408048 -> 4e3351ea6
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c9eeeda7
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c9eeeda7
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c9eeeda7
Branch: refs/heads/3.0.x-fixes
Commit: c9eeeda747e7d178474d87c2abae89f022ff2e44
Parents: 0b64a5d
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Dec 11 09:34:51 2014 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Dec 11 09:34:51 2014 +0000
----------------------------------------------------------------------
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/c9eeeda7/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index d426591..991c567 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -169,6 +169,7 @@ M c1c75b039df7bd1ca9f11ff21f16593fed0c8c16
M c34bf7ad6bc55b6584dfd009f49a3f4eb8ececc9
M c55664128b1223667dedacc2011ccd5945d9c8b9
M d2dec5b87788b8cb5059d3719cf3dfd7135a1280
+M d4a35c40d53fde17fec3d08c25215c7533dcb667
M e2ad037fbc74f42655ac968415fcb4bded87bb38
M e5a805853864e291626bdb913448fc4e2409cca0
M eb3dd938052b3e853b0cf85dacf31ef7f802af38
[4/5] cxf git commit: Initial refactor of transports systests
Posted by co...@apache.org.
Initial refactor of transports systests
Conflicts:
systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPSClientTest.java
systests/transports/src/test/resources/org/apache/cxf/systest/http/jaxws-publish-callback.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0b64a5d6
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0b64a5d6
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0b64a5d6
Branch: refs/heads/3.0.x-fixes
Commit: 0b64a5d643c36e7ec5c00268d4f7500d1bd74773
Parents: 75d4080
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Dec 10 17:49:02 2014 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Dec 11 09:34:51 2014 +0000
----------------------------------------------------------------------
.../cxf/systest/http/CertConstraintsTest.java | 2 +-
.../cxf/systest/http/HTTPConduitTest.java | 39 +--
.../cxf/systest/http/HTTPSClientTest.java | 30 ++-
.../org/apache/cxf/systest/http/Server.java | 2 +-
.../apache/cxf/systest/http/SessionServer.java | 2 +-
.../cxf/systest/http/auth/DigestAuthTest.java | 4 +-
.../apache/cxf/systest/http/resources/Abost.cxf | 47 ----
.../cxf/systest/http/resources/Bethal.cer | Bin 548 -> 0 bytes
.../cxf/systest/http/resources/Bethal.cxf | 84 ------
.../cxf/systest/http/resources/Bethal.jks | Bin 1317 -> 0 bytes
.../cxf/systest/http/resources/Bethal.p12 | Bin 1705 -> 0 bytes
.../http/resources/BethalClientBeans.xml | 24 --
.../http/resources/BethalClientConfig.cxf | 69 -----
.../apache/cxf/systest/http/resources/Gordy.cer | Bin 544 -> 0 bytes
.../apache/cxf/systest/http/resources/Gordy.cxf | 77 ------
.../apache/cxf/systest/http/resources/Gordy.jks | Bin 1313 -> 0 bytes
.../resources/Http2HttpLoopRedirectFail.cxf | 43 ----
.../http/resources/Http2HttpRedirect.cxf | 47 ----
.../cxf/systest/http/resources/Hurlon.cxf | 48 ----
.../cxf/systest/http/resources/Morpit.cxf | 75 ------
.../cxf/systest/http/resources/Morpit.jks | Bin 1337 -> 0 bytes
.../cxf/systest/http/resources/Morpit.p12 | Bin 1721 -> 0 bytes
.../cxf/systest/http/resources/Mortimer.cxf | 47 ----
.../cxf/systest/http/resources/Poltim.cer | Bin 548 -> 0 bytes
.../cxf/systest/http/resources/Poltim.cxf | 77 ------
.../cxf/systest/http/resources/Poltim.jks | Bin 1318 -> 0 bytes
.../cxf/systest/http/resources/Rethwel.cxf | 49 ----
.../systest/http/resources/SessionServer.xml | 48 ----
.../cxf/systest/http/resources/Tarpin.cer | Bin 548 -> 0 bytes
.../cxf/systest/http/resources/Tarpin.cxf | 77 ------
.../cxf/systest/http/resources/Tarpin.jks | Bin 1319 -> 0 bytes
.../cxf/systest/http/resources/Truststore.jks | Bin 2942 -> 0 bytes
.../cxf/systest/http/resources/Truststore.pem | 60 -----
.../cxf/systest/http/resources/genkeys.sh | 53 ----
.../cxf/systest/http/resources/greeting.wsdl | 166 ------------
.../systest/http/resources/jaxws-publish.xml | 64 -----
.../http/resources/jaxws-server-constraints.xml | 255 -------------------
.../cxf/systest/http/resources/jaxws-server.xml | 77 ------
.../http/resources/jaxws-tlsrefs-publish.xml | 60 -----
.../cxf/systest/http/resources/pkcs12.xml | 70 -----
.../http/resources/resource-key-spec-url.xml | 72 ------
.../http/resources/resource-key-spec.xml | 68 -----
.../http_jetty/continuations/cxf_https.xml | 4 +-
.../http_jetty/continuations/jaxws-server.xml | 4 +-
.../src/test/resources/keys/Bethal.cer | Bin 0 -> 548 bytes
.../src/test/resources/keys/Bethal.jks | Bin 0 -> 1317 bytes
.../src/test/resources/keys/Bethal.p12 | Bin 0 -> 1705 bytes
.../src/test/resources/keys/Gordy.cer | Bin 0 -> 544 bytes
.../src/test/resources/keys/Gordy.jks | Bin 0 -> 1313 bytes
.../src/test/resources/keys/Morpit.jks | Bin 0 -> 1337 bytes
.../src/test/resources/keys/Morpit.p12 | Bin 0 -> 1721 bytes
.../src/test/resources/keys/Poltim.cer | Bin 0 -> 548 bytes
.../src/test/resources/keys/Poltim.jks | Bin 0 -> 1318 bytes
.../src/test/resources/keys/Tarpin.cer | Bin 0 -> 548 bytes
.../src/test/resources/keys/Tarpin.jks | Bin 0 -> 1319 bytes
.../src/test/resources/keys/Truststore.jks | Bin 0 -> 2942 bytes
.../src/test/resources/keys/Truststore.pem | 60 +++++
.../src/test/resources/keys/genkeys.sh | 53 ++++
.../org/apache/cxf/systest/http/Abost.cxf | 47 ++++
.../org/apache/cxf/systest/http/Bethal.cxf | 84 ++++++
.../cxf/systest/http/BethalClientBeans.xml | 24 ++
.../cxf/systest/http/BethalClientConfig.cxf | 69 +++++
.../org/apache/cxf/systest/http/Gordy.cxf | 77 ++++++
.../systest/http/Http2HttpLoopRedirectFail.cxf | 43 ++++
.../cxf/systest/http/Http2HttpRedirect.cxf | 47 ++++
.../org/apache/cxf/systest/http/Hurlon.cxf | 48 ++++
.../org/apache/cxf/systest/http/Morpit.cxf | 75 ++++++
.../org/apache/cxf/systest/http/Mortimer.cxf | 47 ++++
.../org/apache/cxf/systest/http/Poltim.cxf | 77 ++++++
.../org/apache/cxf/systest/http/Rethwel.cxf | 49 ++++
.../apache/cxf/systest/http/SessionServer.xml | 48 ++++
.../org/apache/cxf/systest/http/Tarpin.cxf | 77 ++++++
.../org/apache/cxf/systest/http/greeting.wsdl | 166 ++++++++++++
.../cxf/systest/http/jaxws-publish-callback.xml | 64 +++++
.../apache/cxf/systest/http/jaxws-publish.xml | 64 +++++
.../systest/http/jaxws-server-constraints.xml | 255 +++++++++++++++++++
.../apache/cxf/systest/http/jaxws-server.xml | 77 ++++++
.../cxf/systest/http/jaxws-tlsrefs-publish.xml | 60 +++++
.../org/apache/cxf/systest/http/pkcs12.xml | 70 +++++
.../cxf/systest/http/resource-key-spec-url.xml | 72 ++++++
.../cxf/systest/http/resource-key-spec.xml | 68 +++++
81 files changed, 1869 insertions(+), 1796 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/java/org/apache/cxf/systest/http/CertConstraintsTest.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/CertConstraintsTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/http/CertConstraintsTest.java
index 9e7583d..5beb2c0 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/CertConstraintsTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http/CertConstraintsTest.java
@@ -121,7 +121,7 @@ public class CertConstraintsTest extends AbstractBusClientServerTestBase {
@Test
public final void testCertConstraints() throws Exception {
- setTheConfiguration("resources/jaxws-server-constraints.xml");
+ setTheConfiguration("jaxws-server-constraints.xml");
startServers();
//
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java
index 2842b3a..a193aae 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java
@@ -119,13 +119,14 @@ public class HTTPConduitTest extends AbstractBusClientServerTestBase {
static {
try {
//System.setProperty("javax.net.debug", "all");
- String keystore =
- new File(Server.class.getResource("resources/Morpit.jks").toURI()).getAbsolutePath();
+ URL key = Server.class.getResource("../../../../../keys/Morpit.jks");
+ String keystore = new File(key.toURI()).getAbsolutePath();
//System.out.println("Keystore: " + keystore);
KeyManager[] kmgrs = getKeyManagers(getKeyStore("JKS", keystore, "password"), "password");
- String truststore =
- new File(Server.class.getResource("resources/Truststore.jks").toURI()).getAbsolutePath();
+ key = Server.class.getResource("../../../../../keys/Truststore.jks");
+
+ String truststore = new File(key.toURI()).getAbsolutePath();
//System.out.println("Truststore: " + truststore);
TrustManager[] tmgrs = getTrustManagers(getKeyStore("JKS", truststore, "password"));
@@ -205,7 +206,7 @@ public class HTTPConduitTest extends AbstractBusClientServerTestBase {
}
Bus bus = BusFactory.getThreadDefaultBus(false);
URL serverC =
- Server.class.getResource("resources/" + name + ".cxf");
+ Server.class.getResource(name + ".cxf");
BusFactory.setDefaultBus(null);
BusFactory.setThreadDefaultBus(null);
boolean server = launchServer(Server.class, null,
@@ -297,7 +298,7 @@ public class HTTPConduitTest extends AbstractBusClientServerTestBase {
private Greeter getMortimerGreeter() throws MalformedURLException {
- URL wsdl = getClass().getResource("resources/greeting.wsdl");
+ URL wsdl = getClass().getResource("greeting.wsdl");
assertNotNull("WSDL is null", wsdl);
SOAPService service = new SOAPService(wsdl, serviceName);
@@ -355,7 +356,7 @@ public class HTTPConduitTest extends AbstractBusClientServerTestBase {
startServer("Mortimer");
startServer("Rethwel");
- URL wsdl = getClass().getResource("resources/greeting.wsdl");
+ URL wsdl = getClass().getResource("greeting.wsdl");
assertNotNull("WSDL is null", wsdl);
SOAPService service = new SOAPService(wsdl, serviceName);
@@ -401,12 +402,12 @@ public class HTTPConduitTest extends AbstractBusClientServerTestBase {
startServer("Mortimer");
startServer("Rethwel");
- URL config = getClass().getResource("resources/Http2HttpRedirect.cxf");
+ URL config = getClass().getResource("Http2HttpRedirect.cxf");
// We go through the back door, setting the default bus.
new DefaultBusFactory().createBus(config);
- URL wsdl = getClass().getResource("resources/greeting.wsdl");
+ URL wsdl = getClass().getResource("greeting.wsdl");
assertNotNull("WSDL is null", wsdl);
SOAPService service = new SOAPService(wsdl, serviceName);
@@ -436,12 +437,12 @@ public class HTTPConduitTest extends AbstractBusClientServerTestBase {
startServer("Hurlon");
URL config = getClass().getResource(
- "resources/Http2HttpLoopRedirectFail.cxf");
+ "Http2HttpLoopRedirectFail.cxf");
// We go through the back door, setting the default bus.
new DefaultBusFactory().createBus(config);
- URL wsdl = getClass().getResource("resources/greeting.wsdl");
+ URL wsdl = getClass().getResource("greeting.wsdl");
assertNotNull("WSDL is null", wsdl);
SOAPService service = new SOAPService(wsdl, serviceName);
@@ -473,11 +474,11 @@ public class HTTPConduitTest extends AbstractBusClientServerTestBase {
startServer("Bethal");
URL config = getClass().getResource(
- "resources/BethalClientConfig.cxf");
+ "BethalClientConfig.cxf");
// We go through the back door, setting the default bus.
new DefaultBusFactory().createBus(config);
- URL wsdl = getClass().getResource("resources/greeting.wsdl");
+ URL wsdl = getClass().getResource("greeting.wsdl");
assertNotNull("WSDL is null", wsdl);
SOAPService service = new SOAPService(wsdl, serviceName);
@@ -496,7 +497,7 @@ public class HTTPConduitTest extends AbstractBusClientServerTestBase {
BusFactory.setDefaultBus(null);
// The client bean configuration file
- URL beans = getClass().getResource("resources/BethalClientBeans.xml");
+ URL beans = getClass().getResource("BethalClientBeans.xml");
// We go through the back door, setting the default bus.
Bus bus = new DefaultBusFactory().createBus(beans);
@@ -556,7 +557,7 @@ public class HTTPConduitTest extends AbstractBusClientServerTestBase {
public void testHttpsBasicConnection() throws Exception {
startServer("Bethal");
- URL wsdl = getClass().getResource("resources/greeting.wsdl");
+ URL wsdl = getClass().getResource("greeting.wsdl");
assertNotNull("WSDL is null", wsdl);
SOAPService service = new SOAPService(wsdl, serviceName);
@@ -599,7 +600,7 @@ public class HTTPConduitTest extends AbstractBusClientServerTestBase {
startServer("Mortimer");
startServer("Poltim");
- URL wsdl = getClass().getResource("resources/greeting.wsdl");
+ URL wsdl = getClass().getResource("greeting.wsdl");
assertNotNull("WSDL is null", wsdl);
SOAPService service = new SOAPService(wsdl, serviceName);
@@ -688,7 +689,7 @@ public class HTTPConduitTest extends AbstractBusClientServerTestBase {
public void testHttpsTrust() throws Exception {
startServer("Bethal");
- URL wsdl = getClass().getResource("resources/greeting.wsdl");
+ URL wsdl = getClass().getResource("greeting.wsdl");
assertNotNull("WSDL is null", wsdl);
SOAPService service = new SOAPService(wsdl, serviceName);
@@ -749,7 +750,7 @@ public class HTTPConduitTest extends AbstractBusClientServerTestBase {
startServer("Gordy");
startServer("Bethal");
- URL wsdl = getClass().getResource("resources/greeting.wsdl");
+ URL wsdl = getClass().getResource("greeting.wsdl");
assertNotNull("WSDL is null", wsdl);
SOAPService service = new SOAPService(wsdl, serviceName);
@@ -895,7 +896,7 @@ public class HTTPConduitTest extends AbstractBusClientServerTestBase {
startServer("Gordy");
startServer("Bethal");
- URL wsdl = getClass().getResource("resources/greeting.wsdl");
+ URL wsdl = getClass().getResource("greeting.wsdl");
assertNotNull("WSDL is null", wsdl);
SOAPService service = new SOAPService(wsdl, serviceName);
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPSClientTest.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPSClientTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPSClientTest.java
index 3fcda30..80c2da0 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPSClientTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPSClientTest.java
@@ -139,38 +139,46 @@ public class HTTPSClientTest extends AbstractBusClientServerTestBase {
@Test
public final void testJaxwsServer() throws Exception {
- testSuccessfulCall("resources/jaxws-server.xml",
+ testSuccessfulCall("jaxws-server.xml",
"https://localhost:" + BusServer.getPort(2) + "/SoapContext/HttpsPort");
}
@Test
public final void testJaxwsServerChangeHttpsToHttp() throws Exception {
- testSuccessfulCall("resources/jaxws-server.xml",
+ testSuccessfulCall("jaxws-server.xml",
"http://localhost:" + BusServer.getPort(3) + "/SoapContext/HttpPort");
}
@Test
public final void testJaxwsEndpoint() throws Exception {
- testSuccessfulCall("resources/jaxws-publish.xml",
+ testSuccessfulCall("jaxws-publish.xml",
"https://localhost:" + BusServer.getPort(1) + "/SoapContext/HttpsPort");
}
@Test
+<<<<<<< HEAD
+=======
+ public final void testJaxwsEndpointCallback() throws Exception {
+ testSuccessfulCall("jaxws-publish-callback.xml",
+ "https://localhost:" + BusServer.getPort(1) + "/SoapContext/HttpsPort");
+ }
+ @Test
+>>>>>>> d4a35c4... Initial refactor of transports systests
public final void testJaxwsTLSRefsEndpoint() throws Exception {
- testSuccessfulCall("resources/jaxws-tlsrefs-publish.xml",
+ testSuccessfulCall("jaxws-tlsrefs-publish.xml",
"https://localhost:" + BusServer.getPort(1) + "/SoapContext/HttpsPort");
}
@Test
public final void testPKCS12Endpoint() throws Exception {
- testSuccessfulCall("resources/pkcs12.xml",
+ testSuccessfulCall("pkcs12.xml",
"https://localhost:" + BusServer.getPort(6) + "/SoapContext/HttpsPort");
}
@Test
public final void testResourceKeySpecEndpoint() throws Exception {
- testSuccessfulCall("resources/resource-key-spec.xml",
+ testSuccessfulCall("resource-key-spec.xml",
"https://localhost:" + BusServer.getPort(4) + "/SoapContext/HttpsPort");
}
@Test
public final void testResourceKeySpecEndpointURL() throws Exception {
- testSuccessfulCall("resources/resource-key-spec-url.xml",
+ testSuccessfulCall("resource-key-spec-url.xml",
"https://localhost:" + BusServer.getPort(5) + "/SoapContext/HttpsPort",
new URL("https://localhost:" + BusServer.getPort(5) + "/SoapContext/HttpsPort?wsdl"),
true);
@@ -181,7 +189,7 @@ public class HTTPSClientTest extends AbstractBusClientServerTestBase {
public static KeyManager[] getKeyManagers() {
KeyManagersType kmt = new KeyManagersType();
KeyStoreType kst = new KeyStoreType();
- kst.setFile("src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks");
+ kst.setFile("src/test/resources/keys/Bethal.jks");
kst.setPassword("password");
kst.setType("JKS");
@@ -197,7 +205,7 @@ public class HTTPSClientTest extends AbstractBusClientServerTestBase {
public static TrustManager[] getTrustManagers() {
TrustManagersType tmt = new TrustManagersType();
KeyStoreType kst = new KeyStoreType();
- kst.setFile("src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks");
+ kst.setFile("src/test/resources/keys/Truststore.jks");
kst.setPassword("password");
kst.setType("JKS");
@@ -214,7 +222,7 @@ public class HTTPSClientTest extends AbstractBusClientServerTestBase {
public static KeyManager[] getKeyManagers() {
KeyManagersType kmt = new KeyManagersType();
KeyStoreType kst = new KeyStoreType();
- kst.setFile("src/test/java/org/apache/cxf/systest/http/resources/Morpit.jks");
+ kst.setFile("src/test/resources/keys/Morpit.jks");
kst.setPassword("password");
kst.setType("JKS");
@@ -230,7 +238,7 @@ public class HTTPSClientTest extends AbstractBusClientServerTestBase {
public static TrustManager[] getTrustManagers() {
TrustManagersType tmt = new TrustManagersType();
KeyStoreType kst = new KeyStoreType();
- kst.setFile("src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks");
+ kst.setFile("src/test/resources/keys/Truststore.jks");
kst.setPassword("password");
kst.setType("JKS");
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/java/org/apache/cxf/systest/http/Server.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/Server.java b/systests/transports/src/test/java/org/apache/cxf/systest/http/Server.java
index f4ddcdb..ab20326 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/Server.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http/Server.java
@@ -78,7 +78,7 @@ public class Server extends AbstractBusTestServerBase {
getBus(),
implementor,
nullBindingID,
- this.getClass().getResource("resources/greeting.wsdl").toString());
+ this.getClass().getResource("greeting.wsdl").toString());
// How the hell do I know what the name of the
// http-destination is from using this call?
ep.setEndpointName(new QName("http://apache.org/hello_world", name));
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/java/org/apache/cxf/systest/http/SessionServer.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/SessionServer.java b/systests/transports/src/test/java/org/apache/cxf/systest/http/SessionServer.java
index 8c2fb96..df1fa53 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/SessionServer.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http/SessionServer.java
@@ -31,7 +31,7 @@ public class SessionServer extends AbstractBusTestServerBase {
@Override
protected void run() {
- String configurationFile = "resources/SessionServer.xml";
+ String configurationFile = "SessionServer.xml";
URL configure =
SessionServer.class.getResource(configurationFile);
bus = new SpringBusFactory().createBus(configure, true);
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/java/org/apache/cxf/systest/http/auth/DigestAuthTest.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/auth/DigestAuthTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/http/auth/DigestAuthTest.java
index f234f36..13ceeab 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/auth/DigestAuthTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http/auth/DigestAuthTest.java
@@ -56,7 +56,7 @@ public class DigestAuthTest extends AbstractBusClientServerTestBase {
@Test
public void testDigestAuth() throws Exception {
- URL wsdl = getClass().getResource("../resources/greeting.wsdl");
+ URL wsdl = getClass().getResource("../greeting.wsdl");
assertNotNull("WSDL is null", wsdl);
SOAPService service = new SOAPService(wsdl, serviceName);
@@ -85,7 +85,7 @@ public class DigestAuthTest extends AbstractBusClientServerTestBase {
@Test
public void testNoAuth() throws Exception {
- URL wsdl = getClass().getResource("../resources/greeting.wsdl");
+ URL wsdl = getClass().getResource("../greeting.wsdl");
assertNotNull("WSDL is null", wsdl);
SOAPService service = new SOAPService(wsdl, serviceName);
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Abost.cxf
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Abost.cxf b/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Abost.cxf
deleted file mode 100644
index c3cf97f..0000000
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Abost.cxf
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!--
- ** This file configures the Abost Server.
- ** It is an http server that redirects to Hurlon.
- -->
-
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:sec="http://cxf.apache.org/configuration/security"
- xmlns:http="http://cxf.apache.org/transports/http/configuration"
- xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
- xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
- xsi:schemaLocation="
- http://cxf.apache.org/configuration/security
- http://cxf.apache.org/schemas/configuration/security.xsd
- http://cxf.apache.org/transports/http/configuration
- http://cxf.apache.org/schemas/configuration/http-conf.xsd
- http://cxf.apache.org/transports/http-jetty/configuration
- http://cxf.apache.org/schemas/configuration/http-jetty.xsd
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
-
- <http:destination name="{http://apache.org/hello_world}Abost.http-destination">
- <http:server RedirectURL="http://localhost:${testutil.ports.BusServer.6}/Hurlon"/>
- </http:destination>
-
-</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cer
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cer b/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cer
deleted file mode 100644
index 5ca8252..0000000
Binary files a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cer and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf b/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf
deleted file mode 100644
index 53f4c6c..0000000
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!--
- ** This file configures the Bethal Server.
- ** It is an https server that conditionally responds
- ** with 401s.
- -->
-
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:cxf="http://cxf.apache.org/core"
- xmlns:sec="http://cxf.apache.org/configuration/security"
- xmlns:http="http://cxf.apache.org/transports/http/configuration"
- xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
- xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
- xsi:schemaLocation="
- http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
- http://cxf.apache.org/configuration/security
- http://cxf.apache.org/schemas/configuration/security.xsd
- http://cxf.apache.org/transports/http/configuration
- http://cxf.apache.org/schemas/configuration/http-conf.xsd
- http://cxf.apache.org/transports/http-jetty/configuration
- http://cxf.apache.org/schemas/configuration/http-jetty.xsd
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
-
- <http:destination
- name="{http://apache.org/hello_world}Bethal.http-destination">
- </http:destination>
-
- <httpj:engine-factory bus="cxf">
- <httpj:engine port="${testutil.ports.BusServer.2}">
- <httpj:tlsServerParameters>
- <sec:keyManagers keyPassword="OBF:1v2j1uum1xtv1zej1zer1xtn1uvk1v1v">
- <sec:keyStore type="JKS" password="OBF:1v2j1uum1xtv1zej1zer1xtn1uvk1v1v"
- file="src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:keyStore type="JKS" password="OBF:1v2j1uum1xtv1zej1zer1xtn1uvk1v1v"
- file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/>
- </sec:trustManagers>
- <sec:cipherSuitesFilter>
- <!-- these filters ensure that a ciphersuite with
- export-suitable or null encryption is used,
- but exclude anonymous Diffie-Hellman key change as
- this is vulnerable to man-in-the-middle attacks -->
- <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="true"/>
- </httpj:tlsServerParameters>
- </httpj:engine>
- </httpj:engine-factory>
-
- <cxf:bus>
- <cxf:inInterceptors>
- <bean class="org.apache.cxf.systest.http.PushBack401"/>
- </cxf:inInterceptors>
- </cxf:bus>
-
-</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks b/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks
deleted file mode 100644
index 2bf1a9a..0000000
Binary files a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Bethal.p12
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Bethal.p12 b/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Bethal.p12
deleted file mode 100644
index c47515e..0000000
Binary files a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Bethal.p12 and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/BethalClientBeans.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/BethalClientBeans.xml b/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/BethalClientBeans.xml
deleted file mode 100644
index c358979..0000000
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/BethalClientBeans.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xs
d">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
- <import resource="classpath:org/apache/cxf/systest/http/resources/BethalClientConfig.cxf"/>
- <jaxws:client xmlns:s="http://apache.org/hello_world" id="Bethal" serviceClass="org.apache.hello_world.Greeter" serviceName="s:SOAPService" endpointName="s:Bethal" address="https://localhost:${testutil.ports.BusServer.2}/Bethal"/>
-</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/BethalClientConfig.cxf
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/BethalClientConfig.cxf b/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/BethalClientConfig.cxf
deleted file mode 100644
index 8274a5d..0000000
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/BethalClientConfig.cxf
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:sec="http://cxf.apache.org/configuration/security"
- xmlns:http="http://cxf.apache.org/transports/http/configuration"
- xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
- xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
- xsi:schemaLocation="
- http://cxf.apache.org/configuration/security
- http://cxf.apache.org/schemas/configuration/security.xsd
- http://cxf.apache.org/transports/http/configuration
- http://cxf.apache.org/schemas/configuration/http-conf.xsd
- http://cxf.apache.org/transports/http-jetty/configuration
- http://cxf.apache.org/schemas/configuration/http-jetty.xsd
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
-
- <http:conduit name="{http://apache.org/hello_world}Bethal.http-conduit">
-
- <http:tlsClientParameters disableCNCheck="true">
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="JKS" password="password"
- file="src/test/java/org/apache/cxf/systest/http/resources/Morpit.jks"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:keyStore type="JKS" password="password"
- file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/>
- </sec:trustManagers>
- <sec:cipherSuitesFilter>
- <!-- these filters ensure that a ciphersuite with
- export-suitable or null encryption is used,
- but exclude anonymous Diffie-Hellman key change as
- this is vulnerable to man-in-the-middle attacks -->
- <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>
- </http:tlsClientParameters>
- <http:authorization>
- <sec:UserName>Betty</sec:UserName>
- <sec:Password>password</sec:Password>
- </http:authorization>
- <http:client AutoRedirect="true" Connection="Keep-Alive"/>
-
- </http:conduit>
-
-</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cer
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cer b/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cer
deleted file mode 100644
index 6cabd2a..0000000
Binary files a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cer and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf b/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf
deleted file mode 100644
index 1ec9842..0000000
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!--
- ** This file configures the Gordy Server.
- ** It is an https server that redirects to Bethal.
- -->
-
-
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:sec="http://cxf.apache.org/configuration/security"
- xmlns:http="http://cxf.apache.org/transports/http/configuration"
- xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
- xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
- xsi:schemaLocation="
- http://cxf.apache.org/configuration/security
- http://cxf.apache.org/schemas/configuration/security.xsd
- http://cxf.apache.org/transports/http/configuration
- http://cxf.apache.org/schemas/configuration/http-conf.xsd
- http://cxf.apache.org/transports/http-jetty/configuration
- http://cxf.apache.org/schemas/configuration/http-jetty.xsd
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
-
- <http:destination
- name="{http://apache.org/hello_world}Gordy.http-destination">
- <http:server RedirectURL="https://localhost:${testutil.ports.BusServer.2}/Bethal"/>
- </http:destination>
-
- <httpj:engine-factory bus="cxf">
- <httpj:engine port="${testutil.ports.BusServer.1}">
- <httpj:tlsServerParameters>
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="JKS" password="password"
- file="src/test/java/org/apache/cxf/systest/http/resources/Gordy.jks"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:keyStore type="JKS" password="password"
- file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/>
- </sec:trustManagers>
- <sec:cipherSuitesFilter>
- <!-- these filters ensure that a ciphersuite with
- export-suitable or null encryption is used,
- but exclude anonymous Diffie-Hellman key change as
- this is vulnerable to man-in-the-middle attacks -->
- <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="true"/>
- </httpj:tlsServerParameters>
- </httpj:engine>
- </httpj:engine-factory>
-
-</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Gordy.jks
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Gordy.jks b/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Gordy.jks
deleted file mode 100644
index b067db0..0000000
Binary files a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Gordy.jks and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpLoopRedirectFail.cxf
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpLoopRedirectFail.cxf b/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpLoopRedirectFail.cxf
deleted file mode 100644
index 521cb0e..0000000
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpLoopRedirectFail.cxf
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:sec="http://cxf.apache.org/configuration/security"
- xmlns:http="http://cxf.apache.org/transports/http/configuration"
- xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
- xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
- xsi:schemaLocation="
- http://cxf.apache.org/configuration/security
- http://cxf.apache.org/schemas/configuration/security.xsd
- http://cxf.apache.org/transports/http/configuration
- http://cxf.apache.org/schemas/configuration/http-conf.xsd
- http://cxf.apache.org/transports/http-jetty/configuration
- http://cxf.apache.org/schemas/configuration/http-jetty.xsd
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
-
- <http:conduit name="{http://apache.org/hello_world}Hurlon.http-conduit">
-
- <http:client AutoRedirect="true"/>
-
- </http:conduit>
-
-</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpRedirect.cxf
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpRedirect.cxf b/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpRedirect.cxf
deleted file mode 100644
index e9bd45a..0000000
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpRedirect.cxf
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!--
- ** This file configures the Http2HttpRedirect Client.
- -->
-
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:sec="http://cxf.apache.org/configuration/security"
- xmlns:http="http://cxf.apache.org/transports/http/configuration"
- xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
- xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
- xsi:schemaLocation="
- http://cxf.apache.org/configuration/security
- http://cxf.apache.org/schemas/configuration/security.xsd
- http://cxf.apache.org/transports/http/configuration
- http://cxf.apache.org/schemas/configuration/http-conf.xsd
- http://cxf.apache.org/transports/http-jetty/configuration
- http://cxf.apache.org/schemas/configuration/http-jetty.xsd
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <http:conduit name="{http://apache.org/hello_world}Rethwel.http-conduit">
-
- <http:client AutoRedirect="true"/>
-
- </http:conduit>
-
-</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Hurlon.cxf
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Hurlon.cxf b/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Hurlon.cxf
deleted file mode 100644
index 9fe2240..0000000
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Hurlon.cxf
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!--
- ** This file configures the Hurlon Server.
- ** It is an http server that redirects to Abost.
- -->
-
-
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:sec="http://cxf.apache.org/configuration/security"
- xmlns:http="http://cxf.apache.org/transports/http/configuration"
- xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
- xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
- xsi:schemaLocation="
- http://cxf.apache.org/configuration/security
- http://cxf.apache.org/schemas/configuration/security.xsd
- http://cxf.apache.org/transports/http/configuration
- http://cxf.apache.org/schemas/configuration/http-conf.xsd
- http://cxf.apache.org/transports/http-jetty/configuration
- http://cxf.apache.org/schemas/configuration/http-jetty.xsd
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
-
- <http:destination name="{http://apache.org/hello_world}Hurlon.http-destination">
- <http:server RedirectURL="http://localhost:${testutil.ports.BusServer.7}/Abost"/>
- </http:destination>
-
-</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf b/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf
deleted file mode 100644
index a098732..0000000
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!--
- ** This file configures the Morpit Server. It is just an
- ** Https server with a name that will kick in the HostnameVerifier.
- -->
-
-
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:sec="http://cxf.apache.org/configuration/security"
- xmlns:http="http://cxf.apache.org/transports/http/configuration"
- xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
- xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
- xsi:schemaLocation="
- http://cxf.apache.org/configuration/security
- http://cxf.apache.org/schemas/configuration/security.xsd
- http://cxf.apache.org/transports/http/configuration
- http://cxf.apache.org/schemas/configuration/http-conf.xsd
- http://cxf.apache.org/transports/http-jetty/configuration
- http://cxf.apache.org/schemas/configuration/http-jetty.xsd
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
-
- <http:destination name="{http://apache.org/hello_world}GreeterImplPort.http-destination">
- </http:destination>
-
- <httpj:engine-factory bus="cxf">
- <httpj:engine port="${testutil.ports.BusServer.8}">
- <httpj:tlsServerParameters>
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="JKS" password="password"
- file="src/test/java/org/apache/cxf/systest/http/resources/Morpit.jks"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:keyStore type="JKS" password="password"
- file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/>
- </sec:trustManagers>
- <sec:cipherSuitesFilter>
- <!-- these filters ensure that a ciphersuite with
- export-suitable or null encryption is used,
- but exclude anonymous Diffie-Hellman key change as
- this is vulnerable to man-in-the-middle attacks -->
- <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="true"/>
- </httpj:tlsServerParameters>
- </httpj:engine>
- </httpj:engine-factory>
-
-</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Morpit.jks
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Morpit.jks b/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Morpit.jks
deleted file mode 100644
index 95626a7..0000000
Binary files a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Morpit.jks and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Morpit.p12
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Morpit.p12 b/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Morpit.p12
deleted file mode 100644
index f37acff..0000000
Binary files a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Morpit.p12 and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Mortimer.cxf
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Mortimer.cxf b/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Mortimer.cxf
deleted file mode 100644
index 4a26c85..0000000
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Mortimer.cxf
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!--
- ** This file configures the Mortimer Server.
- ** It is an http server.
- -->
-
-
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:sec="http://cxf.apache.org/configuration/security"
- xmlns:http="http://cxf.apache.org/transports/http/configuration"
- xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
- xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
- xsi:schemaLocation="
- http://cxf.apache.org/configuration/security
- http://cxf.apache.org/schemas/configuration/security.xsd
- http://cxf.apache.org/transports/http/configuration
- http://cxf.apache.org/schemas/configuration/http-conf.xsd
- http://cxf.apache.org/transports/http-jetty/configuration
- http://cxf.apache.org/schemas/configuration/http-jetty.xsd
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <http:destination name="{http://apache.org/hello_world}Mortimer.http-destination">
- <!-- Nothing to Configure here for Mortimer -->
- </http:destination>
-
-</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cer
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cer b/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cer
deleted file mode 100644
index cfb2cc5..0000000
Binary files a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cer and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf b/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf
deleted file mode 100644
index 1f27492..0000000
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!--
- ** This file configures the Poltim Server.
- ** It is an https server that redirects to Mortimer.
- -->
-
-
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:sec="http://cxf.apache.org/configuration/security"
- xmlns:http="http://cxf.apache.org/transports/http/configuration"
- xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
- xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
- xsi:schemaLocation="
- http://cxf.apache.org/configuration/security
- http://cxf.apache.org/schemas/configuration/security.xsd
- http://cxf.apache.org/transports/http/configuration
- http://cxf.apache.org/schemas/configuration/http-conf.xsd
- http://cxf.apache.org/transports/http-jetty/configuration
- http://cxf.apache.org/schemas/configuration/http-jetty.xsd
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
-
- <http:destination name="{http://apache.org/hello_world}Poltim.http-destination">
- <http:server RedirectURL="http://localhost:${testutil.ports.BusServer.0}/Mortimer"/>
- </http:destination>
-
- <httpj:engine-factory bus="cxf">
- <httpj:engine port="${testutil.ports.BusServer.5}">
- <httpj:tlsServerParameters>
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="JKS" password="password"
- file="src/test/java/org/apache/cxf/systest/http/resources/Poltim.jks"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:keyStore type="JKS" password="password"
- file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/>
- </sec:trustManagers>
- <sec:cipherSuitesFilter>
- <!-- these filters ensure that a ciphersuite with
- export-suitable or null encryption is used,
- but exclude anonymous Diffie-Hellman key change as
- this is vulnerable to man-in-the-middle attacks -->
- <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="true"/>
- </httpj:tlsServerParameters>
- </httpj:engine>
- </httpj:engine-factory>
-
-</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Poltim.jks
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Poltim.jks b/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Poltim.jks
deleted file mode 100644
index 570e071..0000000
Binary files a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Poltim.jks and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Rethwel.cxf
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Rethwel.cxf b/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Rethwel.cxf
deleted file mode 100644
index c4da8f3..0000000
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Rethwel.cxf
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!--
- ** This file configures the Rethwel Server.
- ** It is an http server that redirects to Mortimer.
- -->
-
-
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:sec="http://cxf.apache.org/configuration/security"
- xmlns:http="http://cxf.apache.org/transports/http/configuration"
- xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
- xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
- xsi:schemaLocation="
- http://cxf.apache.org/configuration/security
- http://cxf.apache.org/schemas/configuration/security.xsd
- http://cxf.apache.org/transports/http/configuration
- http://cxf.apache.org/schemas/configuration/http-conf.xsd
- http://cxf.apache.org/transports/http-jetty/configuration
- http://cxf.apache.org/schemas/configuration/http-jetty.xsd
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
-
- <http:destination name="{http://apache.org/hello_world}Rethwel.http-destination">
-
- <http:server RedirectURL="http://localhost:${testutil.ports.BusServer.0}/Mortimer"/>
- </http:destination>
-
-</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/SessionServer.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/SessionServer.xml b/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/SessionServer.xml
deleted file mode 100644
index 01060a8..0000000
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/SessionServer.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/be
ans/spring-beans.xsd">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
- <httpj:engine-factory bus="cxf">
- <httpj:engine port="${testutil.ports.SessionServer}">
- <httpj:sessionSupport>true</httpj:sessionSupport>
- <httpj:reuseAddress>false</httpj:reuseAddress>
- </httpj:engine>
- </httpj:engine-factory>
- <jaxws:endpoint address="http://localhost:${testutil.ports.SessionServer}/SoapContext/GreeterPort" implementor="org.apache.cxf.systest.http.GreeterSessionImpl">
- <jaxws:properties>
- <entry key="org.apache.cxf.oneway.robust" value="true"/>
- </jaxws:properties>
- </jaxws:endpoint>
- <jaxws:endpoint address="http://localhost:${testutil.ports.SessionServer}/Stateful1" implementorClass="org.apache.cxf.systest.http.StatefulGreeterImpl">
- <jaxws:invoker>
- <bean class="org.apache.cxf.jaxws.JAXWSMethodInvoker">
- <constructor-arg>
- <bean class="org.apache.cxf.service.invoker.SessionFactory">
- <constructor-arg value="org.apache.cxf.systest.http.StatefulGreeterImpl"/>
- </bean>
- </constructor-arg>
- </bean>
- </jaxws:invoker>
- </jaxws:endpoint>
- <jaxws:endpoint address="http://localhost:${testutil.ports.SessionServer}/Stateful2" implementorClass="org.apache.cxf.systest.http.SessionAnnotationGreeterImpl"/>
- <jaxws:endpoint address="http://localhost:${testutil.ports.SessionServer}/PerRequest" implementorClass="org.apache.cxf.systest.http.PerRequestAnnotationGreeterImpl"/>
- <bean id="SpringBean" class="org.apache.cxf.systest.http.SpringAnnotationGreeterImpl"/>
- <jaxws:endpoint address="http://localhost:${testutil.ports.SessionServer}/SpringBean" implementorClass="org.apache.cxf.systest.http.SpringAnnotationGreeterImpl"/>
-</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cer
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cer b/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cer
deleted file mode 100644
index 37edcac..0000000
Binary files a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cer and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf b/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf
deleted file mode 100644
index 9b9a1f1..0000000
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!--
- ** This file configures the Tarpin Server.
- ** It is an https server that redirects to Gordy.
- -->
-
-
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:sec="http://cxf.apache.org/configuration/security"
- xmlns:http="http://cxf.apache.org/transports/http/configuration"
- xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
- xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
- xsi:schemaLocation="
- http://cxf.apache.org/configuration/security
- http://cxf.apache.org/schemas/configuration/security.xsd
- http://cxf.apache.org/transports/http/configuration
- http://cxf.apache.org/schemas/configuration/http-conf.xsd
- http://cxf.apache.org/transports/http-jetty/configuration
- http://cxf.apache.org/schemas/configuration/http-jetty.xsd
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
-
- <http:destination name="{http://apache.org/hello_world}Tarpin.http-destination">
- <http:server RedirectURL="https://localhost:${testutil.ports.BusServer.1}/Gordy"/>
- </http:destination>
-
- <httpj:engine-factory bus="cxf">
- <httpj:engine port="${testutil.ports.BusServer.3}">
- <httpj:tlsServerParameters>
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="JKS" password="password"
- file="src/test/java/org/apache/cxf/systest/http/resources/Tarpin.jks"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:keyStore type="JKS" password="password"
- file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/>
- </sec:trustManagers>
- <sec:cipherSuitesFilter>
- <!-- these filters ensure that a ciphersuite with
- export-suitable or null encryption is used,
- but exclude anonymous Diffie-Hellman key change as
- this is vulnerable to man-in-the-middle attacks -->
- <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="true"/>
- </httpj:tlsServerParameters>
- </httpj:engine>
- </httpj:engine-factory>
-
-</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.jks
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.jks b/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.jks
deleted file mode 100644
index 329af6a..0000000
Binary files a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.jks and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks b/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks
deleted file mode 100644
index e76a076..0000000
Binary files a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Truststore.pem
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Truststore.pem b/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Truststore.pem
deleted file mode 100644
index 1b25477..0000000
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Truststore.pem
+++ /dev/null
@@ -1,60 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICIDCCAYkCBEYRaYcwDQYJKoZIhvcNAQEEBQAwVzELMAkGA1UEBhMCVVMxETAPBgNVBAcTCFN5
-cmFjdXNlMRMwEQYDVQQKEwpBcGFjaGVUZXN0MQ8wDQYDVQQLEwZCZXRoYWwxDzANBgNVBAMTBkJl
-dGhhbDAeFw0wNzA0MDIyMDM3MjdaFw0zNDA4MTgyMDM3MjdaMFcxCzAJBgNVBAYTAlVTMREwDwYD
-VQQHEwhTeXJhY3VzZTETMBEGA1UEChMKQXBhY2hlVGVzdDEPMA0GA1UECxMGQmV0aGFsMQ8wDQYD
-VQQDEwZCZXRoYWwwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAJHOyFu8tTt4g9tBv0bY8c4K
-uidfMlHbFQAukIFXLkR4xu5IxG5OI53ZE0F6rqcPFve1sdEV9h+MxmzqQbo180Wyv1rUEq2AScK3
-6bo0ALuZsreQQmNVGBOjxBpTtrRErRfNJe1mvzNMz9VlGdSNWW17CrBz9kmz6G1EWg8aGfZHAgMB
-AAEwDQYJKoZIhvcNAQEEBQADgYEAbw+VwP1tnBm3cFLFgONnGCozN8XqV2M0OklJ5lBDJL7BV2Ng
-BtTZ8as9jTGYdjetKQXX75wWL7OS7vnkm/9tbr/vNBljT0OP0Yr2X7TAbDdhFfsk/D5mBpXdzXz2
-wqxVZjj6sm5zvwC32e4AxGG0edmY1DN9VMZzA/FrzBP0qoE=
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIICHDCCAYUCBEYRaYkwDQYJKoZIhvcNAQEEBQAwVTELMAkGA1UEBhMCVVMxETAPBgNVBAcTCFN5
-cmFjdXNlMRMwEQYDVQQKEwpBcGFjaGVUZXN0MQ4wDAYDVQQLEwVHb3JkeTEOMAwGA1UEAxMFR29y
-ZHkwHhcNMDcwNDAyMjAzNzI5WhcNMzQwODE4MjAzNzI5WjBVMQswCQYDVQQGEwJVUzERMA8GA1UE
-BxMIU3lyYWN1c2UxEzARBgNVBAoTCkFwYWNoZVRlc3QxDjAMBgNVBAsTBUdvcmR5MQ4wDAYDVQQD
-EwVHb3JkeTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqIbNth+G4Q5tkZvoUZdQsY9RnjAA
-mgKVBUaOVvv//qOniOTskLqBFyKGoMpbCfNAU7/zVKP5fLTLccLdJyCagKGrs1ZmKaNiTRcOnfkE
-3dHnEIp83+hNmASGsrZcyLihtro1N3pMTuXbXzu7x3F2U7fxYFg66iviTEGF6T7dY3MCAwEAATAN
-BgkqhkiG9w0BAQQFAAOBgQBPjsYFdqz0JF9shNpvke/H1eHqhyXJgPdHdCu/ewRO2wV6I9WBrGNU
-cmmKZmAUsv99Y0Tpz59uEXFcM3cBZU4/obw3DlwwWmaVMoIwQ2Nd2FChC6uyKIJ0Bvpx+aDxjm48
-b8c58EHCcU2FRo/nVWctJL9xJ7oBrke5GZrBlUF+rA==
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIICNDCCAZ0CBEYRaY4wDQYJKoZIhvcNAQEEBQAwYTELMAkGA1UEBhMCVVMxETAPBgNVBAcTCFN5
-cmFjdXNlMRMwEQYDVQQKEwpBcGFjaGVUZXN0MQ8wDQYDVQQLEwZNb3JwaXQxGTAXBgNVBAMTEHdo
-YXRldmVyaG9zdC5jb20wHhcNMDcwNDAyMjAzNzM0WhcNMzQwODE4MjAzNzM0WjBhMQswCQYDVQQG
-EwJVUzERMA8GA1UEBxMIU3lyYWN1c2UxEzARBgNVBAoTCkFwYWNoZVRlc3QxDzANBgNVBAsTBk1v
-cnBpdDEZMBcGA1UEAxMQd2hhdGV2ZXJob3N0LmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkC
-gYEAk4FbJxfjllrApiECK5oRbgmTC1exx59HWck20R2AYU6kIkdZa78Ca+oc/zaPCtsVL/QZbjHE
-7lnvVK55tnpGW9qzLxsAHZmYyA/4Wdmcbz/Niwsfm062z94+AKMCGum/1Ug1QZUiRKweZTRBHhmT
-VsxSDEGTTi6UVim6nv47ZlcCAwEAATANBgkqhkiG9w0BAQQFAAOBgQAjWR/W+YO0I5sBlb+zNTbJ
-TPs4CqM4UHQS+prOx59R134FbocgkGncm00FBrO857KJHdSCRjOUUpc3S+MP13FGqSQm2Q0lNjUV
-IygvdZ+BATfgsJ92NbnuIhIVAA+i8AVZK//qPRCMz1Rdm1G994qCw3A4lQMi5eqKYYwqkRJeXw==
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIICIDCCAYkCBEYRaYwwDQYJKoZIhvcNAQEEBQAwVzELMAkGA1UEBhMCVVMxETAPBgNVBAcTCFN5
-cmFjdXNlMRMwEQYDVQQKEwpBcGFjaGVUZXN0MQ8wDQYDVQQLEwZQb2x0aW0xDzANBgNVBAMTBlBv
-bHRpbTAeFw0wNzA0MDIyMDM3MzJaFw0zNDA4MTgyMDM3MzJaMFcxCzAJBgNVBAYTAlVTMREwDwYD
-VQQHEwhTeXJhY3VzZTETMBEGA1UEChMKQXBhY2hlVGVzdDEPMA0GA1UECxMGUG9sdGltMQ8wDQYD
-VQQDEwZQb2x0aW0wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAL/bdivrpaR4Njvo7WB4ipEh
-422V2bAyapFvgOq/tHusGR/e3wH0v9g+9xwnNyqFjhueceuWahXAvNHvknuUaelW0346Aay0fBAu
-EsyowWBTVi/pU+iZleN9FD8uBalY1s6e+xqu+yckhHuBP77TcTar1hBjCIfy2Eo2YevDL6qlAgMB
-AAEwDQYJKoZIhvcNAQEEBQADgYEAuT7QoNfGG7GjfQuU/oYj5vHPH7nPhLtkQBVTEi0WyzgJUXie
-rNG/u4VEZtNtK4+4J5tQyb4YtP2GPUUpWrhusKUaW4eMU79rzpUbZnGUBzTbth8kBoN9xHzXiSop
-ohPdOnGo5ZjThZnLEn/o9doUEX64o4eauu15SPoDLzSfLJ0=
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIICIDCCAYkCBEYRaYswDQYJKoZIhvcNAQEEBQAwVzELMAkGA1UEBhMCVVMxETAPBgNVBAcTCFN5
-cmFjdXNlMRMwEQYDVQQKEwpBcGFjaGVUZXN0MQ8wDQYDVQQLEwZUYXJwaW4xDzANBgNVBAMTBlRh
-cnBpbjAeFw0wNzA0MDIyMDM3MzFaFw0zNDA4MTgyMDM3MzFaMFcxCzAJBgNVBAYTAlVTMREwDwYD
-VQQHEwhTeXJhY3VzZTETMBEGA1UEChMKQXBhY2hlVGVzdDEPMA0GA1UECxMGVGFycGluMQ8wDQYD
-VQQDEwZUYXJwaW4wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKGG8UtWnHyWKFVDJSuSlhT/
-vKxrPjfNBtvdaiQx5gNAlc8QVL5lPOXcJljTF3dEb0QQ1ajai3kC71NE2ABOrxk7Jvk3bEma5Yfy
-U3m/OBthL9H8kE3O3+bh4K2LTsRwIa2Zd1wYbj44vUxsiHhzxer3q3FDfLxsqtahsxz7WjG1AgMB
-AAEwDQYJKoZIhvcNAQEEBQADgYEAE6EWRbYxGOlwmtpv0XE4FwbXYdSDArc+ArhOJWKTzoE3U9l8
-kg1wJL49VXEmVIxpipXKs7d9lpIVLPFsbBVJRZwH8sgHE39nTjfeyHNmwZcd63Lrn+2RydkAo5P9
-FYi8HFGEM5dON4PSo3Et6ycHy1IrS8htrNu+FoW84FRTKDA=
------END CERTIFICATE-----
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/genkeys.sh
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/genkeys.sh b/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/genkeys.sh
deleted file mode 100755
index a01a569..0000000
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/genkeys.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-#
-# This file generates a number of keys/certificates and keystores for
-# names to be used with corresponding CXF configuration files (*.cxf).
-#
-
-#
-# Start with a clean slate. Remove all keystores.
-#
-rm -f *.jks
-rm -f Truststore.pem
-
-#
-# This function generates a key/self-signed certificate with the following DN.
-# "CN=$1, OU=$2, O=ApacheTest, L=Syracuse, C=US" and adds it to
-# the truststore.
-#
-function genkey {
- keytool -genkey -alias $2 -keystore $2.jks -dname "CN=$1, OU=$2, O=ApacheTest, L=Syracuse, C=US" -keyalg RSA -keypass password -storepass password -storetype jks -validity 10000
- keytool -export -file $2.cer -alias $2 -keystore $2.jks -storepass password
- keytool -import -file $2.cer -alias $2 -noprompt -keystore Truststore.jks -storepass password
-}
-
-#
-# We generate keys/certificates with the following CN=<name> OU=<name>
-# The CN used to be "localhost" to conform to the default HostnameVerifier of
-# HttpsURLConnection so it would work for tests. However, we have enhanced
-# the HTTP Conduit logic to accept anything in the CN in favor of the
-# MessageTrustDecider callback making the verification determination.
-#
-for name in Bethal Gordy Tarpin Poltim Morpit
-do
- genkey $name $name
- keytool -export -keystore Truststore.jks -storepass password -alias $i -rfc >> Truststore.pem
-done
-
[5/5] cxf git commit: Fixing build
Posted by co...@apache.org.
Fixing build
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4e3351ea
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4e3351ea
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4e3351ea
Branch: refs/heads/3.0.x-fixes
Commit: 4e3351ea605f6ea71e0242130b3d0c33b8c41918
Parents: c9eeeda
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Dec 11 09:55:46 2014 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Dec 11 09:55:46 2014 +0000
----------------------------------------------------------------------
.../cxf/systest/http/HTTPSClientTest.java | 8 ---
.../cxf/systest/http/jaxws-publish-callback.xml | 64 --------------------
2 files changed, 72 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/4e3351ea/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPSClientTest.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPSClientTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPSClientTest.java
index 80c2da0..8e5ed3d 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPSClientTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPSClientTest.java
@@ -153,14 +153,6 @@ public class HTTPSClientTest extends AbstractBusClientServerTestBase {
"https://localhost:" + BusServer.getPort(1) + "/SoapContext/HttpsPort");
}
@Test
-<<<<<<< HEAD
-=======
- public final void testJaxwsEndpointCallback() throws Exception {
- testSuccessfulCall("jaxws-publish-callback.xml",
- "https://localhost:" + BusServer.getPort(1) + "/SoapContext/HttpsPort");
- }
- @Test
->>>>>>> d4a35c4... Initial refactor of transports systests
public final void testJaxwsTLSRefsEndpoint() throws Exception {
testSuccessfulCall("jaxws-tlsrefs-publish.xml",
"https://localhost:" + BusServer.getPort(1) + "/SoapContext/HttpsPort");
http://git-wip-us.apache.org/repos/asf/cxf/blob/4e3351ea/systests/transports/src/test/resources/org/apache/cxf/systest/http/jaxws-publish-callback.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/jaxws-publish-callback.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/http/jaxws-publish-callback.xml
deleted file mode 100644
index bdea016..0000000
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/http/jaxws-publish-callback.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd ">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
- <!-- -->
- <!-- This Spring config file is designed to represent a minimal -->
- <!-- configuration for spring-loading a CXF servant, where the -->
- <!-- servant listens using HTTP/S as the transport protocol. -->
- <!-- -->
- <!-- Note that the service endpoint is spring-loaded. In the -->
- <!-- scenario in which this config is designed to run, the -->
- <!-- server application merely instantiates a Bus, and does not -->
- <!-- publish any services programmatically -->
- <!-- -->
- <!-- -->
- <!-- Spring-load an HTTPS servant -->
- <!-- -->
- <jaxws:endpoint xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint" implementor="org.apache.cxf.systest.http.GreeterImpl" address="https://localhost:${testutil.ports.BusServer.1}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-9001-tls-config"/>
- <!-- -->
- <!-- TLS Port configuration parameters for port 9001 -->
- <!-- -->
- <httpj:engine-factory id="port-9001-tls-config">
- <httpj:engine port="${testutil.ports.BusServer.1}">
- <httpj:tlsServerParameters>
- <sec:keyManagers keyPasswordCallbackHandler="org.apache.cxf.systest.http.KeyPasswordCallbackHandler">
- <sec:keyStore type="JKS" password="password" file="src/test/resources/keys/Bethal.jks"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:keyStore type="JKS" password="password" file="src/test/resources/keys/Truststore.jks"/>
- </sec:trustManagers>
- </httpj:tlsServerParameters>
- </httpj:engine>
- </httpj:engine-factory>
- <!-- -->
- <!-- HTTP/S configuration for clients -->
- <!-- -->
- <http:conduit name="{http://apache.org/hello_world/services}HttpsPort.http-conduit">
- <http:tlsClientParameters disableCNCheck="true">
- <sec:keyManagers keyPasswordCallbackHandler="org.apache.cxf.systest.http.KeyPasswordCallbackHandler">
- <sec:keyStore type="JKS" password="password" file="src/test/resources/keys/Morpit.jks"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:keyStore type="JKS" password="password" file="src/test/resources/keys/Truststore.jks"/>
- </sec:trustManagers>
- </http:tlsClientParameters>
- </http:conduit>
-</beans>
[3/5] cxf git commit: Initial refactor of transports systests
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/greeting.wsdl
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/greeting.wsdl b/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/greeting.wsdl
deleted file mode 100644
index c12bdfe..0000000
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/greeting.wsdl
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<wsdl:definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://apache.org/hello_world" xmlns:x1="http://apache.org/hello_world/types" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="HelloWorld" targetNamespace="http://apache.org/hello_world">
- <wsdl:types>
- <schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://apache.org/hello_world/types" targetNamespace="http://apache.org/hello_world/types" elementFormDefault="qualified">
- <simpleType name="MyStringType">
- <restriction base="string">
- <maxLength value="30"/>
- </restriction>
- </simpleType>
- <element name="sayHi">
- <complexType/>
- </element>
- <element name="sayHiResponse">
- <complexType>
- <sequence>
- <element name="responseType" type="string"/>
- </sequence>
- </complexType>
- </element>
- <element name="greetMe">
- <complexType>
- <sequence>
- <element name="requestType" type="tns:MyStringType"/>
- </sequence>
- </complexType>
- </element>
- <element name="greetMeResponse">
- <complexType>
- <sequence>
- <element name="responseType" type="string"/>
- </sequence>
- </complexType>
- </element>
- <element name="pingMe">
- <complexType/>
- </element>
- <element name="pingMeResponse">
- <complexType/>
- </element>
- <element name="faultDetail">
- <complexType>
- <sequence>
- <element name="minor" type="short"/>
- <element name="major" type="short"/>
- </sequence>
- </complexType>
- </element>
- </schema>
- </wsdl:types>
- <wsdl:message name="sayHiRequest">
- <wsdl:part element="x1:sayHi" name="in"/>
- </wsdl:message>
- <wsdl:message name="sayHiResponse">
- <wsdl:part element="x1:sayHiResponse" name="out"/>
- </wsdl:message>
- <wsdl:message name="greetMeRequest">
- <wsdl:part element="x1:greetMe" name="in"/>
- </wsdl:message>
- <wsdl:message name="greetMeResponse">
- <wsdl:part element="x1:greetMeResponse" name="out"/>
- </wsdl:message>
- <wsdl:message name="pingMeRequest">
- <wsdl:part name="in" element="x1:pingMe"/>
- </wsdl:message>
- <wsdl:message name="pingMeResponse">
- <wsdl:part name="out" element="x1:pingMeResponse"/>
- </wsdl:message>
- <wsdl:message name="pingMeFault">
- <wsdl:part name="faultDetail" element="x1:faultDetail"/>
- </wsdl:message>
- <wsdl:portType name="Greeter">
- <wsdl:operation name="sayHi">
- <wsdl:input message="tns:sayHiRequest" name="sayHiRequest"/>
- <wsdl:output message="tns:sayHiResponse" name="sayHiResponse"/>
- </wsdl:operation>
- <wsdl:operation name="greetMe">
- <wsdl:input message="tns:greetMeRequest" name="greetMeRequest"/>
- <wsdl:output message="tns:greetMeResponse" name="greetMeResponse"/>
- </wsdl:operation>
- <wsdl:operation name="pingMe">
- <wsdl:input name="pingMeRequest" message="tns:pingMeRequest"/>
- <wsdl:output name="pingMeResponse" message="tns:pingMeResponse"/>
- <wsdl:fault name="pingMeFault" message="tns:pingMeFault"/>
- </wsdl:operation>
- </wsdl:portType>
- <wsdl:binding name="Greeter_SOAPBinding" type="tns:Greeter">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <wsdl:operation name="sayHi">
- <soap:operation soapAction="" style="document"/>
- <wsdl:input name="sayHiRequest">
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output name="sayHiResponse">
- <soap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="greetMe">
- <soap:operation soapAction="" style="document"/>
- <wsdl:input name="greetMeRequest">
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output name="greetMeResponse">
- <soap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="pingMe">
- <soap:operation style="document"/>
- <wsdl:input>
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal"/>
- </wsdl:output>
- <wsdl:fault name="pingMeFault">
- <soap:fault name="pingMeFault" use="literal"/>
- </wsdl:fault>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:service name="SOAPService">
- <wsdl:port binding="tns:Greeter_SOAPBinding" name="Mortimer">
- <soap:address location="http://localhost:9000/Mortimer"/>
- </wsdl:port>
- <wsdl:port binding="tns:Greeter_SOAPBinding" name="Tarpin">
- <soap:address location="https://localhost:9003/Tarpin"/>
- </wsdl:port>
- <wsdl:port binding="tns:Greeter_SOAPBinding" name="Rethwel">
- <soap:address location="http://localhost:9004/Rethwel"/>
- </wsdl:port>
- <wsdl:port binding="tns:Greeter_SOAPBinding" name="Gordy">
- <soap:address location="https://localhost:9001/Gordy"/>
- </wsdl:port>
- <wsdl:port binding="tns:Greeter_SOAPBinding" name="Bethal">
- <soap:address location="https://localhost:9002/Bethal"/>
- </wsdl:port>
- <wsdl:port binding="tns:Greeter_SOAPBinding" name="Hurlon">
- <soap:address location="http://localhost:9006/Hurlon"/>
- </wsdl:port>
- <wsdl:port binding="tns:Greeter_SOAPBinding" name="Poltim">
- <soap:address location="https://localhost:9005/Poltim"/>
- </wsdl:port>
- <wsdl:port binding="tns:Greeter_SOAPBinding" name="Abost">
- <soap:address location="https://localhost:9007/Abost"/>
- </wsdl:port>
- <wsdl:port binding="tns:Greeter_SOAPBinding" name="Morpit">
- <soap:address location="https://localhost:9008/Morpit"/>
- </wsdl:port>
- </wsdl:service>
-</wsdl:definitions>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/jaxws-publish.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/jaxws-publish.xml b/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/jaxws-publish.xml
deleted file mode 100644
index 140b989..0000000
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/jaxws-publish.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd ">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
- <!-- -->
- <!-- This Spring config file is designed to represent a minimal -->
- <!-- configuration for spring-loading a CXF servant, where the -->
- <!-- servant listens using HTTP/S as the transport protocol. -->
- <!-- -->
- <!-- Note that the service endpoint is spring-loaded. In the -->
- <!-- scenario in which this config is designed to run, the -->
- <!-- server application merely instantiates a Bus, and does not -->
- <!-- publish any services programmatically -->
- <!-- -->
- <!-- -->
- <!-- Spring-load an HTTPS servant -->
- <!-- -->
- <jaxws:endpoint xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint" implementor="org.apache.cxf.systest.http.GreeterImpl" address="https://localhost:${testutil.ports.BusServer.1}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-9001-tls-config"/>
- <!-- -->
- <!-- TLS Port configuration parameters for port 9001 -->
- <!-- -->
- <httpj:engine-factory id="port-9001-tls-config">
- <httpj:engine port="${testutil.ports.BusServer.1}">
- <httpj:tlsServerParameters>
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/>
- </sec:trustManagers>
- </httpj:tlsServerParameters>
- </httpj:engine>
- </httpj:engine-factory>
- <!-- -->
- <!-- HTTP/S configuration for clients -->
- <!-- -->
- <http:conduit name="{http://apache.org/hello_world/services}HttpsPort.http-conduit">
- <http:tlsClientParameters disableCNCheck="true">
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Morpit.jks"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/>
- </sec:trustManagers>
- </http:tlsClientParameters>
- </http:conduit>
-</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server-constraints.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server-constraints.xml b/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server-constraints.xml
deleted file mode 100644
index 4ee8b27..0000000
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server-constraints.xml
+++ /dev/null
@@ -1,255 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd ">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
- <!-- -->
- <!-- This Spring config file is designed to represent a minimal -->
- <!-- configuration for spring-loading a CXF servant, where the -->
- <!-- servant listens using HTTP/S as the transport protocol. -->
- <!-- -->
- <!-- Note that the service endpoint is spring-loaded. In the -->
- <!-- scenario in which this config is designed to run, the -->
- <!-- server application merely instantiates a Bus, and does not -->
- <!-- publish any services programmatically -->
- <!-- -->
- <!-- -->
- <!-- Spring-load an HTTPS servant -->
- <!-- -->
- <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint-testutil-ports-BusServer-0" address="https://localhost:${testutil.ports.BusServer.0}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-testutil.ports.BusServer.0-tls-config">
- <jaxws:serviceBean>
- <bean class="org.apache.cxf.systest.http.GreeterImpl"/>
- </jaxws:serviceBean>
- </jaxws:server>
- <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint-testutil-ports-BusServer-1" address="https://localhost:${testutil.ports.BusServer.1}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-testutil.ports.BusServer.1-tls-config">
- <jaxws:serviceBean>
- <bean class="org.apache.cxf.systest.http.GreeterImpl"/>
- </jaxws:serviceBean>
- </jaxws:server>
- <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint-testutil-ports-BusServer-2" address="https://localhost:${testutil.ports.BusServer.2}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-testutil.ports.BusServer.2-tls-config">
- <jaxws:serviceBean>
- <bean class="org.apache.cxf.systest.http.GreeterImpl"/>
- </jaxws:serviceBean>
- </jaxws:server>
- <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint-testutil-ports-BusServer-3" address="https://localhost:${testutil.ports.BusServer.3}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-testutil.ports.BusServer.3-tls-config">
- <jaxws:serviceBean>
- <bean class="org.apache.cxf.systest.http.GreeterImpl"/>
- </jaxws:serviceBean>
- </jaxws:server>
- <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint-testutil-ports-BusServer-4" address="https://localhost:${testutil.ports.BusServer.4}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-testutil.ports.BusServer.4-tls-config">
- <jaxws:serviceBean>
- <bean class="org.apache.cxf.systest.http.GreeterImpl"/>
- </jaxws:serviceBean>
- </jaxws:server>
- <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint-testutil-ports-BusServer-5" address="https://localhost:${testutil.ports.BusServer.5}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-testutil.ports.BusServer.5-tls-config">
- <jaxws:serviceBean>
- <bean class="org.apache.cxf.systest.http.GreeterImpl"/>
- </jaxws:serviceBean>
- </jaxws:server>
- <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint-testutil-ports-BusServer-6" address="https://localhost:${testutil.ports.BusServer.6}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-testutil.ports.BusServer.6-tls-config">
- <jaxws:serviceBean>
- <bean class="org.apache.cxf.systest.http.GreeterImpl"/>
- </jaxws:serviceBean>
- </jaxws:server>
- <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint-testutil-ports-BusServer-7" address="https://localhost:${testutil.ports.BusServer.7}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-testutil.ports.BusServer.7-tls-config">
- <jaxws:serviceBean>
- <bean class="org.apache.cxf.systest.http.GreeterImpl"/>
- </jaxws:serviceBean>
- </jaxws:server>
- <!-- -->
- <!-- TLS Port configuration parameters for port 9000 -->
- <!-- -->
- <httpj:engine-factory id="port-testutil.ports.BusServer.0-tls-config">
- <httpj:engine port="${testutil.ports.BusServer.0}">
- <httpj:tlsServerParameters>
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/>
- </sec:trustManagers>
- <sec:certConstraints>
- <sec:SubjectDNConstraints>
- <sec:RegularExpression>.*O=ApacheTest.*</sec:RegularExpression>
- <sec:RegularExpression>.*OU=Morpit.*</sec:RegularExpression>
- </sec:SubjectDNConstraints>
- </sec:certConstraints>
- </httpj:tlsServerParameters>
- </httpj:engine>
- </httpj:engine-factory>
- <!-- -->
- <!-- TLS Port configuration parameters for port 9007 -->
- <!-- -->
- <httpj:engine-factory id="port-testutil.ports.BusServer.1-tls-config">
- <httpj:engine port="${testutil.ports.BusServer.1}">
- <httpj:tlsServerParameters>
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/>
- </sec:trustManagers>
- <sec:certConstraints>
- <sec:SubjectDNConstraints>
- <sec:RegularExpression>.*O=BadApacheTest.*</sec:RegularExpression>
- </sec:SubjectDNConstraints>
- </sec:certConstraints>
- </httpj:tlsServerParameters>
- </httpj:engine>
- </httpj:engine-factory>
- <!-- -->
- <!-- TLS Port configuration parameters for port 9008 -->
- <!-- -->
- <httpj:engine-factory id="port-testutil.ports.BusServer.2-tls-config">
- <httpj:engine port="${testutil.ports.BusServer.2}">
- <httpj:tlsServerParameters>
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/>
- </sec:trustManagers>
- <sec:certConstraints>
- <sec:SubjectDNConstraints>
- <sec:RegularExpression>.*O=ApacheTest.*</sec:RegularExpression>
- <sec:RegularExpression>.*O=BadApacheTest.*</sec:RegularExpression>
- </sec:SubjectDNConstraints>
- </sec:certConstraints>
- </httpj:tlsServerParameters>
- </httpj:engine>
- </httpj:engine-factory>
- <!-- -->
- <!-- TLS Port configuration parameters for port 9009 -->
- <!-- -->
- <httpj:engine-factory id="port-testutil.ports.BusServer.3-tls-config">
- <httpj:engine port="${testutil.ports.BusServer.3}">
- <httpj:tlsServerParameters>
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/>
- </sec:trustManagers>
- <sec:certConstraints>
- <sec:SubjectDNConstraints combinator="ANY">
- <sec:RegularExpression>.*O=ApacheTest.*</sec:RegularExpression>
- <sec:RegularExpression>.*O=BadApacheTest.*</sec:RegularExpression>
- </sec:SubjectDNConstraints>
- </sec:certConstraints>
- </httpj:tlsServerParameters>
- </httpj:engine>
- </httpj:engine-factory>
- <!-- -->
- <!-- TLS Port configuration parameters for port 9010 -->
- <!-- -->
- <httpj:engine-factory id="port-testutil.ports.BusServer.4-tls-config">
- <httpj:engine port="${testutil.ports.BusServer.4}">
- <httpj:tlsServerParameters>
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/>
- </sec:trustManagers>
- <sec:certConstraints>
- <sec:IssuerDNConstraints combinator="ALL">
- <sec:RegularExpression>.*O=ApacheTest.*</sec:RegularExpression>
- <sec:RegularExpression>.*O=BadApacheTest.*</sec:RegularExpression>
- </sec:IssuerDNConstraints>
- </sec:certConstraints>
- </httpj:tlsServerParameters>
- </httpj:engine>
- </httpj:engine-factory>
- <!-- -->
- <!-- TLS Port configuration parameters for port 9011 -->
- <!-- -->
- <httpj:engine-factory id="port-testutil.ports.BusServer.5-tls-config">
- <httpj:engine port="${testutil.ports.BusServer.5}">
- <httpj:tlsServerParameters>
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/>
- </sec:trustManagers>
- <sec:certConstraints>
- <sec:IssuerDNConstraints combinator="ANY">
- <sec:RegularExpression>.*O=ApacheTest.*</sec:RegularExpression>
- <sec:RegularExpression>.*O=BadApacheTest.*</sec:RegularExpression>
- </sec:IssuerDNConstraints>
- </sec:certConstraints>
- </httpj:tlsServerParameters>
- </httpj:engine>
- </httpj:engine-factory>
- <!-- -->
- <!-- TLS Port configuration parameters for port 9012 -->
- <!-- -->
- <httpj:engine-factory id="port-testutil.ports.BusServer.6-tls-config">
- <httpj:engine port="${testutil.ports.BusServer.6}">
- <httpj:tlsServerParameters>
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Morpit.jks"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/>
- </sec:trustManagers>
- <sec:clientAuthentication required="true"/>
- </httpj:tlsServerParameters>
- </httpj:engine>
- </httpj:engine-factory>
- <!-- -->
- <!-- TLS Port configuration parameters for port 9013 -->
- <!-- -->
- <httpj:engine-factory id="port-testutil.ports.BusServer.7-tls-config">
- <httpj:engine port="${testutil.ports.BusServer.7}">
- <httpj:tlsServerParameters>
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Gordy.jks"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/>
- </sec:trustManagers>
- <sec:clientAuthentication required="true"/>
- </httpj:tlsServerParameters>
- </httpj:engine>
- </httpj:engine-factory>
- <!-- -->
- <!-- HTTP/S configuration for clients -->
- <!-- -->
- <http:conduit name="{http://apache.org/hello_world/services}HttpsPort.http-conduit">
- <http:tlsClientParameters disableCNCheck="true">
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Morpit.jks"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/>
- </sec:trustManagers>
- <sec:certConstraints>
- <sec:SubjectDNConstraints>
- <sec:RegularExpression>.*CN=(Bethal|Gordy).*</sec:RegularExpression>
- <sec:RegularExpression>.*O=ApacheTest.*</sec:RegularExpression>
- </sec:SubjectDNConstraints>
- <sec:IssuerDNConstraints combinator="ANY">
- <sec:RegularExpression>.*CN=Bethal.*</sec:RegularExpression>
- <sec:RegularExpression>.*OU=Morpit.*</sec:RegularExpression>
- </sec:IssuerDNConstraints>
- </sec:certConstraints>
- </http:tlsClientParameters>
- </http:conduit>
-</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server.xml b/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server.xml
deleted file mode 100644
index ade60a2..0000000
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd ">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
- <!-- -->
- <!-- This Spring config file is designed to represent a minimal -->
- <!-- configuration for spring-loading a CXF servant, where the -->
- <!-- servant listens using HTTP/S as the transport protocol. -->
- <!-- -->
- <!-- Note that the service endpoint is spring-loaded. In the -->
- <!-- scenario in which this config is designed to run, the -->
- <!-- server application merely instantiates a Bus, and does not -->
- <!-- publish any services programmatically -->
- <!-- -->
- <!-- -->
- <!-- Spring-load an HTTPS servant -->
- <!-- -->
- <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint" address="https://localhost:${testutil.ports.BusServer.2}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-9002-tls-config">
- <jaxws:serviceBean>
- <bean class="org.apache.cxf.systest.http.GreeterImpl"/>
- </jaxws:serviceBean>
- </jaxws:server>
- <!-- Non http endpoint -->
- <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpEndpoint" address="http://localhost:${testutil.ports.BusServer.3}/SoapContext/HttpPort" serviceName="s:SOAPService" endpointName="e:HttpsPort">
- <jaxws:serviceBean>
- <bean class="org.apache.cxf.systest.http.GreeterImpl"/>
- </jaxws:serviceBean>
- </jaxws:server>
- <!-- -->
- <!-- TLS Port configuration parameters for port 9002 -->
- <!-- -->
- <httpj:engine-factory id="port-9002-tls-config">
- <httpj:engine port="${testutil.ports.BusServer.2}">
- <httpj:tlsServerParameters>
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/>
- </sec:trustManagers>
- <sec:clientAuthentication want="true" required="true"/>
- <sec:certAlias>bethal</sec:certAlias>
- </httpj:tlsServerParameters>
- </httpj:engine>
- </httpj:engine-factory>
- <!-- -->
- <!-- HTTP/S configuration for clients -->
- <!-- -->
- <http:conduit name="{http://apache.org/hello_world/services}HttpsPort.http-conduit">
- <http:tlsClientParameters disableCNCheck="true">
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Morpit.jks"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/>
- </sec:trustManagers>
- <sec:certAlias>morpit</sec:certAlias>
- </http:tlsClientParameters>
- </http:conduit>
-</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/jaxws-tlsrefs-publish.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/jaxws-tlsrefs-publish.xml b/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/jaxws-tlsrefs-publish.xml
deleted file mode 100644
index 18c2bc8..0000000
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/jaxws-tlsrefs-publish.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd ">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
- <!-- -->
- <!-- This Spring config file is designed to represent a minimal -->
- <!-- configuration for spring-loading a CXF servant, where the -->
- <!-- servant listens using HTTP/S as the transport protocol. -->
- <!-- -->
- <!-- Note that the service endpoint is spring-loaded. In the -->
- <!-- scenario in which this config is designed to run, the -->
- <!-- server application merely instantiates a Bus, and does not -->
- <!-- publish any services programmatically -->
- <!-- -->
- <!-- -->
- <!-- Spring-load an HTTPS servant -->
- <!-- -->
- <jaxws:endpoint xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint" implementor="org.apache.cxf.systest.http.GreeterImpl" address="https://localhost:${testutil.ports.BusServer.1}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-9001-tls-config"/>
- <!-- -->
- <!-- TLS Port configuration parameters for port 9001 -->
- <!-- -->
- <bean id="serverKeyManagers" class="org.apache.cxf.systest.http.HTTPSClientTest$ServerManagersFactory" factory-method="getKeyManagers"/>
- <bean id="serverTrustManagers" class="org.apache.cxf.systest.http.HTTPSClientTest$ServerManagersFactory" factory-method="getTrustManagers"/>
- <httpj:engine-factory id="port-9001-tls-config">
- <httpj:engine port="${testutil.ports.BusServer.1}">
- <httpj:tlsServerParameters>
- <sec:keyManagers ref="serverKeyManagers"/>
- <sec:trustManagers ref="serverTrustManagers"/>
- </httpj:tlsServerParameters>
- </httpj:engine>
- </httpj:engine-factory>
- <!-- -->
- <!-- HTTP/S configuration for clients -->
- <!-- -->
- <bean id="clientKeyManagers" class="org.apache.cxf.systest.http.HTTPSClientTest$ClientManagersFactory" factory-method="getKeyManagers"/>
- <bean id="clientTrustManagers" class="org.apache.cxf.systest.http.HTTPSClientTest$ClientManagersFactory" factory-method="getTrustManagers"/>
- <http:conduit name="{http://apache.org/hello_world/services}HttpsPort.http-conduit">
- <http:tlsClientParameters disableCNCheck="true">
- <sec:keyManagers ref="clientKeyManagers"/>
- <sec:trustManagers ref="clientTrustManagers"/>
- </http:tlsClientParameters>
- </http:conduit>
-</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/pkcs12.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/pkcs12.xml b/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/pkcs12.xml
deleted file mode 100644
index e731f43..0000000
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/pkcs12.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd ">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
- <!-- -->
- <!-- This Spring config file is designed to represent a minimal -->
- <!-- configuration for spring-loading a CXF servant, where the -->
- <!-- servant listens using HTTP/S as the transport protocol. -->
- <!-- -->
- <!-- Note that the service endpoint is spring-loaded. In the -->
- <!-- scenario in which this config is designed to run, the -->
- <!-- server application merely instantiates a Bus, and does not -->
- <!-- publish any services programmatically -->
- <!-- -->
- <!-- This test ensures we can use PKCS12 keystores and PEM truststores -->
- <!-- -->
- <!-- -->
- <!-- Spring-load an HTTPS servant -->
- <!-- -->
- <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint" address="https://localhost:${testutil.ports.BusServer.6}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-9006-tls-config">
- <jaxws:serviceBean>
- <bean class="org.apache.cxf.systest.http.GreeterImpl"/>
- </jaxws:serviceBean>
- </jaxws:server>
- <!-- -->
- <!-- TLS Port configuration parameters for port 9006 -->
- <!-- -->
- <httpj:engine-factory id="port-9006-tls-config">
- <httpj:engine port="${testutil.ports.BusServer.6}">
- <httpj:tlsServerParameters>
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="pkcs12" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Bethal.p12"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:certStore file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.pem"/>
- </sec:trustManagers>
- </httpj:tlsServerParameters>
- </httpj:engine>
- </httpj:engine-factory>
- <!-- -->
- <!-- HTTP/S configuration for clients -->
- <!-- -->
- <http:conduit name="{http://apache.org/hello_world/services}HttpsPort.http-conduit">
- <http:tlsClientParameters disableCNCheck="true">
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="pkcs12" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Morpit.p12"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:certStore file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.pem"/>
- </sec:trustManagers>
- </http:tlsClientParameters>
- </http:conduit>
-</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec-url.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec-url.xml b/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec-url.xml
deleted file mode 100644
index 7275ca1..0000000
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec-url.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://cxf.apach
e.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd ">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
- <!-- -->
- <!-- This Spring config file is designed to represent a minimal -->
- <!-- configuration for spring-loading a CXF servant, where the -->
- <!-- servant listens using HTTP/S as the transport protocol. -->
- <!-- -->
- <!-- Note that the service endpoint is spring-loaded. In the -->
- <!-- scenario in which this config is designed to run, the -->
- <!-- server application merely instantiates a Bus, and does not -->
- <!-- publish any services programmatically -->
- <!-- -->
- <!-- -->
- <!-- Spring-load an HTTPS servant -->
- <!-- -->
- <jaxws:endpoint xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint" implementor="org.apache.cxf.systest.http.GreeterImpl" address="https://localhost:${testutil.ports.BusServer.5}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" wsdlLocation="/wsdl/hello_world_services.wsdl" depends-on="port-9005-tls-config">
- <jaxws:features>
- <cxf:logging/>
- </jaxws:features>
- </jaxws:endpoint>
- <!-- -->
- <!-- TLS Port configuration parameters for port 9005 -->
- <!-- -->
- <!-- This test exercises the resource attribute in a keyStore element -->
- <!-- -->
- <httpj:engine-factory id="port-9005-tls-config">
- <httpj:engine port="${testutil.ports.BusServer.5}">
- <httpj:tlsServerParameters>
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="JKS" password="password" resource="org/apache/cxf/systest/http/resources/Bethal.jks"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:keyStore type="JKS" password="password" resource="org/apache/cxf/systest/http/resources/Truststore.jks"/>
- </sec:trustManagers>
- </httpj:tlsServerParameters>
- </httpj:engine>
- </httpj:engine-factory>
- <!-- -->
- <!-- HTTP/S configuration for clients -->
- <!-- -->
- <!-- This test exercises the resource attribute in a keyStore and certStore element -->
- <!-- -->
- <http:conduit name="https://localhost:.*/SoapContext/HttpsPort">
- <http:tlsClientParameters disableCNCheck="true">
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="pkcs12" password="password" resource="org/apache/cxf/systest/http/resources/Morpit.p12"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:certStore resource="org/apache/cxf/systest/http/resources/Truststore.pem"/>
- </sec:trustManagers>
- </http:tlsClientParameters>
- </http:conduit>
-</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec.xml b/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec.xml
deleted file mode 100644
index 5e0838f..0000000
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd ">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
- <!-- -->
- <!-- This Spring config file is designed to represent a minimal -->
- <!-- configuration for spring-loading a CXF servant, where the -->
- <!-- servant listens using HTTP/S as the transport protocol. -->
- <!-- -->
- <!-- Note that the service endpoint is spring-loaded. In the -->
- <!-- scenario in which this config is designed to run, the -->
- <!-- server application merely instantiates a Bus, and does not -->
- <!-- publish any services programmatically -->
- <!-- -->
- <!-- -->
- <!-- Spring-load an HTTPS servant -->
- <!-- -->
- <jaxws:endpoint xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint" implementor="org.apache.cxf.systest.http.GreeterImpl" address="https://localhost:${testutil.ports.BusServer.4}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-9004-tls-config"/>
- <!-- -->
- <!-- TLS Port configuration parameters for port 9004 -->
- <!-- -->
- <!-- This test exercises the resource attribute in a keyStore element -->
- <!-- -->
- <httpj:engine-factory id="port-9004-tls-config">
- <httpj:engine port="${testutil.ports.BusServer.4}">
- <httpj:tlsServerParameters>
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="JKS" password="password" resource="org/apache/cxf/systest/http/resources/Bethal.jks"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:keyStore type="JKS" password="password" resource="org/apache/cxf/systest/http/resources/Truststore.jks"/>
- </sec:trustManagers>
- </httpj:tlsServerParameters>
- </httpj:engine>
- </httpj:engine-factory>
- <!-- -->
- <!-- HTTP/S configuration for clients -->
- <!-- -->
- <!-- This test exercises the resource attribute in a keyStore and certStore element -->
- <!-- -->
- <http:conduit name="{http://apache.org/hello_world/services}HttpsPort.http-conduit">
- <http:tlsClientParameters disableCNCheck="true">
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="pkcs12" password="password" resource="org/apache/cxf/systest/http/resources/Morpit.p12"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:certStore resource="org/apache/cxf/systest/http/resources/Truststore.pem"/>
- </sec:trustManagers>
- </http:tlsClientParameters>
- </http:conduit>
-</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/cxf_https.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/cxf_https.xml b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/cxf_https.xml
index 8d08fe7..7935ae7 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/cxf_https.xml
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/cxf_https.xml
@@ -26,10 +26,10 @@
<http:client ConnectionTimeout="3000000" ReceiveTimeout="3000000"/>
<http:tlsClientParameters disableCNCheck="true">
<sec:keyManagers keyPassword="password">
- <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Morpit.jks"/>
+ <sec:keyStore type="JKS" password="password" resource="keys/Morpit.jks"/>
</sec:keyManagers>
<sec:trustManagers>
- <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/>
+ <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/>
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/jaxws-server.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/jaxws-server.xml b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/jaxws-server.xml
index 5172d18..9c9ef8d 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/jaxws-server.xml
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/jaxws-server.xml
@@ -36,10 +36,10 @@ under the License.
<httpj:engine port="${testutil.ports.Server.1}">
<httpj:tlsServerParameters>
<sec:keyManagers keyPassword="password">
- <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks"/>
+ <sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/>
</sec:keyManagers>
<sec:trustManagers>
- <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/>
+ <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/>
</sec:trustManagers>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/resources/keys/Bethal.cer
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/keys/Bethal.cer b/systests/transports/src/test/resources/keys/Bethal.cer
new file mode 100644
index 0000000..5ca8252
Binary files /dev/null and b/systests/transports/src/test/resources/keys/Bethal.cer differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/resources/keys/Bethal.jks
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/keys/Bethal.jks b/systests/transports/src/test/resources/keys/Bethal.jks
new file mode 100644
index 0000000..2bf1a9a
Binary files /dev/null and b/systests/transports/src/test/resources/keys/Bethal.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/resources/keys/Bethal.p12
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/keys/Bethal.p12 b/systests/transports/src/test/resources/keys/Bethal.p12
new file mode 100644
index 0000000..c47515e
Binary files /dev/null and b/systests/transports/src/test/resources/keys/Bethal.p12 differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/resources/keys/Gordy.cer
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/keys/Gordy.cer b/systests/transports/src/test/resources/keys/Gordy.cer
new file mode 100644
index 0000000..6cabd2a
Binary files /dev/null and b/systests/transports/src/test/resources/keys/Gordy.cer differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/resources/keys/Gordy.jks
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/keys/Gordy.jks b/systests/transports/src/test/resources/keys/Gordy.jks
new file mode 100644
index 0000000..b067db0
Binary files /dev/null and b/systests/transports/src/test/resources/keys/Gordy.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/resources/keys/Morpit.jks
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/keys/Morpit.jks b/systests/transports/src/test/resources/keys/Morpit.jks
new file mode 100644
index 0000000..95626a7
Binary files /dev/null and b/systests/transports/src/test/resources/keys/Morpit.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/resources/keys/Morpit.p12
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/keys/Morpit.p12 b/systests/transports/src/test/resources/keys/Morpit.p12
new file mode 100644
index 0000000..f37acff
Binary files /dev/null and b/systests/transports/src/test/resources/keys/Morpit.p12 differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/resources/keys/Poltim.cer
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/keys/Poltim.cer b/systests/transports/src/test/resources/keys/Poltim.cer
new file mode 100644
index 0000000..cfb2cc5
Binary files /dev/null and b/systests/transports/src/test/resources/keys/Poltim.cer differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/resources/keys/Poltim.jks
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/keys/Poltim.jks b/systests/transports/src/test/resources/keys/Poltim.jks
new file mode 100644
index 0000000..570e071
Binary files /dev/null and b/systests/transports/src/test/resources/keys/Poltim.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/resources/keys/Tarpin.cer
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/keys/Tarpin.cer b/systests/transports/src/test/resources/keys/Tarpin.cer
new file mode 100644
index 0000000..37edcac
Binary files /dev/null and b/systests/transports/src/test/resources/keys/Tarpin.cer differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/resources/keys/Tarpin.jks
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/keys/Tarpin.jks b/systests/transports/src/test/resources/keys/Tarpin.jks
new file mode 100644
index 0000000..329af6a
Binary files /dev/null and b/systests/transports/src/test/resources/keys/Tarpin.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/resources/keys/Truststore.jks
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/keys/Truststore.jks b/systests/transports/src/test/resources/keys/Truststore.jks
new file mode 100644
index 0000000..e76a076
Binary files /dev/null and b/systests/transports/src/test/resources/keys/Truststore.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/resources/keys/Truststore.pem
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/keys/Truststore.pem b/systests/transports/src/test/resources/keys/Truststore.pem
new file mode 100644
index 0000000..1b25477
--- /dev/null
+++ b/systests/transports/src/test/resources/keys/Truststore.pem
@@ -0,0 +1,60 @@
+-----BEGIN CERTIFICATE-----
+MIICIDCCAYkCBEYRaYcwDQYJKoZIhvcNAQEEBQAwVzELMAkGA1UEBhMCVVMxETAPBgNVBAcTCFN5
+cmFjdXNlMRMwEQYDVQQKEwpBcGFjaGVUZXN0MQ8wDQYDVQQLEwZCZXRoYWwxDzANBgNVBAMTBkJl
+dGhhbDAeFw0wNzA0MDIyMDM3MjdaFw0zNDA4MTgyMDM3MjdaMFcxCzAJBgNVBAYTAlVTMREwDwYD
+VQQHEwhTeXJhY3VzZTETMBEGA1UEChMKQXBhY2hlVGVzdDEPMA0GA1UECxMGQmV0aGFsMQ8wDQYD
+VQQDEwZCZXRoYWwwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAJHOyFu8tTt4g9tBv0bY8c4K
+uidfMlHbFQAukIFXLkR4xu5IxG5OI53ZE0F6rqcPFve1sdEV9h+MxmzqQbo180Wyv1rUEq2AScK3
+6bo0ALuZsreQQmNVGBOjxBpTtrRErRfNJe1mvzNMz9VlGdSNWW17CrBz9kmz6G1EWg8aGfZHAgMB
+AAEwDQYJKoZIhvcNAQEEBQADgYEAbw+VwP1tnBm3cFLFgONnGCozN8XqV2M0OklJ5lBDJL7BV2Ng
+BtTZ8as9jTGYdjetKQXX75wWL7OS7vnkm/9tbr/vNBljT0OP0Yr2X7TAbDdhFfsk/D5mBpXdzXz2
+wqxVZjj6sm5zvwC32e4AxGG0edmY1DN9VMZzA/FrzBP0qoE=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICHDCCAYUCBEYRaYkwDQYJKoZIhvcNAQEEBQAwVTELMAkGA1UEBhMCVVMxETAPBgNVBAcTCFN5
+cmFjdXNlMRMwEQYDVQQKEwpBcGFjaGVUZXN0MQ4wDAYDVQQLEwVHb3JkeTEOMAwGA1UEAxMFR29y
+ZHkwHhcNMDcwNDAyMjAzNzI5WhcNMzQwODE4MjAzNzI5WjBVMQswCQYDVQQGEwJVUzERMA8GA1UE
+BxMIU3lyYWN1c2UxEzARBgNVBAoTCkFwYWNoZVRlc3QxDjAMBgNVBAsTBUdvcmR5MQ4wDAYDVQQD
+EwVHb3JkeTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqIbNth+G4Q5tkZvoUZdQsY9RnjAA
+mgKVBUaOVvv//qOniOTskLqBFyKGoMpbCfNAU7/zVKP5fLTLccLdJyCagKGrs1ZmKaNiTRcOnfkE
+3dHnEIp83+hNmASGsrZcyLihtro1N3pMTuXbXzu7x3F2U7fxYFg66iviTEGF6T7dY3MCAwEAATAN
+BgkqhkiG9w0BAQQFAAOBgQBPjsYFdqz0JF9shNpvke/H1eHqhyXJgPdHdCu/ewRO2wV6I9WBrGNU
+cmmKZmAUsv99Y0Tpz59uEXFcM3cBZU4/obw3DlwwWmaVMoIwQ2Nd2FChC6uyKIJ0Bvpx+aDxjm48
+b8c58EHCcU2FRo/nVWctJL9xJ7oBrke5GZrBlUF+rA==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICNDCCAZ0CBEYRaY4wDQYJKoZIhvcNAQEEBQAwYTELMAkGA1UEBhMCVVMxETAPBgNVBAcTCFN5
+cmFjdXNlMRMwEQYDVQQKEwpBcGFjaGVUZXN0MQ8wDQYDVQQLEwZNb3JwaXQxGTAXBgNVBAMTEHdo
+YXRldmVyaG9zdC5jb20wHhcNMDcwNDAyMjAzNzM0WhcNMzQwODE4MjAzNzM0WjBhMQswCQYDVQQG
+EwJVUzERMA8GA1UEBxMIU3lyYWN1c2UxEzARBgNVBAoTCkFwYWNoZVRlc3QxDzANBgNVBAsTBk1v
+cnBpdDEZMBcGA1UEAxMQd2hhdGV2ZXJob3N0LmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkC
+gYEAk4FbJxfjllrApiECK5oRbgmTC1exx59HWck20R2AYU6kIkdZa78Ca+oc/zaPCtsVL/QZbjHE
+7lnvVK55tnpGW9qzLxsAHZmYyA/4Wdmcbz/Niwsfm062z94+AKMCGum/1Ug1QZUiRKweZTRBHhmT
+VsxSDEGTTi6UVim6nv47ZlcCAwEAATANBgkqhkiG9w0BAQQFAAOBgQAjWR/W+YO0I5sBlb+zNTbJ
+TPs4CqM4UHQS+prOx59R134FbocgkGncm00FBrO857KJHdSCRjOUUpc3S+MP13FGqSQm2Q0lNjUV
+IygvdZ+BATfgsJ92NbnuIhIVAA+i8AVZK//qPRCMz1Rdm1G994qCw3A4lQMi5eqKYYwqkRJeXw==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICIDCCAYkCBEYRaYwwDQYJKoZIhvcNAQEEBQAwVzELMAkGA1UEBhMCVVMxETAPBgNVBAcTCFN5
+cmFjdXNlMRMwEQYDVQQKEwpBcGFjaGVUZXN0MQ8wDQYDVQQLEwZQb2x0aW0xDzANBgNVBAMTBlBv
+bHRpbTAeFw0wNzA0MDIyMDM3MzJaFw0zNDA4MTgyMDM3MzJaMFcxCzAJBgNVBAYTAlVTMREwDwYD
+VQQHEwhTeXJhY3VzZTETMBEGA1UEChMKQXBhY2hlVGVzdDEPMA0GA1UECxMGUG9sdGltMQ8wDQYD
+VQQDEwZQb2x0aW0wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAL/bdivrpaR4Njvo7WB4ipEh
+422V2bAyapFvgOq/tHusGR/e3wH0v9g+9xwnNyqFjhueceuWahXAvNHvknuUaelW0346Aay0fBAu
+EsyowWBTVi/pU+iZleN9FD8uBalY1s6e+xqu+yckhHuBP77TcTar1hBjCIfy2Eo2YevDL6qlAgMB
+AAEwDQYJKoZIhvcNAQEEBQADgYEAuT7QoNfGG7GjfQuU/oYj5vHPH7nPhLtkQBVTEi0WyzgJUXie
+rNG/u4VEZtNtK4+4J5tQyb4YtP2GPUUpWrhusKUaW4eMU79rzpUbZnGUBzTbth8kBoN9xHzXiSop
+ohPdOnGo5ZjThZnLEn/o9doUEX64o4eauu15SPoDLzSfLJ0=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICIDCCAYkCBEYRaYswDQYJKoZIhvcNAQEEBQAwVzELMAkGA1UEBhMCVVMxETAPBgNVBAcTCFN5
+cmFjdXNlMRMwEQYDVQQKEwpBcGFjaGVUZXN0MQ8wDQYDVQQLEwZUYXJwaW4xDzANBgNVBAMTBlRh
+cnBpbjAeFw0wNzA0MDIyMDM3MzFaFw0zNDA4MTgyMDM3MzFaMFcxCzAJBgNVBAYTAlVTMREwDwYD
+VQQHEwhTeXJhY3VzZTETMBEGA1UEChMKQXBhY2hlVGVzdDEPMA0GA1UECxMGVGFycGluMQ8wDQYD
+VQQDEwZUYXJwaW4wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKGG8UtWnHyWKFVDJSuSlhT/
+vKxrPjfNBtvdaiQx5gNAlc8QVL5lPOXcJljTF3dEb0QQ1ajai3kC71NE2ABOrxk7Jvk3bEma5Yfy
+U3m/OBthL9H8kE3O3+bh4K2LTsRwIa2Zd1wYbj44vUxsiHhzxer3q3FDfLxsqtahsxz7WjG1AgMB
+AAEwDQYJKoZIhvcNAQEEBQADgYEAE6EWRbYxGOlwmtpv0XE4FwbXYdSDArc+ArhOJWKTzoE3U9l8
+kg1wJL49VXEmVIxpipXKs7d9lpIVLPFsbBVJRZwH8sgHE39nTjfeyHNmwZcd63Lrn+2RydkAo5P9
+FYi8HFGEM5dON4PSo3Et6ycHy1IrS8htrNu+FoW84FRTKDA=
+-----END CERTIFICATE-----
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/resources/keys/genkeys.sh
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/keys/genkeys.sh b/systests/transports/src/test/resources/keys/genkeys.sh
new file mode 100755
index 0000000..a01a569
--- /dev/null
+++ b/systests/transports/src/test/resources/keys/genkeys.sh
@@ -0,0 +1,53 @@
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+#
+# This file generates a number of keys/certificates and keystores for
+# names to be used with corresponding CXF configuration files (*.cxf).
+#
+
+#
+# Start with a clean slate. Remove all keystores.
+#
+rm -f *.jks
+rm -f Truststore.pem
+
+#
+# This function generates a key/self-signed certificate with the following DN.
+# "CN=$1, OU=$2, O=ApacheTest, L=Syracuse, C=US" and adds it to
+# the truststore.
+#
+function genkey {
+ keytool -genkey -alias $2 -keystore $2.jks -dname "CN=$1, OU=$2, O=ApacheTest, L=Syracuse, C=US" -keyalg RSA -keypass password -storepass password -storetype jks -validity 10000
+ keytool -export -file $2.cer -alias $2 -keystore $2.jks -storepass password
+ keytool -import -file $2.cer -alias $2 -noprompt -keystore Truststore.jks -storepass password
+}
+
+#
+# We generate keys/certificates with the following CN=<name> OU=<name>
+# The CN used to be "localhost" to conform to the default HostnameVerifier of
+# HttpsURLConnection so it would work for tests. However, we have enhanced
+# the HTTP Conduit logic to accept anything in the CN in favor of the
+# MessageTrustDecider callback making the verification determination.
+#
+for name in Bethal Gordy Tarpin Poltim Morpit
+do
+ genkey $name $name
+ keytool -export -keystore Truststore.jks -storepass password -alias $i -rfc >> Truststore.pem
+done
+
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/resources/org/apache/cxf/systest/http/Abost.cxf
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Abost.cxf b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Abost.cxf
new file mode 100644
index 0000000..c3cf97f
--- /dev/null
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Abost.cxf
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<!--
+ ** This file configures the Abost Server.
+ ** It is an http server that redirects to Hurlon.
+ -->
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
+ xsi:schemaLocation="
+ http://cxf.apache.org/configuration/security
+ http://cxf.apache.org/schemas/configuration/security.xsd
+ http://cxf.apache.org/transports/http/configuration
+ http://cxf.apache.org/schemas/configuration/http-conf.xsd
+ http://cxf.apache.org/transports/http-jetty/configuration
+ http://cxf.apache.org/schemas/configuration/http-jetty.xsd
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
+ <http:destination name="{http://apache.org/hello_world}Abost.http-destination">
+ <http:server RedirectURL="http://localhost:${testutil.ports.BusServer.6}/Hurlon"/>
+ </http:destination>
+
+</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/resources/org/apache/cxf/systest/http/Bethal.cxf
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Bethal.cxf b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Bethal.cxf
new file mode 100644
index 0000000..d41cf7a
--- /dev/null
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Bethal.cxf
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<!--
+ ** This file configures the Bethal Server.
+ ** It is an https server that conditionally responds
+ ** with 401s.
+ -->
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
+ xsi:schemaLocation="
+ http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
+ http://cxf.apache.org/configuration/security
+ http://cxf.apache.org/schemas/configuration/security.xsd
+ http://cxf.apache.org/transports/http/configuration
+ http://cxf.apache.org/schemas/configuration/http-conf.xsd
+ http://cxf.apache.org/transports/http-jetty/configuration
+ http://cxf.apache.org/schemas/configuration/http-jetty.xsd
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
+ <http:destination
+ name="{http://apache.org/hello_world}Bethal.http-destination">
+ </http:destination>
+
+ <httpj:engine-factory bus="cxf">
+ <httpj:engine port="${testutil.ports.BusServer.2}">
+ <httpj:tlsServerParameters>
+ <sec:keyManagers keyPassword="OBF:1v2j1uum1xtv1zej1zer1xtn1uvk1v1v">
+ <sec:keyStore type="JKS" password="OBF:1v2j1uum1xtv1zej1zer1xtn1uvk1v1v"
+ resource="keys/Bethal.jks"/>
+ </sec:keyManagers>
+ <sec:trustManagers>
+ <sec:keyStore type="JKS" password="OBF:1v2j1uum1xtv1zej1zer1xtn1uvk1v1v"
+ resource="keys/Truststore.jks"/>
+ </sec:trustManagers>
+ <sec:cipherSuitesFilter>
+ <!-- these filters ensure that a ciphersuite with
+ export-suitable or null encryption is used,
+ but exclude anonymous Diffie-Hellman key change as
+ this is vulnerable to man-in-the-middle attacks -->
+ <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="true"/>
+ </httpj:tlsServerParameters>
+ </httpj:engine>
+ </httpj:engine-factory>
+
+ <cxf:bus>
+ <cxf:inInterceptors>
+ <bean class="org.apache.cxf.systest.http.PushBack401"/>
+ </cxf:inInterceptors>
+ </cxf:bus>
+
+</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/resources/org/apache/cxf/systest/http/BethalClientBeans.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/BethalClientBeans.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/http/BethalClientBeans.xml
new file mode 100644
index 0000000..9ed185f
--- /dev/null
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/http/BethalClientBeans.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xs
d">
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <import resource="classpath:org/apache/cxf/systest/http/BethalClientConfig.cxf"/>
+ <jaxws:client xmlns:s="http://apache.org/hello_world" id="Bethal" serviceClass="org.apache.hello_world.Greeter" serviceName="s:SOAPService" endpointName="s:Bethal" address="https://localhost:${testutil.ports.BusServer.2}/Bethal"/>
+</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/resources/org/apache/cxf/systest/http/BethalClientConfig.cxf
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/BethalClientConfig.cxf b/systests/transports/src/test/resources/org/apache/cxf/systest/http/BethalClientConfig.cxf
new file mode 100644
index 0000000..a3d65e2
--- /dev/null
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/http/BethalClientConfig.cxf
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
+ xsi:schemaLocation="
+ http://cxf.apache.org/configuration/security
+ http://cxf.apache.org/schemas/configuration/security.xsd
+ http://cxf.apache.org/transports/http/configuration
+ http://cxf.apache.org/schemas/configuration/http-conf.xsd
+ http://cxf.apache.org/transports/http-jetty/configuration
+ http://cxf.apache.org/schemas/configuration/http-jetty.xsd
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
+ <http:conduit name="{http://apache.org/hello_world}Bethal.http-conduit">
+
+ <http:tlsClientParameters disableCNCheck="true">
+ <sec:keyManagers keyPassword="password">
+ <sec:keyStore type="JKS" password="password"
+ resource="keys/Morpit.jks"/>
+ </sec:keyManagers>
+ <sec:trustManagers>
+ <sec:keyStore type="JKS" password="password"
+ resource="keys/Truststore.jks"/>
+ </sec:trustManagers>
+ <sec:cipherSuitesFilter>
+ <!-- these filters ensure that a ciphersuite with
+ export-suitable or null encryption is used,
+ but exclude anonymous Diffie-Hellman key change as
+ this is vulnerable to man-in-the-middle attacks -->
+ <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>
+ </http:tlsClientParameters>
+ <http:authorization>
+ <sec:UserName>Betty</sec:UserName>
+ <sec:Password>password</sec:Password>
+ </http:authorization>
+ <http:client AutoRedirect="true" Connection="Keep-Alive"/>
+
+ </http:conduit>
+
+</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/resources/org/apache/cxf/systest/http/Gordy.cxf
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Gordy.cxf b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Gordy.cxf
new file mode 100644
index 0000000..aada724
--- /dev/null
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Gordy.cxf
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<!--
+ ** This file configures the Gordy Server.
+ ** It is an https server that redirects to Bethal.
+ -->
+
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
+ xsi:schemaLocation="
+ http://cxf.apache.org/configuration/security
+ http://cxf.apache.org/schemas/configuration/security.xsd
+ http://cxf.apache.org/transports/http/configuration
+ http://cxf.apache.org/schemas/configuration/http-conf.xsd
+ http://cxf.apache.org/transports/http-jetty/configuration
+ http://cxf.apache.org/schemas/configuration/http-jetty.xsd
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
+ <http:destination
+ name="{http://apache.org/hello_world}Gordy.http-destination">
+ <http:server RedirectURL="https://localhost:${testutil.ports.BusServer.2}/Bethal"/>
+ </http:destination>
+
+ <httpj:engine-factory bus="cxf">
+ <httpj:engine port="${testutil.ports.BusServer.1}">
+ <httpj:tlsServerParameters>
+ <sec:keyManagers keyPassword="password">
+ <sec:keyStore type="JKS" password="password"
+ resource="keys/Gordy.jks"/>
+ </sec:keyManagers>
+ <sec:trustManagers>
+ <sec:keyStore type="JKS" password="password"
+ resource="keys/Truststore.jks"/>
+ </sec:trustManagers>
+ <sec:cipherSuitesFilter>
+ <!-- these filters ensure that a ciphersuite with
+ export-suitable or null encryption is used,
+ but exclude anonymous Diffie-Hellman key change as
+ this is vulnerable to man-in-the-middle attacks -->
+ <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="true"/>
+ </httpj:tlsServerParameters>
+ </httpj:engine>
+ </httpj:engine-factory>
+
+</beans>
[2/5] cxf git commit: Initial refactor of transports systests
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/resources/org/apache/cxf/systest/http/Http2HttpLoopRedirectFail.cxf
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Http2HttpLoopRedirectFail.cxf b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Http2HttpLoopRedirectFail.cxf
new file mode 100644
index 0000000..521cb0e
--- /dev/null
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Http2HttpLoopRedirectFail.cxf
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
+ xsi:schemaLocation="
+ http://cxf.apache.org/configuration/security
+ http://cxf.apache.org/schemas/configuration/security.xsd
+ http://cxf.apache.org/transports/http/configuration
+ http://cxf.apache.org/schemas/configuration/http-conf.xsd
+ http://cxf.apache.org/transports/http-jetty/configuration
+ http://cxf.apache.org/schemas/configuration/http-jetty.xsd
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
+ <http:conduit name="{http://apache.org/hello_world}Hurlon.http-conduit">
+
+ <http:client AutoRedirect="true"/>
+
+ </http:conduit>
+
+</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/resources/org/apache/cxf/systest/http/Http2HttpRedirect.cxf
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Http2HttpRedirect.cxf b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Http2HttpRedirect.cxf
new file mode 100644
index 0000000..e9bd45a
--- /dev/null
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Http2HttpRedirect.cxf
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<!--
+ ** This file configures the Http2HttpRedirect Client.
+ -->
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
+ xsi:schemaLocation="
+ http://cxf.apache.org/configuration/security
+ http://cxf.apache.org/schemas/configuration/security.xsd
+ http://cxf.apache.org/transports/http/configuration
+ http://cxf.apache.org/schemas/configuration/http-conf.xsd
+ http://cxf.apache.org/transports/http-jetty/configuration
+ http://cxf.apache.org/schemas/configuration/http-jetty.xsd
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+ <http:conduit name="{http://apache.org/hello_world}Rethwel.http-conduit">
+
+ <http:client AutoRedirect="true"/>
+
+ </http:conduit>
+
+</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/resources/org/apache/cxf/systest/http/Hurlon.cxf
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Hurlon.cxf b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Hurlon.cxf
new file mode 100644
index 0000000..9fe2240
--- /dev/null
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Hurlon.cxf
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<!--
+ ** This file configures the Hurlon Server.
+ ** It is an http server that redirects to Abost.
+ -->
+
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
+ xsi:schemaLocation="
+ http://cxf.apache.org/configuration/security
+ http://cxf.apache.org/schemas/configuration/security.xsd
+ http://cxf.apache.org/transports/http/configuration
+ http://cxf.apache.org/schemas/configuration/http-conf.xsd
+ http://cxf.apache.org/transports/http-jetty/configuration
+ http://cxf.apache.org/schemas/configuration/http-jetty.xsd
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
+ <http:destination name="{http://apache.org/hello_world}Hurlon.http-destination">
+ <http:server RedirectURL="http://localhost:${testutil.ports.BusServer.7}/Abost"/>
+ </http:destination>
+
+</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/resources/org/apache/cxf/systest/http/Morpit.cxf
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Morpit.cxf b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Morpit.cxf
new file mode 100644
index 0000000..4c830e7
--- /dev/null
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Morpit.cxf
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<!--
+ ** This file configures the Morpit Server. It is just an
+ ** Https server with a name that will kick in the HostnameVerifier.
+ -->
+
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
+ xsi:schemaLocation="
+ http://cxf.apache.org/configuration/security
+ http://cxf.apache.org/schemas/configuration/security.xsd
+ http://cxf.apache.org/transports/http/configuration
+ http://cxf.apache.org/schemas/configuration/http-conf.xsd
+ http://cxf.apache.org/transports/http-jetty/configuration
+ http://cxf.apache.org/schemas/configuration/http-jetty.xsd
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
+ <http:destination name="{http://apache.org/hello_world}GreeterImplPort.http-destination">
+ </http:destination>
+
+ <httpj:engine-factory bus="cxf">
+ <httpj:engine port="${testutil.ports.BusServer.8}">
+ <httpj:tlsServerParameters>
+ <sec:keyManagers keyPassword="password">
+ <sec:keyStore type="JKS" password="password"
+ resource="keys/Morpit.jks"/>
+ </sec:keyManagers>
+ <sec:trustManagers>
+ <sec:keyStore type="JKS" password="password"
+ resource="keys/Truststore.jks"/>
+ </sec:trustManagers>
+ <sec:cipherSuitesFilter>
+ <!-- these filters ensure that a ciphersuite with
+ export-suitable or null encryption is used,
+ but exclude anonymous Diffie-Hellman key change as
+ this is vulnerable to man-in-the-middle attacks -->
+ <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="true"/>
+ </httpj:tlsServerParameters>
+ </httpj:engine>
+ </httpj:engine-factory>
+
+</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/resources/org/apache/cxf/systest/http/Mortimer.cxf
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Mortimer.cxf b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Mortimer.cxf
new file mode 100644
index 0000000..4a26c85
--- /dev/null
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Mortimer.cxf
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<!--
+ ** This file configures the Mortimer Server.
+ ** It is an http server.
+ -->
+
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
+ xsi:schemaLocation="
+ http://cxf.apache.org/configuration/security
+ http://cxf.apache.org/schemas/configuration/security.xsd
+ http://cxf.apache.org/transports/http/configuration
+ http://cxf.apache.org/schemas/configuration/http-conf.xsd
+ http://cxf.apache.org/transports/http-jetty/configuration
+ http://cxf.apache.org/schemas/configuration/http-jetty.xsd
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+ <http:destination name="{http://apache.org/hello_world}Mortimer.http-destination">
+ <!-- Nothing to Configure here for Mortimer -->
+ </http:destination>
+
+</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/resources/org/apache/cxf/systest/http/Poltim.cxf
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Poltim.cxf b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Poltim.cxf
new file mode 100644
index 0000000..b383889
--- /dev/null
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Poltim.cxf
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<!--
+ ** This file configures the Poltim Server.
+ ** It is an https server that redirects to Mortimer.
+ -->
+
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
+ xsi:schemaLocation="
+ http://cxf.apache.org/configuration/security
+ http://cxf.apache.org/schemas/configuration/security.xsd
+ http://cxf.apache.org/transports/http/configuration
+ http://cxf.apache.org/schemas/configuration/http-conf.xsd
+ http://cxf.apache.org/transports/http-jetty/configuration
+ http://cxf.apache.org/schemas/configuration/http-jetty.xsd
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
+ <http:destination name="{http://apache.org/hello_world}Poltim.http-destination">
+ <http:server RedirectURL="http://localhost:${testutil.ports.BusServer.0}/Mortimer"/>
+ </http:destination>
+
+ <httpj:engine-factory bus="cxf">
+ <httpj:engine port="${testutil.ports.BusServer.5}">
+ <httpj:tlsServerParameters>
+ <sec:keyManagers keyPassword="password">
+ <sec:keyStore type="JKS" password="password"
+ resource="keys/Poltim.jks"/>
+ </sec:keyManagers>
+ <sec:trustManagers>
+ <sec:keyStore type="JKS" password="password"
+ resource="keys/Truststore.jks"/>
+ </sec:trustManagers>
+ <sec:cipherSuitesFilter>
+ <!-- these filters ensure that a ciphersuite with
+ export-suitable or null encryption is used,
+ but exclude anonymous Diffie-Hellman key change as
+ this is vulnerable to man-in-the-middle attacks -->
+ <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="true"/>
+ </httpj:tlsServerParameters>
+ </httpj:engine>
+ </httpj:engine-factory>
+
+</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/resources/org/apache/cxf/systest/http/Rethwel.cxf
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Rethwel.cxf b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Rethwel.cxf
new file mode 100644
index 0000000..c4da8f3
--- /dev/null
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Rethwel.cxf
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<!--
+ ** This file configures the Rethwel Server.
+ ** It is an http server that redirects to Mortimer.
+ -->
+
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
+ xsi:schemaLocation="
+ http://cxf.apache.org/configuration/security
+ http://cxf.apache.org/schemas/configuration/security.xsd
+ http://cxf.apache.org/transports/http/configuration
+ http://cxf.apache.org/schemas/configuration/http-conf.xsd
+ http://cxf.apache.org/transports/http-jetty/configuration
+ http://cxf.apache.org/schemas/configuration/http-jetty.xsd
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
+ <http:destination name="{http://apache.org/hello_world}Rethwel.http-destination">
+
+ <http:server RedirectURL="http://localhost:${testutil.ports.BusServer.0}/Mortimer"/>
+ </http:destination>
+
+</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/resources/org/apache/cxf/systest/http/SessionServer.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/SessionServer.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/http/SessionServer.xml
new file mode 100644
index 0000000..01060a8
--- /dev/null
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/http/SessionServer.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation=" http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/be
ans/spring-beans.xsd">
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <httpj:engine-factory bus="cxf">
+ <httpj:engine port="${testutil.ports.SessionServer}">
+ <httpj:sessionSupport>true</httpj:sessionSupport>
+ <httpj:reuseAddress>false</httpj:reuseAddress>
+ </httpj:engine>
+ </httpj:engine-factory>
+ <jaxws:endpoint address="http://localhost:${testutil.ports.SessionServer}/SoapContext/GreeterPort" implementor="org.apache.cxf.systest.http.GreeterSessionImpl">
+ <jaxws:properties>
+ <entry key="org.apache.cxf.oneway.robust" value="true"/>
+ </jaxws:properties>
+ </jaxws:endpoint>
+ <jaxws:endpoint address="http://localhost:${testutil.ports.SessionServer}/Stateful1" implementorClass="org.apache.cxf.systest.http.StatefulGreeterImpl">
+ <jaxws:invoker>
+ <bean class="org.apache.cxf.jaxws.JAXWSMethodInvoker">
+ <constructor-arg>
+ <bean class="org.apache.cxf.service.invoker.SessionFactory">
+ <constructor-arg value="org.apache.cxf.systest.http.StatefulGreeterImpl"/>
+ </bean>
+ </constructor-arg>
+ </bean>
+ </jaxws:invoker>
+ </jaxws:endpoint>
+ <jaxws:endpoint address="http://localhost:${testutil.ports.SessionServer}/Stateful2" implementorClass="org.apache.cxf.systest.http.SessionAnnotationGreeterImpl"/>
+ <jaxws:endpoint address="http://localhost:${testutil.ports.SessionServer}/PerRequest" implementorClass="org.apache.cxf.systest.http.PerRequestAnnotationGreeterImpl"/>
+ <bean id="SpringBean" class="org.apache.cxf.systest.http.SpringAnnotationGreeterImpl"/>
+ <jaxws:endpoint address="http://localhost:${testutil.ports.SessionServer}/SpringBean" implementorClass="org.apache.cxf.systest.http.SpringAnnotationGreeterImpl"/>
+</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/resources/org/apache/cxf/systest/http/Tarpin.cxf
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Tarpin.cxf b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Tarpin.cxf
new file mode 100644
index 0000000..bbe6d72
--- /dev/null
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Tarpin.cxf
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<!--
+ ** This file configures the Tarpin Server.
+ ** It is an https server that redirects to Gordy.
+ -->
+
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+ xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
+ xsi:schemaLocation="
+ http://cxf.apache.org/configuration/security
+ http://cxf.apache.org/schemas/configuration/security.xsd
+ http://cxf.apache.org/transports/http/configuration
+ http://cxf.apache.org/schemas/configuration/http-conf.xsd
+ http://cxf.apache.org/transports/http-jetty/configuration
+ http://cxf.apache.org/schemas/configuration/http-jetty.xsd
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
+ <http:destination name="{http://apache.org/hello_world}Tarpin.http-destination">
+ <http:server RedirectURL="https://localhost:${testutil.ports.BusServer.1}/Gordy"/>
+ </http:destination>
+
+ <httpj:engine-factory bus="cxf">
+ <httpj:engine port="${testutil.ports.BusServer.3}">
+ <httpj:tlsServerParameters>
+ <sec:keyManagers keyPassword="password">
+ <sec:keyStore type="JKS" password="password"
+ file="src/test/resources/keys/Tarpin.jks"/>
+ </sec:keyManagers>
+ <sec:trustManagers>
+ <sec:keyStore type="JKS" password="password"
+ file="src/test/resources/keys/Truststore.jks"/>
+ </sec:trustManagers>
+ <sec:cipherSuitesFilter>
+ <!-- these filters ensure that a ciphersuite with
+ export-suitable or null encryption is used,
+ but exclude anonymous Diffie-Hellman key change as
+ this is vulnerable to man-in-the-middle attacks -->
+ <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="true"/>
+ </httpj:tlsServerParameters>
+ </httpj:engine>
+ </httpj:engine-factory>
+
+</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/resources/org/apache/cxf/systest/http/greeting.wsdl
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/greeting.wsdl b/systests/transports/src/test/resources/org/apache/cxf/systest/http/greeting.wsdl
new file mode 100644
index 0000000..c12bdfe
--- /dev/null
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/http/greeting.wsdl
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<wsdl:definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://apache.org/hello_world" xmlns:x1="http://apache.org/hello_world/types" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="HelloWorld" targetNamespace="http://apache.org/hello_world">
+ <wsdl:types>
+ <schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://apache.org/hello_world/types" targetNamespace="http://apache.org/hello_world/types" elementFormDefault="qualified">
+ <simpleType name="MyStringType">
+ <restriction base="string">
+ <maxLength value="30"/>
+ </restriction>
+ </simpleType>
+ <element name="sayHi">
+ <complexType/>
+ </element>
+ <element name="sayHiResponse">
+ <complexType>
+ <sequence>
+ <element name="responseType" type="string"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="greetMe">
+ <complexType>
+ <sequence>
+ <element name="requestType" type="tns:MyStringType"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="greetMeResponse">
+ <complexType>
+ <sequence>
+ <element name="responseType" type="string"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="pingMe">
+ <complexType/>
+ </element>
+ <element name="pingMeResponse">
+ <complexType/>
+ </element>
+ <element name="faultDetail">
+ <complexType>
+ <sequence>
+ <element name="minor" type="short"/>
+ <element name="major" type="short"/>
+ </sequence>
+ </complexType>
+ </element>
+ </schema>
+ </wsdl:types>
+ <wsdl:message name="sayHiRequest">
+ <wsdl:part element="x1:sayHi" name="in"/>
+ </wsdl:message>
+ <wsdl:message name="sayHiResponse">
+ <wsdl:part element="x1:sayHiResponse" name="out"/>
+ </wsdl:message>
+ <wsdl:message name="greetMeRequest">
+ <wsdl:part element="x1:greetMe" name="in"/>
+ </wsdl:message>
+ <wsdl:message name="greetMeResponse">
+ <wsdl:part element="x1:greetMeResponse" name="out"/>
+ </wsdl:message>
+ <wsdl:message name="pingMeRequest">
+ <wsdl:part name="in" element="x1:pingMe"/>
+ </wsdl:message>
+ <wsdl:message name="pingMeResponse">
+ <wsdl:part name="out" element="x1:pingMeResponse"/>
+ </wsdl:message>
+ <wsdl:message name="pingMeFault">
+ <wsdl:part name="faultDetail" element="x1:faultDetail"/>
+ </wsdl:message>
+ <wsdl:portType name="Greeter">
+ <wsdl:operation name="sayHi">
+ <wsdl:input message="tns:sayHiRequest" name="sayHiRequest"/>
+ <wsdl:output message="tns:sayHiResponse" name="sayHiResponse"/>
+ </wsdl:operation>
+ <wsdl:operation name="greetMe">
+ <wsdl:input message="tns:greetMeRequest" name="greetMeRequest"/>
+ <wsdl:output message="tns:greetMeResponse" name="greetMeResponse"/>
+ </wsdl:operation>
+ <wsdl:operation name="pingMe">
+ <wsdl:input name="pingMeRequest" message="tns:pingMeRequest"/>
+ <wsdl:output name="pingMeResponse" message="tns:pingMeResponse"/>
+ <wsdl:fault name="pingMeFault" message="tns:pingMeFault"/>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="Greeter_SOAPBinding" type="tns:Greeter">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="sayHi">
+ <soap:operation soapAction="" style="document"/>
+ <wsdl:input name="sayHiRequest">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="sayHiResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="greetMe">
+ <soap:operation soapAction="" style="document"/>
+ <wsdl:input name="greetMeRequest">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="greetMeResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="pingMe">
+ <soap:operation style="document"/>
+ <wsdl:input>
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal"/>
+ </wsdl:output>
+ <wsdl:fault name="pingMeFault">
+ <soap:fault name="pingMeFault" use="literal"/>
+ </wsdl:fault>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="SOAPService">
+ <wsdl:port binding="tns:Greeter_SOAPBinding" name="Mortimer">
+ <soap:address location="http://localhost:9000/Mortimer"/>
+ </wsdl:port>
+ <wsdl:port binding="tns:Greeter_SOAPBinding" name="Tarpin">
+ <soap:address location="https://localhost:9003/Tarpin"/>
+ </wsdl:port>
+ <wsdl:port binding="tns:Greeter_SOAPBinding" name="Rethwel">
+ <soap:address location="http://localhost:9004/Rethwel"/>
+ </wsdl:port>
+ <wsdl:port binding="tns:Greeter_SOAPBinding" name="Gordy">
+ <soap:address location="https://localhost:9001/Gordy"/>
+ </wsdl:port>
+ <wsdl:port binding="tns:Greeter_SOAPBinding" name="Bethal">
+ <soap:address location="https://localhost:9002/Bethal"/>
+ </wsdl:port>
+ <wsdl:port binding="tns:Greeter_SOAPBinding" name="Hurlon">
+ <soap:address location="http://localhost:9006/Hurlon"/>
+ </wsdl:port>
+ <wsdl:port binding="tns:Greeter_SOAPBinding" name="Poltim">
+ <soap:address location="https://localhost:9005/Poltim"/>
+ </wsdl:port>
+ <wsdl:port binding="tns:Greeter_SOAPBinding" name="Abost">
+ <soap:address location="https://localhost:9007/Abost"/>
+ </wsdl:port>
+ <wsdl:port binding="tns:Greeter_SOAPBinding" name="Morpit">
+ <soap:address location="https://localhost:9008/Morpit"/>
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/resources/org/apache/cxf/systest/http/jaxws-publish-callback.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/jaxws-publish-callback.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/http/jaxws-publish-callback.xml
new file mode 100644
index 0000000..bdea016
--- /dev/null
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/http/jaxws-publish-callback.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd ">
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <!-- -->
+ <!-- This Spring config file is designed to represent a minimal -->
+ <!-- configuration for spring-loading a CXF servant, where the -->
+ <!-- servant listens using HTTP/S as the transport protocol. -->
+ <!-- -->
+ <!-- Note that the service endpoint is spring-loaded. In the -->
+ <!-- scenario in which this config is designed to run, the -->
+ <!-- server application merely instantiates a Bus, and does not -->
+ <!-- publish any services programmatically -->
+ <!-- -->
+ <!-- -->
+ <!-- Spring-load an HTTPS servant -->
+ <!-- -->
+ <jaxws:endpoint xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint" implementor="org.apache.cxf.systest.http.GreeterImpl" address="https://localhost:${testutil.ports.BusServer.1}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-9001-tls-config"/>
+ <!-- -->
+ <!-- TLS Port configuration parameters for port 9001 -->
+ <!-- -->
+ <httpj:engine-factory id="port-9001-tls-config">
+ <httpj:engine port="${testutil.ports.BusServer.1}">
+ <httpj:tlsServerParameters>
+ <sec:keyManagers keyPasswordCallbackHandler="org.apache.cxf.systest.http.KeyPasswordCallbackHandler">
+ <sec:keyStore type="JKS" password="password" file="src/test/resources/keys/Bethal.jks"/>
+ </sec:keyManagers>
+ <sec:trustManagers>
+ <sec:keyStore type="JKS" password="password" file="src/test/resources/keys/Truststore.jks"/>
+ </sec:trustManagers>
+ </httpj:tlsServerParameters>
+ </httpj:engine>
+ </httpj:engine-factory>
+ <!-- -->
+ <!-- HTTP/S configuration for clients -->
+ <!-- -->
+ <http:conduit name="{http://apache.org/hello_world/services}HttpsPort.http-conduit">
+ <http:tlsClientParameters disableCNCheck="true">
+ <sec:keyManagers keyPasswordCallbackHandler="org.apache.cxf.systest.http.KeyPasswordCallbackHandler">
+ <sec:keyStore type="JKS" password="password" file="src/test/resources/keys/Morpit.jks"/>
+ </sec:keyManagers>
+ <sec:trustManagers>
+ <sec:keyStore type="JKS" password="password" file="src/test/resources/keys/Truststore.jks"/>
+ </sec:trustManagers>
+ </http:tlsClientParameters>
+ </http:conduit>
+</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/resources/org/apache/cxf/systest/http/jaxws-publish.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/jaxws-publish.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/http/jaxws-publish.xml
new file mode 100644
index 0000000..1d8190d
--- /dev/null
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/http/jaxws-publish.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd ">
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <!-- -->
+ <!-- This Spring config file is designed to represent a minimal -->
+ <!-- configuration for spring-loading a CXF servant, where the -->
+ <!-- servant listens using HTTP/S as the transport protocol. -->
+ <!-- -->
+ <!-- Note that the service endpoint is spring-loaded. In the -->
+ <!-- scenario in which this config is designed to run, the -->
+ <!-- server application merely instantiates a Bus, and does not -->
+ <!-- publish any services programmatically -->
+ <!-- -->
+ <!-- -->
+ <!-- Spring-load an HTTPS servant -->
+ <!-- -->
+ <jaxws:endpoint xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint" implementor="org.apache.cxf.systest.http.GreeterImpl" address="https://localhost:${testutil.ports.BusServer.1}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-9001-tls-config"/>
+ <!-- -->
+ <!-- TLS Port configuration parameters for port 9001 -->
+ <!-- -->
+ <httpj:engine-factory id="port-9001-tls-config">
+ <httpj:engine port="${testutil.ports.BusServer.1}">
+ <httpj:tlsServerParameters>
+ <sec:keyManagers keyPassword="password">
+ <sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/>
+ </sec:keyManagers>
+ <sec:trustManagers>
+ <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/>
+ </sec:trustManagers>
+ </httpj:tlsServerParameters>
+ </httpj:engine>
+ </httpj:engine-factory>
+ <!-- -->
+ <!-- HTTP/S configuration for clients -->
+ <!-- -->
+ <http:conduit name="{http://apache.org/hello_world/services}HttpsPort.http-conduit">
+ <http:tlsClientParameters disableCNCheck="true">
+ <sec:keyManagers keyPassword="password">
+ <sec:keyStore type="JKS" password="password" resource="keys/Morpit.jks"/>
+ </sec:keyManagers>
+ <sec:trustManagers>
+ <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/>
+ </sec:trustManagers>
+ </http:tlsClientParameters>
+ </http:conduit>
+</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/resources/org/apache/cxf/systest/http/jaxws-server-constraints.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/jaxws-server-constraints.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/http/jaxws-server-constraints.xml
new file mode 100644
index 0000000..753e0a4
--- /dev/null
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/http/jaxws-server-constraints.xml
@@ -0,0 +1,255 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd ">
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <!-- -->
+ <!-- This Spring config file is designed to represent a minimal -->
+ <!-- configuration for spring-loading a CXF servant, where the -->
+ <!-- servant listens using HTTP/S as the transport protocol. -->
+ <!-- -->
+ <!-- Note that the service endpoint is spring-loaded. In the -->
+ <!-- scenario in which this config is designed to run, the -->
+ <!-- server application merely instantiates a Bus, and does not -->
+ <!-- publish any services programmatically -->
+ <!-- -->
+ <!-- -->
+ <!-- Spring-load an HTTPS servant -->
+ <!-- -->
+ <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint-testutil-ports-BusServer-0" address="https://localhost:${testutil.ports.BusServer.0}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-testutil.ports.BusServer.0-tls-config">
+ <jaxws:serviceBean>
+ <bean class="org.apache.cxf.systest.http.GreeterImpl"/>
+ </jaxws:serviceBean>
+ </jaxws:server>
+ <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint-testutil-ports-BusServer-1" address="https://localhost:${testutil.ports.BusServer.1}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-testutil.ports.BusServer.1-tls-config">
+ <jaxws:serviceBean>
+ <bean class="org.apache.cxf.systest.http.GreeterImpl"/>
+ </jaxws:serviceBean>
+ </jaxws:server>
+ <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint-testutil-ports-BusServer-2" address="https://localhost:${testutil.ports.BusServer.2}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-testutil.ports.BusServer.2-tls-config">
+ <jaxws:serviceBean>
+ <bean class="org.apache.cxf.systest.http.GreeterImpl"/>
+ </jaxws:serviceBean>
+ </jaxws:server>
+ <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint-testutil-ports-BusServer-3" address="https://localhost:${testutil.ports.BusServer.3}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-testutil.ports.BusServer.3-tls-config">
+ <jaxws:serviceBean>
+ <bean class="org.apache.cxf.systest.http.GreeterImpl"/>
+ </jaxws:serviceBean>
+ </jaxws:server>
+ <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint-testutil-ports-BusServer-4" address="https://localhost:${testutil.ports.BusServer.4}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-testutil.ports.BusServer.4-tls-config">
+ <jaxws:serviceBean>
+ <bean class="org.apache.cxf.systest.http.GreeterImpl"/>
+ </jaxws:serviceBean>
+ </jaxws:server>
+ <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint-testutil-ports-BusServer-5" address="https://localhost:${testutil.ports.BusServer.5}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-testutil.ports.BusServer.5-tls-config">
+ <jaxws:serviceBean>
+ <bean class="org.apache.cxf.systest.http.GreeterImpl"/>
+ </jaxws:serviceBean>
+ </jaxws:server>
+ <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint-testutil-ports-BusServer-6" address="https://localhost:${testutil.ports.BusServer.6}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-testutil.ports.BusServer.6-tls-config">
+ <jaxws:serviceBean>
+ <bean class="org.apache.cxf.systest.http.GreeterImpl"/>
+ </jaxws:serviceBean>
+ </jaxws:server>
+ <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint-testutil-ports-BusServer-7" address="https://localhost:${testutil.ports.BusServer.7}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-testutil.ports.BusServer.7-tls-config">
+ <jaxws:serviceBean>
+ <bean class="org.apache.cxf.systest.http.GreeterImpl"/>
+ </jaxws:serviceBean>
+ </jaxws:server>
+ <!-- -->
+ <!-- TLS Port configuration parameters for port 9000 -->
+ <!-- -->
+ <httpj:engine-factory id="port-testutil.ports.BusServer.0-tls-config">
+ <httpj:engine port="${testutil.ports.BusServer.0}">
+ <httpj:tlsServerParameters>
+ <sec:keyManagers keyPassword="password">
+ <sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/>
+ </sec:keyManagers>
+ <sec:trustManagers>
+ <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/>
+ </sec:trustManagers>
+ <sec:certConstraints>
+ <sec:SubjectDNConstraints>
+ <sec:RegularExpression>.*O=ApacheTest.*</sec:RegularExpression>
+ <sec:RegularExpression>.*OU=Morpit.*</sec:RegularExpression>
+ </sec:SubjectDNConstraints>
+ </sec:certConstraints>
+ </httpj:tlsServerParameters>
+ </httpj:engine>
+ </httpj:engine-factory>
+ <!-- -->
+ <!-- TLS Port configuration parameters for port 9007 -->
+ <!-- -->
+ <httpj:engine-factory id="port-testutil.ports.BusServer.1-tls-config">
+ <httpj:engine port="${testutil.ports.BusServer.1}">
+ <httpj:tlsServerParameters>
+ <sec:keyManagers keyPassword="password">
+ <sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/>
+ </sec:keyManagers>
+ <sec:trustManagers>
+ <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/>
+ </sec:trustManagers>
+ <sec:certConstraints>
+ <sec:SubjectDNConstraints>
+ <sec:RegularExpression>.*O=BadApacheTest.*</sec:RegularExpression>
+ </sec:SubjectDNConstraints>
+ </sec:certConstraints>
+ </httpj:tlsServerParameters>
+ </httpj:engine>
+ </httpj:engine-factory>
+ <!-- -->
+ <!-- TLS Port configuration parameters for port 9008 -->
+ <!-- -->
+ <httpj:engine-factory id="port-testutil.ports.BusServer.2-tls-config">
+ <httpj:engine port="${testutil.ports.BusServer.2}">
+ <httpj:tlsServerParameters>
+ <sec:keyManagers keyPassword="password">
+ <sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/>
+ </sec:keyManagers>
+ <sec:trustManagers>
+ <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/>
+ </sec:trustManagers>
+ <sec:certConstraints>
+ <sec:SubjectDNConstraints>
+ <sec:RegularExpression>.*O=ApacheTest.*</sec:RegularExpression>
+ <sec:RegularExpression>.*O=BadApacheTest.*</sec:RegularExpression>
+ </sec:SubjectDNConstraints>
+ </sec:certConstraints>
+ </httpj:tlsServerParameters>
+ </httpj:engine>
+ </httpj:engine-factory>
+ <!-- -->
+ <!-- TLS Port configuration parameters for port 9009 -->
+ <!-- -->
+ <httpj:engine-factory id="port-testutil.ports.BusServer.3-tls-config">
+ <httpj:engine port="${testutil.ports.BusServer.3}">
+ <httpj:tlsServerParameters>
+ <sec:keyManagers keyPassword="password">
+ <sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/>
+ </sec:keyManagers>
+ <sec:trustManagers>
+ <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/>
+ </sec:trustManagers>
+ <sec:certConstraints>
+ <sec:SubjectDNConstraints combinator="ANY">
+ <sec:RegularExpression>.*O=ApacheTest.*</sec:RegularExpression>
+ <sec:RegularExpression>.*O=BadApacheTest.*</sec:RegularExpression>
+ </sec:SubjectDNConstraints>
+ </sec:certConstraints>
+ </httpj:tlsServerParameters>
+ </httpj:engine>
+ </httpj:engine-factory>
+ <!-- -->
+ <!-- TLS Port configuration parameters for port 9010 -->
+ <!-- -->
+ <httpj:engine-factory id="port-testutil.ports.BusServer.4-tls-config">
+ <httpj:engine port="${testutil.ports.BusServer.4}">
+ <httpj:tlsServerParameters>
+ <sec:keyManagers keyPassword="password">
+ <sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/>
+ </sec:keyManagers>
+ <sec:trustManagers>
+ <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/>
+ </sec:trustManagers>
+ <sec:certConstraints>
+ <sec:IssuerDNConstraints combinator="ALL">
+ <sec:RegularExpression>.*O=ApacheTest.*</sec:RegularExpression>
+ <sec:RegularExpression>.*O=BadApacheTest.*</sec:RegularExpression>
+ </sec:IssuerDNConstraints>
+ </sec:certConstraints>
+ </httpj:tlsServerParameters>
+ </httpj:engine>
+ </httpj:engine-factory>
+ <!-- -->
+ <!-- TLS Port configuration parameters for port 9011 -->
+ <!-- -->
+ <httpj:engine-factory id="port-testutil.ports.BusServer.5-tls-config">
+ <httpj:engine port="${testutil.ports.BusServer.5}">
+ <httpj:tlsServerParameters>
+ <sec:keyManagers keyPassword="password">
+ <sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/>
+ </sec:keyManagers>
+ <sec:trustManagers>
+ <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/>
+ </sec:trustManagers>
+ <sec:certConstraints>
+ <sec:IssuerDNConstraints combinator="ANY">
+ <sec:RegularExpression>.*O=ApacheTest.*</sec:RegularExpression>
+ <sec:RegularExpression>.*O=BadApacheTest.*</sec:RegularExpression>
+ </sec:IssuerDNConstraints>
+ </sec:certConstraints>
+ </httpj:tlsServerParameters>
+ </httpj:engine>
+ </httpj:engine-factory>
+ <!-- -->
+ <!-- TLS Port configuration parameters for port 9012 -->
+ <!-- -->
+ <httpj:engine-factory id="port-testutil.ports.BusServer.6-tls-config">
+ <httpj:engine port="${testutil.ports.BusServer.6}">
+ <httpj:tlsServerParameters>
+ <sec:keyManagers keyPassword="password">
+ <sec:keyStore type="JKS" password="password" resource="keys/Morpit.jks"/>
+ </sec:keyManagers>
+ <sec:trustManagers>
+ <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/>
+ </sec:trustManagers>
+ <sec:clientAuthentication required="true"/>
+ </httpj:tlsServerParameters>
+ </httpj:engine>
+ </httpj:engine-factory>
+ <!-- -->
+ <!-- TLS Port configuration parameters for port 9013 -->
+ <!-- -->
+ <httpj:engine-factory id="port-testutil.ports.BusServer.7-tls-config">
+ <httpj:engine port="${testutil.ports.BusServer.7}">
+ <httpj:tlsServerParameters>
+ <sec:keyManagers keyPassword="password">
+ <sec:keyStore type="JKS" password="password" resource="keys/Gordy.jks"/>
+ </sec:keyManagers>
+ <sec:trustManagers>
+ <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/>
+ </sec:trustManagers>
+ <sec:clientAuthentication required="true"/>
+ </httpj:tlsServerParameters>
+ </httpj:engine>
+ </httpj:engine-factory>
+ <!-- -->
+ <!-- HTTP/S configuration for clients -->
+ <!-- -->
+ <http:conduit name="{http://apache.org/hello_world/services}HttpsPort.http-conduit">
+ <http:tlsClientParameters disableCNCheck="true">
+ <sec:keyManagers keyPassword="password">
+ <sec:keyStore type="JKS" password="password" resource="keys/Morpit.jks"/>
+ </sec:keyManagers>
+ <sec:trustManagers>
+ <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/>
+ </sec:trustManagers>
+ <sec:certConstraints>
+ <sec:SubjectDNConstraints>
+ <sec:RegularExpression>.*CN=(Bethal|Gordy).*</sec:RegularExpression>
+ <sec:RegularExpression>.*O=ApacheTest.*</sec:RegularExpression>
+ </sec:SubjectDNConstraints>
+ <sec:IssuerDNConstraints combinator="ANY">
+ <sec:RegularExpression>.*CN=Bethal.*</sec:RegularExpression>
+ <sec:RegularExpression>.*OU=Morpit.*</sec:RegularExpression>
+ </sec:IssuerDNConstraints>
+ </sec:certConstraints>
+ </http:tlsClientParameters>
+ </http:conduit>
+</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/resources/org/apache/cxf/systest/http/jaxws-server.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/jaxws-server.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/http/jaxws-server.xml
new file mode 100644
index 0000000..2ded663
--- /dev/null
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/http/jaxws-server.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd ">
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <!-- -->
+ <!-- This Spring config file is designed to represent a minimal -->
+ <!-- configuration for spring-loading a CXF servant, where the -->
+ <!-- servant listens using HTTP/S as the transport protocol. -->
+ <!-- -->
+ <!-- Note that the service endpoint is spring-loaded. In the -->
+ <!-- scenario in which this config is designed to run, the -->
+ <!-- server application merely instantiates a Bus, and does not -->
+ <!-- publish any services programmatically -->
+ <!-- -->
+ <!-- -->
+ <!-- Spring-load an HTTPS servant -->
+ <!-- -->
+ <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint" address="https://localhost:${testutil.ports.BusServer.2}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-9002-tls-config">
+ <jaxws:serviceBean>
+ <bean class="org.apache.cxf.systest.http.GreeterImpl"/>
+ </jaxws:serviceBean>
+ </jaxws:server>
+ <!-- Non http endpoint -->
+ <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpEndpoint" address="http://localhost:${testutil.ports.BusServer.3}/SoapContext/HttpPort" serviceName="s:SOAPService" endpointName="e:HttpsPort">
+ <jaxws:serviceBean>
+ <bean class="org.apache.cxf.systest.http.GreeterImpl"/>
+ </jaxws:serviceBean>
+ </jaxws:server>
+ <!-- -->
+ <!-- TLS Port configuration parameters for port 9002 -->
+ <!-- -->
+ <httpj:engine-factory id="port-9002-tls-config">
+ <httpj:engine port="${testutil.ports.BusServer.2}">
+ <httpj:tlsServerParameters>
+ <sec:keyManagers keyPassword="password">
+ <sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/>
+ </sec:keyManagers>
+ <sec:trustManagers>
+ <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/>
+ </sec:trustManagers>
+ <sec:clientAuthentication want="true" required="true"/>
+ <sec:certAlias>bethal</sec:certAlias>
+ </httpj:tlsServerParameters>
+ </httpj:engine>
+ </httpj:engine-factory>
+ <!-- -->
+ <!-- HTTP/S configuration for clients -->
+ <!-- -->
+ <http:conduit name="{http://apache.org/hello_world/services}HttpsPort.http-conduit">
+ <http:tlsClientParameters disableCNCheck="true">
+ <sec:keyManagers keyPassword="password">
+ <sec:keyStore type="JKS" password="password" resource="keys/Morpit.jks"/>
+ </sec:keyManagers>
+ <sec:trustManagers>
+ <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/>
+ </sec:trustManagers>
+ <sec:certAlias>morpit</sec:certAlias>
+ </http:tlsClientParameters>
+ </http:conduit>
+</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/resources/org/apache/cxf/systest/http/jaxws-tlsrefs-publish.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/jaxws-tlsrefs-publish.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/http/jaxws-tlsrefs-publish.xml
new file mode 100644
index 0000000..18c2bc8
--- /dev/null
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/http/jaxws-tlsrefs-publish.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd ">
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <!-- -->
+ <!-- This Spring config file is designed to represent a minimal -->
+ <!-- configuration for spring-loading a CXF servant, where the -->
+ <!-- servant listens using HTTP/S as the transport protocol. -->
+ <!-- -->
+ <!-- Note that the service endpoint is spring-loaded. In the -->
+ <!-- scenario in which this config is designed to run, the -->
+ <!-- server application merely instantiates a Bus, and does not -->
+ <!-- publish any services programmatically -->
+ <!-- -->
+ <!-- -->
+ <!-- Spring-load an HTTPS servant -->
+ <!-- -->
+ <jaxws:endpoint xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint" implementor="org.apache.cxf.systest.http.GreeterImpl" address="https://localhost:${testutil.ports.BusServer.1}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-9001-tls-config"/>
+ <!-- -->
+ <!-- TLS Port configuration parameters for port 9001 -->
+ <!-- -->
+ <bean id="serverKeyManagers" class="org.apache.cxf.systest.http.HTTPSClientTest$ServerManagersFactory" factory-method="getKeyManagers"/>
+ <bean id="serverTrustManagers" class="org.apache.cxf.systest.http.HTTPSClientTest$ServerManagersFactory" factory-method="getTrustManagers"/>
+ <httpj:engine-factory id="port-9001-tls-config">
+ <httpj:engine port="${testutil.ports.BusServer.1}">
+ <httpj:tlsServerParameters>
+ <sec:keyManagers ref="serverKeyManagers"/>
+ <sec:trustManagers ref="serverTrustManagers"/>
+ </httpj:tlsServerParameters>
+ </httpj:engine>
+ </httpj:engine-factory>
+ <!-- -->
+ <!-- HTTP/S configuration for clients -->
+ <!-- -->
+ <bean id="clientKeyManagers" class="org.apache.cxf.systest.http.HTTPSClientTest$ClientManagersFactory" factory-method="getKeyManagers"/>
+ <bean id="clientTrustManagers" class="org.apache.cxf.systest.http.HTTPSClientTest$ClientManagersFactory" factory-method="getTrustManagers"/>
+ <http:conduit name="{http://apache.org/hello_world/services}HttpsPort.http-conduit">
+ <http:tlsClientParameters disableCNCheck="true">
+ <sec:keyManagers ref="clientKeyManagers"/>
+ <sec:trustManagers ref="clientTrustManagers"/>
+ </http:tlsClientParameters>
+ </http:conduit>
+</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/resources/org/apache/cxf/systest/http/pkcs12.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/pkcs12.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/http/pkcs12.xml
new file mode 100644
index 0000000..d01a2a0
--- /dev/null
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/http/pkcs12.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd ">
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <!-- -->
+ <!-- This Spring config file is designed to represent a minimal -->
+ <!-- configuration for spring-loading a CXF servant, where the -->
+ <!-- servant listens using HTTP/S as the transport protocol. -->
+ <!-- -->
+ <!-- Note that the service endpoint is spring-loaded. In the -->
+ <!-- scenario in which this config is designed to run, the -->
+ <!-- server application merely instantiates a Bus, and does not -->
+ <!-- publish any services programmatically -->
+ <!-- -->
+ <!-- This test ensures we can use PKCS12 keystores and PEM truststores -->
+ <!-- -->
+ <!-- -->
+ <!-- Spring-load an HTTPS servant -->
+ <!-- -->
+ <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint" address="https://localhost:${testutil.ports.BusServer.6}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-9006-tls-config">
+ <jaxws:serviceBean>
+ <bean class="org.apache.cxf.systest.http.GreeterImpl"/>
+ </jaxws:serviceBean>
+ </jaxws:server>
+ <!-- -->
+ <!-- TLS Port configuration parameters for port 9006 -->
+ <!-- -->
+ <httpj:engine-factory id="port-9006-tls-config">
+ <httpj:engine port="${testutil.ports.BusServer.6}">
+ <httpj:tlsServerParameters>
+ <sec:keyManagers keyPassword="password">
+ <sec:keyStore type="pkcs12" password="password" resource="keys/Bethal.p12"/>
+ </sec:keyManagers>
+ <sec:trustManagers>
+ <sec:certStore resource="keys/Truststore.pem"/>
+ </sec:trustManagers>
+ </httpj:tlsServerParameters>
+ </httpj:engine>
+ </httpj:engine-factory>
+ <!-- -->
+ <!-- HTTP/S configuration for clients -->
+ <!-- -->
+ <http:conduit name="{http://apache.org/hello_world/services}HttpsPort.http-conduit">
+ <http:tlsClientParameters disableCNCheck="true">
+ <sec:keyManagers keyPassword="password">
+ <sec:keyStore type="pkcs12" password="password" resource="keys/Morpit.p12"/>
+ </sec:keyManagers>
+ <sec:trustManagers>
+ <sec:certStore resource="keys/Truststore.pem"/>
+ </sec:trustManagers>
+ </http:tlsClientParameters>
+ </http:conduit>
+</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/resources/org/apache/cxf/systest/http/resource-key-spec-url.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/resource-key-spec-url.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/http/resource-key-spec-url.xml
new file mode 100644
index 0000000..0e70d13
--- /dev/null
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/http/resource-key-spec-url.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://cxf.apach
e.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd ">
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <!-- -->
+ <!-- This Spring config file is designed to represent a minimal -->
+ <!-- configuration for spring-loading a CXF servant, where the -->
+ <!-- servant listens using HTTP/S as the transport protocol. -->
+ <!-- -->
+ <!-- Note that the service endpoint is spring-loaded. In the -->
+ <!-- scenario in which this config is designed to run, the -->
+ <!-- server application merely instantiates a Bus, and does not -->
+ <!-- publish any services programmatically -->
+ <!-- -->
+ <!-- -->
+ <!-- Spring-load an HTTPS servant -->
+ <!-- -->
+ <jaxws:endpoint xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint" implementor="org.apache.cxf.systest.http.GreeterImpl" address="https://localhost:${testutil.ports.BusServer.5}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" wsdlLocation="/wsdl/hello_world_services.wsdl" depends-on="port-9005-tls-config">
+ <jaxws:features>
+ <cxf:logging/>
+ </jaxws:features>
+ </jaxws:endpoint>
+ <!-- -->
+ <!-- TLS Port configuration parameters for port 9005 -->
+ <!-- -->
+ <!-- This test exercises the resource attribute in a keyStore element -->
+ <!-- -->
+ <httpj:engine-factory id="port-9005-tls-config">
+ <httpj:engine port="${testutil.ports.BusServer.5}">
+ <httpj:tlsServerParameters>
+ <sec:keyManagers keyPassword="password">
+ <sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/>
+ </sec:keyManagers>
+ <sec:trustManagers>
+ <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/>
+ </sec:trustManagers>
+ </httpj:tlsServerParameters>
+ </httpj:engine>
+ </httpj:engine-factory>
+ <!-- -->
+ <!-- HTTP/S configuration for clients -->
+ <!-- -->
+ <!-- This test exercises the resource attribute in a keyStore and certStore element -->
+ <!-- -->
+ <http:conduit name="https://localhost:.*/SoapContext/HttpsPort">
+ <http:tlsClientParameters disableCNCheck="true">
+ <sec:keyManagers keyPassword="password">
+ <sec:keyStore type="pkcs12" password="password" resource="keys/Morpit.p12"/>
+ </sec:keyManagers>
+ <sec:trustManagers>
+ <sec:certStore resource="keys/Truststore.pem"/>
+ </sec:trustManagers>
+ </http:tlsClientParameters>
+ </http:conduit>
+</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0b64a5d6/systests/transports/src/test/resources/org/apache/cxf/systest/http/resource-key-spec.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/resource-key-spec.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/http/resource-key-spec.xml
new file mode 100644
index 0000000..a1f9bba
--- /dev/null
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/http/resource-key-spec.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd ">
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <!-- -->
+ <!-- This Spring config file is designed to represent a minimal -->
+ <!-- configuration for spring-loading a CXF servant, where the -->
+ <!-- servant listens using HTTP/S as the transport protocol. -->
+ <!-- -->
+ <!-- Note that the service endpoint is spring-loaded. In the -->
+ <!-- scenario in which this config is designed to run, the -->
+ <!-- server application merely instantiates a Bus, and does not -->
+ <!-- publish any services programmatically -->
+ <!-- -->
+ <!-- -->
+ <!-- Spring-load an HTTPS servant -->
+ <!-- -->
+ <jaxws:endpoint xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint" implementor="org.apache.cxf.systest.http.GreeterImpl" address="https://localhost:${testutil.ports.BusServer.4}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-9004-tls-config"/>
+ <!-- -->
+ <!-- TLS Port configuration parameters for port 9004 -->
+ <!-- -->
+ <!-- This test exercises the resource attribute in a keyStore element -->
+ <!-- -->
+ <httpj:engine-factory id="port-9004-tls-config">
+ <httpj:engine port="${testutil.ports.BusServer.4}">
+ <httpj:tlsServerParameters>
+ <sec:keyManagers keyPassword="password">
+ <sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/>
+ </sec:keyManagers>
+ <sec:trustManagers>
+ <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/>
+ </sec:trustManagers>
+ </httpj:tlsServerParameters>
+ </httpj:engine>
+ </httpj:engine-factory>
+ <!-- -->
+ <!-- HTTP/S configuration for clients -->
+ <!-- -->
+ <!-- This test exercises the resource attribute in a keyStore and certStore element -->
+ <!-- -->
+ <http:conduit name="{http://apache.org/hello_world/services}HttpsPort.http-conduit">
+ <http:tlsClientParameters disableCNCheck="true">
+ <sec:keyManagers keyPassword="password">
+ <sec:keyStore type="pkcs12" password="password" resource="keys/Morpit.p12"/>
+ </sec:keyManagers>
+ <sec:trustManagers>
+ <sec:certStore resource="keys/Truststore.pem"/>
+ </sec:trustManagers>
+ </http:tlsClientParameters>
+ </http:conduit>
+</beans>