cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [22/33] cxf git commit: Rationalising the keys used in security tests - part I
Date Sun, 05 Jun 2016 17:02:50 GMT
Rationalising the keys used in security tests - part I


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e578ea94
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e578ea94
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e578ea94

Branch: refs/heads/master-jaxrs-2.1
Commit: e578ea946aa13177adef98727e3e4606652ffc76
Parents: fd66899
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Thu Jun 2 15:45:13 2016 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Thu Jun 2 16:32:34 2016 +0100

----------------------------------------------------------------------
 systests/jaxrs/pom.xml                          |   7 ++
 .../cxf/systest/http/resources/Bethal.cer       | Bin 548 -> 0 bytes
 .../cxf/systest/http/resources/Bethal.cxf       |   6 +-
 .../cxf/systest/http/resources/Bethal.jks       | Bin 1317 -> 0 bytes
 .../cxf/systest/http/resources/Bethal.p12       | Bin 1705 -> 0 bytes
 .../http/resources/BethalClientConfig.cxf       |   6 +-
 .../apache/cxf/systest/http/resources/Gordy.cer | Bin 544 -> 0 bytes
 .../apache/cxf/systest/http/resources/Gordy.cxf |   6 +-
 .../apache/cxf/systest/http/resources/Gordy.jks | Bin 1313 -> 0 bytes
 .../cxf/systest/http/resources/Morpit.cxf       |   6 +-
 .../cxf/systest/http/resources/Morpit.jks       | Bin 1337 -> 0 bytes
 .../cxf/systest/http/resources/Morpit.p12       | Bin 1721 -> 0 bytes
 .../cxf/systest/http/resources/Poltim.cer       | Bin 548 -> 0 bytes
 .../cxf/systest/http/resources/Poltim.cxf       |   6 +-
 .../cxf/systest/http/resources/Poltim.jks       | Bin 1318 -> 0 bytes
 .../cxf/systest/http/resources/Tarpin.cer       | Bin 548 -> 0 bytes
 .../cxf/systest/http/resources/Tarpin.cxf       |   6 +-
 .../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 ------------
 .../systest/http/resources/jaxws-publish.xml    |   8 +-
 .../cxf/systest/http/resources/jaxws-server.xml |   8 +-
 .../cxf/systest/http/resources/pkcs12.xml       |   8 +-
 .../http/resources/resource-key-spec-url.xml    |   8 +-
 .../http/resources/resource-key-spec.xml        |   8 +-
 .../jaxrs/security/JAXRS20HttpsBookTest.java    |  54 ++++++------
 .../jaxrs/security/jaxrs-https-client1.xml      |   8 +-
 .../jaxrs/security/jaxrs-https-client2.xml      |   4 +-
 .../jaxrs/security/jaxrs-https-client3.xml      |   4 +-
 .../jaxrs/security/jaxrs-https-client4.xml      |   4 +-
 .../jaxrs/security/jaxrs-https-client5.xml      |   4 +-
 .../jaxrs/security/jaxrs-https-client_old.xml   |   4 +-
 .../jaxrs/security/jaxrs-https-server.xml       |   4 +-
 systests/kerberos/pom.xml                       |   7 ++
 systests/kerberos/src/test/resources/Bethal.jks | Bin 1317 -> 0 bytes
 systests/kerberos/src/test/resources/Morpit.jks | Bin 1337 -> 0 bytes
 .../kerberos/src/test/resources/Truststore.jks  | Bin 2942 -> 0 bytes
 systests/kerberos/src/test/resources/alice.jks  | Bin 4125 -> 0 bytes
 .../src/test/resources/alice.properties         |   2 +-
 systests/kerberos/src/test/resources/bob.jks    | Bin 4122 -> 0 bytes
 .../kerberos/src/test/resources/bob.properties  |   2 +-
 .../systest/kerberos/wssec/kerberos/client.xml  |   4 +-
 .../systest/kerberos/wssec/kerberos/server.xml  |   4 +-
 .../kerberos/wssec/kerberos/stax-server.xml     |   4 +-
 .../systest/kerberos/wssec/spnego/client.xml    |   4 +-
 .../systest/kerberos/wssec/spnego/server.xml    |   4 +-
 .../kerberos/wssec/spnego/stax-server.xml       |   4 +-
 systests/rs-security/pom.xml                    |   7 ++
 .../cxf/systest/http/resources/Bethal.cer       | Bin 548 -> 0 bytes
 .../cxf/systest/http/resources/Bethal.jks       | Bin 1317 -> 0 bytes
 .../cxf/systest/http/resources/Bethal.p12       | Bin 1705 -> 0 bytes
 .../http/resources/BethalClientConfig.cxf       |   6 +-
 .../apache/cxf/systest/http/resources/Gordy.cer | Bin 544 -> 0 bytes
 .../apache/cxf/systest/http/resources/Gordy.cxf |   6 +-
 .../apache/cxf/systest/http/resources/Gordy.jks | Bin 1313 -> 0 bytes
 .../cxf/systest/http/resources/Morpit.cxf       |   6 +-
 .../cxf/systest/http/resources/Morpit.jks       | Bin 1337 -> 0 bytes
 .../cxf/systest/http/resources/Morpit.p12       | Bin 1721 -> 0 bytes
 .../cxf/systest/http/resources/Poltim.cer       | Bin 548 -> 0 bytes
 .../cxf/systest/http/resources/Poltim.cxf       |   6 +-
 .../cxf/systest/http/resources/Poltim.jks       | Bin 1318 -> 0 bytes
 .../cxf/systest/http/resources/Tarpin.cer       | Bin 548 -> 0 bytes
 .../cxf/systest/http/resources/Tarpin.cxf       |   6 +-
 .../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 -------------
 .../systest/http/resources/jaxws-publish.xml    |   8 +-
 .../cxf/systest/http/resources/jaxws-server.xml |   9 +-
 .../cxf/systest/http/resources/pkcs12.xml       |   6 +-
 .../http/resources/resource-key-spec-url.xml    |   8 +-
 .../http/resources/resource-key-spec.xml        |   8 +-
 .../jose/jwejws/JweJwsAlgorithmTest.java        |   3 +-
 .../jose/jwejws/JweJwsReferenceTest.java        |  24 ++----
 .../security/jose/jwt/JWTAlgorithmTest.java     |   7 +-
 .../security/jose/jwt/JWTAuthnAuthzTest.java    |   3 +-
 .../security/oauth2/common/OAuth2TestUtils.java |   3 +-
 .../oauth2/common/OAuthDataProviderImpl.java    |   6 +-
 .../jaxrs/security/oidc/OIDCFlowTest.java       |   5 +-
 .../jaxrs/security/oidc/UserInfoTest.java       |  12 +--
 .../cxf/systest/jaxrs/security/alice.properties |   2 +-
 .../systest/jaxrs/security/alice.rs.properties  |   2 +-
 .../security/alice.rs.storeonly.properties      |   2 +-
 .../cxf/systest/jaxrs/security/bob.properties   |   2 +-
 .../systest/jaxrs/security/bob.rs.properties    |   2 +-
 .../jaxrs/security/bob.rs.storeonly.properties  |   2 +-
 .../cxf/systest/jaxrs/security/certs/Morpit.jks | Bin 2221 -> 0 bytes
 .../cxf/systest/jaxrs/security/certs/alice.jks  | Bin 4125 -> 0 bytes
 .../cxf/systest/jaxrs/security/certs/bob.jks    | Bin 4122 -> 0 bytes
 .../cxf/systest/jaxrs/security/certs/cxfca.jks  | Bin 961 -> 0 bytes
 .../jaxrs/security/jose/jwejws/client.xml       |   4 +-
 .../security/jose/jwejws/reference-server.xml   |   9 +-
 .../jaxrs/security/jose/jwejws/server.xml       |   4 +-
 .../security/jose/jwejws/serverJweJson.xml      |   4 +-
 .../security/jose/jwejws/serverJwsJson.xml      |   4 +-
 .../security/jose/jwt/algorithms-server.xml     |   7 +-
 .../security/jose/jwt/authn-authz-server.xml    |   4 +-
 .../systest/jaxrs/security/jose/jwt/client.xml  |   4 +-
 .../security/jose/jwt/properties-server.xml     |   4 +-
 .../jaxrs/security/oauth2/filters/client.xml    |   4 +-
 .../security/oauth2/filters/filters-server.xml  |   6 +-
 .../security/oauth2/filters/oauth20-server.xml  |   4 +-
 .../jaxrs/security/oauth2/grants/client.xml     |   4 +-
 .../oauth2/grants/grants-negative-server.xml    |   7 +-
 .../security/oauth2/grants/grants-server.xml    |   7 +-
 .../oauth2/grants/introspection-server.xml      |   4 +-
 .../jaxrs/security/oauth2/grants/server.xml     |  10 +--
 .../cxf/systest/jaxrs/security/oidc/client.xml  |   2 +-
 .../security/oidc/oidc-negative-server.xml      |   7 +-
 .../systest/jaxrs/security/oidc/oidc-server.xml |   7 +-
 .../jaxrs/security/oidc/userinfo-server.xml     |  15 ++--
 .../cxf/systest/jaxrs/security/saml/client.xml  |   4 +-
 .../jaxrs/security/saml/secureServer.xml        |   4 +-
 .../cxf/systest/jaxrs/security/saml/server.xml  |   4 +-
 .../systest/jaxrs/security/samlsso/client.xml   |   4 +-
 .../jaxrs/security/samlsso/metadata-server.xml  |   4 +-
 .../cxf/systest/jaxrs/security/xml/client.xml   |   4 +-
 .../cxf/systest/jaxrs/security/xml/server.xml   |   4 +-
 .../systest/jaxrs/security/xml/stax-server.xml  |   4 +-
 systests/transport-jms/pom.xml                  |   7 ++
 .../src/test/resources/alice.properties         |   2 +-
 .../src/test/resources/bob.properties           |   2 +-
 .../src/test/resources/certs/alice.jks          | Bin 4125 -> 0 bytes
 .../src/test/resources/certs/bob.jks            | Bin 4122 -> 0 bytes
 .../src/test/resources/certs/cxfca.jks          | Bin 961 -> 0 bytes
 systests/transport-undertow/pom.xml             |   7 ++
 .../src/test/resources/keys/Bethal.jks          | Bin 2202 -> 0 bytes
 .../src/test/resources/keys/Bethal.p12          | Bin 2540 -> 0 bytes
 .../src/test/resources/keys/Gordy.jks           | Bin 2197 -> 0 bytes
 .../src/test/resources/keys/Morpit.jks          | Bin 2221 -> 0 bytes
 .../src/test/resources/keys/Morpit.p12          | Bin 2564 -> 0 bytes
 .../src/test/resources/keys/Poltim.jks          | Bin 2203 -> 0 bytes
 .../src/test/resources/keys/Tarpin.jks          | Bin 2201 -> 0 bytes
 .../src/test/resources/keys/Truststore.jks      | Bin 4447 -> 0 bytes
 .../src/test/resources/keys/Truststore.pem      |  86 -------------------
 .../src/test/resources/keys/alice.jks           | Bin 4125 -> 0 bytes
 .../src/test/resources/keys/bob.jks             | Bin 4122 -> 0 bytes
 .../src/test/resources/keys/cxfca.jks           | Bin 961 -> 0 bytes
 .../src/test/resources/keys/genkeys.sh          |  53 ------------
 .../src/test/resources/keys/subjalt.jks         | Bin 8891 -> 0 bytes
 systests/transports-ssl3/pom.xml                |   7 ++
 .../org/apache/cxf/https/ssl3/SSLv3Test.java    |  34 +++++---
 .../src/test/resources/keys/Bethal.cer          | Bin 548 -> 0 bytes
 .../src/test/resources/keys/Bethal.jks          | Bin 1317 -> 0 bytes
 .../src/test/resources/keys/Bethal.p12          | Bin 1705 -> 0 bytes
 .../src/test/resources/keys/Gordy.cer           | Bin 544 -> 0 bytes
 .../src/test/resources/keys/Gordy.jks           | Bin 1313 -> 0 bytes
 .../src/test/resources/keys/Morpit.jks          | Bin 1337 -> 0 bytes
 .../src/test/resources/keys/Morpit.p12          | Bin 1721 -> 0 bytes
 .../src/test/resources/keys/Poltim.cer          | Bin 548 -> 0 bytes
 .../src/test/resources/keys/Poltim.jks          | Bin 1318 -> 0 bytes
 .../src/test/resources/keys/Tarpin.cer          | Bin 548 -> 0 bytes
 .../src/test/resources/keys/Tarpin.jks          | Bin 1319 -> 0 bytes
 .../src/test/resources/keys/Truststore.jks      | Bin 2942 -> 0 bytes
 .../src/test/resources/keys/Truststore.pem      |  60 -------------
 .../src/test/resources/keys/alice.jks           | Bin 4125 -> 0 bytes
 .../src/test/resources/keys/bob.jks             | Bin 4122 -> 0 bytes
 .../src/test/resources/keys/cxfca.jks           | Bin 961 -> 0 bytes
 .../src/test/resources/keys/genkeys.sh          |  53 ------------
 .../src/test/resources/keys/subjalt.jks         | Bin 8891 -> 0 bytes
 systests/transports/pom.xml                     |   7 ++
 .../https/clientauth/ClientAuthTest.java        |  15 ++--
 .../systest/https/conduit/HTTPSClientTest.java  |   8 +-
 .../systest/https/conduit/HTTPSConduitTest.java |  21 ++---
 .../src/test/resources/keys/Bethal.jks          | Bin 2202 -> 0 bytes
 .../src/test/resources/keys/Bethal.p12          | Bin 2540 -> 0 bytes
 .../src/test/resources/keys/Gordy.jks           | Bin 2197 -> 0 bytes
 .../src/test/resources/keys/Morpit.jks          | Bin 2221 -> 0 bytes
 .../src/test/resources/keys/Morpit.p12          | Bin 2564 -> 0 bytes
 .../src/test/resources/keys/Poltim.jks          | Bin 2203 -> 0 bytes
 .../src/test/resources/keys/Tarpin.jks          | Bin 2201 -> 0 bytes
 .../src/test/resources/keys/Truststore.jks      | Bin 4447 -> 0 bytes
 .../src/test/resources/keys/Truststore.pem      |  86 -------------------
 .../src/test/resources/keys/alice.jks           | Bin 4125 -> 0 bytes
 .../transports/src/test/resources/keys/bob.jks  | Bin 4122 -> 0 bytes
 .../src/test/resources/keys/cxfca.jks           | Bin 961 -> 0 bytes
 .../src/test/resources/keys/genkeys.sh          |  53 ------------
 .../src/test/resources/keys/subjalt.jks         | Bin 8891 -> 0 bytes
 .../apache/cxf/systest/https/conduit/Tarpin.cxf |   4 +-
 .../https/conduit/jaxws-publish-callback.xml    |   4 +-
 systests/ws-rm/pom.xml                          |   7 ++
 .../ws-rm/src/test/resources/alice.properties   |   2 +-
 .../ws-rm/src/test/resources/bob.properties     |   2 +-
 .../ws-rm/src/test/resources/certs/alice.jks    | Bin 4125 -> 0 bytes
 systests/ws-rm/src/test/resources/certs/bob.jks | Bin 4122 -> 0 bytes
 systests/ws-security-examples/pom.xml           |   7 ++
 .../src/test/resources/Bethal.jks               | Bin 1317 -> 0 bytes
 .../src/test/resources/Morpit.jks               | Bin 1337 -> 0 bytes
 .../src/test/resources/Truststore.jks           | Bin 2942 -> 0 bytes
 .../src/test/resources/alice.jks                | Bin 4125 -> 0 bytes
 .../src/test/resources/alice.properties         |   2 +-
 .../src/test/resources/bob.jks                  | Bin 4122 -> 0 bytes
 .../src/test/resources/bob.properties           |   2 +-
 .../src/test/resources/cxfca.jks                | Bin 961 -> 0 bytes
 .../src/test/resources/cxfca.properties         |   2 +-
 .../cxf/systest/wssec/examples/saml/client.xml  |   4 +-
 .../cxf/systest/wssec/examples/saml/server.xml  |   4 +-
 .../systest/wssec/examples/saml/stax-server.xml |   4 +-
 .../cxf/systest/wssec/examples/ut/client.xml    |   4 +-
 .../cxf/systest/wssec/examples/ut/server.xml    |   4 +-
 .../systest/wssec/examples/ut/stax-server.xml   |   4 +-
 .../src/test/resources/sts.jks                  | Bin 4121 -> 0 bytes
 .../src/test/resources/sts.properties           |   2 +-
 testutils/pom.xml                               |  12 +++
 testutils/src/test/resources/keys/Bethal.cer    | Bin 0 -> 548 bytes
 testutils/src/test/resources/keys/Bethal.jks    | Bin 0 -> 2202 bytes
 testutils/src/test/resources/keys/Bethal.p12    | Bin 0 -> 2540 bytes
 testutils/src/test/resources/keys/Gordy.cer     | Bin 0 -> 544 bytes
 testutils/src/test/resources/keys/Gordy.jks     | Bin 0 -> 2197 bytes
 testutils/src/test/resources/keys/Morpit.jks    | Bin 0 -> 2221 bytes
 testutils/src/test/resources/keys/Morpit.p12    | Bin 0 -> 2564 bytes
 testutils/src/test/resources/keys/Poltim.cer    | Bin 0 -> 548 bytes
 testutils/src/test/resources/keys/Poltim.jks    | Bin 0 -> 2203 bytes
 testutils/src/test/resources/keys/Tarpin.cer    | Bin 0 -> 548 bytes
 testutils/src/test/resources/keys/Tarpin.jks    | Bin 0 -> 2201 bytes
 .../src/test/resources/keys/Truststore.jks      | Bin 0 -> 4447 bytes
 .../src/test/resources/keys/Truststore.pem      |  86 +++++++++++++++++++
 testutils/src/test/resources/keys/alice.jks     | Bin 0 -> 4125 bytes
 testutils/src/test/resources/keys/bob.jks       | Bin 0 -> 4122 bytes
 testutils/src/test/resources/keys/cxfca.jks     | Bin 0 -> 961 bytes
 testutils/src/test/resources/keys/genkeys.sh    |  53 ++++++++++++
 testutils/src/test/resources/keys/sts.jks       | Bin 0 -> 4121 bytes
 testutils/src/test/resources/keys/subjalt.jks   | Bin 0 -> 8891 bytes
 223 files changed, 502 insertions(+), 889 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/jaxrs/pom.xml
