Updating keystores to work with JDK9
Conflicts:
systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/alice.properties
systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/bob.properties
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c7720313
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c7720313
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c7720313
Branch: refs/heads/3.0.x-fixes
Commit: c7720313ccf181218809afd2ff17c02cf894641a
Parents: 688d411
Author: Colm O hEigeartaigh <cohei...@apache.org>
Authored: Wed Sep 9 17:54:46 2015 +0100
Committer: Colm O hEigeartaigh <cohei...@apache.org>
Committed: Wed Sep 9 17:56:22 2015 +0100
----------------------------------------------------------------------
.../policyhandlers/AbstractBindingBuilder.java | 6 +-
.../data/xkms/certificates/crls/wss40CACRL.cer | Bin 325 -> 345 bytes
.../resources/data/xkms/certificates/wss40.cer | Bin 824 -> 956 bytes
.../data/xkms/certificates/wss40rev.cer | Bin 824 -> 956 bytes
.../trustedAuthorityValidator/wss40.cer | Bin 824 -> 956 bytes
.../trustedAuthorityValidator/wss40CACRL.cer | Bin 325 -> 345 bytes
.../trustedAuthorityValidator/wss40rev.cer | Bin 824 -> 956 bytes
.../src/test/resources/keys/Bethal.cer | Bin 548 -> 0 bytes
.../src/test/resources/keys/Bethal.jks | Bin 1317 -> 2202 bytes
.../src/test/resources/keys/Bethal.p12 | Bin 1705 -> 2540 bytes
.../src/test/resources/keys/Gordy.cer | Bin 544 -> 0 bytes
.../src/test/resources/keys/Gordy.jks | Bin 1313 -> 2197 bytes
.../src/test/resources/keys/Morpit.jks | Bin 1337 -> 2221 bytes
.../src/test/resources/keys/Morpit.p12 | Bin 1721 -> 2564 bytes
.../src/test/resources/keys/Poltim.cer | Bin 548 -> 0 bytes
.../src/test/resources/keys/Poltim.jks | Bin 1318 -> 2203 bytes
.../src/test/resources/keys/Tarpin.cer | Bin 548 -> 0 bytes
.../src/test/resources/keys/Tarpin.jks | Bin 1319 -> 2201 bytes
.../src/test/resources/keys/Truststore.jks | Bin 2942 -> 4447 bytes
.../src/test/resources/keys/Truststore.pem | 126 +++++++++++--------
.../systest/ws/security/SecurityPolicyTest.java | 50 ++++----
.../apache/cxf/systest/ws/security/Bethal.cer | Bin 548 -> 0 bytes
.../apache/cxf/systest/ws/security/Bethal.cxf | 83 ------------
.../apache/cxf/systest/ws/security/Bethal.jks | Bin 1317 -> 2202 bytes
.../apache/cxf/systest/ws/security/Bethal.p12 | Bin 1705 -> 0 bytes
.../cxf/systest/ws/security/DoubleIt.wsdl | 26 ++--
.../apache/cxf/systest/ws/security/Morpit.cxf | 73 -----------
.../apache/cxf/systest/ws/security/Morpit.jks | Bin 1337 -> 2221 bytes
.../apache/cxf/systest/ws/security/Morpit.p12 | Bin 1721 -> 0 bytes
.../cxf/systest/ws/security/Truststore.jks | Bin 2942 -> 4447 bytes
.../cxf/systest/ws/security/Truststore.pem | 60 ---------
.../apache/cxf/systest/ws/security/alice.jks | Bin 1821 -> 0 bytes
.../org/apache/cxf/systest/ws/security/bob.jks | Bin 1820 -> 0 bytes
.../apache/cxf/systest/ws/security/client.xml | 8 +-
.../apache/cxf/systest/ws/security/server.xml | 8 +-
.../cxf/systest/ws/security/stax-server.xml | 8 +-
36 files changed, 129 insertions(+), 319 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/c7720313/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
----------------------------------------------------------------------
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
index 8ffa513..c46515e 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
@@ -369,9 +369,11 @@ public abstract class AbstractBindingBuilder extends
AbstractCommonBindingHandle
SPConstants.LAYOUT_LAX_TIMESTAMP_FIRST));
}
} else if (timestampEl != null) {
- ai.setAsserted(true);
+ if (ai != null) {
+ ai.setAsserted(true);
+ }
addTopDownElement(timestampEl.getElement());
- } else {
+ } else if (ai != null) {
ai.setAsserted(true);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/c7720313/services/xkms/xkms-itests/src/test/resources/data/xkms/certificates/crls/wss40CACRL.cer
----------------------------------------------------------------------
diff --git
a/services/xkms/xkms-itests/src/test/resources/data/xkms/certificates/crls/wss40CACRL.cer
b/services/xkms/xkms-itests/src/test/resources/data/xkms/certificates/crls/wss40CACRL.cer
index 44073b1..0d46cca 100644
Binary files
a/services/xkms/xkms-itests/src/test/resources/data/xkms/certificates/crls/wss40CACRL.cer
and
b/services/xkms/xkms-itests/src/test/resources/data/xkms/certificates/crls/wss40CACRL.cer
differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/c7720313/services/xkms/xkms-itests/src/test/resources/data/xkms/certificates/wss40.cer
----------------------------------------------------------------------
diff --git
a/services/xkms/xkms-itests/src/test/resources/data/xkms/certificates/wss40.cer
b/services/xkms/xkms-itests/src/test/resources/data/xkms/certificates/wss40.cer
index 955322b..f916206 100644
Binary files
a/services/xkms/xkms-itests/src/test/resources/data/xkms/certificates/wss40.cer
and
b/services/xkms/xkms-itests/src/test/resources/data/xkms/certificates/wss40.cer
differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/c7720313/services/xkms/xkms-itests/src/test/resources/data/xkms/certificates/wss40rev.cer
----------------------------------------------------------------------
diff --git
a/services/xkms/xkms-itests/src/test/resources/data/xkms/certificates/wss40rev.cer
b/services/xkms/xkms-itests/src/test/resources/data/xkms/certificates/wss40rev.cer
index 0176460..ef2ff55 100644
Binary files
a/services/xkms/xkms-itests/src/test/resources/data/xkms/certificates/wss40rev.cer
and
b/services/xkms/xkms-itests/src/test/resources/data/xkms/certificates/wss40rev.cer
differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/c7720313/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40.cer
----------------------------------------------------------------------
diff --git
a/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40.cer
b/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40.cer
index 955322b..f916206 100644
Binary files
a/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40.cer
and
b/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40.cer
differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/c7720313/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40CACRL.cer
----------------------------------------------------------------------
diff --git
a/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40CACRL.cer
b/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40CACRL.cer
index 44073b1..0d46cca 100644
Binary files
a/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40CACRL.cer
and
b/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40CACRL.cer
differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/c7720313/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40rev.cer
----------------------------------------------------------------------
diff --git
a/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40rev.cer
b/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40rev.cer
index 0176460..ef2ff55 100644
Binary files
a/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40rev.cer
and
b/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40rev.cer
differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/c7720313/systests/transports/src/test/resources/keys/Bethal.cer
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/keys/Bethal.cer
b/systests/transports/src/test/resources/keys/Bethal.cer
deleted file mode 100644
index 5ca8252..0000000
Binary files a/systests/transports/src/test/resources/keys/Bethal.cer and
/dev/null differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/c7720313/systests/transports/src/test/resources/keys/Bethal.jks
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/keys/Bethal.jks
b/systests/transports/src/test/resources/keys/Bethal.jks
index 2bf1a9a..8da2ad0 100644
Binary files a/systests/transports/src/test/resources/keys/Bethal.jks and
b/systests/transports/src/test/resources/keys/Bethal.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/c7720313/systests/transports/src/test/resources/keys/Bethal.p12
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/keys/Bethal.p12
b/systests/transports/src/test/resources/keys/Bethal.p12
index c47515e..5b627c5 100644
Binary files a/systests/transports/src/test/resources/keys/Bethal.p12 and
b/systests/transports/src/test/resources/keys/Bethal.p12 differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/c7720313/systests/transports/src/test/resources/keys/Gordy.cer
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/keys/Gordy.cer
b/systests/transports/src/test/resources/keys/Gordy.cer
deleted file mode 100644
index 6cabd2a..0000000
Binary files a/systests/transports/src/test/resources/keys/Gordy.cer and
/dev/null differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/c7720313/systests/transports/src/test/resources/keys/Gordy.jks
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/keys/Gordy.jks
b/systests/transports/src/test/resources/keys/Gordy.jks
index b067db0..8fa8847 100644
Binary files a/systests/transports/src/test/resources/keys/Gordy.jks and
b/systests/transports/src/test/resources/keys/Gordy.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/c7720313/systests/transports/src/test/resources/keys/Morpit.jks
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/keys/Morpit.jks
b/systests/transports/src/test/resources/keys/Morpit.jks
index 95626a7..b179baf 100644
Binary files a/systests/transports/src/test/resources/keys/Morpit.jks and
b/systests/transports/src/test/resources/keys/Morpit.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/c7720313/systests/transports/src/test/resources/keys/Morpit.p12
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/keys/Morpit.p12
b/systests/transports/src/test/resources/keys/Morpit.p12
index f37acff..b18c8ed 100644
Binary files a/systests/transports/src/test/resources/keys/Morpit.p12 and
b/systests/transports/src/test/resources/keys/Morpit.p12 differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/c7720313/systests/transports/src/test/resources/keys/Poltim.cer
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/keys/Poltim.cer
b/systests/transports/src/test/resources/keys/Poltim.cer
deleted file mode 100644
index cfb2cc5..0000000
Binary files a/systests/transports/src/test/resources/keys/Poltim.cer and
/dev/null differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/c7720313/systests/transports/src/test/resources/keys/Poltim.jks
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/keys/Poltim.jks
b/systests/transports/src/test/resources/keys/Poltim.jks
index 570e071..f3b3e68 100644
Binary files a/systests/transports/src/test/resources/keys/Poltim.jks and
b/systests/transports/src/test/resources/keys/Poltim.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/c7720313/systests/transports/src/test/resources/keys/Tarpin.cer
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/keys/Tarpin.cer
b/systests/transports/src/test/resources/keys/Tarpin.cer
deleted file mode 100644
index 37edcac..0000000
Binary files a/systests/transports/src/test/resources/keys/Tarpin.cer and
/dev/null differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/c7720313/systests/transports/src/test/resources/keys/Tarpin.jks
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/keys/Tarpin.jks
b/systests/transports/src/test/resources/keys/Tarpin.jks
index 329af6a..cf1ceb6 100644
Binary files a/systests/transports/src/test/resources/keys/Tarpin.jks and
b/systests/transports/src/test/resources/keys/Tarpin.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/c7720313/systests/transports/src/test/resources/keys/Truststore.jks
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/keys/Truststore.jks
b/systests/transports/src/test/resources/keys/Truststore.jks
index e76a076..0abd848 100644
Binary files a/systests/transports/src/test/resources/keys/Truststore.jks and
b/systests/transports/src/test/resources/keys/Truststore.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/c7720313/systests/transports/src/test/resources/keys/Truststore.pem
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/keys/Truststore.pem
b/systests/transports/src/test/resources/keys/Truststore.pem
index 1b25477..c04eaf8 100644
--- a/systests/transports/src/test/resources/keys/Truststore.pem
+++ b/systests/transports/src/test/resources/keys/Truststore.pem
@@ -1,60 +1,86 @@
-----BEGIN CERTIFICATE-----
-MIICIDCCAYkCBEYRaYcwDQYJKoZIhvcNAQEEBQAwVzELMAkGA1UEBhMCVVMxETAPBgNVBAcTCFN5
-cmFjdXNlMRMwEQYDVQQKEwpBcGFjaGVUZXN0MQ8wDQYDVQQLEwZCZXRoYWwxDzANBgNVBAMTBkJl
-dGhhbDAeFw0wNzA0MDIyMDM3MjdaFw0zNDA4MTgyMDM3MjdaMFcxCzAJBgNVBAYTAlVTMREwDwYD
-VQQHEwhTeXJhY3VzZTETMBEGA1UEChMKQXBhY2hlVGVzdDEPMA0GA1UECxMGQmV0aGFsMQ8wDQYD
-VQQDEwZCZXRoYWwwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAJHOyFu8tTt4g9tBv0bY8c4K
-uidfMlHbFQAukIFXLkR4xu5IxG5OI53ZE0F6rqcPFve1sdEV9h+MxmzqQbo180Wyv1rUEq2AScK3
-6bo0ALuZsreQQmNVGBOjxBpTtrRErRfNJe1mvzNMz9VlGdSNWW17CrBz9kmz6G1EWg8aGfZHAgMB
-AAEwDQYJKoZIhvcNAQEEBQADgYEAbw+VwP1tnBm3cFLFgONnGCozN8XqV2M0OklJ5lBDJL7BV2Ng
-BtTZ8as9jTGYdjetKQXX75wWL7OS7vnkm/9tbr/vNBljT0OP0Yr2X7TAbDdhFfsk/D5mBpXdzXz2
-wqxVZjj6sm5zvwC32e4AxGG0edmY1DN9VMZzA/FrzBP0qoE=
+MIIDSTCCAjGgAwIBAgIEGFcAsjANBgkqhkiG9w0BAQsFADBVMQswCQYDVQQGEwJVUzERMA8GA1UE
+BxMIU3lyYWN1c2UxEzARBgNVBAoTCkFwYWNoZVRlc3QxDjAMBgNVBAsTBUdvcmR5MQ4wDAYDVQQD
+EwVHb3JkeTAeFw0xNTA5MDkxNTUyMzRaFw0yNTA5MDYxNTUyMzRaMFUxCzAJBgNVBAYTAlVTMREw
+DwYDVQQHEwhTeXJhY3VzZTETMBEGA1UEChMKQXBhY2hlVGVzdDEOMAwGA1UECxMFR29yZHkxDjAM
+BgNVBAMTBUdvcmR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuVubnwltwu38Slqe
+ANXNBFkWQ3PV4n/T5tU1PLrkg+g7AEOtaWn/3TDfcxYovDF/TWnkwcYeYDeILdXcLJgoa0mhMO2n
+46JrR3NpLM5jBtw0NVBeBR+HuFfbdlLIABgD90+aalm4kB0Fq8BO1moP4NnbxccSl2vLdP6u9oLE
+xXDog+FpHfwffKvgnyDh0Mc3lYJ7dJpwQNOmPO8docyePR53IbQuAXL8C5rYc+OHU/smj4rvwqP9
+S5zj/yOpl+7tTAq+0kLJetHJ03Cb+KVhpl6Gn/80a5DGjm7c1gAzlEwQpxltY0PkD62WJhPsVOkW
+CtRhvUNWrxq+68i460m4ZwIDAQABoyEwHzAdBgNVHQ4EFgQUSYfZ7HYvl7iTrZaoOOwXMbR80Fow
+DQYJKoZIhvcNAQELBQADggEBAAFJpi0Fu74YK0TZk96ApCgGXKU4+CyRtk5OyBeYUN746ImacDO8
+Qg2idSnOAw08sEZGN0RQnHec9r/3dhIZvULf00uDLybhN+Q9ErqI2seooJo4oF0fsd3gR4jJIU5K
+fVL8UJ0mSqUVMyH7oklyN0e3btKgAjY24ycNt+WTXaX0e1K7phsX0vNc9WMp1ZQN9NjozWXW0mte
+5FsrjiFAdnbRx8Bsj4E25ZkyplibBqDnKmlQxl+VDk1QEdignRexdJIBsjRguJfdyl6u//fSRhp0
+GMFO9ovDEyegHf0ZnWJthq4egYTMLmkzReE2neQDzuN8zYoZLTngbA3ynP+Ghgc=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIICHDCCAYUCBEYRaYkwDQYJKoZIhvcNAQEEBQAwVTELMAkGA1UEBhMCVVMxETAPBgNVBAcTCFN5
-cmFjdXNlMRMwEQYDVQQKEwpBcGFjaGVUZXN0MQ4wDAYDVQQLEwVHb3JkeTEOMAwGA1UEAxMFR29y
-ZHkwHhcNMDcwNDAyMjAzNzI5WhcNMzQwODE4MjAzNzI5WjBVMQswCQYDVQQGEwJVUzERMA8GA1UE
-BxMIU3lyYWN1c2UxEzARBgNVBAoTCkFwYWNoZVRlc3QxDjAMBgNVBAsTBUdvcmR5MQ4wDAYDVQQD
-EwVHb3JkeTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqIbNth+G4Q5tkZvoUZdQsY9RnjAA
-mgKVBUaOVvv//qOniOTskLqBFyKGoMpbCfNAU7/zVKP5fLTLccLdJyCagKGrs1ZmKaNiTRcOnfkE
-3dHnEIp83+hNmASGsrZcyLihtro1N3pMTuXbXzu7x3F2U7fxYFg66iviTEGF6T7dY3MCAwEAATAN
-BgkqhkiG9w0BAQQFAAOBgQBPjsYFdqz0JF9shNpvke/H1eHqhyXJgPdHdCu/ewRO2wV6I9WBrGNU
-cmmKZmAUsv99Y0Tpz59uEXFcM3cBZU4/obw3DlwwWmaVMoIwQ2Nd2FChC6uyKIJ0Bvpx+aDxjm48
-b8c58EHCcU2FRo/nVWctJL9xJ7oBrke5GZrBlUF+rA==
+MIIDTTCCAjWgAwIBAgIEOEaECjANBgkqhkiG9w0BAQsFADBXMQswCQYDVQQGEwJVUzERMA8GA1UE
+BxMIU3lyYWN1c2UxEzARBgNVBAoTCkFwYWNoZVRlc3QxDzANBgNVBAsTBkJldGhhbDEPMA0GA1UE
+AxMGQmV0aGFsMB4XDTE1MDkwOTE1NTIwN1oXDTI1MDkwNjE1NTIwN1owVzELMAkGA1UEBhMCVVMx
+ETAPBgNVBAcTCFN5cmFjdXNlMRMwEQYDVQQKEwpBcGFjaGVUZXN0MQ8wDQYDVQQLEwZCZXRoYWwx
+DzANBgNVBAMTBkJldGhhbDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMxgwx2lxVDL
+teM15IOsdgBGff42ozTaLVjr30qHsREbnZrk+1G8KscUtVYUwtCDCEErz64tu/TY2jskUi54q1j2
+tOXCz0awxDRKbE4ddyvnqSqItYC9nB+T/LLFJ65bqyleRbO+Zsqj4Gi+8lGmzgk0kCLoCJ9LTrpt
+VzsHHuBsvEkcBHEX8in5umzbTy6y1jq3zsUdclgA/EV4eyvFd5+8J8XiB6Ac4q7qYJdUaOrDKk5X
+Ns05WuzW3hP/qXDpmyxgS1GQLBMj8yuopVR7/FuGCeDBSJe60cyWtDTxosjTLwjTEYIEB/ySIcgK
+0TU+QxU8XEwwutjMzecKd9PQdpMCAwEAAaMhMB8wHQYDVR0OBBYEFDWt03QU4rqQa91UjYCNkfx0
+tp3HMA0GCSqGSIb3DQEBCwUAA4IBAQCwObHeIssS3e1INNs67T2g0v17Z1+HDEx65dfwph6Wxbex
+hb9yNKEXFUIUk+Z6ZzTmv1fc4DBZ2z0Nbk8rrS2BD6kojWVRwZVnv6pfPDjU82mFL7kHztiNPq8u
+23+lTrhO9HjuQZtVnTW3+Uw9RW5mBu+8QVgze0Q1DjL5PqX3YHq16LCYp6vVjdm0o7fKDQke2Z01
+a4hYtUF17m/Sw6319ocSI2fRA2ppQ7Ts8J3GSkAyygSR52mqaC7jDgD2Oh1eRhRaTgiyxLNLnAHu
+Koxbcr3sGFP2ZYwtP9DlhxwZzzpPcNWwFMqcQ79WPKmRvBMNOQDBdW77P3cxG3DF5KkO
-----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==
+MIIDYTCCAkmgAwIBAgIEDV+5sjANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQGEwJVUzERMA8GA1UE
+BxMIU3lyYWN1c2UxEzARBgNVBAoTCkFwYWNoZVRlc3QxDzANBgNVBAsTBk1vcnBpdDEZMBcGA1UE
+AxMQd2hhdGV2ZXJob3N0LmNvbTAeFw0xNTA5MDkxNTUzMTRaFw0yNTA5MDYxNTUzMTRaMGExCzAJ
+BgNVBAYTAlVTMREwDwYDVQQHEwhTeXJhY3VzZTETMBEGA1UEChMKQXBhY2hlVGVzdDEPMA0GA1UE
+CxMGTW9ycGl0MRkwFwYDVQQDExB3aGF0ZXZlcmhvc3QuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAjKod4Ne5+B5rPhvl7Dt7//O1fRZYw5GACCgTG6F2Cy8ozF7lfQo7jy3KTjrC
+xOkty6IUxcll5EKZQBfsqfKq2beEWI+tG//ZEfc1paK+4HGrqARtFXYm/azzEC8E66cVKRIej8DM
+yXPHvNsSSN/T7c5QCMBAd5p+uQFCGkHcX6ywiCu5hOBDhxBTr3680lRIOjBoICd3ytlT8pnHqjm7
+VexiG5sPg32f90Tf1UCJQL41Jn1miow4xLjDw0L9pCcoLtoh1jjOwErwISeTXtfp0zMAZ1T0Cwmu
+DQCL2Ek0ysmoDSQlpwL/zi/9XzeZCUY9a4KK2DV6q1WNnGJq6pMu0QIDAQABoyEwHzAdBgNVHQ4E
+FgQULNllc99it0vTugh22XKUn7H3zUkwDQYJKoZIhvcNAQELBQADggEBAFnOo+ghsy59M25gjVBG
+82siBQkhgl0eSzp/wVqa41F/KCY5hY8moKZARelNgOFQQxRpK6gBhj53TjF7B0w834r3S30F37qA
+d+T7yfH9drN5I4mNeTHpxPKeI1KJneZUqKt1PR1iZScwPzHHIfUWRiZ8ilJwNNy2MoZONKh7lhf4
+ILfYclRmMu7UJfb2gFjvTnzUwS5YJ8U0H5EYy7oHZS+7q3GXuL953tFypr1m0kvDYW4kYwyhHRZE
+XcDvDWvmO83BIk1AOQhzQ4ak4JLBpVQJnrPBhGUZOUAmIuRoV9If5WfvjVymH13VuAKoPJR3902u
+Gul/3Uq+ifNDF8btPpw=
-----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=
+MIIDTTCCAjWgAwIBAgIEOHEczzANBgkqhkiG9w0BAQsFADBXMQswCQYDVQQGEwJVUzERMA8GA1UE
+BxMIU3lyYWN1c2UxEzARBgNVBAoTCkFwYWNoZVRlc3QxDzANBgNVBAsTBlRhcnBpbjEPMA0GA1UE
+AxMGVGFycGluMB4XDTE1MDkwOTE1NTA1M1oXDTI1MDkwNjE1NTA1M1owVzELMAkGA1UEBhMCVVMx
+ETAPBgNVBAcTCFN5cmFjdXNlMRMwEQYDVQQKEwpBcGFjaGVUZXN0MQ8wDQYDVQQLEwZUYXJwaW4x
+DzANBgNVBAMTBlRhcnBpbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJlWtQr06Soq
+QwTIKgvrLXxcqs/i6FNep3OF5nhzi4K7GOuV88UTyD3TBCFOF/sOtnVfR+mPPSfWe0z+avMKsRiw
+szzak+w2eM9cOBofO+3Ag1i9mQLpkjmkMHxflZ45C0GPcwnU/BekOKZvJ0OcJYZU6S8wszpGPinv
+OPeN1V56Wj3ud/lLR3Ll14G4QdbOxbS6tstJ+olL7Xtz7CfARqCNEjGbKx4VceiIjraheqKM0kLE
+RpdQ0DBgefGEI41BW1wogg92t6PQ6Em1RYeu97pDppSYoA/RYBW5xIDj7vz7aTVY6RaHZwAGNF+1
+Yzj8PVgV7Ppgf5VIhcIFiTyaUuECAwEAAaMhMB8wHQYDVR0OBBYEFMhTmGMuJOrPNTUCjKuRLGQ9
+la4gMA0GCSqGSIb3DQEBCwUAA4IBAQA86Rqp0xrNYb/M7dfk8SzVLaCMPyTslnhiZOVIWwQScwu8
+xqfiDXGg1000r/3N9/ACduiMwwmxYRT3OZOK8DhsHsmQXbY1vTBUEAQ3hx+mV7dPMi3WtmdU4vz6
+KtLPbl3G0803Jujxe0qcFk6FzOhlIiqd0jBRQqvMFWqzzRXDjhy64uLeVY2fNtX9w/b3xWUTL1kI
+mR8SpQnOdWunLqZLrksnuzVGU/hutD11ge0JOQRKHhTBoLBSpqGD8PPTjJipR0p7JII8KI8LbDI6
+YesmuRQmkEbpCMqM5FGVjN7VLeLjRSWcf5dT056WjErd/1zRNFrC0Jjf++g37arTOLQn
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIICIDCCAYkCBEYRaYswDQYJKoZIhvcNAQEEBQAwVzELMAkGA1UEBhMCVVMxETAPBgNVBAcTCFN5
-cmFjdXNlMRMwEQYDVQQKEwpBcGFjaGVUZXN0MQ8wDQYDVQQLEwZUYXJwaW4xDzANBgNVBAMTBlRh
-cnBpbjAeFw0wNzA0MDIyMDM3MzFaFw0zNDA4MTgyMDM3MzFaMFcxCzAJBgNVBAYTAlVTMREwDwYD
-VQQHEwhTeXJhY3VzZTETMBEGA1UEChMKQXBhY2hlVGVzdDEPMA0GA1UECxMGVGFycGluMQ8wDQYD
-VQQDEwZUYXJwaW4wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKGG8UtWnHyWKFVDJSuSlhT/
-vKxrPjfNBtvdaiQx5gNAlc8QVL5lPOXcJljTF3dEb0QQ1ajai3kC71NE2ABOrxk7Jvk3bEma5Yfy
-U3m/OBthL9H8kE3O3+bh4K2LTsRwIa2Zd1wYbj44vUxsiHhzxer3q3FDfLxsqtahsxz7WjG1AgMB
-AAEwDQYJKoZIhvcNAQEEBQADgYEAE6EWRbYxGOlwmtpv0XE4FwbXYdSDArc+ArhOJWKTzoE3U9l8
-kg1wJL49VXEmVIxpipXKs7d9lpIVLPFsbBVJRZwH8sgHE39nTjfeyHNmwZcd63Lrn+2RydkAo5P9
-FYi8HFGEM5dON4PSo3Et6ycHy1IrS8htrNu+FoW84FRTKDA=
+MIIDTTCCAjWgAwIBAgIEUgxbaTANBgkqhkiG9w0BAQsFADBXMQswCQYDVQQGEwJVUzERMA8GA1UE
+BxMIU3lyYWN1c2UxEzARBgNVBAoTCkFwYWNoZVRlc3QxDzANBgNVBAsTBlBvbHRpbTEPMA0GA1UE
+AxMGUG9sdGltMB4XDTE1MDkwOTE1NTM0NFoXDTI1MDkwNjE1NTM0NFowVzELMAkGA1UEBhMCVVMx
+ETAPBgNVBAcTCFN5cmFjdXNlMRMwEQYDVQQKEwpBcGFjaGVUZXN0MQ8wDQYDVQQLEwZQb2x0aW0x
+DzANBgNVBAMTBlBvbHRpbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKxyUZCjOaVe
+IpptbRbdr9Ki+3W/n2G6jmEOp3LJGtQC6JbAh1IprMpC6nbWwp/W0nnBXyCpevYk6Dj5VtLV0NU/
+1pLnzaS5E/EhZKmxL2PXpMozH7js3FsP/8j9FflvIhhMybSa3otw9tmBf1+Tc6mGlcDsZlHRju91
+WdVMRUVEsOBhNPZccKRTd2QK0H83kYSXMrcGc7dmtuWUWzavbVXdq20+UrV6V8Z/aW/Um270d3Zj
+9VFw6Ax4m0IlCmPM7OA/ONA/gzmsT5BVu0EueE4s9RtXCvK+vR+l2o1fwHW0gtIkQShvR8RBGZjf
+9onepE27U/Uya/+CxQWb3K17g+kCAwEAAaMhMB8wHQYDVR0OBBYEFKI4clFM35A+xunrsFmmuN8i
+Rc/gMA0GCSqGSIb3DQEBCwUAA4IBAQCceUMhVspIAMhA4JMdXgdowWhVEY9vhKJhoILRQ4wdorLs
+pQrUZMBxB7juJ2RdOCO+17Y2gYJi4F1HYaPn0q70iZQRAH4AxiSGPpKD9Qxgs4wIHZgzZ5NwCkko
+AXmSM+SyNiDDZBFd01120gmw40Ly8/3HcDR/um6/kx/YAKgJhc6fDGpzQOrLnoTxeyVV1twAmA+R
+PcrmRA6NAS8baWlzUXAYu8pq/xTOl77niKdAvndmtmlEDmsj0BXeXeCURRVODYU8cMTueudHjois
+tj5C6jX6xjGz1/XcXUaZX5Lr34GixSwJRzabrrGYl7S2sKHmEBUUoB4hortyb2Ufedg+
-----END CERTIFICATE-----
http://git-wip-us.apache.org/repos/asf/cxf/blob/c7720313/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java
----------------------------------------------------------------------
diff --git
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java
index 880c058..4ab13d7 100644
---
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java
+++
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java
@@ -206,10 +206,8 @@ public class SecurityPolicyTest extends
AbstractBusClientServerTestBase {
private static void setCryptoProperties(EndpointInfo ei, String sigProps,
String encProps) {
ei.setProperty(SecurityConstants.CALLBACK_HANDLER, new
KeystorePasswordCallback());
- ei.setProperty(SecurityConstants.SIGNATURE_PROPERTIES,
-
SecurityPolicyTest.class.getResource(sigProps).toString());
- ei.setProperty(SecurityConstants.ENCRYPT_PROPERTIES,
-
SecurityPolicyTest.class.getResource(encProps).toString());
+ ei.setProperty(SecurityConstants.SIGNATURE_PROPERTIES, sigProps);
+ ei.setProperty(SecurityConstants.ENCRYPT_PROPERTIES, encProps);
}
@Test
@@ -233,9 +231,9 @@ public class SecurityPolicyTest extends
AbstractBusClientServerTestBase {
((BindingProvider)pt).getRequestContext().put(SecurityConstants.CALLBACK_HANDLER,
new
KeystorePasswordCallback());
((BindingProvider)pt).getRequestContext().put(SecurityConstants.SIGNATURE_PROPERTIES,
-
getClass().getResource("alice.properties"));
+ "alice.properties");
((BindingProvider)pt).getRequestContext().put(SecurityConstants.ENCRYPT_PROPERTIES,
-
getClass().getResource("bob.properties"));
+ "bob.properties");
assertEquals(10, pt.doubleIt(5));
((java.io.Closeable)pt).close();
@@ -245,9 +243,9 @@ public class SecurityPolicyTest extends
AbstractBusClientServerTestBase {
((BindingProvider)pt).getRequestContext().put(SecurityConstants.CALLBACK_HANDLER,
new
KeystorePasswordCallback());
((BindingProvider)pt).getRequestContext().put(SecurityConstants.SIGNATURE_PROPERTIES,
-
getClass().getResource("alice.properties"));
+ "alice.properties");
((BindingProvider)pt).getRequestContext().put(SecurityConstants.ENCRYPT_PROPERTIES,
-
getClass().getResource("bob.properties"));
+ "bob.properties");
// DOM
pt.doubleIt(5);
@@ -264,9 +262,9 @@ public class SecurityPolicyTest extends
AbstractBusClientServerTestBase {
((BindingProvider)pt).getRequestContext().put(SecurityConstants.CALLBACK_HANDLER,
new
KeystorePasswordCallback());
((BindingProvider)pt).getRequestContext().put(SecurityConstants.SIGNATURE_PROPERTIES,
-
getClass().getResource("alice.properties"));
+ "alice.properties");
((BindingProvider)pt).getRequestContext().put(SecurityConstants.ENCRYPT_PROPERTIES,
-
getClass().getResource("bob.properties"));
+ "bob.properties");
// DOM
pt.doubleIt(5);
@@ -282,9 +280,9 @@ public class SecurityPolicyTest extends
AbstractBusClientServerTestBase {
((BindingProvider)pt).getRequestContext().put(SecurityConstants.CALLBACK_HANDLER,
new
KeystorePasswordCallback());
((BindingProvider)pt).getRequestContext().put(SecurityConstants.SIGNATURE_PROPERTIES,
-
getClass().getResource("alice.properties"));
+ "alice.properties");
((BindingProvider)pt).getRequestContext().put(SecurityConstants.ENCRYPT_PROPERTIES,
-
getClass().getResource("bob.properties"));
+ "bob.properties");
// DOM
pt.doubleIt(5);
@@ -356,9 +354,9 @@ public class SecurityPolicyTest extends
AbstractBusClientServerTestBase {
((BindingProvider)pt).getRequestContext().put(SecurityConstants.CALLBACK_HANDLER,
new
KeystorePasswordCallback());
((BindingProvider)pt).getRequestContext().put(SecurityConstants.SIGNATURE_PROPERTIES,
-
getClass().getResource("alice.properties"));
+ "alice.properties");
((BindingProvider)pt).getRequestContext().put(SecurityConstants.ENCRYPT_PROPERTIES,
-
getClass().getResource("bob.properties"));
+ "bob.properties");
//This should work as it should be properly signed.
// DOM
@@ -415,9 +413,9 @@ public class SecurityPolicyTest extends
AbstractBusClientServerTestBase {
disp.getRequestContext().put(SecurityConstants.CALLBACK_HANDLER,
new KeystorePasswordCallback());
disp.getRequestContext().put(SecurityConstants.SIGNATURE_PROPERTIES,
-
getClass().getResource("alice.properties"));
+ "alice.properties");
disp.getRequestContext().put(SecurityConstants.ENCRYPT_PROPERTIES,
- getClass().getResource("bob.properties"));
+ "bob.properties");
updateAddressPort(disp, PORT);
String req = "<ns2:DoubleIt
xmlns:ns2=\"http://www.example.org/schema/DoubleIt\";>"
@@ -490,9 +488,9 @@ public class SecurityPolicyTest extends
AbstractBusClientServerTestBase {
((BindingProvider)pt).getRequestContext().put(SecurityConstants.CALLBACK_HANDLER,
new
KeystorePasswordCallback());
((BindingProvider)pt).getRequestContext().put(SecurityConstants.SIGNATURE_PROPERTIES,
-
getClass().getResource("alice.properties"));
+ "alice.properties");
((BindingProvider)pt).getRequestContext().put(SecurityConstants.ENCRYPT_PROPERTIES,
-
getClass().getResource("bob.properties"));
+ "bob.properties");
// DOM
assertEquals(10, pt.doubleIt(5));
@@ -525,9 +523,9 @@ public class SecurityPolicyTest extends
AbstractBusClientServerTestBase {
((BindingProvider)pt).getRequestContext().put(SecurityConstants.CALLBACK_HANDLER,
new
KeystorePasswordCallback());
((BindingProvider)pt).getRequestContext().put(SecurityConstants.SIGNATURE_PROPERTIES,
-
getClass().getResource("alice.properties"));
+ "alice.properties");
((BindingProvider)pt).getRequestContext().put(SecurityConstants.ENCRYPT_PROPERTIES,
-
getClass().getResource("alice.properties"));
+ "alice.properties");
// DOM
assertEquals(10, pt.doubleIt(5));
@@ -560,9 +558,9 @@ public class SecurityPolicyTest extends
AbstractBusClientServerTestBase {
((BindingProvider)pt).getRequestContext().put(SecurityConstants.CALLBACK_HANDLER,
new
KeystorePasswordCallback());
((BindingProvider)pt).getRequestContext().put(SecurityConstants.SIGNATURE_PROPERTIES,
-
getClass().getResource("alice.properties"));
+ "alice.properties");
((BindingProvider)pt).getRequestContext().put(SecurityConstants.ENCRYPT_PROPERTIES,
-
getClass().getResource("alice.properties"));
+ "alice.properties");
DoubleIt di = new DoubleIt();
di.setNumberToDouble(5);
@@ -592,9 +590,9 @@ public class SecurityPolicyTest extends
AbstractBusClientServerTestBase {
((BindingProvider)pt).getRequestContext().put(SecurityConstants.CALLBACK_HANDLER,
new
KeystorePasswordCallback());
((BindingProvider)pt).getRequestContext().put(SecurityConstants.SIGNATURE_PROPERTIES,
-
getClass().getResource("alice.properties"));
+ "alice.properties");
((BindingProvider)pt).getRequestContext().put(SecurityConstants.ENCRYPT_PROPERTIES,
-
getClass().getResource("revocation.properties"));
+ "revocation.properties");
((BindingProvider)pt).getRequestContext().put(SecurityConstants.ENABLE_REVOCATION,
"true");
@@ -640,9 +638,9 @@ public class SecurityPolicyTest extends
AbstractBusClientServerTestBase {
((BindingProvider)pt).getRequestContext().put(SecurityConstants.CALLBACK_HANDLER,
new
KeystorePasswordCallback());
((BindingProvider)pt).getRequestContext().put(SecurityConstants.SIGNATURE_PROPERTIES,
-
getClass().getResource("revocation.properties"));
+ "revocation.properties");
((BindingProvider)pt).getRequestContext().put(SecurityConstants.ENCRYPT_PROPERTIES,
-
getClass().getResource("bob.properties"));
+ "bob.properties");
// DOM
try {
pt.doubleIt(5);
http://git-wip-us.apache.org/repos/asf/cxf/blob/c7720313/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/Bethal.cer
----------------------------------------------------------------------
diff --git
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/Bethal.cer
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/Bethal.cer
deleted file mode 100644
index 5ca8252..0000000
Binary files
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/Bethal.cer
and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/c7720313/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/Bethal.cxf
----------------------------------------------------------------------
diff --git
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/Bethal.cxf
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/Bethal.cxf
deleted file mode 100644
index d8d3f75..0000000
---
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/Bethal.cxf
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!--
- ** This file configures the Bethal Server.
- ** It is an https server that conditionally responds
- ** with 401s.
- -->
-
-<beans xmlns="http://www.springframework.org/schema/beans";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns:sec="http://cxf.apache.org/configuration/security";
- xmlns:http="http://cxf.apache.org/transports/http/configuration";
- xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration";
- xmlns:cxf="http://cxf.apache.org/core";
- xmlns:jaxws="http://java.sun.com/xml/ns/jaxws";
- xsi:schemaLocation="
- http://cxf.apache.org/configuration/security
- http://cxf.apache.org/schemas/configuration/security.xsd
- http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
- http://cxf.apache.org/transports/http/configuration
- http://cxf.apache.org/schemas/configuration/http-conf.xsd
- http://cxf.apache.org/transports/http-jetty/configuration
- http://cxf.apache.org/schemas/configuration/http-jetty.xsd
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd";>
-
- <http:destination
- name="{http://apache.org/hello_world}Bethal.http-destination";>
- </http:destination>
-
- <httpj:engine-factory bus="cxf">
- <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:trustManagers>
- <sec:keyStore type="JKS" password="password"
-
file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/>
- </sec:trustManagers>
- <sec:cipherSuitesFilter>
- <!-- these filters ensure that a ciphersuite with
- export-suitable or null encryption is used,
- but exclude anonymous Diffie-Hellman key change as
- this is vulnerable to man-in-the-middle attacks -->
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_DES_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- <sec:include>.*_WITH_NULL_.*</sec:include>
- <sec:exclude>.*_DH_anon_.*</sec:exclude>
- </sec:cipherSuitesFilter>
- <sec:clientAuthentication want="true" required="true"/>
- </httpj:tlsServerParameters>
- </httpj:engine>
- </httpj:engine-factory>
-
- <cxf:bus>
- <cxf:inInterceptors>
- <bean class="org.apache.cxf.systest.http.PushBack401"/>
- </cxf:inInterceptors>
- </cxf:bus>
-
-</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/c7720313/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/Bethal.jks
----------------------------------------------------------------------
diff --git
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/Bethal.jks
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/Bethal.jks
index 2bf1a9a..8da2ad0 100644
Binary files
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/Bethal.jks
and
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/Bethal.jks
differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/c7720313/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/Bethal.p12
----------------------------------------------------------------------
diff --git
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/Bethal.p12
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/Bethal.p12
deleted file mode 100644
index c47515e..0000000
Binary files
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/Bethal.p12
and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/c7720313/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/DoubleIt.wsdl
----------------------------------------------------------------------
diff --git
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/DoubleIt.wsdl
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/DoubleIt.wsdl
index 30408d0..f478fa6 100644
---
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/DoubleIt.wsdl
+++
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/DoubleIt.wsdl
@@ -330,7 +330,7 @@
<wsp:Policy>
<sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient";>
<wsp:Policy>
- <sp:WssX509V1Token11/>
+ <sp:WssX509V3Token11/>
</wsp:Policy>
</sp:X509Token>
</wsp:Policy>
@@ -339,7 +339,7 @@
<wsp:Policy>
<sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";>
<wsp:Policy>
- <sp:WssX509V1Token11/>
+ <sp:WssX509V3Token11/>
</wsp:Policy>
</sp:X509Token>
</wsp:Policy>
@@ -384,7 +384,7 @@
<wsp:Policy>
<sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient";>
<wsp:Policy>
- <sp:WssX509V1Token11/>
+ <sp:WssX509V3Token11/>
</wsp:Policy>
</sp:X509Token>
</wsp:Policy>
@@ -393,7 +393,7 @@
<wsp:Policy>
<sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";>
<wsp:Policy>
- <sp:WssX509V1Token11/>
+ <sp:WssX509V3Token11/>
</wsp:Policy>
</sp:X509Token>
</wsp:Policy>
@@ -438,7 +438,7 @@
<wsp:Policy>
<sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient";>
<wsp:Policy>
- <sp:WssX509V1Token11/>
+ <sp:WssX509V3Token11/>
</wsp:Policy>
</sp:X509Token>
</wsp:Policy>
@@ -447,7 +447,7 @@
<wsp:Policy>
<sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Always";>
<wsp:Policy>
- <sp:WssX509V1Token11/>
+ <sp:WssX509V3Token11/>
</wsp:Policy>
</sp:X509Token>
</wsp:Policy>
@@ -485,7 +485,7 @@
<wsp:Policy>
<sp:X509Token
sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient";>
<wsp:Policy>
- <sp:WssX509V1Token11/>
+ <sp:WssX509V3Token11/>
</wsp:Policy>
</sp:X509Token>
</wsp:Policy>
@@ -527,7 +527,7 @@
<wsp:Policy>
<sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient";>
<wsp:Policy>
- <sp:WssX509V1Token11/>
+ <sp:WssX509V3Token11/>
<sp:RequireThumbprintReference/>
<!-- needed for V1 certs -->
</wsp:Policy>
@@ -538,7 +538,7 @@
<wsp:Policy>
<sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Always";>
<wsp:Policy>
- <sp:WssX509V1Token11/>
+ <sp:WssX509V3Token11/>
<sp:RequireThumbprintReference/>
</wsp:Policy>
</sp:X509Token>
@@ -759,7 +759,7 @@
<wsp:Policy>
<sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient";>
<wsp:Policy>
- <sp:WssX509V1Token11/>
+ <sp:WssX509V3Token11/>
</wsp:Policy>
</sp:X509Token>
</wsp:Policy>
@@ -768,7 +768,7 @@
<wsp:Policy>
<sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";>
<wsp:Policy>
- <sp:WssX509V1Token11/>
+ <sp:WssX509V3Token11/>
</wsp:Policy>
</sp:X509Token>
</wsp:Policy>
@@ -812,7 +812,7 @@
<wsp:Policy>
<sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient";>
<wsp:Policy>
- <sp:WssX509V1Token11/>
+ <sp:WssX509V3Token11/>
</wsp:Policy>
</sp:X509Token>
</wsp:Policy>
@@ -821,7 +821,7 @@
<wsp:Policy>
<sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";>
<wsp:Policy>
- <sp:WssX509V1Token11/>
+ <sp:WssX509V3Token11/>
</wsp:Policy>
</sp:X509Token>
</wsp:Policy>
http://git-wip-us.apache.org/repos/asf/cxf/blob/c7720313/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/Morpit.cxf
----------------------------------------------------------------------
diff --git
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/Morpit.cxf
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/Morpit.cxf
deleted file mode 100644
index 609139e..0000000
---
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/Morpit.cxf
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!--
- ** This file configures the Morpit Server. It is just an
- ** Https server with a name that will kick in the HostnameVerifier.
- -->
-
-
-<beans xmlns="http://www.springframework.org/schema/beans";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns:sec="http://cxf.apache.org/configuration/security";
- xmlns:http="http://cxf.apache.org/transports/http/configuration";
- xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration";
- xmlns:jaxws="http://java.sun.com/xml/ns/jaxws";
- xsi:schemaLocation="
- http://cxf.apache.org/configuration/security
- http://cxf.apache.org/schemas/configuration/security.xsd
- http://cxf.apache.org/transports/http/configuration
- http://cxf.apache.org/schemas/configuration/http-conf.xsd
- http://cxf.apache.org/transports/http-jetty/configuration
- http://cxf.apache.org/schemas/configuration/http-jetty.xsd
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd";>
-
- <http:destination
name="{http://apache.org/hello_world}GreeterImplPort.http-destination";>
- </http:destination>
-
- <httpj:engine-factory bus="cxf">
- <httpj:engine port="9008">
- <httpj:tlsServerParameters>
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="JKS" password="password"
-
file="src/test/java/org/apache/cxf/systest/http/resources/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:trustManagers>
- <sec:cipherSuitesFilter>
- <!-- these filters ensure that a ciphersuite with
- export-suitable or null encryption is used,
- but exclude anonymous Diffie-Hellman key change as
- this is vulnerable to man-in-the-middle attacks -->
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_DES_.*</sec:include>
- <sec:include>.*_WITH_NULL_.*</sec:include>
- <sec:exclude>.*_DH_anon_.*</sec:exclude>
- </sec:cipherSuitesFilter>
- <sec:clientAuthentication want="true" required="true"/>
- </httpj:tlsServerParameters>
- </httpj:engine>
- </httpj:engine-factory>
-
-</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/c7720313/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/Morpit.jks
----------------------------------------------------------------------
diff --git
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/Morpit.jks
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/Morpit.jks
index 95626a7..b179baf 100644
Binary files
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/Morpit.jks
and
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/Morpit.jks
differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/c7720313/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/Morpit.p12
----------------------------------------------------------------------
diff --git
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/Morpit.p12
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/Morpit.p12
deleted file mode 100644
index f37acff..0000000
Binary files
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/Morpit.p12
and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/c7720313/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/Truststore.jks
----------------------------------------------------------------------
diff --git
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/Truststore.jks
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/Truststore.jks
index e76a076..0abd848 100644
Binary files
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/Truststore.jks
and
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/Truststore.jks
differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/c7720313/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/Truststore.pem
----------------------------------------------------------------------
diff --git
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/Truststore.pem
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/Truststore.pem
deleted file mode 100644
index 1b25477..0000000
---
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/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/c7720313/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/alice.jks
----------------------------------------------------------------------
diff --git
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/alice.jks
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/alice.jks
deleted file mode 100644
index 5bd162b..0000000
Binary files
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/alice.jks
and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/c7720313/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/bob.jks
----------------------------------------------------------------------
diff --git
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/bob.jks
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/bob.jks
deleted file mode 100644
index a4f49c5..0000000
Binary files
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/bob.jks
and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/c7720313/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/client.xml
----------------------------------------------------------------------
diff --git
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/client.xml
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/client.xml
index 9acaa37..7f8e534 100644
---
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/client.xml
+++
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/client.xml
@@ -44,8 +44,8 @@
<entry key="action" value="Timestamp Signature Encrypt"/>
<!-- <entry key="action" value="Timestamp Signature"/> -->
<entry key="user" value="alice"/>
- <entry key="signaturePropFile"
value="org/apache/cxf/systest/ws/security/alice.properties"/>
- <entry key="encryptionPropFile"
value="org/apache/cxf/systest/ws/security/bob.properties"/>
+ <entry key="signaturePropFile" value="alice.properties"/>
+ <entry key="encryptionPropFile" value="bob.properties"/>
<entry key="encryptionUser" value="Bob"/>
<entry key="signatureKeyIdentifier" value="DirectReference"/>
<entry key="passwordCallbackClass"
value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
@@ -67,8 +67,8 @@
<constructor-arg>
<map>
<entry key="action" value="Timestamp Signature Encrypt"/>
- <entry key="signaturePropFile"
value="org/apache/cxf/systest/ws/security/bob.properties"/>
- <entry key="decryptionPropFile"
value="org/apache/cxf/systest/ws/security/alice.properties"/>
+ <entry key="signaturePropFile" value="bob.properties"/>
+ <entry key="decryptionPropFile" value="alice.properties"/>
<entry key="passwordCallbackClass"
value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
</map>
</constructor-arg>
http://git-wip-us.apache.org/repos/asf/cxf/blob/c7720313/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/server.xml
----------------------------------------------------------------------
diff --git
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/server.xml
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/server.xml
index 504b33f..35cb2a0 100644
---
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/server.xml
+++
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/server.xml
@@ -77,8 +77,8 @@
<!-- Use this action spec for WCF clients
<entry key="action" value="Signature Encrypt Timestamp"/>
-->
- <entry key="signaturePropFile"
value="org/apache/cxf/systest/ws/security/alice.properties"/>
- <entry key="decryptionPropFile"
value="org/apache/cxf/systest/ws/security/bob.properties"/>
+ <entry key="signaturePropFile" value="alice.properties"/>
+ <entry key="decryptionPropFile" value="bob.properties"/>
<entry key="passwordCallbackClass"
value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
</map>
</constructor-arg>
@@ -91,8 +91,8 @@
<map>
<entry key="action" value="Timestamp Signature Encrypt"/>
<entry key="user" value="bob"/>
- <entry key="signaturePropFile"
value="org/apache/cxf/systest/ws/security/bob.properties"/>
- <entry key="encryptionPropFile"
value="org/apache/cxf/systest/ws/security/alice.properties"/>
+ <entry key="signaturePropFile" value="bob.properties"/>
+ <entry key="encryptionPropFile" value="alice.properties"/>
<entry key="encryptionUser" value="Alice"/>
<entry key="signatureKeyIdentifier" value="DirectReference"/>
<entry key="passwordCallbackClass"
value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
http://git-wip-us.apache.org/repos/asf/cxf/blob/c7720313/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/stax-server.xml
----------------------------------------------------------------------
diff --git
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/stax-server.xml
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/stax-server.xml
index 1bd2b1f..329e7ac 100644
---
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/stax-server.xml
+++
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/stax-server.xml
@@ -77,8 +77,8 @@
<!-- Use this action spec for WCF clients
<entry key="action" value="Signature Encrypt Timestamp"/>
-->
- <entry key="signaturePropFile"
value="org/apache/cxf/systest/ws/security/alice.properties"/>
- <entry key="decryptionPropFile"
value="org/apache/cxf/systest/ws/security/bob.properties"/>
+ <entry key="signaturePropFile" value="alice.properties"/>
+ <entry key="decryptionPropFile" value="bob.properties"/>
<entry key="passwordCallbackClass"
value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
</map>
</constructor-arg>
@@ -91,8 +91,8 @@
<map>
<entry key="action" value="Timestamp Signature Encrypt"/>
<entry key="user" value="bob"/>
- <entry key="signaturePropFile"
value="org/apache/cxf/systest/ws/security/bob.properties"/>
- <entry key="encryptionPropFile"
value="org/apache/cxf/systest/ws/security/alice.properties"/>
+ <entry key="signaturePropFile" value="bob.properties"/>
+ <entry key="encryptionPropFile" value="alice.properties"/>
<entry key="encryptionUser" value="Alice"/>
<entry key="signatureKeyIdentifier" value="DirectReference"/>
<entry key="passwordCallbackClass"
value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
