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 2015/10/05 17:40:26 UTC
[1/2] activemq-artemis git commit: Clarify HTTP(S) upgrade config
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 <jb...@apache.org>
Authored: Mon Oct 5 08:31:55 2015 -0500
Committer: jbertram <jb...@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.
[2/2] activemq-artemis git commit: This closes #184 HTTP upgrade
config
Posted by cl...@apache.org.
This closes #184 HTTP upgrade config
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/cc7b8d0c
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/cc7b8d0c
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/cc7b8d0c
Branch: refs/heads/master
Commit: cc7b8d0c5bb86cbbe16440308e74cc9c90c3e35f
Parents: bfe2e05 b8e235f
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon Oct 5 11:40:03 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Oct 5 11:40:03 2015 -0400
----------------------------------------------------------------------
.../NettyConnectorWithHTTPUpgradeTest.java | 26 +++++++++++---------
1 file changed, 14 insertions(+), 12 deletions(-)
----------------------------------------------------------------------