----------------------------------------------------------------------
diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml
index c15ec56..d036dcd 100644
--- a/systests/jaxrs/pom.xml
+++ b/systests/jaxrs/pom.xml
@@ -302,6 +302,13 @@
         </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.apache.cxf</groupId>
             <artifactId>cxf-rt-databinding-sdo</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cer
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cer b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cer
deleted file mode 100644
index 5ca8252..0000000
Binary files a/systests/jaxrs/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/e578ea94/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf
index af12e84..2bd44fc 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf
@@ -48,12 +48,10 @@
 	 <httpj:engine port="9002">
 	     <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:cipherSuitesFilter>
 	        <!-- these filters ensure that a ciphersuite with

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks
deleted file mode 100644
index 2bf1a9a..0000000
Binary files a/systests/jaxrs/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/e578ea94/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Bethal.p12
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Bethal.p12 b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Bethal.p12
deleted file mode 100644
index c47515e..0000000
Binary files a/systests/jaxrs/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/e578ea94/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/BethalClientConfig.cxf
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/BethalClientConfig.cxf b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/BethalClientConfig.cxf
index 942bce1..77a6b83 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/BethalClientConfig.cxf
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/BethalClientConfig.cxf
@@ -37,12 +37,10 @@
 
 	   <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>
 	      <sec:cipherSuitesFilter>
 	        <!-- these filters ensure that a ciphersuite with

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cer
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cer b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cer
deleted file mode 100644
index 6cabd2a..0000000
Binary files a/systests/jaxrs/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/e578ea94/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf
index 33439f7..7618280 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf
@@ -49,12 +49,10 @@
 	 <httpj:engine port="9001">
 	     <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:keyStore type="JKS" password="password" resource="keys/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:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/>
 	      </sec:trustManagers>
 	      <sec:cipherSuitesFilter>
 	        <!-- these filters ensure that a ciphersuite with

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Gordy.jks
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Gordy.jks b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Gordy.jks
deleted file mode 100644
index b067db0..0000000
Binary files a/systests/jaxrs/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/e578ea94/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf
index 7e5b95a..be51f8d 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf
@@ -47,12 +47,10 @@
 	 <httpj:engine port="9008">
 	     <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: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>
 	      <sec:cipherSuitesFilter>
 	        <!-- these filters ensure that a ciphersuite with

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Morpit.jks
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Morpit.jks b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Morpit.jks
deleted file mode 100644
index 95626a7..0000000
Binary files a/systests/jaxrs/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/e578ea94/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Morpit.p12
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Morpit.p12 b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Morpit.p12
deleted file mode 100644
index f37acff..0000000
Binary files a/systests/jaxrs/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/e578ea94/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cer
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cer b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cer
deleted file mode 100644
index cfb2cc5..0000000
Binary files a/systests/jaxrs/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/e578ea94/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf
index 19ed9f6..2d03409 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf
@@ -49,12 +49,10 @@
 	 <httpj:engine port="9005">
 	     <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:keyStore type="JKS" password="password" resource="keys/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:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/>
 	      </sec:trustManagers>
 	      <sec:cipherSuitesFilter>
 	        <!-- these filters ensure that a ciphersuite with

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Poltim.jks
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Poltim.jks b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Poltim.jks
deleted file mode 100644
index 570e071..0000000
Binary files a/systests/jaxrs/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/e578ea94/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cer
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cer b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cer
deleted file mode 100644
index 37edcac..0000000
Binary files a/systests/jaxrs/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/e578ea94/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf
index c6826b6..2a66438 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf
@@ -49,12 +49,10 @@
 	 <httpj:engine port="9003">
 	     <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:keyStore type="JKS" password="password" resource="keys/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:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/>
 	      </sec:trustManagers>
 	      <sec:cipherSuitesFilter>
 	        <!-- these filters ensure that a ciphersuite with

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.jks
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.jks b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.jks
deleted file mode 100644
index 329af6a..0000000
Binary files a/systests/jaxrs/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/e578ea94/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks
deleted file mode 100644
index e76a076..0000000
Binary files a/systests/jaxrs/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/e578ea94/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Truststore.pem
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Truststore.pem b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/Truststore.pem
deleted file mode 100644
index 1b25477..0000000
--- a/systests/jaxrs/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/e578ea94/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/genkeys.sh
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/genkeys.sh b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/genkeys.sh
deleted file mode 100755
index a01a569..0000000
--- a/systests/jaxrs/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
-

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/jaxws-publish.xml
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/jaxws-publish.xml b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/jaxws-publish.xml
index 0e0302c..efe93c3 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/jaxws-publish.xml
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/jaxws-publish.xml
@@ -39,10 +39,10 @@ under the License.
         <httpj:engine port="9001">
             <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>
