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 2018/05/25 12:43:05 UTC
[1/2] activemq-artemis git commit: ARTEMIS-1882 fix failing
SecurityTest
Repository: activemq-artemis
Updated Branches:
refs/heads/master 90a6e9911 -> a6c54a792
ARTEMIS-1882 fix failing SecurityTest
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/6211fb7a
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/6211fb7a
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/6211fb7a
Branch: refs/heads/master
Commit: 6211fb7ad603d8020f59ea8a68172a072b9a55ba
Parents: 90a6e99
Author: Justin Bertram <jb...@apache.org>
Authored: Thu May 24 21:48:04 2018 -0500
Committer: Justin Bertram <jb...@apache.org>
Committed: Thu May 24 22:05:09 2018 -0500
----------------------------------------------------------------------
.../tests/integration/ssl/CoreClientOverOneWaySSLTest.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6211fb7a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverOneWaySSLTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverOneWaySSLTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverOneWaySSLTest.java
index 6217dbd..b9b9bc8 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverOneWaySSLTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverOneWaySSLTest.java
@@ -55,6 +55,7 @@ import org.junit.runners.Parameterized;
@RunWith(value = Parameterized.class)
public class CoreClientOverOneWaySSLTest extends ActiveMQTestBase {
+ String suffix = "";
@Parameterized.Parameters(name = "storeType={0}")
public static Collection getParameters() {
@@ -63,7 +64,7 @@ public class CoreClientOverOneWaySSLTest extends ActiveMQTestBase {
public CoreClientOverOneWaySSLTest(String storeType) {
this.storeType = storeType;
- String suffix = storeType.toLowerCase();
+ suffix = storeType.toLowerCase();
// keytool expects PKCS12 stores to use the extension "p12"
if (storeType.equals("PKCS12")) {
suffix = "p12";
@@ -327,7 +328,7 @@ public class CoreClientOverOneWaySSLTest extends ActiveMQTestBase {
// create an invalid SSL connection
tc.getParams().put(TransportConstants.SSL_ENABLED_PROP_NAME, true);
tc.getParams().put(TransportConstants.TRUSTSTORE_PROVIDER_PROP_NAME, storeType);
- tc.getParams().put(TransportConstants.TRUSTSTORE_PATH_PROP_NAME, "other-client-side-truststore." + storeType.toLowerCase());
+ tc.getParams().put(TransportConstants.TRUSTSTORE_PATH_PROP_NAME, "other-client-side-truststore." + suffix);
tc.getParams().put(TransportConstants.TRUSTSTORE_PASSWORD_PROP_NAME, PASSWORD);
ServerLocator locator = addServerLocator(ActiveMQClient.createServerLocatorWithoutHA(tc)).setCallTimeout(3000);
@@ -340,7 +341,7 @@ public class CoreClientOverOneWaySSLTest extends ActiveMQTestBase {
// reload the acceptor to reload the SSL stores
NettyAcceptor acceptor = (NettyAcceptor) server.getRemotingService().getAcceptor("nettySSL");
- acceptor.setKeyStorePath("other-server-side-keystore." + storeType.toLowerCase());
+ acceptor.setKeyStorePath("other-server-side-keystore." + suffix);
acceptor.reload();
// create a session with the locator which failed previously proving that the SSL stores have been reloaded
[2/2] activemq-artemis git commit: This closes #2111
Posted by cl...@apache.org.
This closes #2111
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/a6c54a79
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/a6c54a79
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/a6c54a79
Branch: refs/heads/master
Commit: a6c54a792682fde85bab620fdbd4601b25cf78ad
Parents: 90a6e99 6211fb7
Author: Clebert Suconic <cl...@apache.org>
Authored: Fri May 25 08:42:42 2018 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri May 25 08:42:42 2018 -0400
----------------------------------------------------------------------
.../tests/integration/ssl/CoreClientOverOneWaySSLTest.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------