You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by co...@apache.org on 2019/06/13 11:04:45 UTC
[camel] branch camel-2.23.x updated: Fixing test failures caused by
expired certs
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch camel-2.23.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-2.23.x by this push:
new 51a0b0a Fixing test failures caused by expired certs
51a0b0a is described below
commit 51a0b0a156196f88e531dcab5640b50486b7e389
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Jun 13 11:08:55 2019 +0100
Fixing test failures caused by expired certs
---
.../cxf/wssecurity/client/UTPasswordCallback.java | 12 +++++------
.../cxf/wssecurity/server/UTPasswordCallback.java | 14 ++++++-------
.../cxf/wssecurity/camel/camel-context.xml | 2 +-
.../component/cxf/wssecurity/client/wssec.xml | 16 +++++++-------
.../component/cxf/wssecurity/server/wssec.xml | 14 ++++++-------
.../wssecurity/etc/Client_Encrypt.properties | 22 --------------------
.../wssecurity/etc/Client_Sign.properties | 23 ---------------------
.../wssecurity/etc/Server_Decrypt.properties | 22 --------------------
.../wssecurity/etc/Server_SignVerf.properties | 22 --------------------
.../test/resources/wssecurity/etc/alice.properties | 21 +++++++++++++++++++
.../test/resources/wssecurity/etc/bob.properties | 21 +++++++++++++++++++
.../test/resources/wssecurity/etc/cxfca.properties | 23 +++++++++++++++++++++
.../test/resources/wssecurity/keystore/alice.jks | Bin 0 -> 4125 bytes
.../src/test/resources/wssecurity/keystore/bob.jks | Bin 0 -> 4122 bytes
.../wssecurity/keystore/client-keystore.jks | Bin 1344 -> 0 bytes
.../wssecurity/keystore/client-truststore.jks | Bin 639 -> 0 bytes
.../test/resources/wssecurity/keystore/cxfca.jks | Bin 0 -> 961 bytes
.../wssecurity/keystore/server-keystore.jks | Bin 1345 -> 0 bytes
.../wssecurity/keystore/server-truststore.jks | Bin 639 -> 0 bytes
19 files changed, 94 insertions(+), 118 deletions(-)
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/client/UTPasswordCallback.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/client/UTPasswordCallback.java
index 98b48ec..d583a80 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/client/UTPasswordCallback.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/client/UTPasswordCallback.java
@@ -29,19 +29,19 @@ import javax.security.auth.callback.UnsupportedCallbackException;
*/
public class UTPasswordCallback implements CallbackHandler {
-
- private Map<String, String> passwords =
+
+ private Map<String, String> passwords =
new HashMap<>();
-
+
public UTPasswordCallback() {
passwords.put("Alice", "ecilA");
passwords.put("abcd", "dcba");
- passwords.put("clientx509v1", "storepassword");
- passwords.put("serverx509v1", "storepassword");
+ passwords.put("alice", "password");
+ passwords.put("bob", "password");
}
/**
- * Here, we attempt to get the password from the private
+ * Here, we attempt to get the password from the private
* alias/passwords map.
*/
public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/server/UTPasswordCallback.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/server/UTPasswordCallback.java
index acdd8b2..a3e6120 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/server/UTPasswordCallback.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/server/UTPasswordCallback.java
@@ -29,19 +29,19 @@ import javax.security.auth.callback.UnsupportedCallbackException;
*/
public class UTPasswordCallback implements CallbackHandler {
-
- private Map<String, String> passwords =
+
+ private Map<String, String> passwords =
new HashMap<>();
-
+
public UTPasswordCallback() {
passwords.put("Alice", "ecilA");
passwords.put("abcd", "dcba");
- passwords.put("clientx509v1", "storepassword");
- passwords.put("serverx509v1", "storepassword");
+ passwords.put("alice", "password");
+ passwords.put("bob", "password");
}
/**
- * Here, we attempt to get the password from the private
+ * Here, we attempt to get the password from the private
* alias/passwords map.
*/
public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
@@ -61,7 +61,7 @@ public class UTPasswordCallback implements CallbackHandler {
}
}
}
-
+
/**
* Add an alias/password pair to the callback mechanism.
*/
diff --git a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wssecurity/camel/camel-context.xml b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wssecurity/camel/camel-context.xml
index f615a0c..eb1a47c 100644
--- a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wssecurity/camel/camel-context.xml
+++ b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wssecurity/camel/camel-context.xml
@@ -133,7 +133,7 @@
<constructor-arg>
<map>
<entry key="action" value="Signature Timestamp"/>
- <entry key="signaturePropFile" value="wssecurity/etc/Server_SignVerf.properties"/>
+ <entry key="signaturePropFile" value="wssecurity/etc/cxfca.properties"/>
</map>
</constructor-arg>
</bean>
diff --git a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wssecurity/client/wssec.xml b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wssecurity/client/wssec.xml
index fcfc9c7..ca77846 100644
--- a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wssecurity/client/wssec.xml
+++ b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wssecurity/client/wssec.xml
@@ -49,8 +49,8 @@
<map>
<entry key="action" value="Signature Timestamp"/>
<entry key="passwordCallbackClass" value="org.apache.camel.component.cxf.wssecurity.client.UTPasswordCallback"/>
- <entry key="user" value="clientx509v1"/>
- <entry key="signaturePropFile" value="wssecurity/etc/Client_Sign.properties"/>
+ <entry key="user" value="alice"/>
+ <entry key="signaturePropFile" value="wssecurity/etc/alice.properties"/>
<entry key="signatureKeyIdentifier" value="DirectReference"/>
<entry key="signatureParts"
value="{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body;{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp"/>
@@ -63,7 +63,7 @@
<constructor-arg>
<map>
<entry key="action" value="Signature Timestamp"/>
- <entry key="signaturePropFile" value="wssecurity/etc/Client_Encrypt.properties"/>
+ <entry key="signaturePropFile" value="wssecurity/etc/cxfca.properties"/>
</map>
</constructor-arg>
</bean>
@@ -91,8 +91,8 @@
<constructor-arg>
<map>
<entry key="action" value="Encrypt"/>
- <entry key="user" value="serverx509v1"/>
- <entry key="encryptionPropFile" value="wssecurity/etc/Client_Encrypt.properties"/>
+ <entry key="user" value="bob"/>
+ <entry key="encryptionPropFile" value="wssecurity/etc/bob.properties"/>
<entry key="encryptionKeyIdentifier" value="IssuerSerial"/>
</map>
</constructor-arg>
@@ -103,7 +103,7 @@
<constructor-arg>
<map>
<entry key="action" value="Encrypt"/>
- <entry key="decryptionPropFile" value="wssecurity/etc/Client_Sign.properties"/>
+ <entry key="decryptionPropFile" value="wssecurity/etc/alice.properties"/>
<entry key="passwordCallbackClass" value="org.apache.camel.component.cxf.wssecurity.client.UTPasswordCallback"/>
</map>
</constructor-arg>
@@ -115,8 +115,8 @@
<jaxws:properties>
<entry key="ws-security.username" value="abcd"/>
<entry key="ws-security.callback-handler" value="org.apache.camel.component.cxf.wssecurity.client.UTPasswordCallback"/>
- <entry key="ws-security.encryption.properties" value="wssecurity/etc/Client_Encrypt.properties"/>
- <entry key="ws-security.encryption.username" value="serverx509v1"/>
+ <entry key="ws-security.encryption.properties" value="wssecurity/etc/bob.properties"/>
+ <entry key="ws-security.encryption.username" value="bob"/>
</jaxws:properties>
<jaxws:features>
<p:policies>
diff --git a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wssecurity/server/wssec.xml b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wssecurity/server/wssec.xml
index 853193b..1dbd15b 100644
--- a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wssecurity/server/wssec.xml
+++ b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wssecurity/server/wssec.xml
@@ -57,8 +57,8 @@
<map>
<entry key="action" value="Signature Timestamp"/>
<entry key="passwordCallbackClass" value="org.apache.camel.component.cxf.wssecurity.server.UTPasswordCallback"/>
- <entry key="user" value="serverx509v1"/>
- <entry key="signaturePropFile" value="wssecurity/etc/Server_Decrypt.properties"/>
+ <entry key="user" value="bob"/>
+ <entry key="signaturePropFile" value="wssecurity/etc/bob.properties"/>
<entry key="signatureKeyIdentifier" value="DirectReference"/>
<entry key="signatureParts"
value="{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body;{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp"/>
@@ -71,7 +71,7 @@
<constructor-arg>
<map>
<entry key="action" value="Signature Timestamp"/>
- <entry key="signaturePropFile" value="wssecurity/etc/Server_SignVerf.properties"/>
+ <entry key="signaturePropFile" value="wssecurity/etc/cxfca.properties"/>
</map>
</constructor-arg>
</bean>
@@ -109,8 +109,8 @@
<constructor-arg>
<map>
<entry key="action" value="Encrypt"/>
- <entry key="user" value="clientx509v1"/>
- <entry key="encryptionPropFile" value="wssecurity/etc/Server_SignVerf.properties"/>
+ <entry key="user" value="alice"/>
+ <entry key="encryptionPropFile" value="wssecurity/etc/alice.properties"/>
<entry key="encryptionKeyIdentifier" value="IssuerSerial"/>
</map>
</constructor-arg>
@@ -121,7 +121,7 @@
<constructor-arg>
<map>
<entry key="action" value="Encrypt"/>
- <entry key="decryptionPropFile" value="wssecurity/etc/Server_Decrypt.properties"/>
+ <entry key="decryptionPropFile" value="wssecurity/etc/bob.properties"/>
<entry key="passwordCallbackClass" value="org.apache.camel.component.cxf.wssecurity.server.UTPasswordCallback"/>
</map>
</constructor-arg>
@@ -138,7 +138,7 @@
wsdlLocation="hello_world_wssec.wsdl">
<jaxws:properties>
<entry key="ws-security.callback-handler" value="org.apache.camel.component.cxf.wssecurity.client.UTPasswordCallback"/>
- <entry key="ws-security.signature.properties" value="wssecurity/etc/Server_Decrypt.properties"/>
+ <entry key="ws-security.signature.properties" value="wssecurity/etc/bob.properties"/>
</jaxws:properties>
<jaxws:features>
<p:policies>
diff --git a/components/camel-cxf/src/test/resources/wssecurity/etc/Client_Encrypt.properties b/components/camel-cxf/src/test/resources/wssecurity/etc/Client_Encrypt.properties
deleted file mode 100644
index 4dd7011..0000000
--- a/components/camel-cxf/src/test/resources/wssecurity/etc/Client_Encrypt.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-## ---------------------------------------------------------------------------
-## 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.
-## ---------------------------------------------------------------------------
-
-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
-org.apache.ws.security.crypto.merlin.keystore.type=jks
-org.apache.ws.security.crypto.merlin.keystore.password=storepassword
-org.apache.ws.security.crypto.merlin.keystore.alias=serverx509v1
-org.apache.ws.security.crypto.merlin.keystore.file=wssecurity/keystore/client-truststore.jks
diff --git a/components/camel-cxf/src/test/resources/wssecurity/etc/Client_Sign.properties b/components/camel-cxf/src/test/resources/wssecurity/etc/Client_Sign.properties
deleted file mode 100644
index 2949287..0000000
--- a/components/camel-cxf/src/test/resources/wssecurity/etc/Client_Sign.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-## ---------------------------------------------------------------------------
-## 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.
-## ---------------------------------------------------------------------------
-
-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
-org.apache.ws.security.crypto.merlin.keystore.type=jks
-org.apache.ws.security.crypto.merlin.keystore.password=storepassword
-org.apache.ws.security.crypto.merlin.keystore.alias=clientx509v1
-org.apache.ws.security.crypto.merlin.keystore.file=wssecurity/keystore/client-keystore.jks
-
diff --git a/components/camel-cxf/src/test/resources/wssecurity/etc/Server_Decrypt.properties b/components/camel-cxf/src/test/resources/wssecurity/etc/Server_Decrypt.properties
deleted file mode 100644
index 3931a41..0000000
--- a/components/camel-cxf/src/test/resources/wssecurity/etc/Server_Decrypt.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-## ---------------------------------------------------------------------------
-## 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.
-## ---------------------------------------------------------------------------
-
-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
-org.apache.ws.security.crypto.merlin.keystore.type=jks
-org.apache.ws.security.crypto.merlin.keystore.password=storepassword
-org.apache.ws.security.crypto.merlin.keystore.alias=serverx509v1
-org.apache.ws.security.crypto.merlin.keystore.file=wssecurity/keystore/server-keystore.jks
diff --git a/components/camel-cxf/src/test/resources/wssecurity/etc/Server_SignVerf.properties b/components/camel-cxf/src/test/resources/wssecurity/etc/Server_SignVerf.properties
deleted file mode 100644
index 2d09c20..0000000
--- a/components/camel-cxf/src/test/resources/wssecurity/etc/Server_SignVerf.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-## ---------------------------------------------------------------------------
-## 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.
-## ---------------------------------------------------------------------------
-
-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
-org.apache.ws.security.crypto.merlin.keystore.type=jks
-org.apache.ws.security.crypto.merlin.keystore.password=storepassword
-org.apache.ws.security.crypto.merlin.keystore.alias=clientx509v1
-org.apache.ws.security.crypto.merlin.keystore.file=wssecurity/keystore/server-truststore.jks
diff --git a/components/camel-cxf/src/test/resources/wssecurity/etc/alice.properties b/components/camel-cxf/src/test/resources/wssecurity/etc/alice.properties
new file mode 100644
index 0000000..7785cac
--- /dev/null
+++ b/components/camel-cxf/src/test/resources/wssecurity/etc/alice.properties
@@ -0,0 +1,21 @@
+# 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.
+org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin
+org.apache.wss4j.crypto.merlin.keystore.type=jks
+org.apache.wss4j.crypto.merlin.keystore.password=password
+org.apache.wss4j.crypto.merlin.keystore.alias=alice
+org.apache.wss4j.crypto.merlin.keystore.file=wssecurity/keystore/alice.jks
diff --git a/components/camel-cxf/src/test/resources/wssecurity/etc/bob.properties b/components/camel-cxf/src/test/resources/wssecurity/etc/bob.properties
new file mode 100644
index 0000000..bfcf695
--- /dev/null
+++ b/components/camel-cxf/src/test/resources/wssecurity/etc/bob.properties
@@ -0,0 +1,21 @@
+# 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.
+org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin
+org.apache.wss4j.crypto.merlin.keystore.type=jks
+org.apache.wss4j.crypto.merlin.keystore.password=password
+org.apache.wss4j.crypto.merlin.keystore.alias=bob
+org.apache.wss4j.crypto.merlin.keystore.file=wssecurity/keystore/bob.jks
diff --git a/components/camel-cxf/src/test/resources/wssecurity/etc/cxfca.properties b/components/camel-cxf/src/test/resources/wssecurity/etc/cxfca.properties
new file mode 100644
index 0000000..85845b6
--- /dev/null
+++ b/components/camel-cxf/src/test/resources/wssecurity/etc/cxfca.properties
@@ -0,0 +1,23 @@
+# 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.
+org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin
+org.apache.wss4j.crypto.merlin.keystore.type=jks
+org.apache.wss4j.crypto.merlin.keystore.password=password
+org.apache.wss4j.crypto.merlin.keystore.alias=cxfca
+org.apache.wss4j.crypto.merlin.keystore.file=wssecurity/keystore/cxfca.jks
+
+
diff --git a/components/camel-cxf/src/test/resources/wssecurity/keystore/alice.jks b/components/camel-cxf/src/test/resources/wssecurity/keystore/alice.jks
new file mode 100644
index 0000000..213b26c
Binary files /dev/null and b/components/camel-cxf/src/test/resources/wssecurity/keystore/alice.jks differ
diff --git a/components/camel-cxf/src/test/resources/wssecurity/keystore/bob.jks b/components/camel-cxf/src/test/resources/wssecurity/keystore/bob.jks
new file mode 100644
index 0000000..5550912
Binary files /dev/null and b/components/camel-cxf/src/test/resources/wssecurity/keystore/bob.jks differ
diff --git a/components/camel-cxf/src/test/resources/wssecurity/keystore/client-keystore.jks b/components/camel-cxf/src/test/resources/wssecurity/keystore/client-keystore.jks
deleted file mode 100644
index bc744f9..0000000
Binary files a/components/camel-cxf/src/test/resources/wssecurity/keystore/client-keystore.jks and /dev/null differ
diff --git a/components/camel-cxf/src/test/resources/wssecurity/keystore/client-truststore.jks b/components/camel-cxf/src/test/resources/wssecurity/keystore/client-truststore.jks
deleted file mode 100644
index 216bddb..0000000
Binary files a/components/camel-cxf/src/test/resources/wssecurity/keystore/client-truststore.jks and /dev/null differ
diff --git a/components/camel-cxf/src/test/resources/wssecurity/keystore/cxfca.jks b/components/camel-cxf/src/test/resources/wssecurity/keystore/cxfca.jks
new file mode 100644
index 0000000..53ad239
Binary files /dev/null and b/components/camel-cxf/src/test/resources/wssecurity/keystore/cxfca.jks differ
diff --git a/components/camel-cxf/src/test/resources/wssecurity/keystore/server-keystore.jks b/components/camel-cxf/src/test/resources/wssecurity/keystore/server-keystore.jks
deleted file mode 100644
index 22fd44e..0000000
Binary files a/components/camel-cxf/src/test/resources/wssecurity/keystore/server-keystore.jks and /dev/null differ
diff --git a/components/camel-cxf/src/test/resources/wssecurity/keystore/server-truststore.jks b/components/camel-cxf/src/test/resources/wssecurity/keystore/server-truststore.jks
deleted file mode 100644
index 2447028..0000000
Binary files a/components/camel-cxf/src/test/resources/wssecurity/keystore/server-truststore.jks and /dev/null differ
Re: [camel] branch camel-2.23.x updated: Fixing test failures caused
by expired certs
Posted by Andrea Cosentino <an...@gmail.com>.
Please, don't forget to run the sourcecheck profile.
I fixed this fix on master, 2.x, 2.24.x and 2.23.x
Il giorno gio 13 giu 2019 alle ore 13:04 <co...@apache.org> ha scritto:
> This is an automated email from the ASF dual-hosted git repository.
>
> coheigea pushed a commit to branch camel-2.23.x
> in repository https://gitbox.apache.org/repos/asf/camel.git
>
>
> The following commit(s) were added to refs/heads/camel-2.23.x by this push:
> new 51a0b0a Fixing test failures caused by expired certs
> 51a0b0a is described below
>
> commit 51a0b0a156196f88e531dcab5640b50486b7e389
> Author: Colm O hEigeartaigh <co...@apache.org>
> AuthorDate: Thu Jun 13 11:08:55 2019 +0100
>
> Fixing test failures caused by expired certs
> ---
> .../cxf/wssecurity/client/UTPasswordCallback.java | 12 +++++------
> .../cxf/wssecurity/server/UTPasswordCallback.java | 14 ++++++-------
> .../cxf/wssecurity/camel/camel-context.xml | 2 +-
> .../component/cxf/wssecurity/client/wssec.xml | 16 +++++++-------
> .../component/cxf/wssecurity/server/wssec.xml | 14 ++++++-------
> .../wssecurity/etc/Client_Encrypt.properties | 22
> --------------------
> .../wssecurity/etc/Client_Sign.properties | 23
> ---------------------
> .../wssecurity/etc/Server_Decrypt.properties | 22
> --------------------
> .../wssecurity/etc/Server_SignVerf.properties | 22
> --------------------
> .../test/resources/wssecurity/etc/alice.properties | 21
> +++++++++++++++++++
> .../test/resources/wssecurity/etc/bob.properties | 21
> +++++++++++++++++++
> .../test/resources/wssecurity/etc/cxfca.properties | 23
> +++++++++++++++++++++
> .../test/resources/wssecurity/keystore/alice.jks | Bin 0 -> 4125 bytes
> .../src/test/resources/wssecurity/keystore/bob.jks | Bin 0 -> 4122 bytes
> .../wssecurity/keystore/client-keystore.jks | Bin 1344 -> 0 bytes
> .../wssecurity/keystore/client-truststore.jks | Bin 639 -> 0 bytes
> .../test/resources/wssecurity/keystore/cxfca.jks | Bin 0 -> 961 bytes
> .../wssecurity/keystore/server-keystore.jks | Bin 1345 -> 0 bytes
> .../wssecurity/keystore/server-truststore.jks | Bin 639 -> 0 bytes
> 19 files changed, 94 insertions(+), 118 deletions(-)
>
> diff --git
> a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/client/UTPasswordCallback.java
> b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/client/UTPasswordCallback.java
> index 98b48ec..d583a80 100644
> ---
> a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/client/UTPasswordCallback.java
> +++
> b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/client/UTPasswordCallback.java
> @@ -29,19 +29,19 @@ import
> javax.security.auth.callback.UnsupportedCallbackException;
> */
>
> public class UTPasswordCallback implements CallbackHandler {
> -
> - private Map<String, String> passwords =
> +
> + private Map<String, String> passwords =
> new HashMap<>();
> -
> +
> public UTPasswordCallback() {
> passwords.put("Alice", "ecilA");
> passwords.put("abcd", "dcba");
> - passwords.put("clientx509v1", "storepassword");
> - passwords.put("serverx509v1", "storepassword");
> + passwords.put("alice", "password");
> + passwords.put("bob", "password");
> }
>
> /**
> - * Here, we attempt to get the password from the private
> + * Here, we attempt to get the password from the private
> * alias/passwords map.
> */
> public void handle(Callback[] callbacks) throws IOException,
> UnsupportedCallbackException {
> diff --git
> a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/server/UTPasswordCallback.java
> b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/server/UTPasswordCallback.java
> index acdd8b2..a3e6120 100644
> ---
> a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/server/UTPasswordCallback.java
> +++
> b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/server/UTPasswordCallback.java
> @@ -29,19 +29,19 @@ import
> javax.security.auth.callback.UnsupportedCallbackException;
> */
>
> public class UTPasswordCallback implements CallbackHandler {
> -
> - private Map<String, String> passwords =
> +
> + private Map<String, String> passwords =
> new HashMap<>();
> -
> +
> public UTPasswordCallback() {
> passwords.put("Alice", "ecilA");
> passwords.put("abcd", "dcba");
> - passwords.put("clientx509v1", "storepassword");
> - passwords.put("serverx509v1", "storepassword");
> + passwords.put("alice", "password");
> + passwords.put("bob", "password");
> }
>
> /**
> - * Here, we attempt to get the password from the private
> + * Here, we attempt to get the password from the private
> * alias/passwords map.
> */
> public void handle(Callback[] callbacks) throws IOException,
> UnsupportedCallbackException {
> @@ -61,7 +61,7 @@ public class UTPasswordCallback implements
> CallbackHandler {
> }
> }
> }
> -
> +
> /**
> * Add an alias/password pair to the callback mechanism.
> */
> diff --git
> a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wssecurity/camel/camel-context.xml
> b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wssecurity/camel/camel-context.xml
> index f615a0c..eb1a47c 100644
> ---
> a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wssecurity/camel/camel-context.xml
> +++
> b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wssecurity/camel/camel-context.xml
> @@ -133,7 +133,7 @@
> <constructor-arg>
> <map>
> <entry key="action" value="Signature Timestamp"/>
> - <entry key="signaturePropFile"
> value="wssecurity/etc/Server_SignVerf.properties"/>
> + <entry key="signaturePropFile"
> value="wssecurity/etc/cxfca.properties"/>
> </map>
> </constructor-arg>
> </bean>
> diff --git
> a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wssecurity/client/wssec.xml
> b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wssecurity/client/wssec.xml
> index fcfc9c7..ca77846 100644
> ---
> a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wssecurity/client/wssec.xml
> +++
> b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wssecurity/client/wssec.xml
> @@ -49,8 +49,8 @@
> <map>
> <entry key="action" value="Signature Timestamp"/>
> <entry key="passwordCallbackClass"
> value="org.apache.camel.component.cxf.wssecurity.client.UTPasswordCallback"/>
> - <entry key="user" value="clientx509v1"/>
> - <entry key="signaturePropFile"
> value="wssecurity/etc/Client_Sign.properties"/>
> + <entry key="user" value="alice"/>
> + <entry key="signaturePropFile"
> value="wssecurity/etc/alice.properties"/>
> <entry key="signatureKeyIdentifier"
> value="DirectReference"/>
> <entry key="signatureParts"
> value="{Element}{
> http://schemas.xmlsoap.org/soap/envelope/}Body;{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp
> "/>
> @@ -63,7 +63,7 @@
> <constructor-arg>
> <map>
> <entry key="action" value="Signature Timestamp"/>
> - <entry key="signaturePropFile"
> value="wssecurity/etc/Client_Encrypt.properties"/>
> + <entry key="signaturePropFile"
> value="wssecurity/etc/cxfca.properties"/>
> </map>
> </constructor-arg>
> </bean>
> @@ -91,8 +91,8 @@
> <constructor-arg>
> <map>
> <entry key="action" value="Encrypt"/>
> - <entry key="user" value="serverx509v1"/>
> - <entry key="encryptionPropFile"
> value="wssecurity/etc/Client_Encrypt.properties"/>
> + <entry key="user" value="bob"/>
> + <entry key="encryptionPropFile"
> value="wssecurity/etc/bob.properties"/>
> <entry key="encryptionKeyIdentifier"
> value="IssuerSerial"/>
> </map>
> </constructor-arg>
> @@ -103,7 +103,7 @@
> <constructor-arg>
> <map>
> <entry key="action" value="Encrypt"/>
> - <entry key="decryptionPropFile"
> value="wssecurity/etc/Client_Sign.properties"/>
> + <entry key="decryptionPropFile"
> value="wssecurity/etc/alice.properties"/>
> <entry key="passwordCallbackClass"
> value="org.apache.camel.component.cxf.wssecurity.client.UTPasswordCallback"/>
> </map>
> </constructor-arg>
> @@ -115,8 +115,8 @@
> <jaxws:properties>
> <entry key="ws-security.username" value="abcd"/>
> <entry key="ws-security.callback-handler"
> value="org.apache.camel.component.cxf.wssecurity.client.UTPasswordCallback"/>
> - <entry key="ws-security.encryption.properties"
> value="wssecurity/etc/Client_Encrypt.properties"/>
> - <entry key="ws-security.encryption.username"
> value="serverx509v1"/>
> + <entry key="ws-security.encryption.properties"
> value="wssecurity/etc/bob.properties"/>
> + <entry key="ws-security.encryption.username" value="bob"/>
> </jaxws:properties>
> <jaxws:features>
> <p:policies>
> diff --git
> a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wssecurity/server/wssec.xml
> b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wssecurity/server/wssec.xml
> index 853193b..1dbd15b 100644
> ---
> a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wssecurity/server/wssec.xml
> +++
> b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wssecurity/server/wssec.xml
> @@ -57,8 +57,8 @@
> <map>
> <entry key="action" value="Signature Timestamp"/>
> <entry key="passwordCallbackClass"
> value="org.apache.camel.component.cxf.wssecurity.server.UTPasswordCallback"/>
> - <entry key="user" value="serverx509v1"/>
> - <entry key="signaturePropFile"
> value="wssecurity/etc/Server_Decrypt.properties"/>
> + <entry key="user" value="bob"/>
> + <entry key="signaturePropFile"
> value="wssecurity/etc/bob.properties"/>
> <entry key="signatureKeyIdentifier"
> value="DirectReference"/>
> <entry key="signatureParts"
> value="{Element}{
> http://schemas.xmlsoap.org/soap/envelope/}Body;{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp
> "/>
> @@ -71,7 +71,7 @@
> <constructor-arg>
> <map>
> <entry key="action" value="Signature Timestamp"/>
> - <entry key="signaturePropFile"
> value="wssecurity/etc/Server_SignVerf.properties"/>
> + <entry key="signaturePropFile"
> value="wssecurity/etc/cxfca.properties"/>
> </map>
> </constructor-arg>
> </bean>
> @@ -109,8 +109,8 @@
> <constructor-arg>
> <map>
> <entry key="action" value="Encrypt"/>
> - <entry key="user" value="clientx509v1"/>
> - <entry key="encryptionPropFile"
> value="wssecurity/etc/Server_SignVerf.properties"/>
> + <entry key="user" value="alice"/>
> + <entry key="encryptionPropFile"
> value="wssecurity/etc/alice.properties"/>
> <entry key="encryptionKeyIdentifier"
> value="IssuerSerial"/>
> </map>
> </constructor-arg>
> @@ -121,7 +121,7 @@
> <constructor-arg>
> <map>
> <entry key="action" value="Encrypt"/>
> - <entry key="decryptionPropFile"
> value="wssecurity/etc/Server_Decrypt.properties"/>
> + <entry key="decryptionPropFile"
> value="wssecurity/etc/bob.properties"/>
> <entry key="passwordCallbackClass"
> value="org.apache.camel.component.cxf.wssecurity.server.UTPasswordCallback"/>
> </map>
> </constructor-arg>
> @@ -138,7 +138,7 @@
> wsdlLocation="hello_world_wssec.wsdl">
> <jaxws:properties>
> <entry key="ws-security.callback-handler"
> value="org.apache.camel.component.cxf.wssecurity.client.UTPasswordCallback"/>
> - <entry key="ws-security.signature.properties"
> value="wssecurity/etc/Server_Decrypt.properties"/>
> + <entry key="ws-security.signature.properties"
> value="wssecurity/etc/bob.properties"/>
> </jaxws:properties>
> <jaxws:features>
> <p:policies>
> diff --git
> a/components/camel-cxf/src/test/resources/wssecurity/etc/Client_Encrypt.properties
> b/components/camel-cxf/src/test/resources/wssecurity/etc/Client_Encrypt.properties
> deleted file mode 100644
> index 4dd7011..0000000
> ---
> a/components/camel-cxf/src/test/resources/wssecurity/etc/Client_Encrypt.properties
> +++ /dev/null
> @@ -1,22 +0,0 @@
> -##
> ---------------------------------------------------------------------------
> -## 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.
> -##
> ---------------------------------------------------------------------------
> -
> -org.apache.ws.security.crypto.provider=org.apache.ws
> .security.components.crypto.Merlin
> -org.apache.ws.security.crypto.merlin.keystore.type=jks
> -org.apache.ws.security.crypto.merlin.keystore.password=storepassword
> -org.apache.ws.security.crypto.merlin.keystore.alias=serverx509v1
>
> -org.apache.ws.security.crypto.merlin.keystore.file=wssecurity/keystore/client-truststore.jks
> diff --git
> a/components/camel-cxf/src/test/resources/wssecurity/etc/Client_Sign.properties
> b/components/camel-cxf/src/test/resources/wssecurity/etc/Client_Sign.properties
> deleted file mode 100644
> index 2949287..0000000
> ---
> a/components/camel-cxf/src/test/resources/wssecurity/etc/Client_Sign.properties
> +++ /dev/null
> @@ -1,23 +0,0 @@
> -##
> ---------------------------------------------------------------------------
> -## 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.
> -##
> ---------------------------------------------------------------------------
> -
> -org.apache.ws.security.crypto.provider=org.apache.ws
> .security.components.crypto.Merlin
> -org.apache.ws.security.crypto.merlin.keystore.type=jks
> -org.apache.ws.security.crypto.merlin.keystore.password=storepassword
> -org.apache.ws.security.crypto.merlin.keystore.alias=clientx509v1
>
> -org.apache.ws.security.crypto.merlin.keystore.file=wssecurity/keystore/client-keystore.jks
> -
> diff --git
> a/components/camel-cxf/src/test/resources/wssecurity/etc/Server_Decrypt.properties
> b/components/camel-cxf/src/test/resources/wssecurity/etc/Server_Decrypt.properties
> deleted file mode 100644
> index 3931a41..0000000
> ---
> a/components/camel-cxf/src/test/resources/wssecurity/etc/Server_Decrypt.properties
> +++ /dev/null
> @@ -1,22 +0,0 @@
> -##
> ---------------------------------------------------------------------------
> -## 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.
> -##
> ---------------------------------------------------------------------------
> -
> -org.apache.ws.security.crypto.provider=org.apache.ws
> .security.components.crypto.Merlin
> -org.apache.ws.security.crypto.merlin.keystore.type=jks
> -org.apache.ws.security.crypto.merlin.keystore.password=storepassword
> -org.apache.ws.security.crypto.merlin.keystore.alias=serverx509v1
>
> -org.apache.ws.security.crypto.merlin.keystore.file=wssecurity/keystore/server-keystore.jks
> diff --git
> a/components/camel-cxf/src/test/resources/wssecurity/etc/Server_SignVerf.properties
> b/components/camel-cxf/src/test/resources/wssecurity/etc/Server_SignVerf.properties
> deleted file mode 100644
> index 2d09c20..0000000
> ---
> a/components/camel-cxf/src/test/resources/wssecurity/etc/Server_SignVerf.properties
> +++ /dev/null
> @@ -1,22 +0,0 @@
> -##
> ---------------------------------------------------------------------------
> -## 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.
> -##
> ---------------------------------------------------------------------------
> -
> -org.apache.ws.security.crypto.provider=org.apache.ws
> .security.components.crypto.Merlin
> -org.apache.ws.security.crypto.merlin.keystore.type=jks
> -org.apache.ws.security.crypto.merlin.keystore.password=storepassword
> -org.apache.ws.security.crypto.merlin.keystore.alias=clientx509v1
>
> -org.apache.ws.security.crypto.merlin.keystore.file=wssecurity/keystore/server-truststore.jks
> diff --git
> a/components/camel-cxf/src/test/resources/wssecurity/etc/alice.properties
> b/components/camel-cxf/src/test/resources/wssecurity/etc/alice.properties
> new file mode 100644
> index 0000000..7785cac
> --- /dev/null
> +++
> b/components/camel-cxf/src/test/resources/wssecurity/etc/alice.properties
> @@ -0,0 +1,21 @@
> +# 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.
> +org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin
> +org.apache.wss4j.crypto.merlin.keystore.type=jks
> +org.apache.wss4j.crypto.merlin.keystore.password=password
> +org.apache.wss4j.crypto.merlin.keystore.alias=alice
> +org.apache.wss4j.crypto.merlin.keystore.file=wssecurity/keystore/alice.jks
> diff --git
> a/components/camel-cxf/src/test/resources/wssecurity/etc/bob.properties
> b/components/camel-cxf/src/test/resources/wssecurity/etc/bob.properties
> new file mode 100644
> index 0000000..bfcf695
> --- /dev/null
> +++ b/components/camel-cxf/src/test/resources/wssecurity/etc/bob.properties
> @@ -0,0 +1,21 @@
> +# 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.
> +org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin
> +org.apache.wss4j.crypto.merlin.keystore.type=jks
> +org.apache.wss4j.crypto.merlin.keystore.password=password
> +org.apache.wss4j.crypto.merlin.keystore.alias=bob
> +org.apache.wss4j.crypto.merlin.keystore.file=wssecurity/keystore/bob.jks
> diff --git
> a/components/camel-cxf/src/test/resources/wssecurity/etc/cxfca.properties
> b/components/camel-cxf/src/test/resources/wssecurity/etc/cxfca.properties
> new file mode 100644
> index 0000000..85845b6
> --- /dev/null
> +++
> b/components/camel-cxf/src/test/resources/wssecurity/etc/cxfca.properties
> @@ -0,0 +1,23 @@
> +# 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.
> +org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin
> +org.apache.wss4j.crypto.merlin.keystore.type=jks
> +org.apache.wss4j.crypto.merlin.keystore.password=password
> +org.apache.wss4j.crypto.merlin.keystore.alias=cxfca
> +org.apache.wss4j.crypto.merlin.keystore.file=wssecurity/keystore/cxfca.jks
> +
> +
> diff --git
> a/components/camel-cxf/src/test/resources/wssecurity/keystore/alice.jks
> b/components/camel-cxf/src/test/resources/wssecurity/keystore/alice.jks
> new file mode 100644
> index 0000000..213b26c
> Binary files /dev/null and
> b/components/camel-cxf/src/test/resources/wssecurity/keystore/alice.jks
> differ
> diff --git
> a/components/camel-cxf/src/test/resources/wssecurity/keystore/bob.jks
> b/components/camel-cxf/src/test/resources/wssecurity/keystore/bob.jks
> new file mode 100644
> index 0000000..5550912
> Binary files /dev/null and
> b/components/camel-cxf/src/test/resources/wssecurity/keystore/bob.jks differ
> diff --git
> a/components/camel-cxf/src/test/resources/wssecurity/keystore/client-keystore.jks
> b/components/camel-cxf/src/test/resources/wssecurity/keystore/client-keystore.jks
> deleted file mode 100644
> index bc744f9..0000000
> Binary files
> a/components/camel-cxf/src/test/resources/wssecurity/keystore/client-keystore.jks
> and /dev/null differ
> diff --git
> a/components/camel-cxf/src/test/resources/wssecurity/keystore/client-truststore.jks
> b/components/camel-cxf/src/test/resources/wssecurity/keystore/client-truststore.jks
> deleted file mode 100644
> index 216bddb..0000000
> Binary files
> a/components/camel-cxf/src/test/resources/wssecurity/keystore/client-truststore.jks
> and /dev/null differ
> diff --git
> a/components/camel-cxf/src/test/resources/wssecurity/keystore/cxfca.jks
> b/components/camel-cxf/src/test/resources/wssecurity/keystore/cxfca.jks
> new file mode 100644
> index 0000000..53ad239
> Binary files /dev/null and
> b/components/camel-cxf/src/test/resources/wssecurity/keystore/cxfca.jks
> differ
> diff --git
> a/components/camel-cxf/src/test/resources/wssecurity/keystore/server-keystore.jks
> b/components/camel-cxf/src/test/resources/wssecurity/keystore/server-keystore.jks
> deleted file mode 100644
> index 22fd44e..0000000
> Binary files
> a/components/camel-cxf/src/test/resources/wssecurity/keystore/server-keystore.jks
> and /dev/null differ
> diff --git
> a/components/camel-cxf/src/test/resources/wssecurity/keystore/server-truststore.jks
> b/components/camel-cxf/src/test/resources/wssecurity/keystore/server-truststore.jks
> deleted file mode 100644
> index 2447028..0000000
> Binary files
> a/components/camel-cxf/src/test/resources/wssecurity/keystore/server-truststore.jks
> and /dev/null differ
>
>