cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [2/5] cxf git commit: Rationalising the keys used in security tests - part I
Date Thu, 02 Jun 2016 15:41:03 GMT
http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/saml/client.xml
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/saml/client.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/saml/client.xml
index 13eaea1..d10dac6 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/saml/client.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/saml/client.xml
@@ -28,10 +28,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/e578ea94/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/saml/secureServer.xml
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/saml/secureServer.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/saml/secureServer.xml
index 1ee3d3d..98fd154 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/saml/secureServer.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/saml/secureServer.xml
@@ -28,10 +28,10 @@ under the License.
         <httpj:engine port="${testutil.ports.jaxrs-saml}">
             <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>
                 <sec:clientAuthentication want="true" required="true"/>
             </httpj:tlsServerParameters>

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/saml/server.xml
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/saml/server.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/saml/server.xml
index 1fe5f58..fcb64c8 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/saml/server.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/saml/server.xml
@@ -28,10 +28,10 @@ under the License.
         <httpj:engine port="${testutil.ports.jaxrs-saml}">
             <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>
                 <sec:clientAuthentication want="true" required="true"/>
             </httpj:tlsServerParameters>

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/samlsso/client.xml
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/samlsso/client.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/samlsso/client.xml
index 13eaea1..d10dac6 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/samlsso/client.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/samlsso/client.xml
@@ -28,10 +28,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/e578ea94/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/samlsso/metadata-server.xml
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/samlsso/metadata-server.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/samlsso/metadata-server.xml
index e130b3c..45db41c 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/samlsso/metadata-server.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/samlsso/metadata-server.xml
@@ -28,10 +28,10 @@ under the License.
         <httpj:engine port="${testutil.ports.jaxrs-saml}">
             <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>
                 <sec:clientAuthentication want="true" required="true"/>
             </httpj:tlsServerParameters>

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/xml/client.xml
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/xml/client.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/xml/client.xml
index 13eaea1..d10dac6 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/xml/client.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/xml/client.xml
@@ -28,10 +28,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/e578ea94/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/xml/server.xml
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/xml/server.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/xml/server.xml
index 6243276..0318feb 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/xml/server.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/xml/server.xml
@@ -28,10 +28,10 @@ under the License.
         <httpj:engine port="${testutil.ports.jaxrs-xmlsec}">
             <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>
                 <sec:clientAuthentication want="true" required="true"/>
             </httpj:tlsServerParameters>

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/xml/stax-server.xml
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/xml/stax-server.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/xml/stax-server.xml
index c76d060..15240a7 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/xml/stax-server.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/xml/stax-server.xml
@@ -28,10 +28,10 @@ under the License.
         <httpj:engine port="${testutil.ports.jaxrs-xmlsec-stax}">
             <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>
                 <sec:clientAuthentication want="true" required="true"/>
             </httpj:tlsServerParameters>

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transport-jms/pom.xml
----------------------------------------------------------------------
diff --git a/systests/transport-jms/pom.xml b/systests/transport-jms/pom.xml
index 8a7d978..cab837f 100644
--- a/systests/transport-jms/pom.xml
+++ b/systests/transport-jms/pom.xml
@@ -164,6 +164,13 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-testutils</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+            <classifier>tests</classifier>
+        </dependency>
+        <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
             <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transport-jms/src/test/resources/alice.properties
----------------------------------------------------------------------
diff --git a/systests/transport-jms/src/test/resources/alice.properties b/systests/transport-jms/src/test/resources/alice.properties
index 2cff960..f2dbb4b 100644
--- a/systests/transport-jms/src/test/resources/alice.properties
+++ b/systests/transport-jms/src/test/resources/alice.properties
@@ -18,4 +18,4 @@ org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin
 org.apache.wss4j.crypto.merlin.keystore.type=jks
 org.apache.wss4j.crypto.merlin.keystore.password=password
 org.apache.wss4j.crypto.merlin.keystore.alias=alice
-org.apache.wss4j.crypto.merlin.keystore.file=certs/alice.jks
+org.apache.wss4j.crypto.merlin.keystore.file=keys/alice.jks

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transport-jms/src/test/resources/bob.properties
----------------------------------------------------------------------
diff --git a/systests/transport-jms/src/test/resources/bob.properties b/systests/transport-jms/src/test/resources/bob.properties
index 6be229b..48e3be7 100644
--- a/systests/transport-jms/src/test/resources/bob.properties
+++ b/systests/transport-jms/src/test/resources/bob.properties
@@ -18,4 +18,4 @@ org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin
 org.apache.wss4j.crypto.merlin.keystore.type=jks
 org.apache.wss4j.crypto.merlin.keystore.password=password
 org.apache.wss4j.crypto.merlin.keystore.alias=bob
-org.apache.wss4j.crypto.merlin.keystore.file=certs/bob.jks
+org.apache.wss4j.crypto.merlin.keystore.file=keys/bob.jks

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transport-jms/src/test/resources/certs/alice.jks
----------------------------------------------------------------------
diff --git a/systests/transport-jms/src/test/resources/certs/alice.jks b/systests/transport-jms/src/test/resources/certs/alice.jks
deleted file mode 100644
index 213b26c..0000000
Binary files a/systests/transport-jms/src/test/resources/certs/alice.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transport-jms/src/test/resources/certs/bob.jks
----------------------------------------------------------------------
diff --git a/systests/transport-jms/src/test/resources/certs/bob.jks b/systests/transport-jms/src/test/resources/certs/bob.jks
deleted file mode 100644
index 5550912..0000000
Binary files a/systests/transport-jms/src/test/resources/certs/bob.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transport-jms/src/test/resources/certs/cxfca.jks
----------------------------------------------------------------------
diff --git a/systests/transport-jms/src/test/resources/certs/cxfca.jks b/systests/transport-jms/src/test/resources/certs/cxfca.jks
deleted file mode 100644
index 53ad239..0000000
Binary files a/systests/transport-jms/src/test/resources/certs/cxfca.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transport-undertow/pom.xml
----------------------------------------------------------------------
diff --git a/systests/transport-undertow/pom.xml b/systests/transport-undertow/pom.xml
index 57e611d..542d71b 100644
--- a/systests/transport-undertow/pom.xml
+++ b/systests/transport-undertow/pom.xml
@@ -142,6 +142,13 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-testutils</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+            <classifier>tests</classifier>
+        </dependency>
+        <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
             <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transport-undertow/src/test/resources/keys/Bethal.jks
