Return-Path: <commits-return-42174-archive-asf-public=cust-asf.ponee.io@cxf.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id A09192009F8
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Fri,  3 Jun 2016 15:18:23 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id 9F4E6160A2A; Fri,  3 Jun 2016 13:18:23 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 7510D160A25
	for <archive-asf-public@cust-asf.ponee.io>; Fri,  3 Jun 2016 15:18:21 +0200 (CEST)
Received: (qmail 36649 invoked by uid 500); 3 Jun 2016 13:18:20 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 36640 invoked by uid 99); 3 Jun 2016 13:18:20 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Jun 2016 13:18:20 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 1CCBBDFDEF; Fri,  3 Jun 2016 13:18:20 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: coheigea@apache.org
To: commits@cxf.apache.org
Message-Id: <6785c587cd9c41018f6fb16ee5731ac4@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: cxf git commit: Key refactoring - part II
Date: Fri,  3 Jun 2016 13:18:20 +0000 (UTC)
archived-at: Fri, 03 Jun 2016 13:18:23 -0000

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 9d19ae888 -> 1f692efcb


Key refactoring - part II


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

Branch: refs/heads/3.1.x-fixes
Commit: 1f692efcbd9fd53e2445b5a09d25df33df9e493d
Parents: 9d19ae8
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Fri Jun 3 11:22:37 2016 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Fri Jun 3 14:18:14 2016 +0100

----------------------------------------------------------------------
 services/xkms/xkms-client/pom.xml                   |   7 +++++++
 .../apache/cxf/xkms/cache/XKMSClientCacheTest.java  |   6 +++---
 .../xkms-client/src/test/resources/certs/alice.jks  | Bin 4125 -> 0 bytes
 .../xkms-client/src/test/resources/certs/bob.jks    | Bin 4122 -> 0 bytes
 .../xkms-client/src/test/resources/certs/cxfca.jks  | Bin 961 -> 0 bytes
 systests/ws-security/pom.xml                        |   7 +++++++
 .../src/test/resources/alice-enc.properties         |   2 +-
 .../ws-security/src/test/resources/alice.properties |   2 +-
 .../src/test/resources/bob-enc.properties           |   2 +-
 .../ws-security/src/test/resources/bob.properties   |   2 +-
 .../ws-security/src/test/resources/certs/alice.jks  | Bin 4125 -> 0 bytes
 .../ws-security/src/test/resources/certs/bob.jks    | Bin 4122 -> 0 bytes
 .../ws-security/src/test/resources/certs/cxfca.jks  | Bin 961 -> 0 bytes
 .../ws-security/src/test/resources/cxfca.properties |   2 +-
 .../src/test/resources/morpit.properties            |   2 +-
 .../org/apache/cxf/systest/ws/https/client.xml      |  10 +++++-----
 .../org/apache/cxf/systest/ws/https/server.xml      |   4 ++--
 .../org/apache/cxf/systest/ws/https/stax-server.xml |   4 ++--
 .../org/apache/cxf/systest/ws/policy/client.xml     |   2 +-
 .../cxf/systest/ws/policy/javafirstclient.xml       |   2 +-
 .../cxf/systest/ws/policy/javafirstserver.xml       |   6 +++---
 .../org/apache/cxf/systest/ws/policy/server.xml     |   2 +-
 .../apache/cxf/systest/ws/policy/sslcertclient.xml  |   4 ++--
 .../cxf/systest/ws/policy/sslnocertclient.xml       |   2 +-
 .../org/apache/cxf/systest/ws/saml/client.xml       |   4 ++--
 .../org/apache/cxf/systest/ws/saml/server.xml       |   4 ++--
 .../org/apache/cxf/systest/ws/saml/stax-server.xml  |   4 ++--
 .../cxf/systest/ws/saml/subjectconf/client-auth.xml |   4 ++--
 .../systest/ws/saml/subjectconf/client-noauth.xml   |   2 +-
 .../cxf/systest/ws/saml/subjectconf/server.xml      |   4 ++--
 .../cxf/systest/ws/saml/subjectconf/stax-server.xml |   4 ++--
 .../org/apache/cxf/systest/ws/security/Bethal.jks   | Bin 2202 -> 0 bytes
 .../org/apache/cxf/systest/ws/security/Morpit.jks   | Bin 2221 -> 0 bytes
 .../apache/cxf/systest/ws/security/Truststore.jks   | Bin 4447 -> 0 bytes
 .../apache/cxf/systest/ws/security/https_config.xml |   4 ++--
 .../cxf/systest/ws/security/https_config_client.xml |   4 ++--
 .../org/apache/cxf/systest/ws/security/wss40CA.jks  | Bin 858 -> 0 bytes
 .../org/apache/cxf/systest/ws/security/wss40rev.jks | Bin 3225 -> 0 bytes
 .../org/apache/cxf/systest/ws/ut/client-derived.xml |   2 +-
 .../org/apache/cxf/systest/ws/ut/client.xml         |   2 +-
 .../org/apache/cxf/systest/ws/ut/policy-client.xml  |   2 +-
 .../org/apache/cxf/systest/ws/ut/policy-server.xml  |   4 ++--
 .../org/apache/cxf/systest/ws/ut/server-derived.xml |   2 +-
 .../org/apache/cxf/systest/ws/ut/server.xml         |   4 ++--
 .../apache/cxf/systest/ws/ut/stax-policy-server.xml |   4 ++--
 .../org/apache/cxf/systest/ws/ut/stax-server.xml    |   4 ++--
 .../org/apache/cxf/systest/ws/wssc/client.xml       |   2 +-
 .../org/apache/cxf/systest/ws/wssc/server.xml       |   4 ++--
 .../org/apache/cxf/systest/ws/wssc/unit-server.xml  |   2 +-
 .../org/apache/cxf/systest/ws/wssec10/client.xml    |   4 ++--
 .../org/apache/cxf/systest/ws/wssec10/server.xml    |   4 ++--
 .../apache/cxf/systest/ws/wssec10/stax-server.xml   |   4 ++--
 .../org/apache/cxf/systest/ws/x509/client.xml       |   2 +-
 .../org/apache/cxf/systest/ws/x509/intermediary.xml |   2 +-
 .../org/apache/cxf/systest/ws/x509/jaxws-client.xml |   2 +-
 .../org/apache/cxf/systest/ws/x509/server.xml       |   2 +-
 .../org/apache/cxf/systest/ws/x509/stax-server.xml  |   2 +-
 .../org/apache/cxf/systest/ws/xkms/client.xml       |   2 +-
 .../org/apache/cxf/systest/ws/xkms/xkms-server.xml  |   2 +-
 59 files changed, 87 insertions(+), 73 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/1f692efc/services/xkms/xkms-client/pom.xml