@@ -53,10 +53,10 @@ under the License.
     <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: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/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server.xml
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server.xml b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server.xml
index 4611fc7..ab6eddd 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server.xml
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server.xml
@@ -49,10 +49,10 @@ under the License.
         <httpj:engine port="9002">
             <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>
@@ -63,10 +63,10 @@ under the License.
     <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: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/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/pkcs12.xml
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/pkcs12.xml b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/pkcs12.xml
index 7f00bcd..6570e17 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/pkcs12.xml
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/pkcs12.xml
@@ -45,10 +45,10 @@ under the License.
         <httpj:engine port="9003">
             <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:keyStore type="pkcs12" password="password" resource="keys/Bethal.p12"/>
                 </sec:keyManagers>
                 <sec:trustManagers>
-                    <sec:certStore file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.pem"/>
+                    <sec:certStore resource="keys/Truststore.pem"/>
                 </sec:trustManagers>
             </httpj:tlsServerParameters>
         </httpj:engine>
@@ -59,10 +59,10 @@ under the License.
     <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:keyStore type="pkcs12" password="password" resource="keys/Morpit.p12"/>
             </sec:keyManagers>
             <sec:trustManagers>
-                <sec:certStore file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.pem"/>
+                <sec:certStore resource="keys/Truststore.pem"/>
             </sec:trustManagers>
         </http:tlsClientParameters>
     </http:conduit>

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec-url.xml
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec-url.xml b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec-url.xml
index 3cb69f1..ff7b8e8 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec-url.xml
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec-url.xml
@@ -41,10 +41,10 @@ under the License.
         <httpj:engine port="9005">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