----------------------------------------------------------------------
diff --git a/systests/transport-undertow/src/test/resources/keys/Bethal.jks b/systests/transport-undertow/src/test/resources/keys/Bethal.jks
deleted file mode 100644
index 8da2ad0..0000000
Binary files a/systests/transport-undertow/src/test/resources/keys/Bethal.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transport-undertow/src/test/resources/keys/Bethal.p12
----------------------------------------------------------------------
diff --git a/systests/transport-undertow/src/test/resources/keys/Bethal.p12 b/systests/transport-undertow/src/test/resources/keys/Bethal.p12
deleted file mode 100644
index 5b627c5..0000000
Binary files a/systests/transport-undertow/src/test/resources/keys/Bethal.p12 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transport-undertow/src/test/resources/keys/Gordy.jks
----------------------------------------------------------------------
diff --git a/systests/transport-undertow/src/test/resources/keys/Gordy.jks b/systests/transport-undertow/src/test/resources/keys/Gordy.jks
deleted file mode 100644
index 8fa8847..0000000
Binary files a/systests/transport-undertow/src/test/resources/keys/Gordy.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transport-undertow/src/test/resources/keys/Morpit.jks
----------------------------------------------------------------------
diff --git a/systests/transport-undertow/src/test/resources/keys/Morpit.jks b/systests/transport-undertow/src/test/resources/keys/Morpit.jks
deleted file mode 100644
index b179baf..0000000
Binary files a/systests/transport-undertow/src/test/resources/keys/Morpit.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transport-undertow/src/test/resources/keys/Morpit.p12
----------------------------------------------------------------------
diff --git a/systests/transport-undertow/src/test/resources/keys/Morpit.p12 b/systests/transport-undertow/src/test/resources/keys/Morpit.p12
deleted file mode 100644
index b18c8ed..0000000
Binary files a/systests/transport-undertow/src/test/resources/keys/Morpit.p12 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transport-undertow/src/test/resources/keys/Poltim.jks
----------------------------------------------------------------------
diff --git a/systests/transport-undertow/src/test/resources/keys/Poltim.jks b/systests/transport-undertow/src/test/resources/keys/Poltim.jks
deleted file mode 100644
index f3b3e68..0000000
Binary files a/systests/transport-undertow/src/test/resources/keys/Poltim.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transport-undertow/src/test/resources/keys/Tarpin.jks
----------------------------------------------------------------------
diff --git a/systests/transport-undertow/src/test/resources/keys/Tarpin.jks b/systests/transport-undertow/src/test/resources/keys/Tarpin.jks
deleted file mode 100644
index cf1ceb6..0000000
Binary files a/systests/transport-undertow/src/test/resources/keys/Tarpin.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transport-undertow/src/test/resources/keys/Truststore.jks
----------------------------------------------------------------------
diff --git a/systests/transport-undertow/src/test/resources/keys/Truststore.jks b/systests/transport-undertow/src/test/resources/keys/Truststore.jks
deleted file mode 100644
index 0abd848..0000000
Binary files a/systests/transport-undertow/src/test/resources/keys/Truststore.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transport-undertow/src/test/resources/keys/Truststore.pem
----------------------------------------------------------------------
diff --git a/systests/transport-undertow/src/test/resources/keys/Truststore.pem b/systests/transport-undertow/src/test/resources/keys/Truststore.pem
deleted file mode 100644
index c04eaf8..0000000
--- a/systests/transport-undertow/src/test/resources/keys/Truststore.pem
+++ /dev/null
@@ -1,86 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDSTCCAjGgAwIBAgIEGFcAsjANBgkqhkiG9w0BAQsFADBVMQswCQYDVQQGEwJVUzERMA8GA1UE
-BxMIU3lyYWN1c2UxEzARBgNVBAoTCkFwYWNoZVRlc3QxDjAMBgNVBAsTBUdvcmR5MQ4wDAYDVQQD
-EwVHb3JkeTAeFw0xNTA5MDkxNTUyMzRaFw0yNTA5MDYxNTUyMzRaMFUxCzAJBgNVBAYTAlVTMREw
-DwYDVQQHEwhTeXJhY3VzZTETMBEGA1UEChMKQXBhY2hlVGVzdDEOMAwGA1UECxMFR29yZHkxDjAM
-BgNVBAMTBUdvcmR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuVubnwltwu38Slqe
-ANXNBFkWQ3PV4n/T5tU1PLrkg+g7AEOtaWn/3TDfcxYovDF/TWnkwcYeYDeILdXcLJgoa0mhMO2n
-46JrR3NpLM5jBtw0NVBeBR+HuFfbdlLIABgD90+aalm4kB0Fq8BO1moP4NnbxccSl2vLdP6u9oLE
-xXDog+FpHfwffKvgnyDh0Mc3lYJ7dJpwQNOmPO8docyePR53IbQuAXL8C5rYc+OHU/smj4rvwqP9
-S5zj/yOpl+7tTAq+0kLJetHJ03Cb+KVhpl6Gn/80a5DGjm7c1gAzlEwQpxltY0PkD62WJhPsVOkW
-CtRhvUNWrxq+68i460m4ZwIDAQABoyEwHzAdBgNVHQ4EFgQUSYfZ7HYvl7iTrZaoOOwXMbR80Fow
-DQYJKoZIhvcNAQELBQADggEBAAFJpi0Fu74YK0TZk96ApCgGXKU4+CyRtk5OyBeYUN746ImacDO8
-Qg2idSnOAw08sEZGN0RQnHec9r/3dhIZvULf00uDLybhN+Q9ErqI2seooJo4oF0fsd3gR4jJIU5K
-fVL8UJ0mSqUVMyH7oklyN0e3btKgAjY24ycNt+WTXaX0e1K7phsX0vNc9WMp1ZQN9NjozWXW0mte
-5FsrjiFAdnbRx8Bsj4E25ZkyplibBqDnKmlQxl+VDk1QEdignRexdJIBsjRguJfdyl6u//fSRhp0
-GMFO9ovDEyegHf0ZnWJthq4egYTMLmkzReE2neQDzuN8zYoZLTngbA3ynP+Ghgc=
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIDTTCCAjWgAwIBAgIEOEaECjANBgkqhkiG9w0BAQsFADBXMQswCQYDVQQGEwJVUzERMA8GA1UE
-BxMIU3lyYWN1c2UxEzARBgNVBAoTCkFwYWNoZVRlc3QxDzANBgNVBAsTBkJldGhhbDEPMA0GA1UE
-AxMGQmV0aGFsMB4XDTE1MDkwOTE1NTIwN1oXDTI1MDkwNjE1NTIwN1owVzELMAkGA1UEBhMCVVMx
-ETAPBgNVBAcTCFN5cmFjdXNlMRMwEQYDVQQKEwpBcGFjaGVUZXN0MQ8wDQYDVQQLEwZCZXRoYWwx
-DzANBgNVBAMTBkJldGhhbDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMxgwx2lxVDL
-teM15IOsdgBGff42ozTaLVjr30qHsREbnZrk+1G8KscUtVYUwtCDCEErz64tu/TY2jskUi54q1j2
-tOXCz0awxDRKbE4ddyvnqSqItYC9nB+T/LLFJ65bqyleRbO+Zsqj4Gi+8lGmzgk0kCLoCJ9LTrpt
-VzsHHuBsvEkcBHEX8in5umzbTy6y1jq3zsUdclgA/EV4eyvFd5+8J8XiB6Ac4q7qYJdUaOrDKk5X
-Ns05WuzW3hP/qXDpmyxgS1GQLBMj8yuopVR7/FuGCeDBSJe60cyWtDTxosjTLwjTEYIEB/ySIcgK
-0TU+QxU8XEwwutjMzecKd9PQdpMCAwEAAaMhMB8wHQYDVR0OBBYEFDWt03QU4rqQa91UjYCNkfx0
-tp3HMA0GCSqGSIb3DQEBCwUAA4IBAQCwObHeIssS3e1INNs67T2g0v17Z1+HDEx65dfwph6Wxbex
-hb9yNKEXFUIUk+Z6ZzTmv1fc4DBZ2z0Nbk8rrS2BD6kojWVRwZVnv6pfPDjU82mFL7kHztiNPq8u
-23+lTrhO9HjuQZtVnTW3+Uw9RW5mBu+8QVgze0Q1DjL5PqX3YHq16LCYp6vVjdm0o7fKDQke2Z01
-a4hYtUF17m/Sw6319ocSI2fRA2ppQ7Ts8J3GSkAyygSR52mqaC7jDgD2Oh1eRhRaTgiyxLNLnAHu
-Koxbcr3sGFP2ZYwtP9DlhxwZzzpPcNWwFMqcQ79WPKmRvBMNOQDBdW77P3cxG3DF5KkO
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIDYTCCAkmgAwIBAgIEDV+5sjANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQGEwJVUzERMA8GA1UE
-BxMIU3lyYWN1c2UxEzARBgNVBAoTCkFwYWNoZVRlc3QxDzANBgNVBAsTBk1vcnBpdDEZMBcGA1UE
-AxMQd2hhdGV2ZXJob3N0LmNvbTAeFw0xNTA5MDkxNTUzMTRaFw0yNTA5MDYxNTUzMTRaMGExCzAJ
-BgNVBAYTAlVTMREwDwYDVQQHEwhTeXJhY3VzZTETMBEGA1UEChMKQXBhY2hlVGVzdDEPMA0GA1UE
-CxMGTW9ycGl0MRkwFwYDVQQDExB3aGF0ZXZlcmhvc3QuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAjKod4Ne5+B5rPhvl7Dt7//O1fRZYw5GACCgTG6F2Cy8ozF7lfQo7jy3KTjrC
-xOkty6IUxcll5EKZQBfsqfKq2beEWI+tG//ZEfc1paK+4HGrqARtFXYm/azzEC8E66cVKRIej8DM
-yXPHvNsSSN/T7c5QCMBAd5p+uQFCGkHcX6ywiCu5hOBDhxBTr3680lRIOjBoICd3ytlT8pnHqjm7
-VexiG5sPg32f90Tf1UCJQL41Jn1miow4xLjDw0L9pCcoLtoh1jjOwErwISeTXtfp0zMAZ1T0Cwmu
-DQCL2Ek0ysmoDSQlpwL/zi/9XzeZCUY9a4KK2DV6q1WNnGJq6pMu0QIDAQABoyEwHzAdBgNVHQ4E
-FgQULNllc99it0vTugh22XKUn7H3zUkwDQYJKoZIhvcNAQELBQADggEBAFnOo+ghsy59M25gjVBG
-82siBQkhgl0eSzp/wVqa41F/KCY5hY8moKZARelNgOFQQxRpK6gBhj53TjF7B0w834r3S30F37qA
-d+T7yfH9drN5I4mNeTHpxPKeI1KJneZUqKt1PR1iZScwPzHHIfUWRiZ8ilJwNNy2MoZONKh7lhf4
-ILfYclRmMu7UJfb2gFjvTnzUwS5YJ8U0H5EYy7oHZS+7q3GXuL953tFypr1m0kvDYW4kYwyhHRZE
-XcDvDWvmO83BIk1AOQhzQ4ak4JLBpVQJnrPBhGUZOUAmIuRoV9If5WfvjVymH13VuAKoPJR3902u
-Gul/3Uq+ifNDF8btPpw=
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIDTTCCAjWgAwIBAgIEOHEczzANBgkqhkiG9w0BAQsFADBXMQswCQYDVQQGEwJVUzERMA8GA1UE
-BxMIU3lyYWN1c2UxEzARBgNVBAoTCkFwYWNoZVRlc3QxDzANBgNVBAsTBlRhcnBpbjEPMA0GA1UE
-AxMGVGFycGluMB4XDTE1MDkwOTE1NTA1M1oXDTI1MDkwNjE1NTA1M1owVzELMAkGA1UEBhMCVVMx
-ETAPBgNVBAcTCFN5cmFjdXNlMRMwEQYDVQQKEwpBcGFjaGVUZXN0MQ8wDQYDVQQLEwZUYXJwaW4x
-DzANBgNVBAMTBlRhcnBpbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJlWtQr06Soq
-QwTIKgvrLXxcqs/i6FNep3OF5nhzi4K7GOuV88UTyD3TBCFOF/sOtnVfR+mPPSfWe0z+avMKsRiw
-szzak+w2eM9cOBofO+3Ag1i9mQLpkjmkMHxflZ45C0GPcwnU/BekOKZvJ0OcJYZU6S8wszpGPinv
-OPeN1V56Wj3ud/lLR3Ll14G4QdbOxbS6tstJ+olL7Xtz7CfARqCNEjGbKx4VceiIjraheqKM0kLE
-RpdQ0DBgefGEI41BW1wogg92t6PQ6Em1RYeu97pDppSYoA/RYBW5xIDj7vz7aTVY6RaHZwAGNF+1
-Yzj8PVgV7Ppgf5VIhcIFiTyaUuECAwEAAaMhMB8wHQYDVR0OBBYEFMhTmGMuJOrPNTUCjKuRLGQ9
-la4gMA0GCSqGSIb3DQEBCwUAA4IBAQA86Rqp0xrNYb/M7dfk8SzVLaCMPyTslnhiZOVIWwQScwu8
-xqfiDXGg1000r/3N9/ACduiMwwmxYRT3OZOK8DhsHsmQXbY1vTBUEAQ3hx+mV7dPMi3WtmdU4vz6
-KtLPbl3G0803Jujxe0qcFk6FzOhlIiqd0jBRQqvMFWqzzRXDjhy64uLeVY2fNtX9w/b3xWUTL1kI
-mR8SpQnOdWunLqZLrksnuzVGU/hutD11ge0JOQRKHhTBoLBSpqGD8PPTjJipR0p7JII8KI8LbDI6
-YesmuRQmkEbpCMqM5FGVjN7VLeLjRSWcf5dT056WjErd/1zRNFrC0Jjf++g37arTOLQn
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIDTTCCAjWgAwIBAgIEUgxbaTANBgkqhkiG9w0BAQsFADBXMQswCQYDVQQGEwJVUzERMA8GA1UE
-BxMIU3lyYWN1c2UxEzARBgNVBAoTCkFwYWNoZVRlc3QxDzANBgNVBAsTBlBvbHRpbTEPMA0GA1UE
-AxMGUG9sdGltMB4XDTE1MDkwOTE1NTM0NFoXDTI1MDkwNjE1NTM0NFowVzELMAkGA1UEBhMCVVMx
-ETAPBgNVBAcTCFN5cmFjdXNlMRMwEQYDVQQKEwpBcGFjaGVUZXN0MQ8wDQYDVQQLEwZQb2x0aW0x
-DzANBgNVBAMTBlBvbHRpbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKxyUZCjOaVe
-IpptbRbdr9Ki+3W/n2G6jmEOp3LJGtQC6JbAh1IprMpC6nbWwp/W0nnBXyCpevYk6Dj5VtLV0NU/
-1pLnzaS5E/EhZKmxL2PXpMozH7js3FsP/8j9FflvIhhMybSa3otw9tmBf1+Tc6mGlcDsZlHRju91
-WdVMRUVEsOBhNPZccKRTd2QK0H83kYSXMrcGc7dmtuWUWzavbVXdq20+UrV6V8Z/aW/Um270d3Zj
-9VFw6Ax4m0IlCmPM7OA/ONA/gzmsT5BVu0EueE4s9RtXCvK+vR+l2o1fwHW0gtIkQShvR8RBGZjf
-9onepE27U/Uya/+CxQWb3K17g+kCAwEAAaMhMB8wHQYDVR0OBBYEFKI4clFM35A+xunrsFmmuN8i
-Rc/gMA0GCSqGSIb3DQEBCwUAA4IBAQCceUMhVspIAMhA4JMdXgdowWhVEY9vhKJhoILRQ4wdorLs
-pQrUZMBxB7juJ2RdOCO+17Y2gYJi4F1HYaPn0q70iZQRAH4AxiSGPpKD9Qxgs4wIHZgzZ5NwCkko
-AXmSM+SyNiDDZBFd01120gmw40Ly8/3HcDR/um6/kx/YAKgJhc6fDGpzQOrLnoTxeyVV1twAmA+R
-PcrmRA6NAS8baWlzUXAYu8pq/xTOl77niKdAvndmtmlEDmsj0BXeXeCURRVODYU8cMTueudHjois
-tj5C6jX6xjGz1/XcXUaZX5Lr34GixSwJRzabrrGYl7S2sKHmEBUUoB4hortyb2Ufedg+
------END CERTIFICATE-----

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transport-undertow/src/test/resources/keys/alice.jks
----------------------------------------------------------------------
diff --git a/systests/transport-undertow/src/test/resources/keys/alice.jks b/systests/transport-undertow/src/test/resources/keys/alice.jks
deleted file mode 100644
index 213b26c..0000000
Binary files a/systests/transport-undertow/src/test/resources/keys/alice.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transport-undertow/src/test/resources/keys/bob.jks
----------------------------------------------------------------------
diff --git a/systests/transport-undertow/src/test/resources/keys/bob.jks b/systests/transport-undertow/src/test/resources/keys/bob.jks
deleted file mode 100644
index 5550912..0000000
Binary files a/systests/transport-undertow/src/test/resources/keys/bob.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transport-undertow/src/test/resources/keys/cxfca.jks
----------------------------------------------------------------------
diff --git a/systests/transport-undertow/src/test/resources/keys/cxfca.jks b/systests/transport-undertow/src/test/resources/keys/cxfca.jks
deleted file mode 100644
index 53ad239..0000000
Binary files a/systests/transport-undertow/src/test/resources/keys/cxfca.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transport-undertow/src/test/resources/keys/genkeys.sh
----------------------------------------------------------------------
diff --git a/systests/transport-undertow/src/test/resources/keys/genkeys.sh b/systests/transport-undertow/src/test/resources/keys/genkeys.sh
deleted file mode 100755
index a01a569..0000000
--- a/systests/transport-undertow/src/test/resources/keys/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
-

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transport-undertow/src/test/resources/keys/subjalt.jks
----------------------------------------------------------------------
diff --git a/systests/transport-undertow/src/test/resources/keys/subjalt.jks b/systests/transport-undertow/src/test/resources/keys/subjalt.jks
deleted file mode 100644
index fefac18..0000000
Binary files a/systests/transport-undertow/src/test/resources/keys/subjalt.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transports-ssl3/pom.xml
----------------------------------------------------------------------
diff --git a/systests/transports-ssl3/pom.xml b/systests/transports-ssl3/pom.xml
index 3b6940a..92779b5 100644
--- a/systests/transports-ssl3/pom.xml
+++ b/systests/transports-ssl3/pom.xml
@@ -108,6 +108,13 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-testutils</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+            <classifier>tests</classifier>
+        </dependency>
+        <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
             <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transports-ssl3/src/test/java/org/apache/cxf/https/ssl3/SSLv3Test.java
