From b97bf8fac48e662fa9a69f484dc57e86da99cbc1 Mon Sep 17 00:00:00 2001 From: Justin Bertram Date: Thu, 24 May 2018 14:09:17 -0500 Subject: [PATCH 1/2] ARTEMIS-1872 fix examples broken after authn change --- .../src/main/resources/activemq/server0/broker.xml | 1 + .../src/main/resources/activemq/server0/broker.xml | 1 + .../src/main/resources/activemq/server0/broker.xml | 8 +------- .../src/main/resources/activemq/server0/broker.xml | 1 + 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/examples/features/standard/management/src/main/resources/activemq/server0/broker.xml b/examples/features/standard/management/src/main/resources/activemq/server0/broker.xml index 6d041c7ff1a..004faf98307 100644 --- a/examples/features/standard/management/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/standard/management/src/main/resources/activemq/server0/broker.xml @@ -55,6 +55,7 @@ under the License. + diff --git a/examples/features/standard/pre-acknowledge/src/main/resources/activemq/server0/broker.xml b/examples/features/standard/pre-acknowledge/src/main/resources/activemq/server0/broker.xml index 50227dd9ff2..65ddcde9d68 100644 --- a/examples/features/standard/pre-acknowledge/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/standard/pre-acknowledge/src/main/resources/activemq/server0/broker.xml @@ -37,6 +37,7 @@ under the License. + diff --git a/examples/features/standard/queue-requestor/src/main/resources/activemq/server0/broker.xml b/examples/features/standard/queue-requestor/src/main/resources/activemq/server0/broker.xml index bf9d4c873a2..f6ca85e9c67 100644 --- a/examples/features/standard/queue-requestor/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/standard/queue-requestor/src/main/resources/activemq/server0/broker.xml @@ -38,6 +38,7 @@ under the License. + @@ -45,13 +46,6 @@ under the License. - - - - - - - diff --git a/examples/features/standard/temp-queue/src/main/resources/activemq/server0/broker.xml b/examples/features/standard/temp-queue/src/main/resources/activemq/server0/broker.xml index ee0398bfc56..9d00b789571 100644 --- a/examples/features/standard/temp-queue/src/main/resources/activemq/server0/broker.xml +++ b/examples/features/standard/temp-queue/src/main/resources/activemq/server0/broker.xml @@ -37,6 +37,7 @@ under the License. + From 6211fb7ad603d8020f59ea8a68172a072b9a55ba Mon Sep 17 00:00:00 2001 From: Justin Bertram Date: Thu, 24 May 2018 21:48:04 -0500 Subject: [PATCH 2/2] ARTEMIS-1882 fix failing SecurityTest --- .../tests/integration/ssl/CoreClientOverOneWaySSLTest.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 6217dbdb6e1..b9b9bc8131c 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 @@ @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 static Collection getParameters() { 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 void testOneWaySSLReloaded() throws Exception { // 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 void testOneWaySSLReloaded() throws Exception { // 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