Repository: cxf-fediz Updated Branches: refs/heads/master 67547bea8 -> b203c0253
Renaming ststrust.jks -> clientrust.jks Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/18f4f412 Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/18f4f412 Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/18f4f412 Branch: refs/heads/master Commit: 18f4f412343424ed8aa9d31aa195ec42f7b3fe2f Parents: 67547be Author: Colm O hEigeartaigh <[email protected]> Authored: Thu Apr 23 17:31:25 2015 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Thu Apr 23 17:31:25 2015 +0100 ---------------------------------------------------------------------- systests/cxf/src/test/resources/clienttrust.jks | Bin 0 -> 1526 bytes systests/cxf/src/test/resources/fediz_config.xml | 2 +- systests/cxf/src/test/resources/ststrust.jks | Bin 2561 -> 0 bytes .../src/main/resources/clienttrust.jks | Bin 0 -> 1526 bytes .../samlIdpWebapp/src/main/resources/ststrust.jks | Bin 2561 -> 0 bytes .../samlsso/src/test/resources/clienttrust.jks | Bin 0 -> 1526 bytes .../src/test/resources/fediz_config_saml_sso.xml | 2 +- .../samlsso/src/test/resources/ststrust.jks | Bin 2561 -> 0 bytes .../wsfed/src/test/resources/clienttrust.jks | Bin 0 -> 1526 bytes .../wsfed/src/test/resources/fediz_config_wsfed.xml | 2 +- .../wsfed/src/test/resources/ststrust.jks | Bin 2561 -> 0 bytes systests/jetty8/src/test/resources/clienttrust.jks | Bin 0 -> 1526 bytes systests/jetty8/src/test/resources/fediz_config.xml | 4 ++-- .../src/test/resources/fediz_config_client_cert.xml | 2 +- systests/jetty8/src/test/resources/ststrust.jks | Bin 2561 -> 0 bytes systests/spring/src/test/resources/fediz_config.xml | 4 ++-- systests/tomcat7/src/test/resources/clienttrust.jks | Bin 0 -> 1526 bytes .../tomcat7/src/test/resources/fediz_config.xml | 2 +- .../src/test/resources/fediz_config_bad_wreq.xml | 2 +- .../src/test/resources/fediz_config_client_cert.xml | 2 +- .../tomcat7/src/test/resources/fediz_config_hok.xml | 2 +- .../src/test/resources/fediz_config_wreq.xml | 2 +- systests/tomcat7/src/test/resources/ststrust.jks | Bin 2561 -> 0 bytes .../cxfWebapp/src/main/resources/clienttrust.jks | Bin 0 -> 1526 bytes .../cxfWebapp/src/main/resources/fediz_config.xml | 2 +- .../cxfWebapp/src/main/resources/ststrust.jks | Bin 2561 -> 0 bytes .../src/main/resources/clienttrust.jks | Bin 0 -> 1526 bytes .../spring2Webapp/src/main/resources/ststrust.jks | Bin 2561 -> 0 bytes .../springWebapp/src/main/resources/clienttrust.jks | Bin 0 -> 1526 bytes .../springWebapp/src/main/resources/ststrust.jks | Bin 2561 -> 0 bytes 30 files changed, 14 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/18f4f412/systests/cxf/src/test/resources/clienttrust.jks ---------------------------------------------------------------------- diff --git a/systests/cxf/src/test/resources/clienttrust.jks b/systests/cxf/src/test/resources/clienttrust.jks new file mode 100644 index 0000000..3631d08 Binary files /dev/null and b/systests/cxf/src/test/resources/clienttrust.jks differ http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/18f4f412/systests/cxf/src/test/resources/fediz_config.xml ---------------------------------------------------------------------- diff --git a/systests/cxf/src/test/resources/fediz_config.xml b/systests/cxf/src/test/resources/fediz_config.xml index 1f20ab6..507995a 100644 --- a/systests/cxf/src/test/resources/fediz_config.xml +++ b/systests/cxf/src/test/resources/fediz_config.xml @@ -10,7 +10,7 @@ </audienceUris> <certificateStores> <trustManager> - <keyStore file="test-classes/ststrust.jks" + <keyStore file="test-classes/clienttrust.jks" password="storepass" type="JKS" /> </trustManager> </certificateStores> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/18f4f412/systests/cxf/src/test/resources/ststrust.jks ---------------------------------------------------------------------- diff --git a/systests/cxf/src/test/resources/ststrust.jks b/systests/cxf/src/test/resources/ststrust.jks deleted file mode 100644 index 911945c..0000000 Binary files a/systests/cxf/src/test/resources/ststrust.jks and /dev/null differ http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/18f4f412/systests/federation/samlIdpWebapp/src/main/resources/clienttrust.jks ---------------------------------------------------------------------- diff --git a/systests/federation/samlIdpWebapp/src/main/resources/clienttrust.jks b/systests/federation/samlIdpWebapp/src/main/resources/clienttrust.jks new file mode 100644 index 0000000..3631d08 Binary files /dev/null and b/systests/federation/samlIdpWebapp/src/main/resources/clienttrust.jks differ http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/18f4f412/systests/federation/samlIdpWebapp/src/main/resources/ststrust.jks ---------------------------------------------------------------------- diff --git a/systests/federation/samlIdpWebapp/src/main/resources/ststrust.jks b/systests/federation/samlIdpWebapp/src/main/resources/ststrust.jks deleted file mode 100644 index 911945c..0000000 Binary files a/systests/federation/samlIdpWebapp/src/main/resources/ststrust.jks and /dev/null differ http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/18f4f412/systests/federation/samlsso/src/test/resources/clienttrust.jks ---------------------------------------------------------------------- diff --git a/systests/federation/samlsso/src/test/resources/clienttrust.jks b/systests/federation/samlsso/src/test/resources/clienttrust.jks new file mode 100644 index 0000000..3631d08 Binary files /dev/null and b/systests/federation/samlsso/src/test/resources/clienttrust.jks differ http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/18f4f412/systests/federation/samlsso/src/test/resources/fediz_config_saml_sso.xml ---------------------------------------------------------------------- diff --git a/systests/federation/samlsso/src/test/resources/fediz_config_saml_sso.xml b/systests/federation/samlsso/src/test/resources/fediz_config_saml_sso.xml index 8137315..fa35e5a 100644 --- a/systests/federation/samlsso/src/test/resources/fediz_config_saml_sso.xml +++ b/systests/federation/samlsso/src/test/resources/fediz_config_saml_sso.xml @@ -10,7 +10,7 @@ </audienceUris> <certificateStores> <trustManager> - <keyStore file="test-classes/ststrust.jks" + <keyStore file="test-classes/clienttrust.jks" password="storepass" type="JKS" /> </trustManager> </certificateStores> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/18f4f412/systests/federation/samlsso/src/test/resources/ststrust.jks ---------------------------------------------------------------------- diff --git a/systests/federation/samlsso/src/test/resources/ststrust.jks b/systests/federation/samlsso/src/test/resources/ststrust.jks deleted file mode 100644 index 911945c..0000000 Binary files a/systests/federation/samlsso/src/test/resources/ststrust.jks and /dev/null differ http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/18f4f412/systests/federation/wsfed/src/test/resources/clienttrust.jks ---------------------------------------------------------------------- diff --git a/systests/federation/wsfed/src/test/resources/clienttrust.jks b/systests/federation/wsfed/src/test/resources/clienttrust.jks new file mode 100644 index 0000000..3631d08 Binary files /dev/null and b/systests/federation/wsfed/src/test/resources/clienttrust.jks differ http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/18f4f412/systests/federation/wsfed/src/test/resources/fediz_config_wsfed.xml ---------------------------------------------------------------------- diff --git a/systests/federation/wsfed/src/test/resources/fediz_config_wsfed.xml b/systests/federation/wsfed/src/test/resources/fediz_config_wsfed.xml index 8137315..fa35e5a 100644 --- a/systests/federation/wsfed/src/test/resources/fediz_config_wsfed.xml +++ b/systests/federation/wsfed/src/test/resources/fediz_config_wsfed.xml @@ -10,7 +10,7 @@ </audienceUris> <certificateStores> <trustManager> - <keyStore file="test-classes/ststrust.jks" + <keyStore file="test-classes/clienttrust.jks" password="storepass" type="JKS" /> </trustManager> </certificateStores> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/18f4f412/systests/federation/wsfed/src/test/resources/ststrust.jks ---------------------------------------------------------------------- diff --git a/systests/federation/wsfed/src/test/resources/ststrust.jks b/systests/federation/wsfed/src/test/resources/ststrust.jks deleted file mode 100644 index 911945c..0000000 Binary files a/systests/federation/wsfed/src/test/resources/ststrust.jks and /dev/null differ http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/18f4f412/systests/jetty8/src/test/resources/clienttrust.jks ---------------------------------------------------------------------- diff --git a/systests/jetty8/src/test/resources/clienttrust.jks b/systests/jetty8/src/test/resources/clienttrust.jks new file mode 100644 index 0000000..3631d08 Binary files /dev/null and b/systests/jetty8/src/test/resources/clienttrust.jks differ http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/18f4f412/systests/jetty8/src/test/resources/fediz_config.xml ---------------------------------------------------------------------- diff --git a/systests/jetty8/src/test/resources/fediz_config.xml b/systests/jetty8/src/test/resources/fediz_config.xml index 28e0d95..bf401cb 100644 --- a/systests/jetty8/src/test/resources/fediz_config.xml +++ b/systests/jetty8/src/test/resources/fediz_config.xml @@ -10,7 +10,7 @@ </audienceUris> <certificateStores> <trustManager> - <keyStore file="ststrust.jks" password="storepass" + <keyStore file="clienttrust.jks" password="storepass" type="JKS" /> </trustManager> </certificateStores> @@ -45,7 +45,7 @@ </audienceUris> <certificateStores> <trustManager> - <keyStore file="ststrust.jks" password="storepass" + <keyStore file="clienttrust.jks" password="storepass" type="JKS" /> </trustManager> </certificateStores> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/18f4f412/systests/jetty8/src/test/resources/fediz_config_client_cert.xml ---------------------------------------------------------------------- diff --git a/systests/jetty8/src/test/resources/fediz_config_client_cert.xml b/systests/jetty8/src/test/resources/fediz_config_client_cert.xml index d0605b8..da6b126 100644 --- a/systests/jetty8/src/test/resources/fediz_config_client_cert.xml +++ b/systests/jetty8/src/test/resources/fediz_config_client_cert.xml @@ -10,7 +10,7 @@ </audienceUris> <certificateStores> <trustManager> - <keyStore file="ststrust.jks" password="storepass" type="JKS" /> + <keyStore file="clienttrust.jks" password="storepass" type="JKS" /> </trustManager> </certificateStores> <trustedIssuers> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/18f4f412/systests/jetty8/src/test/resources/ststrust.jks ---------------------------------------------------------------------- diff --git a/systests/jetty8/src/test/resources/ststrust.jks b/systests/jetty8/src/test/resources/ststrust.jks deleted file mode 100644 index 911945c..0000000 Binary files a/systests/jetty8/src/test/resources/ststrust.jks and /dev/null differ http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/18f4f412/systests/spring/src/test/resources/fediz_config.xml ---------------------------------------------------------------------- diff --git a/systests/spring/src/test/resources/fediz_config.xml b/systests/spring/src/test/resources/fediz_config.xml index 0f83b8d..1061454 100644 --- a/systests/spring/src/test/resources/fediz_config.xml +++ b/systests/spring/src/test/resources/fediz_config.xml @@ -10,7 +10,7 @@ </audienceUris> <certificateStores> <trustManager> - <keyStore file="ststrust.jks" password="storepass" type="JKS" /> + <keyStore file="clienttrust.jks" password="storepass" type="JKS" /> </trustManager> </certificateStores> <trustedIssuers> @@ -49,7 +49,7 @@ </audienceUris> <certificateStores> <trustManager> - <keyStore file="ststrust.jks" password="storepass" type="JKS" /> + <keyStore file="clienttrust.jks" password="storepass" type="JKS" /> </trustManager> </certificateStores> <trustedIssuers> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/18f4f412/systests/tomcat7/src/test/resources/clienttrust.jks ---------------------------------------------------------------------- diff --git a/systests/tomcat7/src/test/resources/clienttrust.jks b/systests/tomcat7/src/test/resources/clienttrust.jks new file mode 100644 index 0000000..3631d08 Binary files /dev/null and b/systests/tomcat7/src/test/resources/clienttrust.jks differ http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/18f4f412/systests/tomcat7/src/test/resources/fediz_config.xml ---------------------------------------------------------------------- diff --git a/systests/tomcat7/src/test/resources/fediz_config.xml b/systests/tomcat7/src/test/resources/fediz_config.xml index 1f20ab6..507995a 100644 --- a/systests/tomcat7/src/test/resources/fediz_config.xml +++ b/systests/tomcat7/src/test/resources/fediz_config.xml @@ -10,7 +10,7 @@ </audienceUris> <certificateStores> <trustManager> - <keyStore file="test-classes/ststrust.jks" + <keyStore file="test-classes/clienttrust.jks" password="storepass" type="JKS" /> </trustManager> </certificateStores> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/18f4f412/systests/tomcat7/src/test/resources/fediz_config_bad_wreq.xml ---------------------------------------------------------------------- diff --git a/systests/tomcat7/src/test/resources/fediz_config_bad_wreq.xml b/systests/tomcat7/src/test/resources/fediz_config_bad_wreq.xml index a518910..bf7dfe8 100644 --- a/systests/tomcat7/src/test/resources/fediz_config_bad_wreq.xml +++ b/systests/tomcat7/src/test/resources/fediz_config_bad_wreq.xml @@ -10,7 +10,7 @@ </audienceUris> <certificateStores> <trustManager> - <keyStore file="test-classes/ststrust.jks" + <keyStore file="test-classes/clienttrust.jks" password="storepass" type="JKS" /> </trustManager> </certificateStores> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/18f4f412/systests/tomcat7/src/test/resources/fediz_config_client_cert.xml ---------------------------------------------------------------------- diff --git a/systests/tomcat7/src/test/resources/fediz_config_client_cert.xml b/systests/tomcat7/src/test/resources/fediz_config_client_cert.xml index 8399dfc..f0497e0 100644 --- a/systests/tomcat7/src/test/resources/fediz_config_client_cert.xml +++ b/systests/tomcat7/src/test/resources/fediz_config_client_cert.xml @@ -10,7 +10,7 @@ </audienceUris> <certificateStores> <trustManager> - <keyStore file="test-classes/ststrust.jks" + <keyStore file="test-classes/clienttrust.jks" password="storepass" type="JKS" /> </trustManager> </certificateStores> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/18f4f412/systests/tomcat7/src/test/resources/fediz_config_hok.xml ---------------------------------------------------------------------- diff --git a/systests/tomcat7/src/test/resources/fediz_config_hok.xml b/systests/tomcat7/src/test/resources/fediz_config_hok.xml index 21bd594..19a9399 100644 --- a/systests/tomcat7/src/test/resources/fediz_config_hok.xml +++ b/systests/tomcat7/src/test/resources/fediz_config_hok.xml @@ -10,7 +10,7 @@ </audienceUris> <certificateStores> <trustManager> - <keyStore file="test-classes/ststrust.jks" + <keyStore file="test-classes/clienttrust.jks" password="storepass" type="JKS" /> </trustManager> </certificateStores> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/18f4f412/systests/tomcat7/src/test/resources/fediz_config_wreq.xml ---------------------------------------------------------------------- diff --git a/systests/tomcat7/src/test/resources/fediz_config_wreq.xml b/systests/tomcat7/src/test/resources/fediz_config_wreq.xml index d5263ef..8f5b41b 100644 --- a/systests/tomcat7/src/test/resources/fediz_config_wreq.xml +++ b/systests/tomcat7/src/test/resources/fediz_config_wreq.xml @@ -10,7 +10,7 @@ </audienceUris> <certificateStores> <trustManager> - <keyStore file="test-classes/ststrust.jks" + <keyStore file="test-classes/clienttrust.jks" password="storepass" type="JKS" /> </trustManager> </certificateStores> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/18f4f412/systests/tomcat7/src/test/resources/ststrust.jks ---------------------------------------------------------------------- diff --git a/systests/tomcat7/src/test/resources/ststrust.jks b/systests/tomcat7/src/test/resources/ststrust.jks deleted file mode 100644 index 911945c..0000000 Binary files a/systests/tomcat7/src/test/resources/ststrust.jks and /dev/null differ http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/18f4f412/systests/webapps/cxfWebapp/src/main/resources/clienttrust.jks ---------------------------------------------------------------------- diff --git a/systests/webapps/cxfWebapp/src/main/resources/clienttrust.jks b/systests/webapps/cxfWebapp/src/main/resources/clienttrust.jks new file mode 100644 index 0000000..3631d08 Binary files /dev/null and b/systests/webapps/cxfWebapp/src/main/resources/clienttrust.jks differ http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/18f4f412/systests/webapps/cxfWebapp/src/main/resources/fediz_config.xml ---------------------------------------------------------------------- diff --git a/systests/webapps/cxfWebapp/src/main/resources/fediz_config.xml b/systests/webapps/cxfWebapp/src/main/resources/fediz_config.xml index 8d0f0a5..a59be1c 100644 --- a/systests/webapps/cxfWebapp/src/main/resources/fediz_config.xml +++ b/systests/webapps/cxfWebapp/src/main/resources/fediz_config.xml @@ -10,7 +10,7 @@ </audienceUris> <certificateStores> <trustManager> - <keyStore file="test-classes/ststrust.jks" + <keyStore file="test-classes/clienttrust.jks" password="storepass" type="JKS" /> </trustManager> </certificateStores> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/18f4f412/systests/webapps/cxfWebapp/src/main/resources/ststrust.jks ---------------------------------------------------------------------- diff --git a/systests/webapps/cxfWebapp/src/main/resources/ststrust.jks b/systests/webapps/cxfWebapp/src/main/resources/ststrust.jks deleted file mode 100644 index 911945c..0000000 Binary files a/systests/webapps/cxfWebapp/src/main/resources/ststrust.jks and /dev/null differ http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/18f4f412/systests/webapps/spring2Webapp/src/main/resources/clienttrust.jks ---------------------------------------------------------------------- diff --git a/systests/webapps/spring2Webapp/src/main/resources/clienttrust.jks b/systests/webapps/spring2Webapp/src/main/resources/clienttrust.jks new file mode 100644 index 0000000..3631d08 Binary files /dev/null and b/systests/webapps/spring2Webapp/src/main/resources/clienttrust.jks differ http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/18f4f412/systests/webapps/spring2Webapp/src/main/resources/ststrust.jks ---------------------------------------------------------------------- diff --git a/systests/webapps/spring2Webapp/src/main/resources/ststrust.jks b/systests/webapps/spring2Webapp/src/main/resources/ststrust.jks deleted file mode 100644 index 911945c..0000000 Binary files a/systests/webapps/spring2Webapp/src/main/resources/ststrust.jks and /dev/null differ http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/18f4f412/systests/webapps/springWebapp/src/main/resources/clienttrust.jks ---------------------------------------------------------------------- diff --git a/systests/webapps/springWebapp/src/main/resources/clienttrust.jks b/systests/webapps/springWebapp/src/main/resources/clienttrust.jks new file mode 100644 index 0000000..3631d08 Binary files /dev/null and b/systests/webapps/springWebapp/src/main/resources/clienttrust.jks differ http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/18f4f412/systests/webapps/springWebapp/src/main/resources/ststrust.jks ---------------------------------------------------------------------- diff --git a/systests/webapps/springWebapp/src/main/resources/ststrust.jks b/systests/webapps/springWebapp/src/main/resources/ststrust.jks deleted file mode 100644 index 911945c..0000000 Binary files a/systests/webapps/springWebapp/src/main/resources/ststrust.jks and /dev/null differ