----------------------------------------------------------------------
diff --git a/systests/transports-ssl3/src/test/java/org/apache/cxf/https/ssl3/SSLv3Test.java b/systests/transports-ssl3/src/test/java/org/apache/cxf/https/ssl3/SSLv3Test.java
index c7be234..487b006 100644
--- a/systests/transports-ssl3/src/test/java/org/apache/cxf/https/ssl3/SSLv3Test.java
+++ b/systests/transports-ssl3/src/test/java/org/apache/cxf/https/ssl3/SSLv3Test.java
@@ -20,19 +20,21 @@
 package org.apache.cxf.https.ssl3;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URL;
+import java.security.KeyStore;
 
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSession;
 import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
 import javax.xml.ws.BindingProvider;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.bus.spring.SpringBusFactory;
-import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.configuration.jsse.SSLUtils;
+import org.apache.cxf.common.classloader.ClassLoaderUtils;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.hello_world.Greeter;
 import org.apache.hello_world.services.SOAPService;
@@ -82,12 +84,17 @@ public class SSLv3Test extends AbstractBusClientServerTestBase {
         connection.setHostnameVerifier(new DisableCNCheckVerifier());
         
         SSLContext sslContext = SSLContext.getInstance("SSL");
-        URL keystore = SSLv3Test.class.getResource("../../../../../keys/Truststore.jks");
-        TrustManager[] trustManagers = 
-            SSLUtils.getTrustStoreManagers(false, "jks", keystore.getPath(), 
-                                           "PKIX", LogUtils.getL7dLogger(SSLv3Test.class));
-        sslContext.init(null, trustManagers, new java.security.SecureRandom());
         
+        KeyStore trustedCertStore = KeyStore.getInstance("jks");
+        try (InputStream keystore = ClassLoaderUtils.getResourceAsStream("keys/Truststore.jks", SSLv3Test.class)) {
+            trustedCertStore.load(keystore, null);
+        }
+        
+        TrustManagerFactory tmf = TrustManagerFactory.getInstance("PKIX");
+        tmf.init(trustedCertStore);
+        TrustManager[] trustManagers = tmf.getTrustManagers();
+        
+        sslContext.init(null, trustManagers, new java.security.SecureRandom());
         connection.setSSLSocketFactory(sslContext.getSocketFactory());
         
         try {
@@ -125,10 +132,15 @@ public class SSLv3Test extends AbstractBusClientServerTestBase {
         connection.setHostnameVerifier(new DisableCNCheckVerifier());
         
         SSLContext sslContext = SSLContext.getInstance("SSL");
-        URL keystore = SSLv3Test.class.getResource("../../../../../keys/Truststore.jks");
-        TrustManager[] trustManagers = 
-            SSLUtils.getTrustStoreManagers(false, "jks", keystore.getPath(), 
-                                           "PKIX", LogUtils.getL7dLogger(SSLv3Test.class));
+        KeyStore trustedCertStore = KeyStore.getInstance("jks");
+        try (InputStream keystore = ClassLoaderUtils.getResourceAsStream("keys/Truststore.jks", SSLv3Test.class)) {
+            trustedCertStore.load(keystore, null);
+        }
+        
+        TrustManagerFactory tmf = TrustManagerFactory.getInstance("PKIX");
+        tmf.init(trustedCertStore);
+        TrustManager[] trustManagers = tmf.getTrustManagers();
+        
         sslContext.init(null, trustManagers, new java.security.SecureRandom());
         
         connection.setSSLSocketFactory(sslContext.getSocketFactory());

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transports-ssl3/src/test/resources/keys/Bethal.cer
----------------------------------------------------------------------
diff --git a/systests/transports-ssl3/src/test/resources/keys/Bethal.cer b/systests/transports-ssl3/src/test/resources/keys/Bethal.cer
deleted file mode 100644
index 5ca8252..0000000
Binary files a/systests/transports-ssl3/src/test/resources/keys/Bethal.cer and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transports-ssl3/src/test/resources/keys/Bethal.jks
----------------------------------------------------------------------
diff --git a/systests/transports-ssl3/src/test/resources/keys/Bethal.jks b/systests/transports-ssl3/src/test/resources/keys/Bethal.jks
deleted file mode 100644
index 2bf1a9a..0000000
Binary files a/systests/transports-ssl3/src/test/resources/keys/Bethal.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transports-ssl3/src/test/resources/keys/Bethal.p12
----------------------------------------------------------------------
diff --git a/systests/transports-ssl3/src/test/resources/keys/Bethal.p12 b/systests/transports-ssl3/src/test/resources/keys/Bethal.p12
deleted file mode 100644
index c47515e..0000000
Binary files a/systests/transports-ssl3/src/test/resources/keys/Bethal.p12 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transports-ssl3/src/test/resources/keys/Gordy.cer
----------------------------------------------------------------------
diff --git a/systests/transports-ssl3/src/test/resources/keys/Gordy.cer b/systests/transports-ssl3/src/test/resources/keys/Gordy.cer
deleted file mode 100644
index 6cabd2a..0000000
Binary files a/systests/transports-ssl3/src/test/resources/keys/Gordy.cer and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transports-ssl3/src/test/resources/keys/Gordy.jks
----------------------------------------------------------------------
diff --git a/systests/transports-ssl3/src/test/resources/keys/Gordy.jks b/systests/transports-ssl3/src/test/resources/keys/Gordy.jks
deleted file mode 100644
index b067db0..0000000
Binary files a/systests/transports-ssl3/src/test/resources/keys/Gordy.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transports-ssl3/src/test/resources/keys/Morpit.jks
----------------------------------------------------------------------
diff --git a/systests/transports-ssl3/src/test/resources/keys/Morpit.jks b/systests/transports-ssl3/src/test/resources/keys/Morpit.jks
deleted file mode 100644
index 95626a7..0000000
Binary files a/systests/transports-ssl3/src/test/resources/keys/Morpit.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transports-ssl3/src/test/resources/keys/Morpit.p12
----------------------------------------------------------------------
diff --git a/systests/transports-ssl3/src/test/resources/keys/Morpit.p12 b/systests/transports-ssl3/src/test/resources/keys/Morpit.p12
deleted file mode 100644
index f37acff..0000000
Binary files a/systests/transports-ssl3/src/test/resources/keys/Morpit.p12 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transports-ssl3/src/test/resources/keys/Poltim.cer
----------------------------------------------------------------------
diff --git a/systests/transports-ssl3/src/test/resources/keys/Poltim.cer b/systests/transports-ssl3/src/test/resources/keys/Poltim.cer
deleted file mode 100644
index cfb2cc5..0000000
Binary files a/systests/transports-ssl3/src/test/resources/keys/Poltim.cer and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transports-ssl3/src/test/resources/keys/Poltim.jks
----------------------------------------------------------------------
diff --git a/systests/transports-ssl3/src/test/resources/keys/Poltim.jks b/systests/transports-ssl3/src/test/resources/keys/Poltim.jks
deleted file mode 100644
index 570e071..0000000
Binary files a/systests/transports-ssl3/src/test/resources/keys/Poltim.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transports-ssl3/src/test/resources/keys/Tarpin.cer
----------------------------------------------------------------------
diff --git a/systests/transports-ssl3/src/test/resources/keys/Tarpin.cer b/systests/transports-ssl3/src/test/resources/keys/Tarpin.cer
deleted file mode 100644
index 37edcac..0000000
Binary files a/systests/transports-ssl3/src/test/resources/keys/Tarpin.cer and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transports-ssl3/src/test/resources/keys/Tarpin.jks
----------------------------------------------------------------------
diff --git a/systests/transports-ssl3/src/test/resources/keys/Tarpin.jks b/systests/transports-ssl3/src/test/resources/keys/Tarpin.jks
deleted file mode 100644
index 329af6a..0000000
Binary files a/systests/transports-ssl3/src/test/resources/keys/Tarpin.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transports-ssl3/src/test/resources/keys/Truststore.jks
----------------------------------------------------------------------
diff --git a/systests/transports-ssl3/src/test/resources/keys/Truststore.jks b/systests/transports-ssl3/src/test/resources/keys/Truststore.jks
deleted file mode 100644
index e76a076..0000000
Binary files a/systests/transports-ssl3/src/test/resources/keys/Truststore.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transports-ssl3/src/test/resources/keys/Truststore.pem
----------------------------------------------------------------------
diff --git a/systests/transports-ssl3/src/test/resources/keys/Truststore.pem b/systests/transports-ssl3/src/test/resources/keys/Truststore.pem
deleted file mode 100644
index 1b25477..0000000
--- a/systests/transports-ssl3/src/test/resources/keys/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/e578ea94/systests/transports-ssl3/src/test/resources/keys/alice.jks
----------------------------------------------------------------------
diff --git a/systests/transports-ssl3/src/test/resources/keys/alice.jks b/systests/transports-ssl3/src/test/resources/keys/alice.jks
deleted file mode 100644
index 213b26c..0000000
Binary files a/systests/transports-ssl3/src/test/resources/keys/alice.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transports-ssl3/src/test/resources/keys/bob.jks
----------------------------------------------------------------------
diff --git a/systests/transports-ssl3/src/test/resources/keys/bob.jks b/systests/transports-ssl3/src/test/resources/keys/bob.jks
deleted file mode 100644
index 5550912..0000000
Binary files a/systests/transports-ssl3/src/test/resources/keys/bob.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transports-ssl3/src/test/resources/keys/cxfca.jks
----------------------------------------------------------------------
diff --git a/systests/transports-ssl3/src/test/resources/keys/cxfca.jks b/systests/transports-ssl3/src/test/resources/keys/cxfca.jks
deleted file mode 100644
index 53ad239..0000000
Binary files a/systests/transports-ssl3/src/test/resources/keys/cxfca.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transports-ssl3/src/test/resources/keys/genkeys.sh
----------------------------------------------------------------------
diff --git a/systests/transports-ssl3/src/test/resources/keys/genkeys.sh b/systests/transports-ssl3/src/test/resources/keys/genkeys.sh
deleted file mode 100755
index a01a569..0000000
--- a/systests/transports-ssl3/src/test/resources/keys/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
-

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transports-ssl3/src/test/resources/keys/subjalt.jks
----------------------------------------------------------------------
diff --git a/systests/transports-ssl3/src/test/resources/keys/subjalt.jks b/systests/transports-ssl3/src/test/resources/keys/subjalt.jks
deleted file mode 100644
index fefac18..0000000
Binary files a/systests/transports-ssl3/src/test/resources/keys/subjalt.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transports/pom.xml
----------------------------------------------------------------------
diff --git a/systests/transports/pom.xml b/systests/transports/pom.xml
index cc6a292..6846759 100644
--- a/systests/transports/pom.xml
+++ b/systests/transports/pom.xml
@@ -170,6 +170,13 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-testutils</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+            <classifier>tests</classifier>
+        </dependency>
+        <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
             <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transports/src/test/java/org/apache/cxf/systest/https/clientauth/ClientAuthTest.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/https/clientauth/ClientAuthTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/https/clientauth/ClientAuthTest.java
index 6afe893..050bee1 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/https/clientauth/ClientAuthTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/https/clientauth/ClientAuthTest.java
@@ -19,7 +19,7 @@
 
 package org.apache.cxf.systest.https.clientauth;
 
-import java.io.FileInputStream;
+import java.io.InputStream;
 import java.net.URL;
 import java.security.KeyStore;
 
@@ -32,6 +32,7 @@ import javax.net.ssl.TrustManagerFactory;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.common.classloader.ClassLoaderUtils;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.hello_world.Greeter;
 import org.apache.hello_world.services.SOAPService;
@@ -262,19 +263,19 @@ public class ClientAuthTest extends AbstractBusClientServerTestBase {
         
         SSLContext sslContext = SSLContext.getInstance("TLS");
         
-        URL trustStore = ClientAuthTest.class.getResource("../../../../../../keys/Truststore.jks");
         KeyStore ts = KeyStore.getInstance("JKS");
-        try (FileInputStream trustStoreInputStream = new FileInputStream(trustStore.getPath())) {
-            ts.load(trustStoreInputStream, "password".toCharArray());
+        try (InputStream trustStore = 
+            ClassLoaderUtils.getResourceAsStream("keys/Truststore.jks", ClientAuthTest.class)) {
+            ts.load(trustStore, "password".toCharArray());
         }
 
         TrustManagerFactory tmf = TrustManagerFactory.getInstance("PKIX");
         tmf.init(ts);
         
-        URL keyStore = ClientAuthTest.class.getResource("../../../../../../keys/Morpit.jks");
         KeyStore ks = KeyStore.getInstance("JKS");
-        try (FileInputStream keyStoreInputStream = new FileInputStream(keyStore.getPath())) {
-            ks.load(keyStoreInputStream, "password".toCharArray());
+        try (InputStream keyStore = 
+            ClassLoaderUtils.getResourceAsStream("keys/Morpit.jks", ClientAuthTest.class)) {
+            ks.load(keyStore, "password".toCharArray());
         }
 
         KeyManagerFactory kmf = KeyManagerFactory.getInstance("PKIX");

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSClientTest.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSClientTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSClientTest.java
index 75515af..4265828 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSClientTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSClientTest.java
@@ -185,7 +185,7 @@ public class HTTPSClientTest extends AbstractBusClientServerTestBase {
         public static KeyManager[] getKeyManagers() {
             KeyManagersType kmt = new KeyManagersType();
             KeyStoreType kst = new KeyStoreType();
-            kst.setFile("src/test/resources/keys/Bethal.jks");
+            kst.setResource("keys/Bethal.jks");
             kst.setPassword("password");
             kst.setType("JKS");
         
@@ -201,7 +201,7 @@ public class HTTPSClientTest extends AbstractBusClientServerTestBase {
         public static TrustManager[] getTrustManagers() {
             TrustManagersType tmt = new TrustManagersType();
             KeyStoreType kst = new KeyStoreType();
-            kst.setFile("src/test/resources/keys/Truststore.jks");
+            kst.setResource("keys/Truststore.jks");
             kst.setPassword("password");
             kst.setType("JKS");
         
@@ -218,7 +218,7 @@ public class HTTPSClientTest extends AbstractBusClientServerTestBase {
         public static KeyManager[] getKeyManagers() {
             KeyManagersType kmt = new KeyManagersType();
             KeyStoreType kst = new KeyStoreType();
-            kst.setFile("src/test/resources/keys/Morpit.jks");
+            kst.setResource("keys/Morpit.jks");
             kst.setPassword("password");
             kst.setType("JKS");
         
@@ -234,7 +234,7 @@ public class HTTPSClientTest extends AbstractBusClientServerTestBase {
         public static TrustManager[] getTrustManagers() {
             TrustManagersType tmt = new TrustManagersType();
             KeyStoreType kst = new KeyStoreType();
-            kst.setFile("src/test/resources/keys/Truststore.jks");
+            kst.setResource("keys/Truststore.jks");
             kst.setPassword("password");
             kst.setType("JKS");
         

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSConduitTest.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSConduitTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSConduitTest.java
index 2a9ffbb..61521e5 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSConduitTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSConduitTest.java
@@ -20,9 +20,8 @@
 package org.apache.cxf.systest.https.conduit;
 
 
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URI;
 import java.net.URL;
 import java.security.GeneralSecurityException;
@@ -42,6 +41,7 @@ import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.BusApplicationContext;
 import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.common.classloader.ClassLoaderUtils;
 import org.apache.cxf.common.util.Base64Utility;
 import org.apache.cxf.configuration.jsse.TLSClientParameters;
 import org.apache.cxf.configuration.security.AuthorizationPolicy;
@@ -98,17 +98,12 @@ public class HTTPSConduitTest extends AbstractBusClientServerTestBase {
     private static Map<String, String> addrMap = new TreeMap<String, String>();
     
     static {
-        try {
+        try (InputStream key = ClassLoaderUtils.getResourceAsStream("keys/Morpit.jks", HTTPSConduitTest.class);
+            InputStream truststore = 
+                ClassLoaderUtils.getResourceAsStream("keys/Truststore.jks", HTTPSConduitTest.class);) {
             //System.setProperty("javax.net.debug", "all");
-            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");
-            
-            key = Server.class.getResource("../../../../../../keys/Truststore.jks");
+            KeyManager[] kmgrs = getKeyManagers(getKeyStore("JKS", key, "password"), "password");
             
-            String truststore = new File(key.toURI()).getAbsolutePath();
-            //System.out.println("Truststore: " + truststore);
             TrustManager[] tmgrs = getTrustManagers(getKeyStore("JKS", truststore, "password"));
             
             tlsClientParameters.setKeyManagers(kmgrs);
@@ -196,7 +191,7 @@ public class HTTPSConduitTest extends AbstractBusClientServerTestBase {
         }
     }
 
-    public static KeyStore getKeyStore(String ksType, String file, String ksPassword)
+    public static KeyStore getKeyStore(String ksType, InputStream inputStream, String ksPassword)
         throws GeneralSecurityException,
                IOException {
         
@@ -211,7 +206,7 @@ public class HTTPSConduitTest extends AbstractBusClientServerTestBase {
         // We just use the default Keystore provider
         KeyStore keyStore = KeyStore.getInstance(type);
         
-        keyStore.load(new FileInputStream(file), password);
+        keyStore.load(inputStream, password);
         
         return keyStore;
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/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
deleted file mode 100644
index 8da2ad0..0000000
Binary files a/systests/transports/src/test/resources/keys/Bethal.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/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
deleted file mode 100644
index 5b627c5..0000000
Binary files a/systests/transports/src/test/resources/keys/Bethal.p12 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/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
deleted file mode 100644
index 8fa8847..0000000
Binary files a/systests/transports/src/test/resources/keys/Gordy.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/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
deleted file mode 100644
index b179baf..0000000
Binary files a/systests/transports/src/test/resources/keys/Morpit.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/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
deleted file mode 100644
index b18c8ed..0000000
Binary files a/systests/transports/src/test/resources/keys/Morpit.p12 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/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
deleted file mode 100644
index f3b3e68..0000000
Binary files a/systests/transports/src/test/resources/keys/Poltim.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/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
deleted file mode 100644
index cf1ceb6..0000000
Binary files a/systests/transports/src/test/resources/keys/Tarpin.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/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
deleted file mode 100644
index 0abd848..0000000
Binary files a/systests/transports/src/test/resources/keys/Truststore.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/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
deleted file mode 100644
index c04eaf8..0000000
--- a/systests/transports/src/test/resources/keys/Truststore.pem
+++ /dev/null
@@ -1,86 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDSTCCAjGgAwIBAgIEGFcAsjANBgkqhkiG9w0BAQsFADBVMQswCQYDVQQGEwJVUzERMA8GA1UE
-BxMIU3lyYWN1c2UxEzARBgNVBAoTCkFwYWNoZVRlc3QxDjAMBgNVBAsTBUdvcmR5MQ4wDAYDVQQD
-EwVHb3JkeTAeFw0xNTA5MDkxNTUyMzRaFw0yNTA5MDYxNTUyMzRaMFUxCzAJBgNVBAYTAlVTMREw
-DwYDVQQHEwhTeXJhY3VzZTETMBEGA1UEChMKQXBhY2hlVGVzdDEOMAwGA1UECxMFR29yZHkxDjAM
-BgNVBAMTBUdvcmR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuVubnwltwu38Slqe
-ANXNBFkWQ3PV4n/T5tU1PLrkg+g7AEOtaWn/3TDfcxYovDF/TWnkwcYeYDeILdXcLJgoa0mhMO2n
-46JrR3NpLM5jBtw0NVBeBR+HuFfbdlLIABgD90+aalm4kB0Fq8BO1moP4NnbxccSl2vLdP6u9oLE
-xXDog+FpHfwffKvgnyDh0Mc3lYJ7dJpwQNOmPO8docyePR53IbQuAXL8C5rYc+OHU/smj4rvwqP9
-S5zj/yOpl+7tTAq+0kLJetHJ03Cb+KVhpl6Gn/80a5DGjm7c1gAzlEwQpxltY0PkD62WJhPsVOkW
-CtRhvUNWrxq+68i460m4ZwIDAQABoyEwHzAdBgNVHQ4EFgQUSYfZ7HYvl7iTrZaoOOwXMbR80Fow
-DQYJKoZIhvcNAQELBQADggEBAAFJpi0Fu74YK0TZk96ApCgGXKU4+CyRtk5OyBeYUN746ImacDO8
-Qg2idSnOAw08sEZGN0RQnHec9r/3dhIZvULf00uDLybhN+Q9ErqI2seooJo4oF0fsd3gR4jJIU5K
-fVL8UJ0mSqUVMyH7oklyN0e3btKgAjY24ycNt+WTXaX0e1K7phsX0vNc9WMp1ZQN9NjozWXW0mte
-5FsrjiFAdnbRx8Bsj4E25ZkyplibBqDnKmlQxl+VDk1QEdignRexdJIBsjRguJfdyl6u//fSRhp0
-GMFO9ovDEyegHf0ZnWJthq4egYTMLmkzReE2neQDzuN8zYoZLTngbA3ynP+Ghgc=
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIDTTCCAjWgAwIBAgIEOEaECjANBgkqhkiG9w0BAQsFADBXMQswCQYDVQQGEwJVUzERMA8GA1UE
-BxMIU3lyYWN1c2UxEzARBgNVBAoTCkFwYWNoZVRlc3QxDzANBgNVBAsTBkJldGhhbDEPMA0GA1UE
-AxMGQmV0aGFsMB4XDTE1MDkwOTE1NTIwN1oXDTI1MDkwNjE1NTIwN1owVzELMAkGA1UEBhMCVVMx
-ETAPBgNVBAcTCFN5cmFjdXNlMRMwEQYDVQQKEwpBcGFjaGVUZXN0MQ8wDQYDVQQLEwZCZXRoYWwx
-DzANBgNVBAMTBkJldGhhbDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMxgwx2lxVDL
-teM15IOsdgBGff42ozTaLVjr30qHsREbnZrk+1G8KscUtVYUwtCDCEErz64tu/TY2jskUi54q1j2
-tOXCz0awxDRKbE4ddyvnqSqItYC9nB+T/LLFJ65bqyleRbO+Zsqj4Gi+8lGmzgk0kCLoCJ9LTrpt
-VzsHHuBsvEkcBHEX8in5umzbTy6y1jq3zsUdclgA/EV4eyvFd5+8J8XiB6Ac4q7qYJdUaOrDKk5X
-Ns05WuzW3hP/qXDpmyxgS1GQLBMj8yuopVR7/FuGCeDBSJe60cyWtDTxosjTLwjTEYIEB/ySIcgK
-0TU+QxU8XEwwutjMzecKd9PQdpMCAwEAAaMhMB8wHQYDVR0OBBYEFDWt03QU4rqQa91UjYCNkfx0
-tp3HMA0GCSqGSIb3DQEBCwUAA4IBAQCwObHeIssS3e1INNs67T2g0v17Z1+HDEx65dfwph6Wxbex
-hb9yNKEXFUIUk+Z6ZzTmv1fc4DBZ2z0Nbk8rrS2BD6kojWVRwZVnv6pfPDjU82mFL7kHztiNPq8u
-23+lTrhO9HjuQZtVnTW3+Uw9RW5mBu+8QVgze0Q1DjL5PqX3YHq16LCYp6vVjdm0o7fKDQke2Z01
-a4hYtUF17m/Sw6319ocSI2fRA2ppQ7Ts8J3GSkAyygSR52mqaC7jDgD2Oh1eRhRaTgiyxLNLnAHu
-Koxbcr3sGFP2ZYwtP9DlhxwZzzpPcNWwFMqcQ79WPKmRvBMNOQDBdW77P3cxG3DF5KkO
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIDYTCCAkmgAwIBAgIEDV+5sjANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQGEwJVUzERMA8GA1UE
-BxMIU3lyYWN1c2UxEzARBgNVBAoTCkFwYWNoZVRlc3QxDzANBgNVBAsTBk1vcnBpdDEZMBcGA1UE
-AxMQd2hhdGV2ZXJob3N0LmNvbTAeFw0xNTA5MDkxNTUzMTRaFw0yNTA5MDYxNTUzMTRaMGExCzAJ
-BgNVBAYTAlVTMREwDwYDVQQHEwhTeXJhY3VzZTETMBEGA1UEChMKQXBhY2hlVGVzdDEPMA0GA1UE
-CxMGTW9ycGl0MRkwFwYDVQQDExB3aGF0ZXZlcmhvc3QuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAjKod4Ne5+B5rPhvl7Dt7//O1fRZYw5GACCgTG6F2Cy8ozF7lfQo7jy3KTjrC
-xOkty6IUxcll5EKZQBfsqfKq2beEWI+tG//ZEfc1paK+4HGrqARtFXYm/azzEC8E66cVKRIej8DM
-yXPHvNsSSN/T7c5QCMBAd5p+uQFCGkHcX6ywiCu5hOBDhxBTr3680lRIOjBoICd3ytlT8pnHqjm7
-VexiG5sPg32f90Tf1UCJQL41Jn1miow4xLjDw0L9pCcoLtoh1jjOwErwISeTXtfp0zMAZ1T0Cwmu
-DQCL2Ek0ysmoDSQlpwL/zi/9XzeZCUY9a4KK2DV6q1WNnGJq6pMu0QIDAQABoyEwHzAdBgNVHQ4E
-FgQULNllc99it0vTugh22XKUn7H3zUkwDQYJKoZIhvcNAQELBQADggEBAFnOo+ghsy59M25gjVBG
-82siBQkhgl0eSzp/wVqa41F/KCY5hY8moKZARelNgOFQQxRpK6gBhj53TjF7B0w834r3S30F37qA
-d+T7yfH9drN5I4mNeTHpxPKeI1KJneZUqKt1PR1iZScwPzHHIfUWRiZ8ilJwNNy2MoZONKh7lhf4
-ILfYclRmMu7UJfb2gFjvTnzUwS5YJ8U0H5EYy7oHZS+7q3GXuL953tFypr1m0kvDYW4kYwyhHRZE
-XcDvDWvmO83BIk1AOQhzQ4ak4JLBpVQJnrPBhGUZOUAmIuRoV9If5WfvjVymH13VuAKoPJR3902u
-Gul/3Uq+ifNDF8btPpw=
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIDTTCCAjWgAwIBAgIEOHEczzANBgkqhkiG9w0BAQsFADBXMQswCQYDVQQGEwJVUzERMA8GA1UE
-BxMIU3lyYWN1c2UxEzARBgNVBAoTCkFwYWNoZVRlc3QxDzANBgNVBAsTBlRhcnBpbjEPMA0GA1UE
-AxMGVGFycGluMB4XDTE1MDkwOTE1NTA1M1oXDTI1MDkwNjE1NTA1M1owVzELMAkGA1UEBhMCVVMx
-ETAPBgNVBAcTCFN5cmFjdXNlMRMwEQYDVQQKEwpBcGFjaGVUZXN0MQ8wDQYDVQQLEwZUYXJwaW4x
-DzANBgNVBAMTBlRhcnBpbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJlWtQr06Soq
-QwTIKgvrLXxcqs/i6FNep3OF5nhzi4K7GOuV88UTyD3TBCFOF/sOtnVfR+mPPSfWe0z+avMKsRiw
-szzak+w2eM9cOBofO+3Ag1i9mQLpkjmkMHxflZ45C0GPcwnU/BekOKZvJ0OcJYZU6S8wszpGPinv
-OPeN1V56Wj3ud/lLR3Ll14G4QdbOxbS6tstJ+olL7Xtz7CfARqCNEjGbKx4VceiIjraheqKM0kLE
-RpdQ0DBgefGEI41BW1wogg92t6PQ6Em1RYeu97pDppSYoA/RYBW5xIDj7vz7aTVY6RaHZwAGNF+1
-Yzj8PVgV7Ppgf5VIhcIFiTyaUuECAwEAAaMhMB8wHQYDVR0OBBYEFMhTmGMuJOrPNTUCjKuRLGQ9
-la4gMA0GCSqGSIb3DQEBCwUAA4IBAQA86Rqp0xrNYb/M7dfk8SzVLaCMPyTslnhiZOVIWwQScwu8
-xqfiDXGg1000r/3N9/ACduiMwwmxYRT3OZOK8DhsHsmQXbY1vTBUEAQ3hx+mV7dPMi3WtmdU4vz6
-KtLPbl3G0803Jujxe0qcFk6FzOhlIiqd0jBRQqvMFWqzzRXDjhy64uLeVY2fNtX9w/b3xWUTL1kI
-mR8SpQnOdWunLqZLrksnuzVGU/hutD11ge0JOQRKHhTBoLBSpqGD8PPTjJipR0p7JII8KI8LbDI6
-YesmuRQmkEbpCMqM5FGVjN7VLeLjRSWcf5dT056WjErd/1zRNFrC0Jjf++g37arTOLQn
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIDTTCCAjWgAwIBAgIEUgxbaTANBgkqhkiG9w0BAQsFADBXMQswCQYDVQQGEwJVUzERMA8GA1UE
-BxMIU3lyYWN1c2UxEzARBgNVBAoTCkFwYWNoZVRlc3QxDzANBgNVBAsTBlBvbHRpbTEPMA0GA1UE
-AxMGUG9sdGltMB4XDTE1MDkwOTE1NTM0NFoXDTI1MDkwNjE1NTM0NFowVzELMAkGA1UEBhMCVVMx
-ETAPBgNVBAcTCFN5cmFjdXNlMRMwEQYDVQQKEwpBcGFjaGVUZXN0MQ8wDQYDVQQLEwZQb2x0aW0x
-DzANBgNVBAMTBlBvbHRpbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKxyUZCjOaVe
-IpptbRbdr9Ki+3W/n2G6jmEOp3LJGtQC6JbAh1IprMpC6nbWwp/W0nnBXyCpevYk6Dj5VtLV0NU/
-1pLnzaS5E/EhZKmxL2PXpMozH7js3FsP/8j9FflvIhhMybSa3otw9tmBf1+Tc6mGlcDsZlHRju91
-WdVMRUVEsOBhNPZccKRTd2QK0H83kYSXMrcGc7dmtuWUWzavbVXdq20+UrV6V8Z/aW/Um270d3Zj
-9VFw6Ax4m0IlCmPM7OA/ONA/gzmsT5BVu0EueE4s9RtXCvK+vR+l2o1fwHW0gtIkQShvR8RBGZjf
-9onepE27U/Uya/+CxQWb3K17g+kCAwEAAaMhMB8wHQYDVR0OBBYEFKI4clFM35A+xunrsFmmuN8i
-Rc/gMA0GCSqGSIb3DQEBCwUAA4IBAQCceUMhVspIAMhA4JMdXgdowWhVEY9vhKJhoILRQ4wdorLs
-pQrUZMBxB7juJ2RdOCO+17Y2gYJi4F1HYaPn0q70iZQRAH4AxiSGPpKD9Qxgs4wIHZgzZ5NwCkko
-AXmSM+SyNiDDZBFd01120gmw40Ly8/3HcDR/um6/kx/YAKgJhc6fDGpzQOrLnoTxeyVV1twAmA+R
-PcrmRA6NAS8baWlzUXAYu8pq/xTOl77niKdAvndmtmlEDmsj0BXeXeCURRVODYU8cMTueudHjois
-tj5C6jX6xjGz1/XcXUaZX5Lr34GixSwJRzabrrGYl7S2sKHmEBUUoB4hortyb2Ufedg+
------END CERTIFICATE-----

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transports/src/test/resources/keys/alice.jks
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/keys/alice.jks b/systests/transports/src/test/resources/keys/alice.jks
deleted file mode 100644
index 213b26c..0000000
Binary files a/systests/transports/src/test/resources/keys/alice.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transports/src/test/resources/keys/bob.jks
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/keys/bob.jks b/systests/transports/src/test/resources/keys/bob.jks
deleted file mode 100644
index 5550912..0000000
Binary files a/systests/transports/src/test/resources/keys/bob.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transports/src/test/resources/keys/cxfca.jks
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/keys/cxfca.jks b/systests/transports/src/test/resources/keys/cxfca.jks
deleted file mode 100644
index 53ad239..0000000
Binary files a/systests/transports/src/test/resources/keys/cxfca.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/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
deleted file mode 100755
index a01a569..0000000
--- a/systests/transports/src/test/resources/keys/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
-

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transports/src/test/resources/keys/subjalt.jks
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/keys/subjalt.jks b/systests/transports/src/test/resources/keys/subjalt.jks
deleted file mode 100644
index fefac18..0000000
Binary files a/systests/transports/src/test/resources/keys/subjalt.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Tarpin.cxf
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Tarpin.cxf b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Tarpin.cxf
index 00d5c20..7dc8dc0 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Tarpin.cxf
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Tarpin.cxf
@@ -51,11 +51,11 @@
 	     <httpj:tlsServerParameters>
 	      <sec:keyManagers keyPassword="password">
 	           <sec:keyStore type="JKS" password="password" 
-	                file="src/test/resources/keys/Tarpin.jks"/>
+	                resource="keys/Tarpin.jks"/>
 	      </sec:keyManagers>
 	      <sec:trustManagers>
 	          <sec:keyStore type="JKS" password="password"
-	               file="src/test/resources/keys/Truststore.jks"/>
+	               resource="keys/Truststore.jks"/>
 	      </sec:trustManagers>
 	      <sec:clientAuthentication want="true" required="true"/>
 	    </httpj:tlsServerParameters>

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-publish-callback.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-publish-callback.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-publish-callback.xml
index 9a94baa..e3e4bdd 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-publish-callback.xml
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-publish-callback.xml
@@ -40,10 +40,10 @@ under the License.
         <httpj:engine port="${testutil.ports.BusServer.1}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPasswordCallbackHandler="org.apache.cxf.systest.https.conduit.KeyPasswordCallbackHandler">
-                    <sec:keyStore type="JKS" password="password" file="src/test/resources/keys/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/resources/keys/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/e578ea94/systests/ws-rm/pom.xml
----------------------------------------------------------------------
diff --git a/systests/ws-rm/pom.xml b/systests/ws-rm/pom.xml
index 6ad4b9c..107ce67 100644
--- a/systests/ws-rm/pom.xml
+++ b/systests/ws-rm/pom.xml
@@ -93,6 +93,13 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-testutils</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+            <classifier>tests</classifier>
+        </dependency>
+        <dependency>
             <groupId>${cxf.asm.groupId}</groupId>
             <artifactId>${cxf.asm.artifactId}</artifactId>
         </dependency>

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/ws-rm/src/test/resources/alice.properties
----------------------------------------------------------------------
diff --git a/systests/ws-rm/src/test/resources/alice.properties b/systests/ws-rm/src/test/resources/alice.properties
index 1b9111d..fb18b11 100644
--- a/systests/ws-rm/src/test/resources/alice.properties
+++ b/systests/ws-rm/src/test/resources/alice.properties
@@ -18,4 +18,4 @@ org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.
 org.apache.ws.security.crypto.merlin.keystore.type=jks
 org.apache.ws.security.crypto.merlin.keystore.password=password
 org.apache.ws.security.crypto.merlin.keystore.alias=alice
-org.apache.ws.security.crypto.merlin.keystore.file=certs/alice.jks
+org.apache.ws.security.crypto.merlin.keystore.file=keys/alice.jks

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/ws-rm/src/test/resources/bob.properties
----------------------------------------------------------------------
diff --git a/systests/ws-rm/src/test/resources/bob.properties b/systests/ws-rm/src/test/resources/bob.properties
index 8df0ee0..61bb2ec 100644
--- a/systests/ws-rm/src/test/resources/bob.properties
+++ b/systests/ws-rm/src/test/resources/bob.properties
@@ -18,4 +18,4 @@ org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.
 org.apache.ws.security.crypto.merlin.keystore.type=jks
 org.apache.ws.security.crypto.merlin.keystore.password=password
 org.apache.ws.security.crypto.merlin.keystore.alias=bob
-org.apache.ws.security.crypto.merlin.keystore.file=certs/bob.jks
+org.apache.ws.security.crypto.merlin.keystore.file=keys/bob.jks

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/ws-rm/src/test/resources/certs/alice.jks
----------------------------------------------------------------------
diff --git a/systests/ws-rm/src/test/resources/certs/alice.jks b/systests/ws-rm/src/test/resources/certs/alice.jks
deleted file mode 100644
index 213b26c..0000000
Binary files a/systests/ws-rm/src/test/resources/certs/alice.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/ws-rm/src/test/resources/certs/bob.jks
----------------------------------------------------------------------
diff --git a/systests/ws-rm/src/test/resources/certs/bob.jks b/systests/ws-rm/src/test/resources/certs/bob.jks
deleted file mode 100644
index 5550912..0000000
Binary files a/systests/ws-rm/src/test/resources/certs/bob.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/ws-security-examples/pom.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security-examples/pom.xml b/systests/ws-security-examples/pom.xml
index 85df2a3..363c00d 100644
--- a/systests/ws-security-examples/pom.xml
+++ b/systests/ws-security-examples/pom.xml
@@ -154,6 +154,13 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-testutils</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+            <classifier>tests</classifier>
+        </dependency>
+        <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
         </dependency>

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/ws-security-examples/src/test/resources/Bethal.jks
----------------------------------------------------------------------
diff --git a/systests/ws-security-examples/src/test/resources/Bethal.jks b/systests/ws-security-examples/src/test/resources/Bethal.jks
deleted file mode 100644
index 2bf1a9a..0000000
Binary files a/systests/ws-security-examples/src/test/resources/Bethal.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/ws-security-examples/src/test/resources/Morpit.jks
----------------------------------------------------------------------
diff --git a/systests/ws-security-examples/src/test/resources/Morpit.jks b/systests/ws-security-examples/src/test/resources/Morpit.jks
deleted file mode 100644
index 95626a7..0000000
Binary files a/systests/ws-security-examples/src/test/resources/Morpit.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/ws-security-examples/src/test/resources/Truststore.jks
----------------------------------------------------------------------
diff --git a/systests/ws-security-examples/src/test/resources/Truststore.jks b/systests/ws-security-examples/src/test/resources/Truststore.jks
deleted file mode 100644
index e76a076..0000000
Binary files a/systests/ws-security-examples/src/test/resources/Truststore.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/ws-security-examples/src/test/resources/alice.jks
----------------------------------------------------------------------
diff --git a/systests/ws-security-examples/src/test/resources/alice.jks b/systests/ws-security-examples/src/test/resources/alice.jks
deleted file mode 100644
index 213b26c..0000000
Binary files a/systests/ws-security-examples/src/test/resources/alice.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/ws-security-examples/src/test/resources/alice.properties
----------------------------------------------------------------------
diff --git a/systests/ws-security-examples/src/test/resources/alice.properties b/systests/ws-security-examples/src/test/resources/alice.properties
index 887d848..fb18b11 100644
--- a/systests/ws-security-examples/src/test/resources/alice.properties
+++ b/systests/ws-security-examples/src/test/resources/alice.properties
@@ -18,4 +18,4 @@ org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.
 org.apache.ws.security.crypto.merlin.keystore.type=jks
 org.apache.ws.security.crypto.merlin.keystore.password=password
 org.apache.ws.security.crypto.merlin.keystore.alias=alice
-org.apache.ws.security.crypto.merlin.keystore.file=alice.jks
+org.apache.ws.security.crypto.merlin.keystore.file=keys/alice.jks

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/ws-security-examples/src/test/resources/bob.jks
----------------------------------------------------------------------
diff --git a/systests/ws-security-examples/src/test/resources/bob.jks b/systests/ws-security-examples/src/test/resources/bob.jks
deleted file mode 100644
index 5550912..0000000
Binary files a/systests/ws-security-examples/src/test/resources/bob.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/ws-security-examples/src/test/resources/bob.properties
----------------------------------------------------------------------
diff --git a/systests/ws-security-examples/src/test/resources/bob.properties b/systests/ws-security-examples/src/test/resources/bob.properties
index 31bad68..5b9fb6e 100644
--- a/systests/ws-security-examples/src/test/resources/bob.properties
+++ b/systests/ws-security-examples/src/test/resources/bob.properties
@@ -18,6 +18,6 @@ org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.
 org.apache.ws.security.crypto.merlin.keystore.type=jks
 org.apache.ws.security.crypto.merlin.keystore.password=password
 org.apache.ws.security.crypto.merlin.keystore.alias=bob
-org.apache.ws.security.crypto.merlin.keystore.file=bob.jks
+org.apache.ws.security.crypto.merlin.keystore.file=keys/bob.jks
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/ws-security-examples/src/test/resources/cxfca.jks
----------------------------------------------------------------------
diff --git a/systests/ws-security-examples/src/test/resources/cxfca.jks b/systests/ws-security-examples/src/test/resources/cxfca.jks
deleted file mode 100644
index 53ad239..0000000
Binary files a/systests/ws-security-examples/src/test/resources/cxfca.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/ws-security-examples/src/test/resources/cxfca.properties
----------------------------------------------------------------------
diff --git a/systests/ws-security-examples/src/test/resources/cxfca.properties b/systests/ws-security-examples/src/test/resources/cxfca.properties
index 38927f3..f7d9e80 100644
--- a/systests/ws-security-examples/src/test/resources/cxfca.properties
+++ b/systests/ws-security-examples/src/test/resources/cxfca.properties
@@ -18,4 +18,4 @@ org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.
 org.apache.ws.security.crypto.merlin.keystore.type=jks
 org.apache.ws.security.crypto.merlin.keystore.password=password
 org.apache.ws.security.crypto.merlin.keystore.alias=cxfca
-org.apache.ws.security.crypto.merlin.keystore.file=cxfca.jks
+org.apache.ws.security.crypto.merlin.keystore.file=keys/cxfca.jks

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml
index 9b59c35..9eb0e26 100644
--- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml
+++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml
@@ -143,10 +143,10 @@
     <http:conduit name="https://localhost:.*">
         <http:tlsClientParameters disableCNCheck="true">
             <sec:keyManagers keyPassword="password">
-                <sec:keyStore type="jks" password="password" resource="alice.jks"/>
+                <sec:keyStore type="jks" password="password" resource="keys/alice.jks"/>
             </sec:keyManagers>
             <sec:trustManagers>
-                <sec:keyStore type="jks" password="password" resource="cxfca.jks"/>
+                <sec:keyStore type="jks" password="password" resource="keys/cxfca.jks"/>
             </sec:trustManagers>
         </http:tlsClientParameters>
     </http:conduit>


Mime
View raw message