http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/clientKeystore.properties ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/clientKeystore.properties b/services/sts/systests/basic/src/test/resources/clientKeystore.properties index 8ab391e..b76fb47 100644 --- a/services/sts/systests/basic/src/test/resources/clientKeystore.properties +++ b/services/sts/systests/basic/src/test/resources/clientKeystore.properties @@ -20,5 +20,5 @@ 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=cspass org.apache.ws.security.crypto.merlin.keystore.alias=myclientkey -org.apache.ws.security.crypto.merlin.keystore.file=clientstore.jks +org.apache.ws.security.crypto.merlin.keystore.file=keys/clientstore.jks
http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/clientstore.jks ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/clientstore.jks b/services/sts/systests/basic/src/test/resources/clientstore.jks deleted file mode 100644 index f734f87..0000000 Binary files a/services/sts/systests/basic/src/test/resources/clientstore.jks and /dev/null differ http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-client.xml index b4281c9..64eb335 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-client.xml @@ -51,10 +51,10 @@ <http:conduit name="https://localhost.*";> <http:tlsClientParameters disableCNCheck="true"> <sec:keyManagers keyPassword="ckpass"> - <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/> + <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/> + <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:trustManagers> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-service.xml index 04a696f..e733d03 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-service.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-service.xml @@ -37,10 +37,10 @@ <httpj:engine port="${testutil.ports.bearer.Server}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="skpass"> - <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/> + <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/> + <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:trustManagers> <sec:clientAuthentication want="true" required="true"/> </httpj:tlsServerParameters> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-stax-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-stax-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-stax-service.xml index 94c24e3..3f68318 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-stax-service.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-stax-service.xml @@ -39,10 +39,10 @@ <httpj:engine port="${testutil.ports.bearer.StaxServer}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="skpass"> - <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/> + <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/> + <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:trustManagers> <sec:clientAuthentication want="true" required="true"/> </httpj:tlsServerParameters> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-unsigned-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-unsigned-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-unsigned-client.xml index 1cc647a..abcea11 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-unsigned-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-unsigned-client.xml @@ -30,10 +30,10 @@ <http:conduit name="https://localhost.*";> <http:tlsClientParameters disableCNCheck="true"> <sec:keyManagers keyPassword="ckpass"> - <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/> + <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/> + <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:trustManagers> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-client.xml index 5d8cff2..fd3b2dc 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-client.xml @@ -27,10 +27,10 @@ <http:conduit name="https://localhost.*";> <http:tlsClientParameters disableCNCheck="true"> <sec:keyManagers keyPassword="ckpass"> - <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/> + <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/> + <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:trustManagers> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-sts-transport.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-sts-transport.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-sts-transport.xml index 6ed9b6b..7240914 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-sts-transport.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-sts-transport.xml @@ -130,10 +130,10 @@ <httpj:engine port="${testutil.ports.STSServer}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="skpass"> - <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/> + <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/> + <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:trustManagers> <sec:clientAuthentication want="false" required="false"/> </httpj:tlsServerParameters> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml index d5201cc..b2b3404 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml @@ -164,10 +164,10 @@ <httpj:engine port="${testutil.ports.STSServer}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="skpass"> - <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/> + <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/> + <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:trustManagers> <sec:clientAuthentication want="false" required="false"/> </httpj:tlsServerParameters> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-transport.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-transport.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-transport.xml index 9f05ebb..43c75c7 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-transport.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-transport.xml @@ -148,10 +148,10 @@ <httpj:engine port="${testutil.ports.StaxSTSServer}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="skpass"> - <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/> + <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/> + <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:trustManagers> <sec:clientAuthentication want="false" required="false"/> </httpj:tlsServerParameters> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-bad-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-bad-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-bad-client.xml index 6370756..357bb9c 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-bad-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-bad-client.xml @@ -50,7 +50,7 @@ <http:conduit name="https://localhost.*";> <http:tlsClientParameters disableCNCheck="true"> <sec:trustManagers> - <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/> + <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:trustManagers> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-client.xml index 3527b88..cadb974 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-client.xml @@ -49,7 +49,7 @@ <http:conduit name="https://localhost.*";> <http:tlsClientParameters disableCNCheck="true"> <sec:trustManagers> - <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/> + <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:trustManagers> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary-caching.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary-caching.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary-caching.xml index 9921276..5690484 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary-caching.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary-caching.xml @@ -35,7 +35,7 @@ <httpj:engine port="${testutil.ports.intermediary_transformation.Intermediary}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="skpass"> - <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/> + <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="false" required="false"/> </httpj:tlsServerParameters> @@ -72,10 +72,10 @@ <http:conduit name="https://localhost.*";> <http:tlsClientParameters disableCNCheck="true"> <sec:keyManagers keyPassword="ckpass"> - <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/> + <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/> + <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:trustManagers> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary.xml index 03c3d6d..f3a84d7 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary.xml @@ -35,7 +35,7 @@ <httpj:engine port="${testutil.ports.intermediary_transformation.Intermediary}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="skpass"> - <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/> + <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="false" required="false"/> </httpj:tlsServerParameters> @@ -67,10 +67,10 @@ <http:conduit name="https://localhost.*";> <http:tlsClientParameters disableCNCheck="true"> <sec:keyManagers keyPassword="ckpass"> - <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/> + <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/> + <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:trustManagers> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-service.xml index 87b2531..9bc424e 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-service.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-service.xml @@ -38,10 +38,10 @@ <httpj:engine port="${testutil.ports.intermediary_transformation.Server.2}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="skpass"> - <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/> + <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/> + <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:trustManagers> <sec:clientAuthentication want="true" required="true"/> </httpj:tlsServerParameters> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-client.xml index 1eeee80..bdee0eb 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-client.xml @@ -65,10 +65,10 @@ <http:conduit name="https://localhost.*";> <http:tlsClientParameters disableCNCheck="true"> <sec:keyManagers keyPassword="ckpass"> - <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/> + <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/> + <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:trustManagers> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-service.xml index 6a2d4cb..5565827 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-service.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-service.xml @@ -51,10 +51,10 @@ <httpj:engine port="${testutil.ports.issuer.Server}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="skpass"> - <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/> + <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/> + <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:trustManagers> <sec:clientAuthentication want="true" required="true"/> </httpj:tlsServerParameters> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-sts-transport.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-sts-transport.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-sts-transport.xml index 762ee45..9d69637 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-sts-transport.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-sts-transport.xml @@ -131,10 +131,10 @@ <httpj:engine port="30101"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="skpass"> - <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/> + <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/> + <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:trustManagers> <sec:clientAuthentication want="false" required="false"/> </httpj:tlsServerParameters> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issueunit/cxf-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issueunit/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issueunit/cxf-client.xml index 892e5a5..ea662df 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issueunit/cxf-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issueunit/cxf-client.xml @@ -26,7 +26,7 @@ <http:conduit name="https://localhost:.*";> <http:tlsClientParameters disableCNCheck="true"> <sec:trustManagers> - <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/> + <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:trustManagers> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-client.xml index bed086d..193821c 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-client.xml @@ -27,10 +27,10 @@ <http:conduit name="https://localhost.*";> <http:tlsClientParameters disableCNCheck="true"> <sec:keyManagers keyPassword="ckpass"> - <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/> + <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/> + <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:trustManagers> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml index 3e9bb09..a1036d9 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml @@ -116,10 +116,10 @@ <httpj:engine port="${testutil.ports.jaas.Server}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="skpass"> - <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/> + <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/> + <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:trustManagers> <sec:clientAuthentication want="true" required="true"/> </httpj:tlsServerParameters> @@ -129,10 +129,10 @@ <http:conduit name="https://localhost.*";> <http:tlsClientParameters disableCNCheck="true"> <sec:keyManagers keyPassword="skpass"> - <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/> + <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/> + <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:trustManagers> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service2.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service2.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service2.xml index c6dc2f6..a8e679b 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service2.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service2.xml @@ -56,10 +56,10 @@ <httpj:engine port="${testutil.ports.jaas.Server2}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="skpass"> - <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/> + <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/> + <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:trustManagers> <sec:clientAuthentication want="true" required="true"/> </httpj:tlsServerParameters> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-sts-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-sts-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-sts-client.xml index 92cc8b2..5265cfa 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-sts-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-sts-client.xml @@ -22,10 +22,10 @@ <http:conduit name="https://localhost.*";> <http:tlsClientParameters disableCNCheck="true"> <sec:keyManagers keyPassword="skpass"> - <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/> + <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/> + <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:trustManagers> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/rest/cxf-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/rest/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/rest/cxf-client.xml index f45b741..32e0bb5 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/rest/cxf-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/rest/cxf-client.xml @@ -26,10 +26,10 @@ <http:conduit name="https://localhost:.*";> <http:tlsClientParameters disableCNCheck="true"> <sec:keyManagers keyPassword="ckpass"> - <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/> + <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/> + <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:trustManagers> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/rest/cxf-rest-sts.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/rest/cxf-rest-sts.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/rest/cxf-rest-sts.xml index a7c1156..1fd4ed2 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/rest/cxf-rest-sts.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/rest/cxf-rest-sts.xml @@ -134,10 +134,10 @@ <httpj:engine port="${testutil.ports.STSRESTServer}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="skpass"> - <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/> + <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/> + <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:trustManagers> <sec:clientAuthentication want="true" required="true"/> </httpj:tlsServerParameters> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-client.xml index c6d3cef..99062cf 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-client.xml @@ -32,7 +32,7 @@ <http:conduit name="https://localhost.*";> <http:tlsClientParameters disableCNCheck="true"> <sec:trustManagers> - <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/> + <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:trustManagers> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-intermediary.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-intermediary.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-intermediary.xml index 8e5ab47..eeb1f3e 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-intermediary.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-intermediary.xml @@ -36,7 +36,7 @@ <httpj:engine port="${testutil.ports.sendervouches.Intermediary}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="skpass"> - <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/> + <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="false" required="false"/> </httpj:tlsServerParameters> @@ -45,10 +45,10 @@ <http:conduit name="https://localhost.*";> <http:tlsClientParameters disableCNCheck="true"> <sec:trustManagers> - <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/> + <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:trustManagers> <sec:keyManagers keyPassword="skpass"> - <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/> + <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-service.xml index b9d2637..30d83b1 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-service.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-service.xml @@ -34,10 +34,10 @@ <httpj:engine port="${testutil.ports.sendervouches.Server.2}"> <httpj:tlsServerParameters> <sec:trustManagers> - <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/> + <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:trustManagers> <sec:keyManagers keyPassword="stskpass"> - <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/> + <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="true" required="true"/> </httpj:tlsServerParameters> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-intermediary.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-intermediary.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-intermediary.xml index 7bda0db..ee2f81a 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-intermediary.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-intermediary.xml @@ -37,7 +37,7 @@ <httpj:engine port="${testutil.ports.sendervouches.StaxIntermediary}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="skpass"> - <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/> + <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="false" required="false"/> </httpj:tlsServerParameters> @@ -51,10 +51,10 @@ <http:conduit name="https://localhost.*";> <http:tlsClientParameters disableCNCheck="true"> <sec:trustManagers> - <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/> + <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:trustManagers> <sec:keyManagers keyPassword="skpass"> - <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/> + <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-service.xml index ab91a5f..12ab91c 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-service.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-service.xml @@ -35,10 +35,10 @@ <httpj:engine port="${testutil.ports.sendervouches.StaxServer.2}"> <httpj:tlsServerParameters> <sec:trustManagers> - <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/> + <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:trustManagers> <sec:keyManagers keyPassword="stskpass"> - <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/> + <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="true" required="true"/> </httpj:tlsServerParameters> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-client-name.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-client-name.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-client-name.xml index 404f92b..d0ffe3e 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-client-name.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-client-name.xml @@ -48,10 +48,10 @@ <http:conduit name="https://localhost.*";> <http:tlsClientParameters disableCNCheck="true"> <sec:keyManagers keyPassword="ckpass"> - <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/> + <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/> + <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:trustManagers> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-default-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-default-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-default-client.xml index 435ee5c..2c8c48d 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-default-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-default-client.xml @@ -48,10 +48,10 @@ <http:conduit name="https://localhost.*";> <http:tlsClientParameters disableCNCheck="true"> <sec:keyManagers keyPassword="ckpass"> - <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/> + <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/> + <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:trustManagers> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-service.xml index 3f26bbf..0473cc8 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-service.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-service.xml @@ -29,10 +29,10 @@ <httpj:engine port="${testutil.ports.stsclient.Server}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="skpass"> - <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/> + <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/> + <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:trustManagers> <sec:clientAuthentication want="true" required="true"/> </httpj:tlsServerParameters> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-client.xml index fbc2254..f23b44a 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-client.xml @@ -40,10 +40,10 @@ <http:conduit name="https://localhost.*";> <http:tlsClientParameters disableCNCheck="true"> <sec:keyManagers keyPassword="ckpass"> - <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/> + <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/> + <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:trustManagers> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-service.xml index 1daf0f1..115248c 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-service.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-service.xml @@ -37,10 +37,10 @@ <httpj:engine port="${testutil.ports.template.Server}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="skpass"> - <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/> + <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/> + <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:trustManagers> <sec:clientAuthentication want="true" required="true"/> </httpj:tlsServerParameters> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-stax-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-stax-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-stax-service.xml index 17d4290..f90d40b 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-stax-service.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-stax-service.xml @@ -39,10 +39,10 @@ <httpj:engine port="${testutil.ports.template.StaxServer}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="skpass"> - <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/> + <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/> + <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:trustManagers> <sec:clientAuthentication want="true" required="true"/> </httpj:tlsServerParameters> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-bad-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-bad-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-bad-client.xml index 0869c8d..052e714 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-bad-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-bad-client.xml @@ -72,10 +72,10 @@ <http:conduit name="https://localhost.*";> <http:tlsClientParameters disableCNCheck="true"> <sec:keyManagers keyPassword="ckpass"> - <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/> + <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/> + <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:trustManagers> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-client.xml index 2151d9b..0c9402b 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-client.xml @@ -83,10 +83,10 @@ <http:conduit name="https://localhost.*";> <http:tlsClientParameters disableCNCheck="true"> <sec:keyManagers keyPassword="ckpass"> - <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/> + <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/> + <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:trustManagers> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-service.xml index cf75a23..b2306e3 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-service.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-service.xml @@ -56,10 +56,10 @@ <httpj:engine port="${testutil.ports.transport.Server}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="skpass"> - <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/> + <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/> + <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:trustManagers> <sec:clientAuthentication want="true" required="true"/> </httpj:tlsServerParameters> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-stax-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-stax-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-stax-service.xml index c8f1f01..dea1ca8 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-stax-service.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-stax-service.xml @@ -61,10 +61,10 @@ <httpj:engine port="${testutil.ports.transport.StaxServer}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="skpass"> - <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/> + <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/> + <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:trustManagers> <sec:clientAuthentication want="true" required="true"/> </httpj:tlsServerParameters> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-client.xml index 62861c3..828dc64 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-client.xml @@ -172,7 +172,7 @@ <http:conduit name="https://localhost:.*";> <http:tlsClientParameters disableCNCheck="true"> <sec:trustManagers> - <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/> + <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:trustManagers> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-client.xml index e2c10fe..249d4e3 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-client.xml @@ -172,7 +172,7 @@ <http:conduit name="https://localhost:.*";> <http:tlsClientParameters disableCNCheck="true"> <sec:trustManagers> - <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/> + <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:trustManagers> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/serviceKeystore.properties ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/serviceKeystore.properties b/services/sts/systests/basic/src/test/resources/serviceKeystore.properties index 7657a5f..f837778 100644 --- a/services/sts/systests/basic/src/test/resources/serviceKeystore.properties +++ b/services/sts/systests/basic/src/test/resources/serviceKeystore.properties @@ -20,5 +20,5 @@ 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=sspass org.apache.ws.security.crypto.merlin.keystore.alias=myservicekey -org.apache.ws.security.crypto.merlin.keystore.file=servicestore.jks +org.apache.ws.security.crypto.merlin.keystore.file=keys/servicestore.jks http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/serviceKeystore2.properties ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/serviceKeystore2.properties b/services/sts/systests/basic/src/test/resources/serviceKeystore2.properties index 7cadde9..f85af2d 100644 --- a/services/sts/systests/basic/src/test/resources/serviceKeystore2.properties +++ b/services/sts/systests/basic/src/test/resources/serviceKeystore2.properties @@ -20,7 +20,7 @@ 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=sspass org.apache.ws.security.crypto.merlin.keystore.alias=myservicekey -org.apache.ws.security.crypto.merlin.keystore.file=servicestore.jks +org.apache.ws.security.crypto.merlin.keystore.file=keys/servicestore.jks org.apache.ws.security.crypto.merlin.truststore.password=stsspass -org.apache.ws.security.crypto.merlin.truststore.file=stsstore.jks +org.apache.ws.security.crypto.merlin.truststore.file=keys/stsstore.jks http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/servicestore.jks ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/servicestore.jks b/services/sts/systests/basic/src/test/resources/servicestore.jks deleted file mode 100644 index 999ee82..0000000 Binary files a/services/sts/systests/basic/src/test/resources/servicestore.jks and /dev/null differ http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/stsKeystore.properties ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/stsKeystore.properties b/services/sts/systests/basic/src/test/resources/stsKeystore.properties index 2f132ea..a11eefa 100644 --- a/services/sts/systests/basic/src/test/resources/stsKeystore.properties +++ b/services/sts/systests/basic/src/test/resources/stsKeystore.properties @@ -19,5 +19,5 @@ org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin org.apache.ws.security.crypto.merlin.keystore.type=jks org.apache.ws.security.crypto.merlin.keystore.password=stsspass -org.apache.ws.security.crypto.merlin.keystore.file=stsstore.jks +org.apache.ws.security.crypto.merlin.keystore.file=keys/stsstore.jks http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/resources/stsstore.jks ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/stsstore.jks b/services/sts/systests/basic/src/test/resources/stsstore.jks deleted file mode 100644 index 51f131f..0000000 Binary files a/services/sts/systests/basic/src/test/resources/stsstore.jks and /dev/null differ http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/systests/kerberos/src/test/resources/clientKeystore.properties ---------------------------------------------------------------------- diff --git a/systests/kerberos/src/test/resources/clientKeystore.properties b/systests/kerberos/src/test/resources/clientKeystore.properties index 8ab391e..b76fb47 100644 --- a/systests/kerberos/src/test/resources/clientKeystore.properties +++ b/systests/kerberos/src/test/resources/clientKeystore.properties @@ -20,5 +20,5 @@ 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=cspass org.apache.ws.security.crypto.merlin.keystore.alias=myclientkey -org.apache.ws.security.crypto.merlin.keystore.file=clientstore.jks +org.apache.ws.security.crypto.merlin.keystore.file=keys/clientstore.jks http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/systests/kerberos/src/test/resources/clientstore.jks ---------------------------------------------------------------------- diff --git a/systests/kerberos/src/test/resources/clientstore.jks b/systests/kerberos/src/test/resources/clientstore.jks deleted file mode 100644 index f734f87..0000000 Binary files a/systests/kerberos/src/test/resources/clientstore.jks and /dev/null differ http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/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 0c2b229..6a634a9 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 @@ -185,7 +185,7 @@ <httpj:engine port="${testutil.ports.Server.3}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="skpass"> - <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/> + <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="false" required="false"/> </httpj:tlsServerParameters> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/sts-client.xml ---------------------------------------------------------------------- diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/sts-client.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/sts-client.xml index a5af7a7..7446b20 100644 --- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/sts-client.xml +++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/sts-client.xml @@ -61,10 +61,10 @@ <http:conduit name="https://localhost:.*";> <http:tlsClientParameters disableCNCheck="true"> <sec:trustManagers> - <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/> + <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:trustManagers> <sec:keyManagers keyPassword="skpass"> - <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/> + <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/sts/cxf-sts.xml ---------------------------------------------------------------------- diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/sts/cxf-sts.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/sts/cxf-sts.xml index 60c4cc7..97cd441 100644 --- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/sts/cxf-sts.xml +++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/sts/cxf-sts.xml @@ -84,10 +84,10 @@ <httpj:engine port="${testutil.ports.STSServer}"> <httpj:tlsServerParameters> <sec:trustManagers> - <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/> + <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:trustManagers> <sec:keyManagers keyPassword="stskpass"> - <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/> + <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="true" required="true"/> </httpj:tlsServerParameters> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/sts/stax-cxf-sts.xml ---------------------------------------------------------------------- diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/sts/stax-cxf-sts.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/sts/stax-cxf-sts.xml index 7ba9201..96e3e7a 100644 --- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/sts/stax-cxf-sts.xml +++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/sts/stax-cxf-sts.xml @@ -89,10 +89,10 @@ <httpj:engine port="${testutil.ports.StaxSTSServer}"> <httpj:tlsServerParameters> <sec:trustManagers> - <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/> + <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:trustManagers> <sec:keyManagers keyPassword="stskpass"> - <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/> + <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="true" required="true"/> </httpj:tlsServerParameters> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/systests/kerberos/src/test/resources/serviceKeystore.properties ---------------------------------------------------------------------- diff --git a/systests/kerberos/src/test/resources/serviceKeystore.properties b/systests/kerberos/src/test/resources/serviceKeystore.properties index 7657a5f..f837778 100644 --- a/systests/kerberos/src/test/resources/serviceKeystore.properties +++ b/systests/kerberos/src/test/resources/serviceKeystore.properties @@ -20,5 +20,5 @@ 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=sspass org.apache.ws.security.crypto.merlin.keystore.alias=myservicekey -org.apache.ws.security.crypto.merlin.keystore.file=servicestore.jks +org.apache.ws.security.crypto.merlin.keystore.file=keys/servicestore.jks http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/systests/kerberos/src/test/resources/servicestore.jks ---------------------------------------------------------------------- diff --git a/systests/kerberos/src/test/resources/servicestore.jks b/systests/kerberos/src/test/resources/servicestore.jks deleted file mode 100644 index 999ee82..0000000 Binary files a/systests/kerberos/src/test/resources/servicestore.jks and /dev/null differ http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/systests/kerberos/src/test/resources/stsKeystore.properties ---------------------------------------------------------------------- diff --git a/systests/kerberos/src/test/resources/stsKeystore.properties b/systests/kerberos/src/test/resources/stsKeystore.properties index 2f132ea..a11eefa 100644 --- a/systests/kerberos/src/test/resources/stsKeystore.properties +++ b/systests/kerberos/src/test/resources/stsKeystore.properties @@ -19,5 +19,5 @@ org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin org.apache.ws.security.crypto.merlin.keystore.type=jks org.apache.ws.security.crypto.merlin.keystore.password=stsspass -org.apache.ws.security.crypto.merlin.keystore.file=stsstore.jks +org.apache.ws.security.crypto.merlin.keystore.file=keys/stsstore.jks http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/systests/kerberos/src/test/resources/stsstore.jks ---------------------------------------------------------------------- diff --git a/systests/kerberos/src/test/resources/stsstore.jks b/systests/kerberos/src/test/resources/stsstore.jks deleted file mode 100644 index 51f131f..0000000 Binary files a/systests/kerberos/src/test/resources/stsstore.jks and /dev/null differ http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/testutils/src/test/resources/keys/clientstore.jks ---------------------------------------------------------------------- diff --git a/testutils/src/test/resources/keys/clientstore.jks b/testutils/src/test/resources/keys/clientstore.jks new file mode 100644 index 0000000..f734f87 Binary files /dev/null and b/testutils/src/test/resources/keys/clientstore.jks differ http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/testutils/src/test/resources/keys/servicestore.jks ---------------------------------------------------------------------- diff --git a/testutils/src/test/resources/keys/servicestore.jks b/testutils/src/test/resources/keys/servicestore.jks new file mode 100644 index 0000000..999ee82 Binary files /dev/null and b/testutils/src/test/resources/keys/servicestore.jks differ http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/testutils/src/test/resources/keys/stsstore.jks ---------------------------------------------------------------------- diff --git a/testutils/src/test/resources/keys/stsstore.jks b/testutils/src/test/resources/keys/stsstore.jks new file mode 100644 index 0000000..51f131f Binary files /dev/null and b/testutils/src/test/resources/keys/stsstore.jks differ