-                    <sec:keyStore type="JKS" password="password" resource="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" resource="org/apache/cxf/systest/http/resources/Truststore.jks"/>
+                    <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/>
                 </sec:trustManagers>
             </httpj:tlsServerParameters>
         </httpj:engine>
@@ -57,10 +57,10 @@ under the License.
     <http:conduit name="https://localhost:9005/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:keyStore type="pkcs12" password="password" resource="keys/Morpit.p12"/>
             </sec:keyManagers>
             <sec:trustManagers>
-                <sec:certStore resource="org/apache/cxf/systest/http/resources/Truststore.pem"/>
+                <sec:certStore resource="keys/Truststore.pem"/>
             </sec:trustManagers>
         </http:tlsClientParameters>
     </http:conduit>

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec.xml
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec.xml b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec.xml
index d4f0e47..0861d5e 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec.xml
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec.xml
@@ -41,10 +41,10 @@ under the License.
         <httpj:engine port="9004">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
-                    <sec:keyStore type="JKS" password="password" resource="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" resource="org/apache/cxf/systest/http/resources/Truststore.jks"/>
+                    <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/>
                 </sec:trustManagers>
             </httpj:tlsServerParameters>
         </httpj:engine>
@@ -57,10 +57,10 @@ under the License.
     <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:keyStore type="pkcs12" password="password" resource="keys/Morpit.p12"/>
             </sec:keyManagers>
             <sec:trustManagers>
