You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2022/01/24 14:57:23 UTC
[activemq-artemis] branch 2.19.x updated: NO-JIRA Fix activemq5-unit-tests with SSL
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch 2.19.x
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/2.19.x by this push:
new 3e630a4 NO-JIRA Fix activemq5-unit-tests with SSL
3e630a4 is described below
commit 3e630a4b850f106ff30a9f1ebb56d1e87e8ddfa2
Author: Domenico Francesco Bruscino <br...@apache.org>
AuthorDate: Mon Jan 17 16:59:21 2022 +0100
NO-JIRA Fix activemq5-unit-tests with SSL
(cherry picked from commit fc357213d2f95e8fc4479f4d79d342e821c56914)
---
.../org/apache/activemq/broker/BrokerService.java | 4 ++--
.../activemq5-unit-tests/src/test/java/dummy.keystore | Bin 1224 -> 2214 bytes
.../src/test/resources/dummy.keystore | Bin 1224 -> 2214 bytes
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/BrokerService.java b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/BrokerService.java
index d944bce..c1e190d 100644
--- a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/BrokerService.java
+++ b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/BrokerService.java
@@ -796,9 +796,9 @@ public class BrokerService implements Service {
//it means the uri is already configured ssl
uri = new URI("tcp", bindAddress.getUserInfo(), host, port, bindAddress.getPath(), bindAddress.getQuery(), bindAddress.getFragment());
} else {
- String baseUri = "tcp://" + host + ":" + port + "?" + TransportConstants.SSL_ENABLED_PROP_NAME + "=true&" + TransportConstants.KEYSTORE_PATH_PROP_NAME + "=" + (context == null ? defaultKeyStore : context.getKeyStore()) + "&" + TransportConstants.KEYSTORE_PASSWORD_PROP_NAME + "=" + (context == null ? defaultKeyStorePassword : context.getKeyStorePassword()) + "&" + TransportConstants.KEYSTORE_PROVIDER_PROP_NAME + "=" + (context == null ? defaultKeyStoreType : context.getKeyStor [...]
+ String baseUri = "tcp://" + host + ":" + port + "?" + TransportConstants.SSL_ENABLED_PROP_NAME + "=true&" + TransportConstants.KEYSTORE_PATH_PROP_NAME + "=" + (context == null ? defaultKeyStore : context.getKeyStore()) + "&" + TransportConstants.KEYSTORE_PASSWORD_PROP_NAME + "=" + (context == null ? defaultKeyStorePassword : context.getKeyStorePassword()) + "&" + TransportConstants.KEYSTORE_TYPE_PROP_NAME + "=" + (context == null ? defaultKeyStoreType : context.getKeyStoreType());
if (clientAuth) {
- baseUri = baseUri + "&" + TransportConstants.NEED_CLIENT_AUTH_PROP_NAME + "=true" + "&" + TransportConstants.TRUSTSTORE_PATH_PROP_NAME + "=" + (context == null ? defaultTrustStore : context.getTrustStore()) + "&" + TransportConstants.TRUSTSTORE_PASSWORD_PROP_NAME + "=" + (context == null ? defaultTrustStorePassword : context.getTrustStorePassword()) + "&" + TransportConstants.TRUSTSTORE_PROVIDER_PROP_NAME + "=" + (context == null ? defaultTrustStoreType : context.getTrustS [...]
+ baseUri = baseUri + "&" + TransportConstants.NEED_CLIENT_AUTH_PROP_NAME + "=true" + "&" + TransportConstants.TRUSTSTORE_PATH_PROP_NAME + "=" + (context == null ? defaultTrustStore : context.getTrustStore()) + "&" + TransportConstants.TRUSTSTORE_PASSWORD_PROP_NAME + "=" + (context == null ? defaultTrustStorePassword : context.getTrustStorePassword()) + "&" + TransportConstants.TRUSTSTORE_TYPE_PROP_NAME + "=" + (context == null ? defaultTrustStoreType : context.getTrustStore [...]
}
uri = new URI(baseUri);
}
diff --git a/tests/activemq5-unit-tests/src/test/java/dummy.keystore b/tests/activemq5-unit-tests/src/test/java/dummy.keystore
index 9f705e5..aa7943f 100644
Binary files a/tests/activemq5-unit-tests/src/test/java/dummy.keystore and b/tests/activemq5-unit-tests/src/test/java/dummy.keystore differ
diff --git a/tests/activemq5-unit-tests/src/test/resources/dummy.keystore b/tests/activemq5-unit-tests/src/test/resources/dummy.keystore
index 9f705e5..aa7943f 100644
Binary files a/tests/activemq5-unit-tests/src/test/resources/dummy.keystore and b/tests/activemq5-unit-tests/src/test/resources/dummy.keystore differ