Repository: activemq-artemis Updated Branches: refs/heads/master bfe2e055f -> cc7b8d0c5
Clarify HTTP(S) upgrade config Demonstrate that the Artemis acceptor receiving HTTP(S) upgrade connections doesn't need any SSL configuration. Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/b8e235f7 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/b8e235f7 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/b8e235f7 Branch: refs/heads/master Commit: b8e235f77e43ff4df81778aa7ba400fa7260d72d Parents: bfe2e05 Author: jbertram <jbert...@apache.org> Authored: Mon Oct 5 08:31:55 2015 -0500 Committer: jbertram <jbert...@apache.org> Committed: Mon Oct 5 08:38:22 2015 -0500 ---------------------------------------------------------------------- .../NettyConnectorWithHTTPUpgradeTest.java | 26 +++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b8e235f7/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java index d9b7930..e455ac2 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java @@ -110,25 +110,27 @@ public class NettyConnectorWithHTTPUpgradeTest extends ActiveMQTestBase { @Before public void setUp() throws Exception { super.setUp(); - HashMap<String, Object> httpParams = new HashMap<String, Object>(); + HashMap<String, Object> httpAcceptorParams = new HashMap<String, Object>(); // This prop controls the usage of HTTP Get + Upgrade from Netty connector - httpParams.put(TransportConstants.HTTP_UPGRADE_ENABLED_PROP_NAME, true); - httpParams.put(TransportConstants.PORT_PROP_NAME, HTTP_PORT); - if (useSSL) { - httpParams.put(TransportConstants.SSL_ENABLED_PROP_NAME, true); - httpParams.put(TransportConstants.KEYSTORE_PATH_PROP_NAME, SERVER_SIDE_KEYSTORE); - httpParams.put(TransportConstants.KEYSTORE_PASSWORD_PROP_NAME, PASSWORD); - httpParams.put(TransportConstants.TRUSTSTORE_PATH_PROP_NAME, CLIENT_SIDE_TRUSTSTORE); - httpParams.put(TransportConstants.TRUSTSTORE_PASSWORD_PROP_NAME, PASSWORD); - } + httpAcceptorParams.put(TransportConstants.HTTP_UPGRADE_ENABLED_PROP_NAME, true); + httpAcceptorParams.put(TransportConstants.PORT_PROP_NAME, HTTP_PORT); acceptorName = randomString(); - conf = createDefaultNettyConfig().addAcceptorConfiguration(new TransportConfiguration(NETTY_ACCEPTOR_FACTORY, httpParams, acceptorName)); + conf = createDefaultNettyConfig().addAcceptorConfiguration(new TransportConfiguration(NETTY_ACCEPTOR_FACTORY, httpAcceptorParams, acceptorName)); server = addServer(ActiveMQServers.newActiveMQServer(conf, false)); server.start(); - locator = ActiveMQClient.createServerLocatorWithoutHA(new TransportConfiguration(NETTY_CONNECTOR_FACTORY, httpParams)); + + HashMap<String, Object> httpConnectorParams = new HashMap<String, Object>(); + httpAcceptorParams.put(TransportConstants.HTTP_UPGRADE_ENABLED_PROP_NAME, true); + httpAcceptorParams.put(TransportConstants.PORT_PROP_NAME, HTTP_PORT); + if (useSSL) { + httpAcceptorParams.put(TransportConstants.SSL_ENABLED_PROP_NAME, true); + httpAcceptorParams.put(TransportConstants.TRUSTSTORE_PATH_PROP_NAME, CLIENT_SIDE_TRUSTSTORE); + httpAcceptorParams.put(TransportConstants.TRUSTSTORE_PASSWORD_PROP_NAME, PASSWORD); + } + locator = ActiveMQClient.createServerLocatorWithoutHA(new TransportConfiguration(NETTY_CONNECTOR_FACTORY, httpConnectorParams)); addServerLocator(locator); // THe web server owns the HTTP port, not ActiveMQ Artemis.