-                <sec:certStore resource="org/apache/cxf/systest/http/resources/Truststore.pem"/>
+                <sec:certStore resource="keys/Truststore.pem"/>
             </sec:trustManagers>
         </http:tlsClientParameters>
     </http:conduit>

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRS20HttpsBookTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRS20HttpsBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRS20HttpsBookTest.java
index a7e6b40..c5ec779 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRS20HttpsBookTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRS20HttpsBookTest.java
@@ -19,7 +19,7 @@
 
 package org.apache.cxf.systest.jaxrs.security;
 
-import java.io.FileInputStream;
+import java.io.InputStream;
 import java.security.KeyStore;
 
 import javax.net.ssl.KeyManagerFactory;
@@ -30,6 +30,7 @@ import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 
+import org.apache.cxf.common.classloader.ClassLoaderUtils;
 import org.apache.cxf.configuration.jsse.TLSClientParameters;
 import org.apache.cxf.feature.LoggingFeature;
 import org.apache.cxf.systest.jaxrs.Book;
@@ -54,15 +55,16 @@ public class JAXRS20HttpsBookTest extends AbstractBusClientServerTestBase {
         
         ClientBuilder builder = ClientBuilder.newBuilder();
         
-        KeyStore trustStore = loadStore("src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks",
-                                       "password");
-        
-        builder.trustStore(trustStore);
+        try (InputStream keystore = ClassLoaderUtils.getResourceAsStream("keys/Truststore.jks", this.getClass())) {
+            KeyStore trustStore = loadStore(keystore, "password");
+            builder.trustStore(trustStore);
+        }
         builder.hostnameVerifier(new AllowAllHostnameVerifier());
         
-        KeyStore keyStore = loadStore("src/test/java/org/apache/cxf/systest/http/resources/Morpit.jks",
-            "password");
-        builder.keyStore(keyStore, "password");
+        try (InputStream keystore = ClassLoaderUtils.getResourceAsStream("keys/Morpit.jks", this.getClass())) {
+            KeyStore keyStore = loadStore(keystore, "password");
+            builder.keyStore(keyStore, "password");
+        }
         
         Client client = builder.build();
         client.register(new LoggingFeature());
@@ -90,30 +92,32 @@ public class JAXRS20HttpsBookTest extends AbstractBusClientServerTestBase {
         assertEquals(123, b.getId());
     }
     
-    private KeyStore loadStore(String trustStoreFile, String password) throws Exception {
+    private KeyStore loadStore(InputStream inputStream, String password) throws Exception {
         KeyStore store = KeyStore.getInstance("JKS");
-        store.load(new FileInputStream(trustStoreFile), password.toCharArray());
+        store.load(inputStream, password.toCharArray());
         return store;
     }
     
     private SSLContext createSSLContext() throws Exception {
         TLSClientParameters tlsParams = new TLSClientParameters();
         
-        KeyStore trustStore = loadStore("src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks",
-            "password");
-        
-        TrustManagerFactory tmf = 
-            TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-        tmf.init(trustStore);
-        tlsParams.setTrustManagers(tmf.getTrustManagers());
-        
-        KeyStore keyStore = loadStore("src/test/java/org/apache/cxf/systest/http/resources/Morpit.jks",
-            "password");
-        
-        KeyManagerFactory kmf = 
-            KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
-        kmf.init(keyStore, "password".toCharArray());
-        tlsParams.setKeyManagers(kmf.getKeyManagers());
+        try (InputStream keystore = ClassLoaderUtils.getResourceAsStream("keys/Truststore.jks", this.getClass())) {
+            KeyStore trustStore = loadStore(keystore, "password");
+            
+            TrustManagerFactory tmf = 
+                TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+            tmf.init(trustStore);
+            tlsParams.setTrustManagers(tmf.getTrustManagers());
+        }
+        
+        try (InputStream keystore = ClassLoaderUtils.getResourceAsStream("keys/Morpit.jks", this.getClass())) {
+            KeyStore keyStore = loadStore(keystore, "password");
+            
+            KeyManagerFactory kmf = 
+                KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
+            kmf.init(keyStore, "password".toCharArray());
+            tlsParams.setKeyManagers(kmf.getKeyManagers());
+        }
         
         return SSLUtils.getSSLContext(tlsParams);
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client1.xml
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client1.xml b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client1.xml
index f272b0a..d87496c 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client1.xml
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client1.xml
@@ -25,10 +25,10 @@ under the License.
         <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>
@@ -39,10 +39,10 @@ under the License.
         <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/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client2.xml
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client2.xml b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client2.xml
index f02b741..cb4942c 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client2.xml
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client2.xml
@@ -26,10 +26,10 @@ under the License.
         <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/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client3.xml
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client3.xml b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client3.xml
index 6f77aaf..6aa22a8 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client3.xml
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client3.xml
@@ -26,10 +26,10 @@ under the License.
         <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/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client4.xml
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client4.xml b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client4.xml
index e2eafc4..865dfdc 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client4.xml
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client4.xml
@@ -26,10 +26,10 @@ under the License.
         <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/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client5.xml
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client5.xml b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client5.xml
index 8c22666..a200063 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client5.xml
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client5.xml
@@ -26,10 +26,10 @@ under the License.
         <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/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client_old.xml
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client_old.xml b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client_old.xml
index 373a1d2..e2fd7e0 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client_old.xml
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client_old.xml
@@ -36,10 +36,10 @@ under the License.
         <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/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-server.xml
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-server.xml b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-server.xml
index c7058df..766f170 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-server.xml
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-server.xml
@@ -23,10 +23,10 @@ under the License.
         <httpj:engine port="${testutil.ports.jaxrs-https}">
             <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/kerberos/pom.xml
----------------------------------------------------------------------
diff --git a/systests/kerberos/pom.xml b/systests/kerberos/pom.xml
index f200234..ceeab08 100644
--- a/systests/kerberos/pom.xml
+++ b/systests/kerberos/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-core</artifactId>
         </dependency>

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

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

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

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

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/kerberos/src/test/resources/alice.properties
----------------------------------------------------------------------
diff --git a/systests/kerberos/src/test/resources/alice.properties b/systests/kerberos/src/test/resources/alice.properties
index 887d848..fb18b11 100644
--- a/systests/kerberos/src/test/resources/alice.properties
+++ b/systests/kerberos/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/kerberos/src/test/resources/bob.jks
----------------------------------------------------------------------
diff --git a/systests/kerberos/src/test/resources/bob.jks b/systests/kerberos/src/test/resources/bob.jks
deleted file mode 100644
index 5550912..0000000
Binary files a/systests/kerberos/src/test/resources/bob.jks and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/kerberos/src/test/resources/bob.properties
----------------------------------------------------------------------
diff --git a/systests/kerberos/src/test/resources/bob.properties b/systests/kerberos/src/test/resources/bob.properties
index 50a99ab..61bb2ec 100644
--- a/systests/kerberos/src/test/resources/bob.properties
+++ b/systests/kerberos/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=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/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/client.xml
----------------------------------------------------------------------
diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/client.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/client.xml
index 85b79b3..649fc85 100644
--- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/client.xml
+++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/client.xml
@@ -28,10 +28,10 @@
     <http:conduit name="https://localhost.*">
         <http:tlsClientParameters disableCNCheck="true">
             <sec:keyManagers keyPassword="password">
-                <sec:keyStore type="jks" password="password" resource="Morpit.jks"/>
+                <sec:keyStore type="jks" password="password" resource="keys/Morpit.jks"/>
             </sec:keyManagers>
             <sec:trustManagers>
-                <sec:keyStore type="jks" password="password" resource="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/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/server.xml
----------------------------------------------------------------------
diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/server.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/server.xml
index 1aea3a1..0c2b229 100644
--- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/server.xml
+++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/server.xml
@@ -33,10 +33,10 @@
         <httpj:engine port="${testutil.ports.Server.2}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
-                    <sec:keyStore type="jks" password="password" resource="Bethal.jks"/>
+                    <sec:keyStore type="jks" password="password" resource="keys/Bethal.jks"/>
                 </sec:keyManagers>
                 <sec:trustManagers>
-                    <sec:keyStore type="jks" password="password" resource="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/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/stax-server.xml
----------------------------------------------------------------------
diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/stax-server.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/stax-server.xml
index 83ae26b..adf8d3c 100644
--- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/stax-server.xml
+++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/stax-server.xml
@@ -33,10 +33,10 @@
         <httpj:engine port="${testutil.ports.StaxServer.2}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
-                    <sec:keyStore type="jks" password="password" resource="Bethal.jks"/>
+                    <sec:keyStore type="jks" password="password" resource="keys/Bethal.jks"/>
                 </sec:keyManagers>
                 <sec:trustManagers>
-                    <sec:keyStore type="jks" password="password" resource="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/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/client.xml
----------------------------------------------------------------------
diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/client.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/client.xml
index 1bd7ac5..17eeddb 100644
--- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/client.xml
+++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/client.xml
@@ -82,10 +82,10 @@
     <http:conduit name="https://localhost.*">
         <http:tlsClientParameters disableCNCheck="true">
             <sec:keyManagers keyPassword="password">
-                <sec:keyStore type="jks" password="password" resource="Morpit.jks"/>
+                <sec:keyStore type="jks" password="password" resource="keys/Morpit.jks"/>
             </sec:keyManagers>
             <sec:trustManagers>
-                <sec:keyStore type="jks" password="password" resource="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/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/server.xml
----------------------------------------------------------------------
diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/server.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/server.xml
index a0d91e6..e111080 100644
--- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/server.xml
+++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/server.xml
@@ -34,10 +34,10 @@
         <httpj:engine port="${testutil.ports.Server.2}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
-                    <sec:keyStore type="jks" password="password" resource="Bethal.jks"/>
+                    <sec:keyStore type="jks" password="password" resource="keys/Bethal.jks"/>
                 </sec:keyManagers>
                 <sec:trustManagers>
-                    <sec:keyStore type="jks" password="password" resource="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/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/stax-server.xml
----------------------------------------------------------------------
diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/stax-server.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/stax-server.xml
index 0c8b759..072b253 100644
--- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/stax-server.xml
+++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/stax-server.xml
@@ -34,10 +34,10 @@
         <httpj:engine port="${testutil.ports.StaxServer.2}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
-                    <sec:keyStore type="jks" password="password" resource="Bethal.jks"/>
+                    <sec:keyStore type="jks" password="password" resource="keys/Bethal.jks"/>
                 </sec:keyManagers>
                 <sec:trustManagers>
-                    <sec:keyStore type="jks" password="password" resource="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/pom.xml
----------------------------------------------------------------------
diff --git a/systests/rs-security/pom.xml b/systests/rs-security/pom.xml
index b046927..823979e 100644
--- a/systests/rs-security/pom.xml
+++ b/systests/rs-security/pom.xml
@@ -126,6 +126,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>javax.annotation</groupId>
             <artifactId>jsr250-api</artifactId>
             <version>1.0</version>

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cer
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cer b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cer
deleted file mode 100644
index 5ca8252..0000000
Binary files a/systests/rs-security/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/e578ea94/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks
deleted file mode 100644
index 2bf1a9a..0000000
Binary files a/systests/rs-security/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/e578ea94/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Bethal.p12
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Bethal.p12 b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Bethal.p12
deleted file mode 100644
index c47515e..0000000
Binary files a/systests/rs-security/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/e578ea94/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/BethalClientConfig.cxf
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/BethalClientConfig.cxf b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/BethalClientConfig.cxf
index 43dc831..a486669 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/BethalClientConfig.cxf
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/BethalClientConfig.cxf
@@ -37,12 +37,10 @@
 
 	   <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>
 	      <sec:cipherSuitesFilter>
 	        <!-- these filters ensure that a ciphersuite with

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cer
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cer b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cer
deleted file mode 100644
index 6cabd2a..0000000
Binary files a/systests/rs-security/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/e578ea94/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf
index 6a25b57..bc86cfa 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf
@@ -49,12 +49,10 @@
 	 <httpj:engine port="9001">
 	     <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:keyStore type="JKS" password="password" resource="keys/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:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/>
 	      </sec:trustManagers>
 	      <sec:cipherSuitesFilter>
 	        <!-- these filters ensure that a ciphersuite with

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Gordy.jks
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Gordy.jks b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Gordy.jks
deleted file mode 100644
index b067db0..0000000
Binary files a/systests/rs-security/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/e578ea94/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf
index 331e2ae..6736abf 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf
@@ -47,12 +47,10 @@
 	 <httpj:engine port="9008">
 	     <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: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>
 	      <sec:cipherSuitesFilter>
 	        <!-- these filters ensure that a ciphersuite with

http://git-wip-us.apache.org/repos/asf/cxf/blob/e578ea94/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Morpit.jks
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Morpit.jks b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Morpit.jks
deleted file mode 100644
index 95626a7..0000000
Binary files a/systests/rs-security/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/e578ea94/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Morpit.p12
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Morpit.p12 b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Morpit.p12
deleted file mode 100644
index f37acff..0000000
Binary files a/systests/rs-security/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/e578ea94/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cer
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cer b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cer
deleted file mode 100644
index cfb2cc5..0000000
Binary files a/systests/rs-security/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/e578ea94/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf
index 8c201e4..2d3998e 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf
@@ -49,12 +49,10 @@
 	 <httpj:engine port="9005">
 	     <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:keyStore type="JKS" password="password" resource="keys/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:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/>
 	      </sec:trustManagers>
 	      <sec:cipherSuitesFilter>
 	        <!-- these filters ensure that a ciphersuite with


Mime
View raw message