----------------------------------------------------------------------
diff --git a/services/xkms/xkms-client/pom.xml b/services/xkms/xkms-client/pom.xml
index 4c91160..116e35d 100644
--- a/services/xkms/xkms-client/pom.xml
+++ b/services/xkms/xkms-client/pom.xml
@@ -102,6 +102,13 @@
             <version>${cxf.wss4j.version}</version>
         </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.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>

http://git-wip-us.apache.org/repos/asf/cxf/blob/1f692efc/services/xkms/xkms-client/src/test/java/org/apache/cxf/xkms/cache/XKMSClientCacheTest.java
----------------------------------------------------------------------
diff --git a/services/xkms/xkms-client/src/test/java/org/apache/cxf/xkms/cache/XKMSClientCacheTest.java b/services/xkms/xkms-client/src/test/java/org/apache/cxf/xkms/cache/XKMSClientCacheTest.java
index b9b0803..d13302b 100644
--- a/services/xkms/xkms-client/src/test/java/org/apache/cxf/xkms/cache/XKMSClientCacheTest.java
+++ b/services/xkms/xkms-client/src/test/java/org/apache/cxf/xkms/cache/XKMSClientCacheTest.java
@@ -38,13 +38,13 @@ public class XKMSClientCacheTest extends org.junit.Assert {
         cache = new EHCacheXKMSClientCache();
         
         KeyStore keystore = KeyStore.getInstance(KeyStore.getDefaultType());
-        keystore.load(ClassLoaderUtils.getResourceAsStream("certs/alice.jks", 
+        keystore.load(ClassLoaderUtils.getResourceAsStream("keys/alice.jks", 
                                                            XKMSClientCacheTest.class), 
                                                            "password".toCharArray());
         alice = (X509Certificate)keystore.getCertificate("alice");
         
         keystore = KeyStore.getInstance(KeyStore.getDefaultType());
-        keystore.load(ClassLoaderUtils.getResourceAsStream("certs/bob.jks", 
+        keystore.load(ClassLoaderUtils.getResourceAsStream("keys/bob.jks", 
                                                            XKMSClientCacheTest.class), 
                                                            "password".toCharArray());
         bob = (X509Certificate)keystore.getCertificate("bob");
@@ -110,4 +110,4 @@ public class XKMSClientCacheTest extends org.junit.Assert {
     private String getKeyForIssuerSerial(String issuer, BigInteger serial) {
         return issuer + "-" + serial.toString(16);
     }
-}
\ No newline at end of file
+}

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

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

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

http://git-wip-us.apache.org/repos/asf/cxf/blob/1f692efc/systests/ws-security/pom.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/pom.xml b/systests/ws-security/pom.xml
index 10f6a99..5be6b83 100644
--- a/systests/ws-security/pom.xml
+++ b/systests/ws-security/pom.xml
@@ -168,6 +168,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/1f692efc/systests/ws-security/src/test/resources/alice-enc.properties
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/alice-enc.properties b/systests/ws-security/src/test/resources/alice-enc.properties
index 41744da..ac71f2b 100644
--- a/systests/ws-security/src/test/resources/alice-enc.properties
+++ b/systests/ws-security/src/test/resources/alice-enc.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=ENC(mC9pTqoZ9n1dW2wETrJEpHHDmgXn1e7T)
 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/1f692efc/systests/ws-security/src/test/resources/alice.properties
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/alice.properties b/systests/ws-security/src/test/resources/alice.properties
index 2cff960..f2dbb4b 100644
--- a/systests/ws-security/src/test/resources/alice.properties
+++ b/systests/ws-security/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/1f692efc/systests/ws-security/src/test/resources/bob-enc.properties
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/bob-enc.properties b/systests/ws-security/src/test/resources/bob-enc.properties
index d017be7..1752ac9 100644
--- a/systests/ws-security/src/test/resources/bob-enc.properties
+++ b/systests/ws-security/src/test/resources/bob-enc.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=ENC(eAsmYazOvgvygJmuMzWG5uvRBmkvXf5G)
 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/1f692efc/systests/ws-security/src/test/resources/bob.properties
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/bob.properties b/systests/ws-security/src/test/resources/bob.properties
index 6be229b..48e3be7 100644
--- a/systests/ws-security/src/test/resources/bob.properties
+++ b/systests/ws-security/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/1f692efc/systests/ws-security/src/test/resources/certs/alice.jks
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/certs/alice.jks b/systests/ws-security/src/test/resources/certs/alice.jks
deleted file mode 100644
index 213b26c..0000000
Binary files a/systests/ws-security/src/test/resources/certs/alice.jks and /dev/null differ

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

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

http://git-wip-us.apache.org/repos/asf/cxf/blob/1f692efc/systests/ws-security/src/test/resources/cxfca.properties
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/cxfca.properties b/systests/ws-security/src/test/resources/cxfca.properties
index 3869bb0..a5ab1c9 100644
--- a/systests/ws-security/src/test/resources/cxfca.properties
+++ b/systests/ws-security/src/test/resources/cxfca.properties
@@ -18,6 +18,6 @@ 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=cxfca
-org.apache.wss4j.crypto.merlin.keystore.file=certs/cxfca.jks
+org.apache.wss4j.crypto.merlin.keystore.file=keys/cxfca.jks
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/1f692efc/systests/ws-security/src/test/resources/morpit.properties
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/morpit.properties b/systests/ws-security/src/test/resources/morpit.properties
index 25732d9..7cf81d6 100644
--- a/systests/ws-security/src/test/resources/morpit.properties
+++ b/systests/ws-security/src/test/resources/morpit.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=morpit
-org.apache.wss4j.crypto.merlin.keystore.file=org/apache/cxf/systest/ws/security/Morpit.jks
+org.apache.wss4j.crypto.merlin.keystore.file=keys/Morpit.jks

http://git-wip-us.apache.org/repos/asf/cxf/blob/1f692efc/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/client.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/client.xml
index 4cb0e24..5ccb4b7 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/client.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/client.xml
@@ -27,10 +27,10 @@
     <http:conduit name="https://localhost:.*/DoubleItRequireClientCert">
         <http:tlsClientParameters disableCNCheck="true">
             <sec:keyManagers keyPassword="password">
-                <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/Morpit.jks"/>
+                <sec:keyStore type="jks" password="password" resource="keys/Morpit.jks"/>
             </sec:keyManagers>
             <sec:trustManagers>
-                <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/Truststore.jks"/>
+                <sec:keyStore type="jks" password="password" resource="keys/Truststore.jks"/>
             </sec:trustManagers>
         </http:tlsClientParameters>
     </http:conduit>
@@ -46,7 +46,7 @@
     <http:conduit name="https://localhost:.*/DoubleItRequireClientCert2">
         <http:tlsClientParameters disableCNCheck="true">
             <sec:trustManagers>
-                <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/Truststore.jks"/>
+                <sec:keyStore type="jks" password="password" resource="keys/Truststore.jks"/>
             </sec:trustManagers>
         </http:tlsClientParameters>
     </http:conduit>
@@ -62,7 +62,7 @@
     <http:conduit name="https://localhost:.*/DoubleItBasicAuth">
         <http:tlsClientParameters disableCNCheck="true">
             <sec:trustManagers>
-                <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/Truststore.jks"/>
+                <sec:keyStore type="jks" password="password" resource="keys/Truststore.jks"/>
             </sec:trustManagers>
         </http:tlsClientParameters>
         <http:authorization>
@@ -83,7 +83,7 @@
     <http:conduit name="https://localhost:.*/DoubleItBasicAuth2">
         <http:tlsClientParameters disableCNCheck="true">
             <sec:trustManagers>
-                <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/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/1f692efc/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/server.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/server.xml
index 1c86b64..f2a13b8 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/server.xml
@@ -33,10 +33,10 @@
         <httpj:engine port="${testutil.ports.https.Server}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
-                    <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/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/ws/security/Truststore.jks"/>
+                    <sec:keyStore type="jks" password="password" resource="keys/Truststore.jks"/>
                 </sec:trustManagers>
                 <sec:clientAuthentication want="true" required="false"/>
             </httpj:tlsServerParameters>

http://git-wip-us.apache.org/repos/asf/cxf/blob/1f692efc/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/stax-server.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/stax-server.xml
index 06e4e87..5e27236 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/stax-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/stax-server.xml
@@ -33,10 +33,10 @@
         <httpj:engine port="${testutil.ports.https.StaxServer}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
-                    <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/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/ws/security/Truststore.jks"/>
+                    <sec:keyStore type="jks" password="password" resource="keys/Truststore.jks"/>
                 </sec:trustManagers>
                 <sec:clientAuthentication want="true" required="false"/>
             </httpj:tlsServerParameters>

http://git-wip-us.apache.org/repos/asf/cxf/blob/1f692efc/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client.xml
index 8aa7e94..25fac00 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client.xml
@@ -103,7 +103,7 @@
     <http:conduit name="https://localhost:.*">
         <http:tlsClientParameters disableCNCheck="true">
             <sec:trustManagers>
-                <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/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/1f692efc/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/javafirstclient.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/javafirstclient.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/javafirstclient.xml
index 42b86b8..1e13d7b 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/javafirstclient.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/javafirstclient.xml
@@ -28,7 +28,7 @@
     <http:conduit name="https://localhost:.*">
         <http:tlsClientParameters disableCNCheck="true">
             <sec:trustManagers>
-                <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/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/1f692efc/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/javafirstserver.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/javafirstserver.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/javafirstserver.xml
index ec3ac3d..2ddc6c8 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/javafirstserver.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/javafirstserver.xml
@@ -21,7 +21,7 @@
         <httpj:engine port="${testutil.ports.JavaFirstPolicyServer.2}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
-                    <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/Bethal.jks"/>
+                    <sec:keyStore type="jks" password="password" resource="keys/Bethal.jks"/>
                 </sec:keyManagers>
                 <sec:clientAuthentication want="true" required="false"/>
             </httpj:tlsServerParameters>
@@ -31,10 +31,10 @@
         <httpj:engine port="${testutil.ports.JavaFirstPolicyServer.3}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
-                    <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/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/ws/security/Truststore.jks"/>
+                    <sec:keyStore type="jks" password="password" resource="keys/Truststore.jks"/>
                 </sec:trustManagers>
                 <sec:clientAuthentication want="true" required="false"/>
             </httpj:tlsServerParameters>

http://git-wip-us.apache.org/repos/asf/cxf/blob/1f692efc/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server.xml
index 766cb06..a3cf97b 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server.xml
@@ -33,7 +33,7 @@
         <httpj:engine port="${testutil.ports.policy.Server.2}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
-                    <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/Bethal.jks"/>
+                    <sec:keyStore type="jks" password="password" resource="keys/Bethal.jks"/>
                 </sec:keyManagers>
                 <sec:clientAuthentication want="true" required="false"/>
             </httpj:tlsServerParameters>

http://git-wip-us.apache.org/repos/asf/cxf/blob/1f692efc/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/sslcertclient.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/sslcertclient.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/sslcertclient.xml
index d34d1d5..05e94ee 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/sslcertclient.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/sslcertclient.xml
@@ -20,10 +20,10 @@
     <http:conduit name="https://localhost:.*">
         <http:tlsClientParameters disableCNCheck="true">
             <sec:trustManagers>
-                <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/Truststore.jks"/>
+                <sec:keyStore type="jks" password="password" resource="keys/Truststore.jks"/>
             </sec:trustManagers>
             <sec:keyManagers keyPassword="password">
-                <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/Bethal.jks"/>
+                <sec:keyStore type="jks" password="password" resource="keys/Bethal.jks"/>
             </sec:keyManagers>
         </http:tlsClientParameters>
     </http:conduit>

http://git-wip-us.apache.org/repos/asf/cxf/blob/1f692efc/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/sslnocertclient.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/sslnocertclient.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/sslnocertclient.xml
index e62ebf0..c637dcd 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/sslnocertclient.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/sslnocertclient.xml
@@ -20,7 +20,7 @@
     <http:conduit name="https://localhost:.*">
         <http:tlsClientParameters disableCNCheck="true">
             <sec:trustManagers>
-                <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/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/1f692efc/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client.xml
index 26c6b2f..7647c67 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/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="org/apache/cxf/systest/ws/security/Morpit.jks"/>
+                <sec:keyStore type="jks" password="password" resource="keys/Morpit.jks"/>
             </sec:keyManagers>
             <sec:trustManagers>
-                <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/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/1f692efc/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server.xml
index e0c7c00..4e6b93a 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server.xml
@@ -33,10 +33,10 @@
         <httpj:engine port="${testutil.ports.saml.Server.2}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
-                    <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/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/ws/security/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/1f692efc/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/stax-server.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/stax-server.xml
index 6651ff9..051dac54 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/stax-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/stax-server.xml
@@ -33,10 +33,10 @@
         <httpj:engine port="${testutil.ports.saml.StaxServer.2}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
-                    <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/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/ws/security/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/1f692efc/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/client-auth.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/client-auth.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/client-auth.xml
index fbd66aa..25c0d7e 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/client-auth.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/client-auth.xml
@@ -29,10 +29,10 @@
     <http:conduit name="https://localhost.*">
         <http:tlsClientParameters disableCNCheck="true">
             <sec:keyManagers keyPassword="password">
-                <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/Morpit.jks"/>
+                <sec:keyStore type="jks" password="password" resource="keys/Morpit.jks"/>
             </sec:keyManagers>
             <sec:trustManagers>
-                <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/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/1f692efc/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/client-noauth.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/client-noauth.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/client-noauth.xml
index af2b73e..f241765 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/client-noauth.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/client-noauth.xml
@@ -29,7 +29,7 @@
     <http:conduit name="https://localhost.*">
         <http:tlsClientParameters disableCNCheck="true">
             <sec:trustManagers>
-                <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/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/1f692efc/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/server.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/server.xml
index f5b9891..476ce16 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/server.xml
@@ -33,10 +33,10 @@
         <httpj:engine port="${testutil.ports.saml.subjectconf.Server}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
-                    <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/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/ws/security/Truststore.jks"/>
+                    <sec:keyStore type="jks" password="password" resource="keys/Truststore.jks"/>
                 </sec:trustManagers>
                 <sec:clientAuthentication want="true" required="false"/>
             </httpj:tlsServerParameters>

http://git-wip-us.apache.org/repos/asf/cxf/blob/1f692efc/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/stax-server.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/stax-server.xml
index 278343f..9c9f13f 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/stax-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/stax-server.xml
@@ -33,10 +33,10 @@
         <httpj:engine port="${testutil.ports.saml.subjectconf.StaxServer}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
-                    <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/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/ws/security/Truststore.jks"/>
+                    <sec:keyStore type="jks" password="password" resource="keys/Truststore.jks"/>
                 </sec:trustManagers>
                 <sec:clientAuthentication want="true" required="false"/>
             </httpj:tlsServerParameters>

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

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

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

http://git-wip-us.apache.org/repos/asf/cxf/blob/1f692efc/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/https_config.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/https_config.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/https_config.xml
index a673cd2..9d81ab3 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/https_config.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/https_config.xml
@@ -36,10 +36,10 @@ under the License.
         <httpj:engine port="${testutil.ports.SecurityPolicyTest.1}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
-                    <sec:keyStore type="JKS" password="password" resource="org/apache/cxf/systest/ws/security/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/ws/security/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/1f692efc/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/https_config_client.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/https_config_client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/https_config_client.xml
index bf0e148..7c3d276 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/https_config_client.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/https_config_client.xml
@@ -25,10 +25,10 @@ under the License.
     <http:conduit name="{http://www.example.org/contract/DoubleIt}DoubleItPortHttps.http-conduit">
         <http:tlsClientParameters disableCNCheck="true">
             <sec:keyManagers keyPassword="password">
-                <sec:keyStore type="JKS" password="password" resource="org/apache/cxf/systest/ws/security/Morpit.jks"/>
+                <sec:keyStore type="JKS" password="password" resource="keys/Morpit.jks"/>
             </sec:keyManagers>
             <sec:trustManagers>
-                <sec:keyStore type="JKS" password="password" resource="org/apache/cxf/systest/ws/security/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/1f692efc/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/wss40CA.jks
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/wss40CA.jks b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/wss40CA.jks
deleted file mode 100644
index e3c1adf..0000000
Binary files a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/wss40CA.jks and /dev/null differ

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

http://git-wip-us.apache.org/repos/asf/cxf/blob/1f692efc/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client-derived.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client-derived.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client-derived.xml
index 0d82391..f46a459 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client-derived.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client-derived.xml
@@ -75,7 +75,7 @@
     <http:conduit name="https://localhost:.*">
         <http:tlsClientParameters disableCNCheck="true">
             <sec:trustManagers>
-                <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/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/1f692efc/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client.xml
index 1ef403b..6a2290b 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client.xml
@@ -27,7 +27,7 @@
     <http:conduit name="https://localhost:.*">
         <http:tlsClientParameters disableCNCheck="true">
             <sec:trustManagers>
-                <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/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/1f692efc/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/policy-client.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/policy-client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/policy-client.xml
index 19f099b..de639b1 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/policy-client.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/policy-client.xml
@@ -27,7 +27,7 @@
     <http:conduit name="https://localhost:.*">
         <http:tlsClientParameters disableCNCheck="true">
             <sec:trustManagers>
-                <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/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/1f692efc/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/policy-server.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/policy-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/policy-server.xml
index 61c2d40..03f9f33 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/policy-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/policy-server.xml
@@ -33,10 +33,10 @@
         <httpj:engine port="${testutil.ports.PolicyServer}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
-                    <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/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/ws/security/Truststore.jks"/>
+                    <sec:keyStore type="jks" password="password" resource="keys/Truststore.jks"/>
                 </sec:trustManagers>
                 <sec:clientAuthentication want="true" required="false"/>
             </httpj:tlsServerParameters>

http://git-wip-us.apache.org/repos/asf/cxf/blob/1f692efc/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server-derived.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server-derived.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server-derived.xml
index 803abed..c114b8e 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server-derived.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server-derived.xml
@@ -74,7 +74,7 @@
         <httpj:engine port="${testutil.ports.ut.ServerDerived.2}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
-                    <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/Bethal.jks"/>
+                    <sec:keyStore type="jks" password="password" resource="keys/Bethal.jks"/>
                 </sec:keyManagers>
                 <sec:clientAuthentication want="true" required="false"/>
             </httpj:tlsServerParameters>

http://git-wip-us.apache.org/repos/asf/cxf/blob/1f692efc/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server.xml
index b049406..8084a66 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server.xml
@@ -33,10 +33,10 @@
         <httpj:engine port="${testutil.ports.ut.Server}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
-                    <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/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/ws/security/Truststore.jks"/>
+                    <sec:keyStore type="jks" password="password" resource="keys/Truststore.jks"/>
                 </sec:trustManagers>
                 <sec:clientAuthentication want="true" required="false"/>
             </httpj:tlsServerParameters>

http://git-wip-us.apache.org/repos/asf/cxf/blob/1f692efc/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-policy-server.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-policy-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-policy-server.xml
index 8632aaf..6a479c1 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-policy-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-policy-server.xml
@@ -33,10 +33,10 @@
         <httpj:engine port="${testutil.ports.StaxPolicyServer}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
-                    <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/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/ws/security/Truststore.jks"/>
+                    <sec:keyStore type="jks" password="password" resource="keys/Truststore.jks"/>
                 </sec:trustManagers>
                 <sec:clientAuthentication want="true" required="false"/>
             </httpj:tlsServerParameters>

http://git-wip-us.apache.org/repos/asf/cxf/blob/1f692efc/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-server.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-server.xml
index b925f48..3a32e5e 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-server.xml
@@ -33,10 +33,10 @@
         <httpj:engine port="${testutil.ports.ut.StaxServer}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
-                    <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/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/ws/security/Truststore.jks"/>
+                    <sec:keyStore type="jks" password="password" resource="keys/Truststore.jks"/>
                 </sec:trustManagers>
                 <sec:clientAuthentication want="true" required="false"/>
             </httpj:tlsServerParameters>

http://git-wip-us.apache.org/repos/asf/cxf/blob/1f692efc/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client.xml
index 67b0661..6a13417 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client.xml
@@ -195,7 +195,7 @@
     <http:conduit name="https://localhost:.*">
         <http:tlsClientParameters disableCNCheck="true">
             <sec:trustManagers>
-                <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/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/1f692efc/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/server.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/server.xml
index 0e5b5f4..ef84996 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/server.xml
@@ -35,7 +35,7 @@
         <httpj:engine port="${testutil.ports.wssc.Server.2}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
-                    <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/Bethal.jks"/>
+                    <sec:keyStore type="jks" password="password" resource="keys/Bethal.jks"/>
                 </sec:keyManagers>
                 <sec:clientAuthentication want="true" required="false"/>
             </httpj:tlsServerParameters>
@@ -46,7 +46,7 @@
         <httpj:engine port="${testutil.ports.wssc.StaxServer.2}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
-                    <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/Bethal.jks"/>
+                    <sec:keyStore type="jks" password="password" resource="keys/Bethal.jks"/>
                 </sec:keyManagers>
                 <sec:clientAuthentication want="true" required="false"/>
             </httpj:tlsServerParameters>

http://git-wip-us.apache.org/repos/asf/cxf/blob/1f692efc/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/unit-server.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/unit-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/unit-server.xml
index 4913420..2808074 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/unit-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/unit-server.xml
@@ -29,7 +29,7 @@
         <httpj:engine port="${testutil.ports.UnitServer}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
-                    <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/Bethal.jks"/>
+                    <sec:keyStore type="jks" password="password" resource="keys/Bethal.jks"/>
                 </sec:keyManagers>
                 <sec:clientAuthentication want="true" required="false"/>
             </httpj:tlsServerParameters>

http://git-wip-us.apache.org/repos/asf/cxf/blob/1f692efc/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client.xml
index ec350ed..e1fd47a 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client.xml
@@ -42,10 +42,10 @@
     <http:conduit name="https://.*/UserNameOverTransport.*">
         <http:tlsClientParameters disableCNCheck="true">
             <sec:keyManagers keyPassword="password">
-                <sec:keyStore type="jks" password="password" resource="certs/alice.jks"/>
+                <sec:keyStore type="jks" password="password" resource="keys/alice.jks"/>
             </sec:keyManagers>
             <sec:trustManagers>
-                <sec:keyStore type="jks" password="password" resource="certs/bob.jks"/>
+                <sec:keyStore type="jks" password="password" resource="keys/bob.jks"/>
             </sec:trustManagers>
         </http:tlsClientParameters>
     </http:conduit>

http://git-wip-us.apache.org/repos/asf/cxf/blob/1f692efc/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server.xml
index 9acb53e..64ba57d 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server.xml
@@ -33,10 +33,10 @@
         <httpj:engine port="${testutil.ports.wssec10.server.Server.1}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
-                    <sec:keyStore type="jks" password="password" resource="certs/bob.jks"/>
+                    <sec:keyStore type="jks" password="password" resource="keys/bob.jks"/>
                 </sec:keyManagers>
                 <sec:trustManagers>
-                    <sec:keyStore type="jks" password="password" resource="certs/alice.jks"/>
+                    <sec:keyStore type="jks" password="password" resource="keys/alice.jks"/>
                 </sec:trustManagers>
                 <!--
                 <sec:clientAuthentication want="true" required="true"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/1f692efc/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server.xml
index afa9435..22cd0f2 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server.xml
@@ -33,10 +33,10 @@
         <httpj:engine port="${testutil.ports.wssec10.server.StaxServer.1}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
-                    <sec:keyStore type="jks" password="password" resource="certs/bob.jks"/>
+                    <sec:keyStore type="jks" password="password" resource="keys/bob.jks"/>
                 </sec:keyManagers>
                 <sec:trustManagers>
-                    <sec:keyStore type="jks" password="password" resource="certs/alice.jks"/>
+                    <sec:keyStore type="jks" password="password" resource="keys/alice.jks"/>
                 </sec:trustManagers>
                 <!--
                 <sec:clientAuthentication want="true" required="true"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/1f692efc/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client.xml
index c3e58f8..58fd8b9 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client.xml
@@ -420,7 +420,7 @@
     <http:conduit name="https://localhost:.*">
         <http:tlsClientParameters disableCNCheck="true">
             <sec:trustManagers>
-                <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/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/1f692efc/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/intermediary.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/intermediary.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/intermediary.xml
index f1ca6ee..b23fccc 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/intermediary.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/intermediary.xml
@@ -35,7 +35,7 @@
     <http:conduit name="https://localhost:.*">
         <http:tlsClientParameters disableCNCheck="true">
             <sec:trustManagers>
-                <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/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/1f692efc/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/jaxws-client.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/jaxws-client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/jaxws-client.xml
index 5fbfe97..1bf7bcf 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/jaxws-client.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/jaxws-client.xml
@@ -34,7 +34,7 @@
     <http:conduit name="https://localhost:.*">
         <http:tlsClientParameters disableCNCheck="true">
             <sec:trustManagers>
-                <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/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/1f692efc/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml
index fa2796b..3839ebd 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml
@@ -33,7 +33,7 @@
         <httpj:engine port="${testutil.ports.x509.Server.2}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
-                    <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/Bethal.jks"/>
+                    <sec:keyStore type="jks" password="password" resource="keys/Bethal.jks"/>
                 </sec:keyManagers>
                 <sec:clientAuthentication want="true" required="false"/>
             </httpj:tlsServerParameters>

http://git-wip-us.apache.org/repos/asf/cxf/blob/1f692efc/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/stax-server.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/stax-server.xml
index 6c770d9..53e6f2e 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/stax-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/stax-server.xml
@@ -33,7 +33,7 @@
         <httpj:engine port="${testutil.ports.x509.StaxServer.2}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
-                    <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/Bethal.jks"/>
+                    <sec:keyStore type="jks" password="password" resource="keys/Bethal.jks"/>
                 </sec:keyManagers>
                 <sec:clientAuthentication want="true" required="false"/>
             </httpj:tlsServerParameters>

http://git-wip-us.apache.org/repos/asf/cxf/blob/1f692efc/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/client.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/client.xml
index d5d4837..d6b0a7f 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/client.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/client.xml
@@ -86,7 +86,7 @@
     <http:conduit name="https://localhost:.*">
         <http:tlsClientParameters disableCNCheck="true">
             <sec:trustManagers>
-                <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/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/1f692efc/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/xkms-server.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/xkms-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/xkms-server.xml
index 49a784d..9b36ce5 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/xkms-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/xkms-server.xml
@@ -33,7 +33,7 @@
         <httpj:engine port="${testutil.ports.xkms.XKMSServer}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
-                    <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/Bethal.jks"/>
+                    <sec:keyStore type="jks" password="password" resource="keys/Bethal.jks"/>
                 </sec:keyManagers>
                 <sec:clientAuthentication want="true" required="false"/>
             </httpj:tlsServerParameters>