http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf index b472e1c..195a868 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf @@ -49,12 +49,10 @@ <httpj:engine port="9003"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="password"> - <sec:keyStore type="JKS" password="password" - file="src/test/java/org/apache/cxf/systest/http/resources/Tarpin.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Tarpin.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="JKS" password="password" - file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/> </sec:trustManagers> <sec:cipherSuitesFilter> <!-- these filters ensure that a ciphersuite with
http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.jks ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.jks b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.jks deleted file mode 100644 index 329af6a..0000000 Binary files a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.jks and /dev/null differ http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks deleted file mode 100644 index e76a076..0000000 Binary files a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks and /dev/null differ http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Truststore.pem ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Truststore.pem b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Truststore.pem deleted file mode 100644 index 1b25477..0000000 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/Truststore.pem +++ /dev/null @@ -1,60 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICIDCCAYkCBEYRaYcwDQYJKoZIhvcNAQEEBQAwVzELMAkGA1UEBhMCVVMxETAPBgNVBAcTCFN5 -cmFjdXNlMRMwEQYDVQQKEwpBcGFjaGVUZXN0MQ8wDQYDVQQLEwZCZXRoYWwxDzANBgNVBAMTBkJl -dGhhbDAeFw0wNzA0MDIyMDM3MjdaFw0zNDA4MTgyMDM3MjdaMFcxCzAJBgNVBAYTAlVTMREwDwYD -VQQHEwhTeXJhY3VzZTETMBEGA1UEChMKQXBhY2hlVGVzdDEPMA0GA1UECxMGQmV0aGFsMQ8wDQYD -VQQDEwZCZXRoYWwwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAJHOyFu8tTt4g9tBv0bY8c4K -uidfMlHbFQAukIFXLkR4xu5IxG5OI53ZE0F6rqcPFve1sdEV9h+MxmzqQbo180Wyv1rUEq2AScK3 -6bo0ALuZsreQQmNVGBOjxBpTtrRErRfNJe1mvzNMz9VlGdSNWW17CrBz9kmz6G1EWg8aGfZHAgMB -AAEwDQYJKoZIhvcNAQEEBQADgYEAbw+VwP1tnBm3cFLFgONnGCozN8XqV2M0OklJ5lBDJL7BV2Ng -BtTZ8as9jTGYdjetKQXX75wWL7OS7vnkm/9tbr/vNBljT0OP0Yr2X7TAbDdhFfsk/D5mBpXdzXz2 -wqxVZjj6sm5zvwC32e4AxGG0edmY1DN9VMZzA/FrzBP0qoE= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIICHDCCAYUCBEYRaYkwDQYJKoZIhvcNAQEEBQAwVTELMAkGA1UEBhMCVVMxETAPBgNVBAcTCFN5 -cmFjdXNlMRMwEQYDVQQKEwpBcGFjaGVUZXN0MQ4wDAYDVQQLEwVHb3JkeTEOMAwGA1UEAxMFR29y -ZHkwHhcNMDcwNDAyMjAzNzI5WhcNMzQwODE4MjAzNzI5WjBVMQswCQYDVQQGEwJVUzERMA8GA1UE -BxMIU3lyYWN1c2UxEzARBgNVBAoTCkFwYWNoZVRlc3QxDjAMBgNVBAsTBUdvcmR5MQ4wDAYDVQQD -EwVHb3JkeTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqIbNth+G4Q5tkZvoUZdQsY9RnjAA -mgKVBUaOVvv//qOniOTskLqBFyKGoMpbCfNAU7/zVKP5fLTLccLdJyCagKGrs1ZmKaNiTRcOnfkE -3dHnEIp83+hNmASGsrZcyLihtro1N3pMTuXbXzu7x3F2U7fxYFg66iviTEGF6T7dY3MCAwEAATAN -BgkqhkiG9w0BAQQFAAOBgQBPjsYFdqz0JF9shNpvke/H1eHqhyXJgPdHdCu/ewRO2wV6I9WBrGNU -cmmKZmAUsv99Y0Tpz59uEXFcM3cBZU4/obw3DlwwWmaVMoIwQ2Nd2FChC6uyKIJ0Bvpx+aDxjm48 -b8c58EHCcU2FRo/nVWctJL9xJ7oBrke5GZrBlUF+rA== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIICNDCCAZ0CBEYRaY4wDQYJKoZIhvcNAQEEBQAwYTELMAkGA1UEBhMCVVMxETAPBgNVBAcTCFN5 -cmFjdXNlMRMwEQYDVQQKEwpBcGFjaGVUZXN0MQ8wDQYDVQQLEwZNb3JwaXQxGTAXBgNVBAMTEHdo -YXRldmVyaG9zdC5jb20wHhcNMDcwNDAyMjAzNzM0WhcNMzQwODE4MjAzNzM0WjBhMQswCQYDVQQG -EwJVUzERMA8GA1UEBxMIU3lyYWN1c2UxEzARBgNVBAoTCkFwYWNoZVRlc3QxDzANBgNVBAsTBk1v -cnBpdDEZMBcGA1UEAxMQd2hhdGV2ZXJob3N0LmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkC -gYEAk4FbJxfjllrApiECK5oRbgmTC1exx59HWck20R2AYU6kIkdZa78Ca+oc/zaPCtsVL/QZbjHE -7lnvVK55tnpGW9qzLxsAHZmYyA/4Wdmcbz/Niwsfm062z94+AKMCGum/1Ug1QZUiRKweZTRBHhmT -VsxSDEGTTi6UVim6nv47ZlcCAwEAATANBgkqhkiG9w0BAQQFAAOBgQAjWR/W+YO0I5sBlb+zNTbJ -TPs4CqM4UHQS+prOx59R134FbocgkGncm00FBrO857KJHdSCRjOUUpc3S+MP13FGqSQm2Q0lNjUV -IygvdZ+BATfgsJ92NbnuIhIVAA+i8AVZK//qPRCMz1Rdm1G994qCw3A4lQMi5eqKYYwqkRJeXw== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIICIDCCAYkCBEYRaYwwDQYJKoZIhvcNAQEEBQAwVzELMAkGA1UEBhMCVVMxETAPBgNVBAcTCFN5 -cmFjdXNlMRMwEQYDVQQKEwpBcGFjaGVUZXN0MQ8wDQYDVQQLEwZQb2x0aW0xDzANBgNVBAMTBlBv -bHRpbTAeFw0wNzA0MDIyMDM3MzJaFw0zNDA4MTgyMDM3MzJaMFcxCzAJBgNVBAYTAlVTMREwDwYD -VQQHEwhTeXJhY3VzZTETMBEGA1UEChMKQXBhY2hlVGVzdDEPMA0GA1UECxMGUG9sdGltMQ8wDQYD -VQQDEwZQb2x0aW0wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAL/bdivrpaR4Njvo7WB4ipEh -422V2bAyapFvgOq/tHusGR/e3wH0v9g+9xwnNyqFjhueceuWahXAvNHvknuUaelW0346Aay0fBAu -EsyowWBTVi/pU+iZleN9FD8uBalY1s6e+xqu+yckhHuBP77TcTar1hBjCIfy2Eo2YevDL6qlAgMB -AAEwDQYJKoZIhvcNAQEEBQADgYEAuT7QoNfGG7GjfQuU/oYj5vHPH7nPhLtkQBVTEi0WyzgJUXie -rNG/u4VEZtNtK4+4J5tQyb4YtP2GPUUpWrhusKUaW4eMU79rzpUbZnGUBzTbth8kBoN9xHzXiSop -ohPdOnGo5ZjThZnLEn/o9doUEX64o4eauu15SPoDLzSfLJ0= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIICIDCCAYkCBEYRaYswDQYJKoZIhvcNAQEEBQAwVzELMAkGA1UEBhMCVVMxETAPBgNVBAcTCFN5 -cmFjdXNlMRMwEQYDVQQKEwpBcGFjaGVUZXN0MQ8wDQYDVQQLEwZUYXJwaW4xDzANBgNVBAMTBlRh -cnBpbjAeFw0wNzA0MDIyMDM3MzFaFw0zNDA4MTgyMDM3MzFaMFcxCzAJBgNVBAYTAlVTMREwDwYD -VQQHEwhTeXJhY3VzZTETMBEGA1UEChMKQXBhY2hlVGVzdDEPMA0GA1UECxMGVGFycGluMQ8wDQYD -VQQDEwZUYXJwaW4wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKGG8UtWnHyWKFVDJSuSlhT/ -vKxrPjfNBtvdaiQx5gNAlc8QVL5lPOXcJljTF3dEb0QQ1ajai3kC71NE2ABOrxk7Jvk3bEma5Yfy -U3m/OBthL9H8kE3O3+bh4K2LTsRwIa2Zd1wYbj44vUxsiHhzxer3q3FDfLxsqtahsxz7WjG1AgMB -AAEwDQYJKoZIhvcNAQEEBQADgYEAE6EWRbYxGOlwmtpv0XE4FwbXYdSDArc+ArhOJWKTzoE3U9l8 -kg1wJL49VXEmVIxpipXKs7d9lpIVLPFsbBVJRZwH8sgHE39nTjfeyHNmwZcd63Lrn+2RydkAo5P9 -FYi8HFGEM5dON4PSo3Et6ycHy1IrS8htrNu+FoW84FRTKDA= ------END CERTIFICATE----- http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/jaxws-publish.xml ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/jaxws-publish.xml b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/jaxws-publish.xml index 0e0302c..efe93c3 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/jaxws-publish.xml +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/jaxws-publish.xml @@ -39,10 +39,10 @@ under the License. <httpj:engine port="9001"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="password"> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/> </sec:trustManagers> </httpj:tlsServerParameters> </httpj:engine> @@ -53,10 +53,10 @@ under the License. <http:conduit name="{http://apache.org/hello_world/services}HttpsPort.http-conduit";> <http:tlsClientParameters disableCNCheck="true"> <sec:keyManagers keyPassword="password"> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Morpit.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Morpit.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/> </sec:trustManagers> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server.xml ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server.xml b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server.xml index 4611fc7..22c6a0b 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server.xml +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server.xml @@ -49,10 +49,9 @@ under the License. <httpj:engine port="9002"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="password"> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks"/> - </sec:keyManagers> + <sec:keyStore type="JKS" password="password" resource="keys <sec:trustManagers> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/> </sec:trustManagers> </httpj:tlsServerParameters> </httpj:engine> @@ -63,10 +62,10 @@ under the License. <http:conduit name="{http://apache.org/hello_world/services}HttpsPort.http-conduit";> <http:tlsClientParameters disableCNCheck="true"> <sec:keyManagers keyPassword="password"> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Morpit.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Morpit.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/> </sec:trustManagers> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/pkcs12.xml ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/pkcs12.xml b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/pkcs12.xml index 7f00bcd..69fc18d 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/pkcs12.xml +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/pkcs12.xml @@ -48,7 +48,7 @@ under the License. <sec:keyStore type="pkcs12" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Bethal.p12"/> </sec:keyManagers> <sec:trustManagers> - <sec:certStore file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.pem"/> + <sec:certStore resource="keys/Truststore.pem"/> </sec:trustManagers> </httpj:tlsServerParameters> </httpj:engine> @@ -59,10 +59,10 @@ under the License. <http:conduit name="{http://apache.org/hello_world/services}HttpsPort.http-conduit";> <http:tlsClientParameters disableCNCheck="true"> <sec:keyManagers keyPassword="password"> - <sec:keyStore type="pkcs12" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Morpit.p12"/> + <sec:keyStore type="pkcs12" password="password" resource="keys/Morpit.p12"/> </sec:keyManagers> <sec:trustManagers> - <sec:certStore file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.pem"/> + <sec:certStore resource="keys/Truststore.pem"/> </sec:trustManagers> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec-url.xml ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec-url.xml b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec-url.xml index 3cb69f1..ff7b8e8 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec-url.xml +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec-url.xml @@ -41,10 +41,10 @@ under the License. <httpj:engine port="9005"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="password"> - <sec:keyStore type="JKS" password="password" resource="org/apache/cxf/systest/http/resources/Bethal.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="JKS" password="password" resource="org/apache/cxf/systest/http/resources/Truststore.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/> </sec:trustManagers> </httpj:tlsServerParameters> </httpj:engine> @@ -57,10 +57,10 @@ under the License. <http:conduit name="https://localhost:9005/SoapContext/HttpsPort";> <http:tlsClientParameters disableCNCheck="true"> <sec:keyManagers keyPassword="password"> - <sec:keyStore type="pkcs12" password="password" resource="org/apache/cxf/systest/http/resources/Morpit.p12"/> + <sec:keyStore type="pkcs12" password="password" resource="keys/Morpit.p12"/> </sec:keyManagers> <sec:trustManagers> - <sec:certStore resource="org/apache/cxf/systest/http/resources/Truststore.pem"/> + <sec:certStore resource="keys/Truststore.pem"/> </sec:trustManagers> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec.xml ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec.xml b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec.xml index d4f0e47..0861d5e 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec.xml +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec.xml @@ -41,10 +41,10 @@ under the License. <httpj:engine port="9004"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="password"> - <sec:keyStore type="JKS" password="password" resource="org/apache/cxf/systest/http/resources/Bethal.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="JKS" password="password" resource="org/apache/cxf/systest/http/resources/Truststore.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/> </sec:trustManagers> </httpj:tlsServerParameters> </httpj:engine> @@ -57,10 +57,10 @@ under the License. <http:conduit name="{http://apache.org/hello_world/services}HttpsPort.http-conduit";> <http:tlsClientParameters disableCNCheck="true"> <sec:keyManagers keyPassword="password"> - <sec:keyStore type="pkcs12" password="password" resource="org/apache/cxf/systest/http/resources/Morpit.p12"/> + <sec:keyStore type="pkcs12" password="password" resource="keys/Morpit.p12"/> </sec:keyManagers> <sec:trustManagers> - <sec:certStore resource="org/apache/cxf/systest/http/resources/Truststore.pem"/> + <sec:certStore resource="keys/Truststore.pem"/> </sec:trustManagers> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JweJwsAlgorithmTest.java ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JweJwsAlgorithmTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JweJwsAlgorithmTest.java index 40b9010..905fe60 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JweJwsAlgorithmTest.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JweJwsAlgorithmTest.java @@ -392,8 +392,7 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase { properties.put("rs.security.keystore.password", "password"); properties.put("rs.security.key.password", "password"); properties.put("rs.security.keystore.alias", "alice"); - properties.put("rs.security.keystore.file", - "org/apache/cxf/systest/jaxrs/security/certs/alice.jks"); + properties.put("rs.security.keystore.file", "keys/alice.jks"); properties.put("rs.security.signature.algorithm", "RS256"); WebClient.getConfig(client).getRequestContext().putAll(properties); http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JweJwsReferenceTest.java ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JweJwsReferenceTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JweJwsReferenceTest.java index feac35d..b116596 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JweJwsReferenceTest.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JweJwsReferenceTest.java @@ -113,8 +113,7 @@ public class JweJwsReferenceTest extends AbstractBusClientServerTestBase { properties.put("rs.security.keystore.alias", "bob"); properties.put("rs.security.keystore.password", "password"); properties.put("rs.security.key.password", "password"); - properties.put("rs.security.keystore.file", - "org/apache/cxf/systest/jaxrs/security/certs/bob.jks"); + properties.put("rs.security.keystore.file", "keys/bob.jks"); properties.put("rs.security.encryption.content.algorithm", "A128GCM"); properties.put("rs.security.encryption.key.algorithm", "RSA-OAEP"); WebClient.getConfig(client).getRequestContext().putAll(properties); @@ -151,8 +150,7 @@ public class JweJwsReferenceTest extends AbstractBusClientServerTestBase { properties.put("rs.security.keystore.alias", "alice"); properties.put("rs.security.keystore.password", "password"); properties.put("rs.security.key.password", "password"); - properties.put("rs.security.keystore.file", - "org/apache/cxf/systest/jaxrs/security/certs/alice.jks"); + properties.put("rs.security.keystore.file", "keys/alice.jks"); properties.put("rs.security.encryption.content.algorithm", "A128GCM"); properties.put("rs.security.encryption.key.algorithm", "RSA-OAEP"); properties.put("rs.security.encryption.include.cert", "true"); @@ -182,8 +180,7 @@ public class JweJwsReferenceTest extends AbstractBusClientServerTestBase { properties.put("rs.security.keystore.alias", "bob"); properties.put("rs.security.keystore.password", "password"); properties.put("rs.security.key.password", "password"); - properties.put("rs.security.keystore.file", - "org/apache/cxf/systest/jaxrs/security/certs/bob.jks"); + properties.put("rs.security.keystore.file", "keys/bob.jks"); properties.put("rs.security.encryption.content.algorithm", "A128GCM"); properties.put("rs.security.encryption.key.algorithm", "RSA-OAEP"); WebClient.getConfig(client).getRequestContext().putAll(properties); @@ -220,8 +217,7 @@ public class JweJwsReferenceTest extends AbstractBusClientServerTestBase { properties.put("rs.security.keystore.alias", "alice"); properties.put("rs.security.keystore.password", "password"); properties.put("rs.security.key.password", "password"); - properties.put("rs.security.keystore.file", - "org/apache/cxf/systest/jaxrs/security/certs/alice.jks"); + properties.put("rs.security.keystore.file", "keys/alice.jks"); properties.put("rs.security.encryption.content.algorithm", "A128GCM"); properties.put("rs.security.encryption.key.algorithm", "RSA-OAEP"); properties.put("rs.security.encryption.include.cert.sha1", "true"); @@ -255,8 +251,7 @@ public class JweJwsReferenceTest extends AbstractBusClientServerTestBase { properties.put("rs.security.keystore.alias", "alice"); properties.put("rs.security.keystore.password", "password"); properties.put("rs.security.key.password", "password"); - properties.put("rs.security.keystore.file", - "org/apache/cxf/systest/jaxrs/security/certs/alice.jks"); + properties.put("rs.security.keystore.file", "keys/alice.jks"); WebClient.getConfig(client).getRequestContext().putAll(properties); // First test that it fails without adding a cert (reference). This is because @@ -291,8 +286,7 @@ public class JweJwsReferenceTest extends AbstractBusClientServerTestBase { properties.put("rs.security.keystore.alias", "morpit"); properties.put("rs.security.keystore.password", "password"); properties.put("rs.security.key.password", "password"); - properties.put("rs.security.keystore.file", - "org/apache/cxf/systest/jaxrs/security/certs/Morpit.jks"); + properties.put("rs.security.keystore.file", "keys/Morpit.jks"); properties.put("rs.security.signature.include.cert", "true"); WebClient.getConfig(client).getRequestContext().putAll(properties); @@ -320,8 +314,7 @@ public class JweJwsReferenceTest extends AbstractBusClientServerTestBase { properties.put("rs.security.keystore.alias", "alice"); properties.put("rs.security.keystore.password", "password"); properties.put("rs.security.key.password", "password"); - properties.put("rs.security.keystore.file", - "org/apache/cxf/systest/jaxrs/security/certs/alice.jks"); + properties.put("rs.security.keystore.file", "keys/alice.jks"); WebClient.getConfig(client).getRequestContext().putAll(properties); // First test that it fails without adding a cert (reference). This is because @@ -357,8 +350,7 @@ public class JweJwsReferenceTest extends AbstractBusClientServerTestBase { properties.put("rs.security.keystore.alias", "morpit"); properties.put("rs.security.keystore.password", "password"); properties.put("rs.security.key.password", "password"); - properties.put("rs.security.keystore.file", - "org/apache/cxf/systest/jaxrs/security/certs/Morpit.jks"); + properties.put("rs.security.keystore.file", "keys/Morpit.jks"); properties.put("rs.security.signature.include.cert.sha1", "true"); WebClient.getConfig(client).getRequestContext().putAll(properties); http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTAlgorithmTest.java ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTAlgorithmTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTAlgorithmTest.java index d627de9..9ee33af 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTAlgorithmTest.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTAlgorithmTest.java @@ -71,7 +71,6 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase { // // Encryption tests // - @org.junit.Test public void testEncryptionProperties() throws Exception { @@ -424,8 +423,7 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase { properties.put("rs.security.keystore.password", "password"); properties.put("rs.security.key.password", "password"); properties.put("rs.security.keystore.alias", "alice"); - properties.put("rs.security.keystore.file", - "org/apache/cxf/systest/jaxrs/security/certs/alice.jks"); + properties.put("rs.security.keystore.file", "keys/alice.jks"); properties.put("rs.security.signature.algorithm", "RS256"); properties.put(JwtConstants.JWT_TOKEN, token); WebClient.getConfig(client).getRequestContext().putAll(properties); @@ -652,8 +650,7 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase { properties.put("rs.security.keystore.password", "password"); properties.put("rs.security.key.password", "password"); properties.put("rs.security.keystore.alias", "alice"); - properties.put("rs.security.keystore.file", - "org/apache/cxf/systest/jaxrs/security/certs/alice.jks"); + properties.put("rs.security.keystore.file", "keys/alice.jks"); properties.put("rs.security.signature.algorithm", "RS256"); properties.put("rs.security.signature.include.cert", "true"); properties.put(JwtConstants.JWT_TOKEN, token); http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTAuthnAuthzTest.java ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTAuthnAuthzTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTAuthnAuthzTest.java index 6ee8ff0..be641a8 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTAuthnAuthzTest.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTAuthnAuthzTest.java @@ -135,8 +135,7 @@ public class JWTAuthnAuthzTest extends AbstractBusClientServerTestBase { properties.put("rs.security.keystore.password", "password"); properties.put("rs.security.key.password", "password"); properties.put("rs.security.keystore.alias", "alice"); - properties.put("rs.security.keystore.file", - "org/apache/cxf/systest/jaxrs/security/certs/alice.jks"); + properties.put("rs.security.keystore.file", "keys/alice.jks"); properties.put("rs.security.signature.algorithm", "RS256"); properties.put(JwtConstants.JWT_TOKEN, token); WebClient.getConfig(client).getRequestContext().putAll(properties); http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/OAuth2TestUtils.java ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/OAuth2TestUtils.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/OAuth2TestUtils.java index 8c44a42..9bab25d 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/OAuth2TestUtils.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/OAuth2TestUtils.java @@ -226,8 +226,7 @@ public final class OAuth2TestUtils { signingProperties.put("rs.security.keystore.type", "jks"); signingProperties.put("rs.security.keystore.password", "password"); signingProperties.put("rs.security.keystore.alias", "alice"); - signingProperties.put("rs.security.keystore.file", - "org/apache/cxf/systest/jaxrs/security/certs/alice.jks"); + signingProperties.put("rs.security.keystore.file", "keys/alice.jks"); signingProperties.put("rs.security.key.password", "password"); signingProperties.put("rs.security.signature.algorithm", "RS256"); http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/OAuthDataProviderImpl.java ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/OAuthDataProviderImpl.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/OAuthDataProviderImpl.java index 0252e1a..b79e736 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/OAuthDataProviderImpl.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/OAuthDataProviderImpl.java @@ -31,6 +31,7 @@ import org.apache.cxf.rs.security.oauth2.grants.code.DefaultEHCacheCodeDataProvi import org.apache.cxf.rs.security.oauth2.provider.OAuthServiceException; import org.apache.cxf.rs.security.oauth2.saml.Constants; import org.apache.cxf.rt.security.crypto.CryptoUtils; +import org.apache.xml.security.utils.ClassLoaderUtils; /** * Extend the DefaultEHCacheCodeDataProvider to allow refreshing of tokens @@ -109,8 +110,9 @@ public class OAuthDataProviderImpl extends DefaultEHCacheCodeDataProvider { } private Certificate loadCert() throws Exception { - InputStream is = this.getClass().getResourceAsStream("/org/apache/cxf/systest/http/resources/Truststore.jks"); - return CryptoUtils.loadCertificate(is, new char[]{'p', 'a', 's', 's', 'w', 'o', 'r', 'd'}, "morpit", null); + try (InputStream is = ClassLoaderUtils.getResourceAsStream("keys/Truststore.jks", this.getClass())) { + return CryptoUtils.loadCertificate(is, new char[]{'p', 'a', 's', 's', 'w', 'o', 'r', 'd'}, "morpit", null); + } } @Override http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/OIDCFlowTest.java ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/OIDCFlowTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/OIDCFlowTest.java index f6f5a39..88c5685 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/OIDCFlowTest.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/OIDCFlowTest.java @@ -49,8 +49,7 @@ import org.apache.cxf.systest.jaxrs.security.oauth2.common.OAuth2TestUtils; import org.apache.cxf.systest.jaxrs.security.oauth2.common.OAuth2TestUtils.AuthorizationCodeParameters; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; import org.apache.cxf.testutil.common.TestUtil; -import org.apache.wss4j.common.util.Loader; - +import org.apache.xml.security.utils.ClassLoaderUtils; import org.junit.Assert; import org.junit.BeforeClass; @@ -750,7 +749,7 @@ public class OIDCFlowTest extends AbstractBusClientServerTestBase { } KeyStore keystore = KeyStore.getInstance("JKS"); - keystore.load(Loader.getResource("org/apache/cxf/systest/jaxrs/security/certs/alice.jks").openStream(), + keystore.load(ClassLoaderUtils.getResourceAsStream("keys/alice.jks", this.getClass()), "password".toCharArray()); Certificate cert = keystore.getCertificate("alice"); Assert.assertNotNull(cert); http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/UserInfoTest.java ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/UserInfoTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/UserInfoTest.java index d123554..887abfa 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/UserInfoTest.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/UserInfoTest.java @@ -30,6 +30,7 @@ import java.security.cert.X509Certificate; import javax.ws.rs.core.Response; +import org.apache.cxf.common.classloader.ClassLoaderUtils; import org.apache.cxf.jaxrs.client.WebClient; import org.apache.cxf.rs.security.jose.jwa.SignatureAlgorithm; import org.apache.cxf.rs.security.jose.jwe.JweJwtCompactConsumer; @@ -42,7 +43,6 @@ import org.apache.cxf.rs.security.oidc.common.UserInfo; import org.apache.cxf.systest.jaxrs.security.oauth2.common.OAuth2TestUtils; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; import org.apache.cxf.testutil.common.TestUtil; -import org.apache.wss4j.common.util.Loader; import org.junit.Assert; import org.junit.BeforeClass; @@ -165,8 +165,8 @@ public class UserInfoTest extends AbstractBusClientServerTestBase { assertEquals("consumer-id", jwt.getClaim(JwtConstants.CLAIM_AUDIENCE)); KeyStore keystore = KeyStore.getInstance("JKS"); - String keystorePath = "org/apache/cxf/systest/jaxrs/security/certs/alice.jks"; - keystore.load(Loader.getResource(keystorePath).openStream(), "password".toCharArray()); + keystore.load(ClassLoaderUtils.getResourceAsStream("keys/alice.jks", this.getClass()), + "password".toCharArray()); Certificate cert = keystore.getCertificate("alice"); Assert.assertNotNull(cert); @@ -220,8 +220,8 @@ public class UserInfoTest extends AbstractBusClientServerTestBase { assertNotNull(token); KeyStore keystore = KeyStore.getInstance("JKS"); - String keystorePath = "org/apache/cxf/systest/jaxrs/security/certs/bob.jks"; - keystore.load(Loader.getResource(keystorePath).openStream(), "password".toCharArray()); + keystore.load(ClassLoaderUtils.getResourceAsStream("keys/bob.jks", this.getClass()), + "password".toCharArray()); JweJwtCompactConsumer jwtConsumer = new JweJwtCompactConsumer(token); PrivateKey privateKey = (PrivateKey)keystore.getKey("bob", "password".toCharArray()); @@ -247,7 +247,7 @@ public class UserInfoTest extends AbstractBusClientServerTestBase { } KeyStore keystore = KeyStore.getInstance("JKS"); - keystore.load(Loader.getResource("org/apache/cxf/systest/jaxrs/security/certs/alice.jks").openStream(), + keystore.load(ClassLoaderUtils.getResourceAsStream("keys/alice.jks", this.getClass()), "password".toCharArray()); Certificate cert = keystore.getCertificate("alice"); Assert.assertNotNull(cert); http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.properties ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.properties index c161258..fb18b11 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.properties +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.properties @@ -18,4 +18,4 @@ org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto. org.apache.ws.security.crypto.merlin.keystore.type=jks org.apache.ws.security.crypto.merlin.keystore.password=password org.apache.ws.security.crypto.merlin.keystore.alias=alice -org.apache.ws.security.crypto.merlin.keystore.file=org/apache/cxf/systest/jaxrs/security/certs/alice.jks +org.apache.ws.security.crypto.merlin.keystore.file=keys/alice.jks http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.rs.properties ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.rs.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.rs.properties index 7922a19..8005782 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.rs.properties +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.rs.properties @@ -17,7 +17,7 @@ rs.security.keystore.type=jks rs.security.keystore.password=password rs.security.keystore.alias=alice -rs.security.keystore.file=org/apache/cxf/systest/jaxrs/security/certs/alice.jks +rs.security.keystore.file=keys/alice.jks rs.security.encryption.content.algorithm=A128GCM rs.security.encryption.key.algorithm=RSA-OAEP rs.security.signature.algorithm=RS256 http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.rs.storeonly.properties ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.rs.storeonly.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.rs.storeonly.properties index 3dd7174..6aee063 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.rs.storeonly.properties +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.rs.storeonly.properties @@ -16,4 +16,4 @@ # under the License. rs.security.keystore.type=jks rs.security.keystore.password=password -rs.security.keystore.file=org/apache/cxf/systest/jaxrs/security/certs/alice.jks +rs.security.keystore.file=keys/alice.jks http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.properties ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.properties index 41bcc99..8dbdb7e 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.properties +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.properties @@ -20,4 +20,4 @@ org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto. org.apache.ws.security.crypto.merlin.keystore.type=jks org.apache.ws.security.crypto.merlin.keystore.password=password org.apache.ws.security.crypto.merlin.keystore.alias=bob -org.apache.ws.security.crypto.merlin.keystore.file=org/apache/cxf/systest/jaxrs/security/certs/bob.jks +org.apache.ws.security.crypto.merlin.keystore.file=keys/bob.jks http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.rs.properties ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.rs.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.rs.properties index 293556b..dea95cd 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.rs.properties +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.rs.properties @@ -19,7 +19,7 @@ rs.security.keystore.type=jks rs.security.keystore.password=password rs.security.keystore.alias=bob -rs.security.keystore.file=org/apache/cxf/systest/jaxrs/security/certs/bob.jks +rs.security.keystore.file=keys/bob.jks rs.security.encryption.content.algorithm=A128GCM rs.security.encryption.key.algorithm=RSA-OAEP rs.security.signature.algorithm=RS256 http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.rs.storeonly.properties ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.rs.storeonly.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.rs.storeonly.properties index 9f69a3d..88f4625 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.rs.storeonly.properties +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.rs.storeonly.properties @@ -18,4 +18,4 @@ # rs.security.keystore.type=jks rs.security.keystore.password=password -rs.security.keystore.file=org/apache/cxf/systest/jaxrs/security/certs/bob.jks +rs.security.keystore.file=keys/bob.jks http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/Morpit.jks ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/Morpit.jks b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/Morpit.jks deleted file mode 100644 index b179baf..0000000 Binary files a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/Morpit.jks and /dev/null differ http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/alice.jks ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/alice.jks b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/alice.jks deleted file mode 100644 index 213b26c..0000000 Binary files a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/alice.jks and /dev/null differ http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/bob.jks ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/bob.jks b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/bob.jks deleted file mode 100644 index 5550912..0000000 Binary files a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/bob.jks and /dev/null differ http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/cxfca.jks ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/cxfca.jks b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/cxfca.jks deleted file mode 100644 index 53ad239..0000000 Binary files a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/cxfca.jks and /dev/null differ http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/client.xml ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/client.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/client.xml index 13eaea1..d10dac6 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/client.xml +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/client.xml @@ -28,10 +28,10 @@ <http:client ConnectionTimeout="3000000" ReceiveTimeout="3000000"/> <http:tlsClientParameters disableCNCheck="true"> <sec:keyManagers keyPassword="password"> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Morpit.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Morpit.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/> </sec:trustManagers> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/reference-server.xml ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/reference-server.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/reference-server.xml index 0d33cbc..644bbe5 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/reference-server.xml +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/reference-server.xml @@ -57,8 +57,7 @@ under the License. </jaxrs:providers> <jaxrs:properties> <entry key="rs.security.keystore.type" value="jks"/> - <entry key="rs.security.keystore.file" - value="org/apache/cxf/systest/jaxrs/security/certs/bob.jks"/> + <entry key="rs.security.keystore.file" value="keys/bob.jks"/> <entry key="rs.security.keystore.password" value="password"/> <entry key="rs.security.decryption.key.password.provider" value-ref="passwordProvider"/> <entry key="rs.security.encryption.content.algorithm" value="A128GCM"/> @@ -77,8 +76,7 @@ under the License. </jaxrs:providers> <jaxrs:properties> <entry key="rs.security.keystore.type" value="jks"/> - <entry key="rs.security.keystore.file" - value="org/apache/cxf/systest/jaxrs/security/certs/cxfca.jks"/> + <entry key="rs.security.keystore.file" value="keys/cxfca.jks"/> <entry key="rs.security.keystore.password" value="password"/> </jaxrs:properties> </jaxrs:server> @@ -92,8 +90,7 @@ under the License. </jaxrs:providers> <jaxrs:properties> <entry key="rs.security.keystore.type" value="jks"/> - <entry key="rs.security.keystore.file" - value="org/apache/cxf/systest/jaxrs/security/certs/alice.jks"/> + <entry key="rs.security.keystore.file" value="keys/alice.jks"/> <entry key="rs.security.keystore.password" value="password"/> </jaxrs:properties> </jaxrs:server> http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/server.xml ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/server.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/server.xml index 5811506..747653d 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/server.xml +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/server.xml @@ -28,10 +28,10 @@ under the License. <httpj:engine port="${testutil.ports.jaxrs-jwt}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="password"> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/> </sec:trustManagers> <sec:clientAuthentication want="true" required="true"/> </httpj:tlsServerParameters> http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/serverJweJson.xml ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/serverJweJson.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/serverJweJson.xml index eaebd0c..7757ef7 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/serverJweJson.xml +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/serverJweJson.xml @@ -28,10 +28,10 @@ under the License. <httpj:engine port="${testutil.ports.jaxrs-jwe-json}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="password"> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/> </sec:trustManagers> <sec:clientAuthentication want="true" required="true"/> </httpj:tlsServerParameters> http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/serverJwsJson.xml ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/serverJwsJson.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/serverJwsJson.xml index 840dfbd..5ff334e 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/serverJwsJson.xml +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/serverJwsJson.xml @@ -28,10 +28,10 @@ under the License. <httpj:engine port="${testutil.ports.jaxrs-jws-json}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="password"> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/> </sec:trustManagers> <sec:clientAuthentication want="true" required="true"/> </httpj:tlsServerParameters> http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwt/algorithms-server.xml ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwt/algorithms-server.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwt/algorithms-server.xml index 3e59c9f..8bcfb78 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwt/algorithms-server.xml +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwt/algorithms-server.xml @@ -28,10 +28,10 @@ under the License. <httpj:engine port="${testutil.ports.jaxrs-jwt-algorithms}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="password"> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/> </sec:trustManagers> <sec:clientAuthentication want="true" required="true"/> </httpj:tlsServerParameters> @@ -116,8 +116,7 @@ under the License. </jaxrs:providers> <jaxrs:properties> <entry key="rs.security.keystore.type" value="jks"/> - <entry key="rs.security.keystore.file" - value="org/apache/cxf/systest/jaxrs/security/certs/cxfca.jks"/> + <entry key="rs.security.keystore.file" value="keys/cxfca.jks"/> <entry key="rs.security.keystore.password" value="password"/> </jaxrs:properties> </jaxrs:server> http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwt/authn-authz-server.xml ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwt/authn-authz-server.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwt/authn-authz-server.xml index 9f7f477..14cfa47 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwt/authn-authz-server.xml +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwt/authn-authz-server.xml @@ -28,10 +28,10 @@ under the License. <httpj:engine port="${testutil.ports.jaxrs-jwt-authn-authz}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="password"> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/> </sec:trustManagers> <sec:clientAuthentication want="true" required="true"/> </httpj:tlsServerParameters> http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwt/client.xml ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwt/client.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwt/client.xml index 13eaea1..d10dac6 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwt/client.xml +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwt/client.xml @@ -28,10 +28,10 @@ <http:client ConnectionTimeout="3000000" ReceiveTimeout="3000000"/> <http:tlsClientParameters disableCNCheck="true"> <sec:keyManagers keyPassword="password"> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Morpit.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Morpit.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/> </sec:trustManagers> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwt/properties-server.xml ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwt/properties-server.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwt/properties-server.xml index 7c286db..9efcbc7 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwt/properties-server.xml +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwt/properties-server.xml @@ -28,10 +28,10 @@ under the License. <httpj:engine port="${testutil.ports.jaxrs-jwt-properties}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="password"> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/> </sec:trustManagers> <sec:clientAuthentication want="true" required="true"/> </httpj:tlsServerParameters> http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/client.xml ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/client.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/client.xml index 13eaea1..d10dac6 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/client.xml +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/client.xml @@ -28,10 +28,10 @@ <http:client ConnectionTimeout="3000000" ReceiveTimeout="3000000"/> <http:tlsClientParameters disableCNCheck="true"> <sec:keyManagers keyPassword="password"> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Morpit.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Morpit.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/> </sec:trustManagers> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/filters-server.xml ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/filters-server.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/filters-server.xml index 9afd201..1d02361 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/filters-server.xml +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/filters-server.xml @@ -51,10 +51,10 @@ under the License. <httpj:engine port="${testutil.ports.jaxrs-oauth2-filters}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="password"> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/> </sec:trustManagers> <sec:clientAuthentication want="true" required="true"/> </httpj:tlsServerParameters> @@ -108,7 +108,7 @@ under the License. <http:client ConnectionTimeout="3000000" ReceiveTimeout="3000000"/> <http:tlsClientParameters disableCNCheck="true"> <sec:trustManagers> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/> </sec:trustManagers> </http:tlsClientParameters> <http:authorization> http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/oauth20-server.xml ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/oauth20-server.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/oauth20-server.xml index 678d470..17df73d 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/oauth20-server.xml +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/oauth20-server.xml @@ -51,10 +51,10 @@ under the License. <httpj:engine port="${testutil.ports.jaxrs-oauth2-service}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="password"> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/> </sec:trustManagers> <sec:clientAuthentication want="true" required="false"/> </httpj:tlsServerParameters> http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/client.xml ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/client.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/client.xml index 13eaea1..d10dac6 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/client.xml +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/client.xml @@ -28,10 +28,10 @@ <http:client ConnectionTimeout="3000000" ReceiveTimeout="3000000"/> <http:tlsClientParameters disableCNCheck="true"> <sec:keyManagers keyPassword="password"> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Morpit.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Morpit.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/> </sec:trustManagers> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-negative-server.xml ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-negative-server.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-negative-server.xml index 80f8f3d..15a7b0d 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-negative-server.xml +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-negative-server.xml @@ -51,10 +51,10 @@ under the License. <httpj:engine port="${testutil.ports.jaxrs-oauth2-grants-negative}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="password"> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/> </sec:trustManagers> <sec:clientAuthentication want="true" required="true"/> </httpj:tlsServerParameters> @@ -134,8 +134,7 @@ under the License. <entry key="rs.security.keystore.type" value="jks" /> <entry key="rs.security.keystore.alias" value="alice"/> <entry key="rs.security.keystore.password" value="password"/> - <entry key="rs.security.keystore.file" - value="org/apache/cxf/systest/jaxrs/security/certs/alice.jks" /> + <entry key="rs.security.keystore.file" value="keys/alice.jks" /> <entry key="rs.security.signature.algorithm" value="RS256" /> </jaxrs:properties> </jaxrs:server> http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-server.xml ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-server.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-server.xml index b8c2314..ca3be62 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-server.xml +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/grants-server.xml @@ -51,10 +51,10 @@ under the License. <httpj:engine port="${testutil.ports.jaxrs-oauth2-grants}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="password"> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/> </sec:trustManagers> <sec:clientAuthentication want="true" required="true"/> </httpj:tlsServerParameters> @@ -134,8 +134,7 @@ under the License. <entry key="rs.security.keystore.type" value="jks" /> <entry key="rs.security.keystore.alias" value="alice"/> <entry key="rs.security.keystore.password" value="password"/> - <entry key="rs.security.keystore.file" - value="org/apache/cxf/systest/jaxrs/security/certs/alice.jks" /> + <entry key="rs.security.keystore.file" value="keys/alice.jks" /> <entry key="rs.security.signature.algorithm" value="RS256" /> </jaxrs:properties> </jaxrs:server> http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/introspection-server.xml ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/introspection-server.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/introspection-server.xml index bd51292..4814174 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/introspection-server.xml +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/introspection-server.xml @@ -51,10 +51,10 @@ under the License. <httpj:engine port="${testutil.ports.jaxrs-oauth2-introspection}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="password"> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/> </sec:trustManagers> <sec:clientAuthentication want="true" required="true"/> </httpj:tlsServerParameters> http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/server.xml ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/server.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/server.xml index d22ee61..60bce6f 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/server.xml +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/grants/server.xml @@ -49,10 +49,10 @@ under the License. <httpj:engine port="${testutil.ports.jaxrs-oauth2}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="password"> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/> </sec:trustManagers> <sec:clientAuthentication want="true" required="true"/> </httpj:tlsServerParameters> @@ -94,8 +94,7 @@ under the License. <entry key="rs.security.keystore.type" value="jks" /> <entry key="rs.security.keystore.alias" value="alice"/> <entry key="rs.security.keystore.password" value="password"/> - <entry key="rs.security.keystore.file" - value="org/apache/cxf/systest/jaxrs/security/certs/alice.jks" /> + <entry key="rs.security.keystore.file" value="keys/alice.jks" /> <entry key="rs.security.signature.algorithm" value="RS256" /> </jaxrs:properties> </jaxrs:server> @@ -121,8 +120,7 @@ under the License. <entry key="rs.security.keystore.type" value="jks" /> <entry key="rs.security.keystore.alias" value="alice"/> <entry key="rs.security.keystore.password" value="password"/> - <entry key="rs.security.keystore.file" - value="org/apache/cxf/systest/jaxrs/security/certs/alice.jks" /> + <entry key="rs.security.keystore.file" value="keys/alice.jks" /> <entry key="rs.security.signature.algorithm" value="RS256" /> </jaxrs:properties> </jaxrs:server> http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/client.xml ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/client.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/client.xml index f5ede61..6bf01ee 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/client.xml +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/client.xml @@ -28,7 +28,7 @@ <http:client ConnectionTimeout="3000000" ReceiveTimeout="3000000"/> <http:tlsClientParameters disableCNCheck="true"> <sec:trustManagers> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/> </sec:trustManagers> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-negative-server.xml ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-negative-server.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-negative-server.xml index f671aae..84765b3 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-negative-server.xml +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-negative-server.xml @@ -51,10 +51,10 @@ under the License. <httpj:engine port="${testutil.ports.jaxrs-negative-oidc}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="password"> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/> </sec:trustManagers> <sec:clientAuthentication want="false" required="false"/> </httpj:tlsServerParameters> @@ -129,8 +129,7 @@ under the License. <entry key="rs.security.keystore.alias" value="alice"/> <entry key="rs.security.keystore.password" value="password"/> <entry key="rs.security.key.password" value="password"/> - <entry key="rs.security.keystore.file" - value="org/apache/cxf/systest/jaxrs/security/certs/alice.jks" /> + <entry key="rs.security.keystore.file" value="keys/alice.jks" /> <entry key="rs.security.signature.algorithm" value="RS256" /> </jaxrs:properties> </jaxrs:server> http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-server.xml ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-server.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-server.xml index 93873df..34ba1dd 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-server.xml +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-server.xml @@ -51,10 +51,10 @@ under the License. <httpj:engine port="${testutil.ports.jaxrs-oidc}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="password"> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/> </sec:trustManagers> <sec:clientAuthentication want="false" required="false"/> </httpj:tlsServerParameters> @@ -129,8 +129,7 @@ under the License. <entry key="rs.security.keystore.alias" value="alice"/> <entry key="rs.security.keystore.password" value="password"/> <entry key="rs.security.key.password" value="password"/> - <entry key="rs.security.keystore.file" - value="org/apache/cxf/systest/jaxrs/security/certs/alice.jks" /> + <entry key="rs.security.keystore.file" value="keys/alice.jks" /> <entry key="rs.security.signature.algorithm" value="RS256" /> </jaxrs:properties> </jaxrs:server> http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/userinfo-server.xml ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/userinfo-server.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/userinfo-server.xml index 5b9fbf8..aea38f2 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/userinfo-server.xml +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/userinfo-server.xml @@ -51,10 +51,10 @@ under the License. <httpj:engine port="${testutil.ports.jaxrs-userinfo}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="password"> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/> </sec:trustManagers> <sec:clientAuthentication want="false" required="false"/> </httpj:tlsServerParameters> @@ -101,8 +101,7 @@ under the License. <entry key="rs.security.keystore.alias" value="alice"/> <entry key="rs.security.keystore.password" value="password"/> <entry key="rs.security.key.password" value="password"/> - <entry key="rs.security.keystore.file" - value="org/apache/cxf/systest/jaxrs/security/certs/alice.jks" /> + <entry key="rs.security.keystore.file" value="keys/alice.jks" /> <entry key="rs.security.signature.algorithm" value="RS256" /> </jaxrs:properties> </jaxrs:server> @@ -150,8 +149,7 @@ under the License. <entry key="rs.security.keystore.alias" value="alice"/> <entry key="rs.security.keystore.password" value="password"/> <entry key="rs.security.key.password" value="password"/> - <entry key="rs.security.keystore.file" - value="org/apache/cxf/systest/jaxrs/security/certs/alice.jks" /> + <entry key="rs.security.keystore.file" value="keys/alice.jks" /> <entry key="rs.security.signature.algorithm" value="RS256" /> </jaxrs:properties> </jaxrs:server> @@ -175,8 +173,7 @@ under the License. <entry key="rs.security.keystore.type" value="jks" /> <entry key="rs.security.keystore.alias" value="bob"/> <entry key="rs.security.keystore.password" value="password"/> - <entry key="rs.security.keystore.file" - value="org/apache/cxf/systest/jaxrs/security/certs/bob.jks" /> + <entry key="rs.security.keystore.file" value="keys/bob.jks" /> <entry key="rs.security.signature.algorithm" value="RS256" /> </jaxrs:properties> @@ -186,7 +183,7 @@ under the License. <http:client ConnectionTimeout="3000000" ReceiveTimeout="3000000"/> <http:tlsClientParameters disableCNCheck="true"> <sec:trustManagers> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/> </sec:trustManagers> </http:tlsClientParameters> </http:conduit> http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e34286/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/saml/client.xml ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/saml/client.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/saml/client.xml index 13eaea1..d10dac6 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/saml/client.xml +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/saml/client.xml @@ -28,10 +28,10 @@ <http:client ConnectionTimeout="3000000" ReceiveTimeout="3000000"/> <http:tlsClientParameters disableCNCheck="true"> <sec:keyManagers keyPassword="password"> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Morpit.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Morpit.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/> + <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/> </sec:trustManagers> </http:tlsClientParameters> </http:conduit>
