http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-caching-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-caching-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-caching-service.xml index 86df044..984c70b 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-caching-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-caching-service.xml @@ -81,10 +81,10 @@ <httpj:engine port="${testutil.ports.caching.CachingServer}"> <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> @@ -93,10 +93,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/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-client.xml index 0124abd..ce52ce5 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-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/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-service.xml index f24227f..421c940 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-service.xml @@ -41,10 +41,10 @@ <httpj:engine port="${testutil.ports.caching.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> @@ -53,10 +53,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/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-bad-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-bad-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-bad-client.xml index 3e1a440..b906034 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-bad-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-bad-client.xml @@ -48,10 +48,10 @@ <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> <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> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client-cbhandler.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client-cbhandler.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client-cbhandler.xml index d8dce9a..5ca2ea2 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client-cbhandler.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client-cbhandler.xml @@ -51,10 +51,10 @@ <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> <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> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client.xml index 678b9ff..135a7bb 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client.xml @@ -64,10 +64,10 @@ <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> <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> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-service.xml index 1885ad6..25032db 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-service.xml @@ -68,10 +68,10 @@ <httpj:engine port="${testutil.ports.claims.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> @@ -80,7 +80,7 @@ <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> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/stax-cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/stax-cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/stax-cxf-service.xml index b76784b..bb780f4 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/stax-cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/stax-cxf-service.xml @@ -73,10 +73,10 @@ <httpj:engine port="${testutil.ports.claims.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> @@ -85,7 +85,7 @@ <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> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client.xml index a127bdc..a57080b 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client.xml @@ -73,10 +73,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/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-service.xml index c4721ca..075a14a 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-service.xml @@ -42,10 +42,10 @@ <httpj:engine port="${testutil.ports.cross_domain.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="false" required="false"/> </httpj:tlsServerParameters> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml1.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml1.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml1.xml index 9d427c5..d63d41f 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml1.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml1.xml @@ -71,10 +71,10 @@ <httpj:engine port="30101"> <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/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml2.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml2.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml2.xml index 91f2d2c..d2984d7 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml2.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml2.xml @@ -71,10 +71,10 @@ <httpj:engine port="30102"> <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/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-client.xml index 59b7231..f5a47ba 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-client.xml @@ -50,10 +50,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/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-service.xml index 26f421b..b136cf4 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-service.xml @@ -47,10 +47,10 @@ <httpj:engine port="${testutil.ports.custom_onbehalfof.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> @@ -59,10 +59,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/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-sts.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-sts.xml index d46e697..1adf2b7 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-sts.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-sts.xml @@ -132,10 +132,10 @@ <httpj:engine port="${testutil.ports.custom_onbehalfof.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/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts.xml index 490d5cf..8353b01 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts.xml @@ -138,10 +138,10 @@ <httpj:engine port="${testutil.ports.deployment.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/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-sts.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-sts.xml index 0478f57..78ef796 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-sts.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-sts.xml @@ -138,10 +138,10 @@ <httpj:engine port="${testutil.ports.deployment.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/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-client.xml index e613d9c..c81ea75 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-client.xml @@ -57,10 +57,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/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-service.xml index 7fb958f..9aed6ce 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-service.xml @@ -78,10 +78,10 @@ <httpj:engine port="${testutil.ports.distributed_caching.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> @@ -90,10 +90,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/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-1.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-1.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-1.xml index abeb81a..0f1c868 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-1.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-1.xml @@ -112,10 +112,10 @@ <httpj:engine port="${testutil.ports.distributed_caching.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/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-2.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-2.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-2.xml index 5bdf3a2..407722d 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-2.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-2.xml @@ -105,10 +105,10 @@ <httpj:engine port="${testutil.ports.distributed_caching.STSServer.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/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/cxf-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/cxf-client.xml index 924f7d2..2d88049 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/cxf-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/cxf-client.xml @@ -28,10 +28,10 @@ <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> <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> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/cxf-service.xml index 4c2ca11..de769d1 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/cxf-service.xml @@ -35,7 +35,7 @@ <entry key="rs.security.keystore.type" value="jks" /> <entry key="rs.security.keystore.alias" value="mystskey"/> <entry key="rs.security.keystore.password" value="sspass"/> - <entry key="rs.security.keystore.file" value="servicestore.jks" /> + <entry key="rs.security.keystore.file" value="keys/servicestore.jks" /> <entry key="rs.security.signature.algorithm" value="RS256" /> </jaxrs:properties> </jaxrs:server> @@ -44,7 +44,7 @@ <httpj:engine port="${testutil.ports.jwt.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:clientAuthentication want="false" required="false"/> </httpj:tlsServerParameters> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary-client.xml index 8bfbaae..8da3df0 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary-client.xml @@ -38,10 +38,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/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary-jaxrs-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary-jaxrs-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary-jaxrs-client.xml index f992249..6b07751 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary-jaxrs-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary-jaxrs-client.xml @@ -28,10 +28,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:authorization> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary.xml index aa116c2..bdba93a 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary.xml @@ -83,7 +83,7 @@ <httpj:engine port="${testutil.ports.kerberos.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> @@ -93,10 +93,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/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-service.xml index cd34cba..df67d53 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-service.xml @@ -34,7 +34,7 @@ <httpj:engine port="${testutil.ports.kerberos.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:clientAuthentication want="false" required="false"/> </httpj:tlsServerParameters> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-client.xml index eb4b6ac..6053d62 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-client.xml @@ -111,10 +111,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/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-service.xml index 3ed4ca7..435762f 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-service.xml @@ -120,10 +120,10 @@ <httpj:engine port="${testutil.ports.realms.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="false" required="false"/> </httpj:tlsServerParameters> @@ -132,10 +132,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/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml1.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml1.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml1.xml index 3775534..7022507 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml1.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml1.xml @@ -95,10 +95,10 @@ <httpj:engine port="${testutil.ports.realms.STSServer.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/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml2.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml2.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml2.xml index 4447d9f..41ef14d 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml2.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml2.xml @@ -88,10 +88,10 @@ <httpj:engine port="${testutil.ports.realms.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/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client-unit.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client-unit.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client-unit.xml index 5abe27a..9af06b1 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client-unit.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client-unit.xml @@ -27,10 +27,10 @@ <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> <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> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client.xml index 4e61494..eab0d82 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client.xml @@ -157,10 +157,10 @@ <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> <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> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-service.xml index c60b8a9..41941e6 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-service.xml @@ -58,7 +58,7 @@ <httpj:engine port="${testutil.ports.renew.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:clientAuthentication want="false" required="false"/> </httpj:tlsServerParameters> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts-pop.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts-pop.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts-pop.xml index 21600a6..35d0396 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts-pop.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts-pop.xml @@ -130,10 +130,10 @@ <httpj:engine port="${testutil.ports.renew.STSServerPOP}"> <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/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts.xml index a8bb938..f1b27a4 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts.xml @@ -112,10 +112,10 @@ <httpj:engine port="${testutil.ports.renew.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/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/stax-cxf-sts.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/stax-cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/stax-cxf-sts.xml index 7ee0615..5b8cb15 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/stax-cxf-sts.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/stax-cxf-sts.xml @@ -115,10 +115,10 @@ <httpj:engine port="${testutil.ports.renew.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/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-client.xml index 05f4beb..9463c98 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-client.xml @@ -58,10 +58,10 @@ <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> <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> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-service.xml index 6285fe7..2d0cc6e 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-service.xml @@ -78,10 +78,10 @@ <httpj:engine port="${testutil.ports.secure_conv.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> @@ -90,10 +90,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/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-sts.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-sts.xml index 37806f9..37ff258 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-sts.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-sts.xml @@ -142,10 +142,10 @@ <httpj:engine port="${testutil.ports.secure_conv.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/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/stax-cxf-sts.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/stax-cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/stax-cxf-sts.xml index e220adb..f33f9d0 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/stax-cxf-sts.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/stax-cxf-sts.xml @@ -149,10 +149,10 @@ <httpj:engine port="${testutil.ports.secure_conv.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/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-client.xml index 902dbb4..9cda7cc 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-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/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-service.xml index a8dc806..b194138 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-service.xml @@ -51,10 +51,10 @@ <httpj:engine port="${testutil.ports.soap12.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> @@ -63,10 +63,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/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/stax-cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/stax-cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/stax-cxf-service.xml index e2149b1..d1799f8 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/stax-cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/stax-cxf-service.xml @@ -53,10 +53,10 @@ <httpj:engine port="${testutil.ports.soap12.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> @@ -65,10 +65,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/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-client.xml index 8e6a61b..2b436c6 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-client.xml @@ -38,7 +38,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/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-service.xml index 062e3fa..894daf8 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-service.xml @@ -78,7 +78,7 @@ <httpj:engine port="${testutil.ports.transformation.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:clientAuthentication want="false" required="false"/> </httpj:tlsServerParameters> @@ -87,10 +87,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/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-bad-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-bad-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-bad-client.xml index 1363d27..66546e6 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-bad-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-bad-client.xml @@ -38,7 +38,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/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-client.xml index c9fad1a..fba5e48 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-client.xml @@ -39,7 +39,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/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-service.xml index 14ba9b5..c22c2df 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-service.xml @@ -94,7 +94,7 @@ <httpj:engine port="${testutil.ports.usernametoken.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:clientAuthentication want="false" required="false"/> </httpj:tlsServerParameters> @@ -103,10 +103,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/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/stax-cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/stax-cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/stax-cxf-service.xml index e594b0d..f454461 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/stax-cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/stax-cxf-service.xml @@ -52,7 +52,7 @@ <httpj:engine port="${testutil.ports.usernametoken.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:clientAuthentication want="false" required="false"/> </httpj:tlsServerParameters> @@ -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/services/sts/systests/advanced/src/test/resources/serviceKeystore.properties ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/serviceKeystore.properties b/services/sts/systests/advanced/src/test/resources/serviceKeystore.properties index 7657a5f..f837778 100644 --- a/services/sts/systests/advanced/src/test/resources/serviceKeystore.properties +++ b/services/sts/systests/advanced/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/advanced/src/test/resources/servicestore.jks ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/servicestore.jks b/services/sts/systests/advanced/src/test/resources/servicestore.jks deleted file mode 100644 index 999ee82..0000000 Binary files a/services/sts/systests/advanced/src/test/resources/servicestore.jks and /dev/null differ http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/advanced/src/test/resources/stsKeystore.properties ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/stsKeystore.properties b/services/sts/systests/advanced/src/test/resources/stsKeystore.properties index 2f132ea..a11eefa 100644 --- a/services/sts/systests/advanced/src/test/resources/stsKeystore.properties +++ b/services/sts/systests/advanced/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/advanced/src/test/resources/stsstore.jks ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/stsstore.jks b/services/sts/systests/advanced/src/test/resources/stsstore.jks deleted file mode 100644 index 51f131f..0000000 Binary files a/services/sts/systests/advanced/src/test/resources/stsstore.jks and /dev/null differ http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/pom.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/pom.xml b/services/sts/systests/basic/pom.xml index 3fdc0fb..9acab84 100644 --- a/services/sts/systests/basic/pom.xml +++ b/services/sts/systests/basic/pom.xml @@ -86,6 +86,13 @@ </dependency> <dependency> <groupId>org.apache.cxf</groupId> + <artifactId>cxf-testutils</artifactId> + <version>${project.version}</version> + <scope>test</scope> + <classifier>tests</classifier> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-databinding-jaxb</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java index 8eb80e3..12f7697 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java @@ -543,7 +543,7 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase { "org.apache.ws.security.crypto.provider", "org.apache.ws.security.components.crypto.Merlin" ); properties.put("org.apache.ws.security.crypto.merlin.keystore.password", "stsspass"); - properties.put("org.apache.ws.security.crypto.merlin.keystore.file", "stsstore.jks"); + properties.put("org.apache.ws.security.crypto.merlin.keystore.file", "keys/stsstore.jks"); return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java index cae4f0c..2b96420 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java @@ -1211,7 +1211,7 @@ public class STSRESTTest extends AbstractBusClientServerTestBase { Assert.assertNotNull(jwt.getClaim(JwtConstants.CLAIM_ISSUED_AT)); KeyStore keystore = KeyStore.getInstance("JKS"); - keystore.load(Loader.getResource("servicestore.jks").openStream(), "sspass".toCharArray()); + keystore.load(Loader.getResource("keys/servicestore.jks").openStream(), "sspass".toCharArray()); Certificate cert = keystore.getCertificate("mystskey"); Assert.assertNotNull(cert); http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenOutInterceptorTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenOutInterceptorTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenOutInterceptorTest.java index 683f8f7..978f017 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenOutInterceptorTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenOutInterceptorTest.java @@ -94,7 +94,7 @@ public class STSTokenOutInterceptorTest extends AbstractBusClientServerTestBase private static final String STS_TRANSPORT_ENDPOINT_NAME = "{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port";; - private static final String CLIENTSTORE = "/clientstore.jks"; + private static final String CLIENTSTORE = "/keys/clientstore.jks"; private static final String KEYSTORE_PASS = "cspass"; private static final String KEY_PASS = "ckpass"; http://git-wip-us.apache.org/repos/asf/cxf/blob/1b9056ce/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenRetrieverTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenRetrieverTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenRetrieverTest.java index 3b585f7..549269d 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenRetrieverTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenRetrieverTest.java @@ -92,7 +92,7 @@ public class STSTokenRetrieverTest extends AbstractBusClientServerTestBase { private static final String STS_TRANSPORT_ENDPOINT_NAME = "{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port";; - private static final String CLIENTSTORE = "/clientstore.jks"; + private static final String CLIENTSTORE = "/keys/clientstore.jks"; private static final String KEYSTORE_PASS = "cspass"; private static final String KEY_PASS = "ckpass";
