You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by an...@apache.org on 2015/02/25 14:30:56 UTC
[7/8] activemq-6 git commit: Replace all references of port 5445 with
61616
Replace all references of port 5445 with 61616
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/e194b780
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/e194b780
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/e194b780
Branch: refs/heads/master
Commit: e194b7803e5de1ffc34a173894ef4a5cb52fbef1
Parents: 2b71aa1
Author: Martyn Taylor <mt...@redhat.com>
Authored: Tue Feb 24 15:50:54 2015 +0000
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Wed Feb 25 13:27:04 2015 +0000
----------------------------------------------------------------------
.../apache/activemq/utils/uri/URIFactory.java | 4 ++--
.../api/core/TransportConfiguration.java | 2 +-
.../remoting/impl/netty/TransportConstants.java | 2 +-
.../activemq/uri/TCPServerLocatorSchema.java | 2 +-
.../activemq/uri/ConnectionFactoryURITest.java | 12 +++++-----
.../rest/queue/push/xml/XmlHttpHeader.java | 2 +-
.../impl/FileConfigurationParserTest.java | 2 +-
.../WrongRoleFileConfigurationParserTest.java | 2 +-
.../resources/ConfigurationTest-full-config.xml | 2 +-
.../resources/InvalidConfigurationTest0.xml | 4 ++--
.../resources/InvalidConfigurationTest1.xml | 4 ++--
.../resources/InvalidConfigurationTest2.xml | 4 ++--
.../resources/InvalidConfigurationTest3.xml | 4 ++--
.../resources/InvalidConfigurationTest4.xml | 4 ++--
.../resources/InvalidConfigurationTest5.xml | 4 ++--
.../resources/divertRoutingNameNotRequired.xml | 6 ++---
.../xa/recovery/ActiveMQXAResourceRecovery.java | 4 ++--
.../src/main/resources/bin/activemq.conf | 2 +-
docs/quickstart-guide/en/examples.md | 4 ++--
docs/quickstart-guide/en/running.md | 4 ++--
docs/user-manual/en/client-reconnection.md | 2 +-
docs/user-manual/en/clusters.md | 12 +++++-----
docs/user-manual/en/configuring-transports.md | 20 ++++++++--------
docs/user-manual/en/flow-control.md | 8 +++----
docs/user-manual/en/ha.md | 2 +-
docs/user-manual/en/large-messages.md | 4 ++--
docs/user-manual/en/message-grouping.md | 4 ++--
docs/user-manual/en/pre-acknowledge.md | 2 +-
docs/user-manual/en/thread-pooling.md | 2 +-
docs/user-manual/en/tools.md | 2 +-
docs/user-manual/en/using-jms.md | 16 ++++++-------
docs/user-manual/en/using-server.md | 4 ++--
.../core/example/EmbeddedRemoteExample.java | 2 +-
.../activemq/core/example/EmbeddedServer.java | 2 +-
examples/core/perf/perf.properties | 2 +-
.../server0/activemq-configuration.xml | 2 +-
.../hornetq-configuration-messaging-lab.xml | 2 +-
.../server0/activemq-configuration.xml | 4 ++--
.../common/example/ActiveMQExample.java | 6 ++---
.../activemq-ra-rar/src/main/resources/ra.xml | 2 +-
examples/jms/aerogear/pom.xml | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../aerogear/src/main/resources/jndi.properties | 2 +-
examples/jms/applet/pom.xml | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
examples/jms/application-layer-failover/pom.xml | 4 ++--
.../ApplicationLayerFailoverExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../activemq/server1/activemq-configuration.xml | 2 +-
examples/jms/bridge/pom.xml | 4 ++--
.../activemq/jms/example/BridgeExample.java | 4 ++--
.../activemq/server0/activemq-configuration.xml | 4 ++--
.../activemq/server1/activemq-configuration.xml | 2 +-
examples/jms/browser/pom.xml | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../browser/src/main/resources/jndi.properties | 2 +-
examples/jms/client-kickoff/pom.xml | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 4 ++--
.../activemq/server1/activemq-configuration.xml | 4 ++--
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 4 ++--
.../activemq/server1/activemq-configuration.xml | 4 ++--
.../activemq/server2/activemq-configuration.xml | 4 ++--
.../jms/clustered-durable-subscription/pom.xml | 4 ++--
.../activemq/server0/activemq-configuration.xml | 4 ++--
.../activemq/server1/activemq-configuration.xml | 4 ++--
examples/jms/clustered-grouping/pom.xml | 6 ++---
.../activemq/server0/activemq-configuration.xml | 4 ++--
.../activemq/server1/activemq-configuration.xml | 4 ++--
.../activemq/server2/activemq-configuration.xml | 4 ++--
examples/jms/clustered-jgroups/pom.xml | 4 ++--
.../activemq/server0/activemq-configuration.xml | 4 ++--
.../activemq/server0/client-jndi.properties | 2 +-
.../activemq/server1/activemq-configuration.xml | 4 ++--
.../activemq/server1/client-jndi.properties | 2 +-
examples/jms/clustered-queue/pom.xml | 4 ++--
.../activemq/server0/activemq-configuration.xml | 4 ++--
.../activemq/server1/activemq-configuration.xml | 4 ++--
examples/jms/clustered-standalone/pom.xml | 6 ++---
.../activemq/server0/activemq-configuration.xml | 4 ++--
.../activemq/server1/activemq-configuration.xml | 4 ++--
.../activemq/server2/activemq-configuration.xml | 4 ++--
examples/jms/clustered-static-discovery/pom.xml | 8 +++----
.../activemq/server0/activemq-configuration.xml | 6 ++---
.../activemq/server1/activemq-configuration.xml | 6 ++---
.../activemq/server2/activemq-configuration.xml | 6 ++---
.../activemq/server3/activemq-configuration.xml | 6 ++---
examples/jms/clustered-static-oneway/pom.xml | 6 ++---
.../activemq/server0/activemq-configuration.xml | 6 ++---
.../activemq/server1/activemq-configuration.xml | 6 ++---
.../activemq/server2/activemq-configuration.xml | 4 ++--
examples/jms/clustered-topic/pom.xml | 4 ++--
.../activemq/server0/activemq-configuration.xml | 4 ++--
.../activemq/server1/activemq-configuration.xml | 4 ++--
.../jms/colocated-failover-scale-down/pom.xml | 4 ++--
.../activemq/server0/activemq-configuration.xml | 4 ++--
.../activemq/server1/activemq-configuration.xml | 4 ++--
examples/jms/colocated-failover/pom.xml | 4 ++--
.../activemq/server0/activemq-configuration.xml | 4 ++--
.../activemq/server1/activemq-configuration.xml | 4 ++--
examples/jms/consumer-rate-limit/pom.xml | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
examples/jms/dead-letter/pom.xml | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
examples/jms/delayed-redelivery/pom.xml | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
examples/jms/divert/pom.xml | 4 ++--
.../activemq/server0/activemq-configuration.xml | 4 ++--
.../activemq/server1/activemq-configuration.xml | 2 +-
examples/jms/durable-subscription/pom.xml | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
examples/jms/embedded-simple/pom.xml | 4 ++--
examples/jms/embedded/pom.xml | 4 ++--
examples/jms/expiry/pom.xml | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../expiry/src/main/resources/jndi.properties | 2 +-
examples/jms/ha-policy-autobackup/pom.xml | 4 ++--
.../activemq/server0/activemq-configuration.xml | 6 ++---
.../activemq/server1/activemq-configuration.xml | 6 ++---
examples/jms/http-transport/pom.xml | 2 +-
.../jms/instantiate-connection-factory/pom.xml | 2 +-
.../instantiate-connection-factory/readme.html | 4 ++--
.../InstantiateConnectionFactoryExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
examples/jms/interceptor/pom.xml | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
examples/jms/jms-bridge/pom.xml | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
examples/jms/jms-shared-consumer/pom.xml | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../jms/jmx/src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 4 ++--
.../activemq/server1/activemq-configuration.xml | 4 ++--
.../activemq/server2/activemq-configuration.xml | 4 ++--
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 4 ++--
.../activemq/server1/activemq-configuration.xml | 4 ++--
.../activemq/server2/activemq-configuration.xml | 4 ++--
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 4 ++--
.../activemq/server1/activemq-configuration.xml | 4 ++--
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 4 ++--
.../activemq/server0/activemq-configuration.xml | 4 ++--
.../paging/src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../jms/perf/src/main/resources/jndi.properties | 2 +-
examples/jms/pre-acknowledge/pom.xml | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
examples/jms/proton-cpp/readme.html | 4 ++--
examples/jms/proton-cpp/src/main/cpp/hello.cpp | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
examples/jms/proton-j/pom.xml | 2 +-
examples/jms/proton-j/readme.html | 2 +-
.../jms/queue-message-redistribution/pom.xml | 4 ++--
.../activemq/server0/activemq-configuration.xml | 4 ++--
.../activemq/server1/activemq-configuration.xml | 4 ++--
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../queue/src/main/resources/jndi.properties | 2 +-
.../activemq/jms/example/ReattachExample.java | 2 +-
.../activemq/server0/activemq-configuration.xml | 8 +++----
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 6 ++---
.../activemq/server1/activemq-configuration.xml | 6 ++---
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 4 ++--
.../activemq/server1/activemq-configuration.xml | 6 ++---
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 4 ++--
.../activemq/server1/activemq-configuration.xml | 4 ++--
.../activemq/server2/activemq-configuration.xml | 4 ++--
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 4 ++--
.../activemq/server1/activemq-configuration.xml | 4 ++--
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../src/main/resources/activemq-client.xml | 2 +-
.../main/resources/activemq-configuration.xml | 2 +-
.../src/main/resources/activemq-client.xml | 2 +-
.../main/resources/activemq-configuration.xml | 2 +-
.../push/src/main/resources/activemq-client.xml | 2 +-
.../main/resources/activemq-configuration.xml | 2 +-
.../activemq/server0/activemq-configuration.xml | 4 ++--
.../activemq/server1/activemq-configuration.xml | 6 ++---
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../security/src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
examples/jms/static-selector-jms/pom.xml | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
examples/jms/stomp-websockets/pom.xml | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../stomp/src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../stomp1.1/src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../stomp1.2/src/main/resources/jndi.properties | 2 +-
examples/jms/stop-server-failover/pom.xml | 4 ++--
.../activemq/server0/activemq-configuration.xml | 4 ++--
.../activemq/server1/activemq-configuration.xml | 4 ++--
.../src/main/resources/jndi.properties | 2 +-
examples/jms/symmetric-cluster/pom.xml | 10 ++++----
.../activemq/server0/activemq-configuration.xml | 4 ++--
.../activemq/server1/activemq-configuration.xml | 4 ++--
.../activemq/server2/activemq-configuration.xml | 4 ++--
.../activemq/server3/activemq-configuration.xml | 4 ++--
.../activemq/server4/activemq-configuration.xml | 4 ++--
.../activemq/server0/activemq-configuration.xml | 4 ++--
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
examples/jms/topic/pom.xml | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../topic/src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 4 ++--
.../activemq/server1/activemq-configuration.xml | 4 ++--
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 2 +-
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 4 ++--
.../activemq/server0/activemq-configuration.xml | 2 +-
.../src/main/resources/jndi.properties | 4 ++--
.../activemq/server0/activemq-configuration.xml | 2 +-
.../xa-send/src/main/resources/jndi.properties | 4 ++--
examples/soak/normal/pom.xml | 8 +++----
.../normal/server0/activemq-configuration.xml | 4 ++--
.../activemq/jms/soak/example/SoakReceiver.java | 2 +-
.../activemq/jms/soak/example/SoakSender.java | 2 +-
.../config/server-start-stop-backup-config1.xml | 4 ++--
tests/config/server-start-stop-live-config1.xml | 4 ++--
.../client/JmsNettyNioStressTest.java | 4 ++--
.../AutomaticColocatedQuorumVoteTest.java | 24 ++++++++++----------
.../cluster/failover/FailoverTestBase.java | 4 ++--
.../integration/jms/SimpleJNDIClientTest.java | 10 ++++----
.../integration/openwire/OpenWireTestBase.java | 3 ---
.../integration/ra/ResourceAdapterTest.java | 2 +-
.../integration/server/ScaleDown3NodeTest.java | 2 +-
.../tests/util/TransportConfigurationUtils.java | 4 ++--
.../colocated-server-start-stop-config1.xml | 4 ++--
.../resources/server-start-stop-config1.xml | 4 ++--
.../test/resources/activemq-configuration.xml | 4 ++--
.../org/apache/activemq/jms/ActiveMQAdmin.java | 2 +-
.../jtests/jms/framework/PTPTestCase.java | 2 +-
.../jtests/jms/framework/PubSubTestCase.java | 2 +-
.../jtests/jms/framework/UnifiedTestCase.java | 6 ++---
.../ra/ActiveMQResourceAdapterConfigTest.java | 2 +-
.../tests/unit/ra/ResourceAdapterTest.java | 12 +++++-----
300 files changed, 495 insertions(+), 498 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/activemq-commons/src/main/java/org/apache/activemq/utils/uri/URIFactory.java
----------------------------------------------------------------------
diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/uri/URIFactory.java b/activemq-commons/src/main/java/org/apache/activemq/utils/uri/URIFactory.java
index 0a1df92..e2d144c 100644
--- a/activemq-commons/src/main/java/org/apache/activemq/utils/uri/URIFactory.java
+++ b/activemq-commons/src/main/java/org/apache/activemq/utils/uri/URIFactory.java
@@ -97,10 +97,10 @@ public class URIFactory<T, P>
/*
* this method is used to change a string with multiple URI's in it into a valid URI.
* for instance it is possible to have the following String
- * (tcp://localhost:5445,tcp://localhost:5545,tcp://localhost:5555)?somequery
+ * (tcp://localhost:61616,tcp://localhost:5545,tcp://localhost:5555)?somequery
* This is an invalid URI so will be changed so that the first URI is used and the
* extra ones added as part of the URI fragment, like so
- * tcp://localhost:5445?someQuery#tcp://localhost:5545,tcp://localhost:5555.
+ * tcp://localhost:61616?someQuery#tcp://localhost:5545,tcp://localhost:5555.
*
* It is the job of the URISchema implementation to handle these fragments as needed.
* */
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/activemq-core-client/src/main/java/org/apache/activemq/api/core/TransportConfiguration.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/TransportConfiguration.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/TransportConfiguration.java
index 5a21e07..0960c49 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/TransportConfiguration.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/TransportConfiguration.java
@@ -36,7 +36,7 @@ import org.apache.activemq.utils.UUIDGenerator;
* <pre>
* HashMap<String, Object> map = new HashMap<String, Object>();
* map.put("host", "localhost");
- * map.put("port", 5445);
+ * map.put("port", 61616);
* TransportConfiguration config = new TransportConfiguration(InVMConnectorFactory.class.getName(), map);
* ClientSessionFactory sf = new ClientSessionFactoryImpl(config);
* </pre>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/TransportConstants.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/TransportConstants.java b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/TransportConstants.java
index 625323d..5cf9681 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/TransportConstants.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/TransportConstants.java
@@ -131,7 +131,7 @@ public class TransportConstants
public static final String DEFAULT_HOST = "localhost";
- public static final int DEFAULT_PORT = 5445;
+ public static final int DEFAULT_PORT = 61616;
public static final String DEFAULT_LOCAL_ADDRESS = null;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/activemq-core-client/src/main/java/org/apache/activemq/uri/TCPServerLocatorSchema.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/uri/TCPServerLocatorSchema.java b/activemq-core-client/src/main/java/org/apache/activemq/uri/TCPServerLocatorSchema.java
index 959865b..93c2ceb 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/uri/TCPServerLocatorSchema.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/uri/TCPServerLocatorSchema.java
@@ -97,7 +97,7 @@ public class TCPServerLocatorSchema extends AbstractServerLocatorSchema
{
return Integer.valueOf((String) port);
}
- return port != null ? (int) port : 5445;
+ return port != null ? (int) port : 61616;
}
private static String getHost(Map<String, Object> params)
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/activemq-jms-client/src/test/java/org/apache/activemq/uri/ConnectionFactoryURITest.java
----------------------------------------------------------------------
diff --git a/activemq-jms-client/src/test/java/org/apache/activemq/uri/ConnectionFactoryURITest.java b/activemq-jms-client/src/test/java/org/apache/activemq/uri/ConnectionFactoryURITest.java
index 7918da5..eedea19 100644
--- a/activemq-jms-client/src/test/java/org/apache/activemq/uri/ConnectionFactoryURITest.java
+++ b/activemq-jms-client/src/test/java/org/apache/activemq/uri/ConnectionFactoryURITest.java
@@ -142,13 +142,13 @@ public class ConnectionFactoryURITest
Map<String, Object> props = new HashMap<>();
Set<String> allowableConnectorKeys = TransportConstants.ALLOWABLE_CONNECTOR_KEYS;
StringBuilder sb = new StringBuilder();
- sb.append("(tcp://localhost0:5445?");//localhost1:5446,localhost2:5447,localhost3:5448)&ha=true");
+ sb.append("(tcp://localhost0:61616?");//localhost1:61617,localhost2:61618,localhost3:61619)&ha=true");
populateConnectorParams(props, allowableConnectorKeys, sb);
Map<String, Object> props2 = new HashMap<>();
- sb.append(",tcp://localhost1:5446?");
+ sb.append(",tcp://localhost1:61617?");
populateConnectorParams(props2, allowableConnectorKeys, sb);
Map<String, Object> props3 = new HashMap<>();
- sb.append(",tcp://localhost2:5447?");
+ sb.append(",tcp://localhost2:61618?");
populateConnectorParams(props3, allowableConnectorKeys, sb);
sb.append(")?ha=true&clientID=myID");
@@ -165,7 +165,7 @@ public class ConnectionFactoryURITest
{
TransportConfiguration connector = staticConnector;
Assert.assertEquals(connector.getParams().get("host"), "localhost" + offfSet);
- Assert.assertEquals(connector.getParams().get("port"), "" + (5445 + offfSet));
+ Assert.assertEquals(connector.getParams().get("port"), "" + (61616 + offfSet));
Map<String, Object> params = connector.getParams();
for (Map.Entry<String, Object> entry : params.entrySet())
{
@@ -195,11 +195,11 @@ public class ConnectionFactoryURITest
TransportConfiguration tc = new TransportConfiguration(NettyConnectorFactory.class.getName());
HashMap<String, Object> params = new HashMap<>();
params.put("host", "localhost1");
- params.put("port", 5446);
+ params.put("port", 61617);
TransportConfiguration tc2 = new TransportConfiguration(NettyConnectorFactory.class.getName(), params);
HashMap<String, Object> params2 = new HashMap<>();
params2.put("host", "localhost2");
- params2.put("port", 5447);
+ params2.put("port", 61618);
TransportConfiguration tc3 = new TransportConfiguration(NettyConnectorFactory.class.getName(), params2);
ActiveMQConnectionFactory connectionFactoryWithHA = ActiveMQJMSClient.createConnectionFactoryWithHA(JMSFactoryType.CF, tc, tc2, tc3);
URI tcp = parser.createSchema("tcp", connectionFactoryWithHA);
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/XmlHttpHeader.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/XmlHttpHeader.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/XmlHttpHeader.java
index a1242c4..57ac88a 100644
--- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/XmlHttpHeader.java
+++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/xml/XmlHttpHeader.java
@@ -32,7 +32,7 @@ import javax.xml.bind.annotation.XmlValue;
@XmlAccessorType(XmlAccessType.PROPERTY)
public class XmlHttpHeader implements Serializable
{
- private static final long serialVersionUID = -390039194544718601L;
+ private static final long serialVersionUID = -3900391946161818601L;
private String name;
private String value;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.java b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.java
index 7c62f36..b82ddab 100644
--- a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.java
+++ b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.java
@@ -145,7 +145,7 @@ public class FileConfigurationParserTest extends UnitTestCase
"<large-messages-directory>${jboss.server.data.dir}/activemq/largemessages</large-messages-directory>" + "\n" +
"<paging-directory>${jboss.server.data.dir}/activemq/paging</paging-directory>" + "\n" +
"<connectors>" + "\n" +
- "<connector name=\"netty\">tcp://localhost:5445</connector>" + "\n" +
+ "<connector name=\"netty\">tcp://localhost:61616</connector>" + "\n" +
"<connector name=\"netty-throughput\">tcp://localhost:5545</connector>" + "\n" +
"<connector name=\"in-vm\">vm://0</connector>" + "\n" +
"</connectors>" + "\n" +
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java
index bbf4eea..0773d3f 100644
--- a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java
+++ b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java
@@ -75,7 +75,7 @@ public class WrongRoleFileConfigurationParserTest extends UnitTestCase
"<large-messages-directory>${jboss.server.data.dir}/activemq/largemessages</large-messages-directory>" + "\n" +
"<paging-directory>${jboss.server.data.dir}/activemq/paging</paging-directory>" + "\n" +
"<connectors>" + "\n" +
- "<connector name=\"netty\">tcp://localhost:5445</connector>" + "\n" +
+ "<connector name=\"netty\">tcp://localhost:61616</connector>" + "\n" +
"<connector name=\"netty-throughput\">tcp://localhost:5545</connector>" + "\n" +
"<connector name=\"in-vm\">vm://0</connector>" + "\n" +
"</connectors>" + "\n" +
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/activemq-server/src/test/resources/ConfigurationTest-full-config.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/ConfigurationTest-full-config.xml b/activemq-server/src/test/resources/ConfigurationTest-full-config.xml
index 0eaf796..b16e11a 100644
--- a/activemq-server/src/test/resources/ConfigurationTest-full-config.xml
+++ b/activemq-server/src/test/resources/ConfigurationTest-full-config.xml
@@ -64,7 +64,7 @@
<connector name="connector2">vm://5</connector>
</connectors>
<acceptors>
- <acceptor>tcp://0.0.0.0:5445?tcpNoDelay=456;connectionTtl=44</acceptor>
+ <acceptor>tcp://0.0.0.0:61616?tcpNoDelay=456;connectionTtl=44</acceptor>
<acceptor>vm://0?e1=z1;e2=567</acceptor>
</acceptors>
<broadcast-groups>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/activemq-server/src/test/resources/InvalidConfigurationTest0.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest0.xml b/activemq-server/src/test/resources/InvalidConfigurationTest0.xml
index 862b4fa..ddc50d5 100644
--- a/activemq-server/src/test/resources/InvalidConfigurationTest0.xml
+++ b/activemq-server/src/test/resources/InvalidConfigurationTest0.xml
@@ -71,11 +71,11 @@
</remoting-incoming-interceptors>
<connectors>
- <connector name="connector1">tcp://localhost:5445</connector>
+ <connector name="connector1">tcp://localhost:61616</connector>
<connector name="connector2">vm://0</connector>
</connectors>
<acceptors>
- <acceptor name="acceptor1">tcp://localhost:5445</acceptor>
+ <acceptor name="acceptor1">tcp://localhost:61616</acceptor>
<acceptor name="acceptor2">vm://0</acceptor>
</acceptors>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/activemq-server/src/test/resources/InvalidConfigurationTest1.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest1.xml b/activemq-server/src/test/resources/InvalidConfigurationTest1.xml
index 43075b6..cb599cc 100644
--- a/activemq-server/src/test/resources/InvalidConfigurationTest1.xml
+++ b/activemq-server/src/test/resources/InvalidConfigurationTest1.xml
@@ -71,11 +71,11 @@
</remoting-incoming-interceptors>
<connectors>
- <connector name="connector1">tcp://localhost:5445</connector>
+ <connector name="connector1">tcp://localhost:61616</connector>
<connector name="connector2">vm://0</connector>
</connectors>
<acceptors>
- <acceptor name="acceptor1">tcp://localhost:5445</acceptor>
+ <acceptor name="acceptor1">tcp://localhost:61616</acceptor>
<acceptor name="acceptor2">vm://0</acceptor>
</acceptors>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/activemq-server/src/test/resources/InvalidConfigurationTest2.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest2.xml b/activemq-server/src/test/resources/InvalidConfigurationTest2.xml
index e558f69..7e45afc 100644
--- a/activemq-server/src/test/resources/InvalidConfigurationTest2.xml
+++ b/activemq-server/src/test/resources/InvalidConfigurationTest2.xml
@@ -71,11 +71,11 @@
</remoting-incoming-interceptors>
<connectors>
- <connector name="connector1">tcp://localhost:5445</connector>
+ <connector name="connector1">tcp://localhost:61616</connector>
<connector name="connector2">vm://0</connector>
</connectors>
<acceptors>
- <acceptor name="acceptor1">tcp://localhost:5445</acceptor>
+ <acceptor name="acceptor1">tcp://localhost:61616</acceptor>
<acceptor name="acceptor2">vm://0</acceptor>
</acceptors>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/activemq-server/src/test/resources/InvalidConfigurationTest3.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest3.xml b/activemq-server/src/test/resources/InvalidConfigurationTest3.xml
index 68aeacd..19fa198 100644
--- a/activemq-server/src/test/resources/InvalidConfigurationTest3.xml
+++ b/activemq-server/src/test/resources/InvalidConfigurationTest3.xml
@@ -71,11 +71,11 @@
</remoting-incoming-interceptors>
<connectors>
- <connector name="connector1">tcp://localhost:5445</connector>
+ <connector name="connector1">tcp://localhost:61616</connector>
<connector name="connector2">vm://0</connector>
</connectors>
<acceptors>
- <acceptor name="acceptor1">tcp://localhost:5445</acceptor>
+ <acceptor name="acceptor1">tcp://localhost:61616</acceptor>
<acceptor>vm://0</acceptor>
</acceptors>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/activemq-server/src/test/resources/InvalidConfigurationTest4.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest4.xml b/activemq-server/src/test/resources/InvalidConfigurationTest4.xml
index bce0a2b..21314b0 100644
--- a/activemq-server/src/test/resources/InvalidConfigurationTest4.xml
+++ b/activemq-server/src/test/resources/InvalidConfigurationTest4.xml
@@ -71,11 +71,11 @@
</remoting-incoming-interceptors>
<connectors>
- <connector name="connector1">tcp://localhost:5445</connector>
+ <connector name="connector1">tcp://localhost:61616</connector>
<connector name="connector2">vm://0</connector>
</connectors>
<acceptors>
- <acceptor name="acceptor1">tcp://localhost:5445</acceptor>
+ <acceptor name="acceptor1">tcp://localhost:61616</acceptor>
<acceptor name="acceptor2">vm://0</acceptor>
</acceptors>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/activemq-server/src/test/resources/InvalidConfigurationTest5.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/InvalidConfigurationTest5.xml b/activemq-server/src/test/resources/InvalidConfigurationTest5.xml
index d05d372..3571a14 100644
--- a/activemq-server/src/test/resources/InvalidConfigurationTest5.xml
+++ b/activemq-server/src/test/resources/InvalidConfigurationTest5.xml
@@ -71,11 +71,11 @@
</remoting-incoming-interceptors>
<connectors>
- <connector name="connector1">tcp://localhost:5445</connector>
+ <connector name="connector1">tcp://localhost:61616</connector>
<connector name="connector2">vm://0</connector>
</connectors>
<acceptors>
- <acceptor name="acceptor1">tcp://localhost:5445</acceptor>
+ <acceptor name="acceptor1">tcp://localhost:61616</acceptor>
<acceptor name="acceptor2">vm://0</acceptor>
</acceptors>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/activemq-server/src/test/resources/divertRoutingNameNotRequired.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/divertRoutingNameNotRequired.xml b/activemq-server/src/test/resources/divertRoutingNameNotRequired.xml
index 934d2ee..230021b 100644
--- a/activemq-server/src/test/resources/divertRoutingNameNotRequired.xml
+++ b/activemq-server/src/test/resources/divertRoutingNameNotRequired.xml
@@ -34,17 +34,17 @@
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">tcp://localhost:5445</connector>
+ <connector name="netty-connector">tcp://localhost:61616</connector>
<!-- This connector corresponds to the New York server -->
- <connector name="newyork-connector">tcp://localhost:5446</connector>
+ <connector name="newyork-connector">tcp://localhost:61617</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61616</acceptor>
</acceptors>
<!-- Divert configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/recovery/ActiveMQXAResourceRecovery.java
----------------------------------------------------------------------
diff --git a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/recovery/ActiveMQXAResourceRecovery.java b/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/recovery/ActiveMQXAResourceRecovery.java
index d9f4847..8767aa8 100644
--- a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/recovery/ActiveMQXAResourceRecovery.java
+++ b/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/recovery/ActiveMQXAResourceRecovery.java
@@ -37,13 +37,13 @@ import org.apache.activemq.api.core.TransportConfiguration;
* you'll need something like this if the ActiveMQ Server is remote
* <pre>
* <property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.ACTIVEMQ2"
- * value="org.apache.activemq.jms.server.recovery.ActiveMQXAResourceRecovery;org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost,port=5445"/>
+ * value="org.apache.activemq.jms.server.recovery.ActiveMQXAResourceRecovery;org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost,port=61616"/>
* </pre>
* <p>
* you'll need something like this if the ActiveMQ Server is remote and has failover configured
* <pre>
* <property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.ACTIVEMQ2"
- * value="org.apache.activemq.jms.server.recovery.ActiveMQXAResourceRecovery;org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost,port=5445;org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost2,port=5446"/>
+ * value="org.apache.activemq.jms.server.recovery.ActiveMQXAResourceRecovery;org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost,port=61616;org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost2,port=61617"/>
* </pre>
*
* @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/distribution/activemq/src/main/resources/bin/activemq.conf
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/bin/activemq.conf b/distribution/activemq/src/main/resources/bin/activemq.conf
index e83bb2b..9ac1e18 100644
--- a/distribution/activemq/src/main/resources/bin/activemq.conf
+++ b/distribution/activemq/src/main/resources/bin/activemq.conf
@@ -25,7 +25,7 @@ ACTIVEMQ_DATA_DIR=$ACTIVEMQ_HOME/data
ACTIVEMQ_LOG_MANAGER=org.jboss.logmanager.LogManager
# Cluster Properties: Used to pass arguments to ActiveMQ which can be referenced in activemq-configuration.xml
-#ACTIVEMQ_CLUSTER_PROPS="-Dactivemq.remoting.netty.port=5447"
+#ACTIVEMQ_CLUSTER_PROPS="-Dactivemq.remoting.netty.port=61618"
# Java Opts
JAVA_ARGS="-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M"
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/docs/quickstart-guide/en/examples.md
----------------------------------------------------------------------
diff --git a/docs/quickstart-guide/en/examples.md b/docs/quickstart-guide/en/examples.md
index 5b84747..375df7b 100644
--- a/docs/quickstart-guide/en/examples.md
+++ b/docs/quickstart-guide/en/examples.md
@@ -99,7 +99,7 @@ Type the command `mvn verify` and you should see the following output:
Apr 17, 2013 10:51:02 AM org.apache.activemq.core.server.impl.ActiveMQServerImpl deployQueue
INFO: HQ221003: trying to deploy queue jms.queue.exampleQueue
Apr 17, 2013 10:51:02 AM org.apache.activemq.core.remoting.impl.netty.NettyAcceptor start
- INFO: HQ221020: Started Netty Acceptor version 3.6.2.Final-c0d783c localhost:5445 for CORE protocol
+ INFO: HQ221020: Started Netty Acceptor version 3.6.2.Final-c0d783c localhost:61616 for CORE protocol
Apr 17, 2013 10:51:02 AM org.apache.activemq.core.server.impl.ActiveMQServerImpl$SharedStoreLiveActivation run
INFO: HQ221007: Server is now live
Apr 17, 2013 10:51:02 AM org.apache.activemq.core.server.impl.ActiveMQServerImpl start
@@ -230,7 +230,7 @@ In the shell window you should see something like the following output:
10:58:06,434 INFO [org.jboss.as.remoting] (MSC service thread 1-2) JBAS017100: Listening on localhost.localdomain/127.0.0.1:4447
10:58:06,434 INFO [org.jboss.as.remoting] (MSC service thread 1-15) JBAS017100: Listening on /127.0.0.1:9999
10:58:06,436 INFO [org.jboss.as.server.deployment.scanner] (MSC service thread 1-16) JBAS015012: Started FileSystemDeploymentService for directory /home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/deployments
- 10:58:08,790 INFO [org.apache.activemq.core.remoting.impl.netty.NettyAcceptor] (MSC service thread 1-11) Started Netty Acceptor version 3.2.5.Final-a96d88c localhost.localdomain:5445 for CORE protocol
+ 10:58:08,790 INFO [org.apache.activemq.core.remoting.impl.netty.NettyAcceptor] (MSC service thread 1-11) Started Netty Acceptor version 3.2.5.Final-a96d88c localhost.localdomain:61616 for CORE protocol
10:58:08,793 INFO [org.apache.activemq.core.remoting.impl.netty.NettyAcceptor] (MSC service thread 1-11) Started Netty Acceptor version 3.2.5.Final-a96d88c localhost.localdomain:5455 for CORE protocol
10:58:08,795 INFO [org.apache.activemq.core.server.impl.ActiveMQServerImpl] (MSC service thread 1-11) Server is now live
10:58:08,797 INFO [org.apache.activemq.core.server.impl.ActiveMQServerImpl] (MSC service thread 1-11) ActiveMQ Server version 2.2.13.Final (HQ_2_2_13_FINAL_AS7, 122) [5c499e88-9c63-11e2-bfa3-fe5400591699]) started
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/docs/quickstart-guide/en/running.md
----------------------------------------------------------------------
diff --git a/docs/quickstart-guide/en/running.md b/docs/quickstart-guide/en/running.md
index d12ddf6..715ea92 100644
--- a/docs/quickstart-guide/en/running.md
+++ b/docs/quickstart-guide/en/running.md
@@ -87,8 +87,8 @@ standalone-full.xml configuration by running the command
14:47:44,115 INFO [org.jboss.as.jacorb] (MSC service thread 1-13) JBAS016328: CORBA Naming Service started
14:47:44,345 INFO [org.wildfly.extension.undertow] (MSC service thread 1-3) JBAS018210: Register web context: /activemq-server
14:47:44,361 INFO [org.apache.activemq.core.server] (ServerService Thread Pool -- 58) HQ221020: Started Netty Acceptor version 3.6.6.Final-90e1eb2 127.0.0.1:5455 for CORE protocol
- 14:47:44,362 INFO [org.apache.activemq.core.server] (ServerService Thread Pool -- 58) HQ221020: Started Netty Acceptor version 3.6.6.Final-90e1eb2 127.0.0.1:5445 for CORE protocol
- 14:47:44,364 INFO [org.apache.activemq.core.server] (ServerService Thread Pool -- 58) HQ221020: Started Netty Acceptor version 3.6.6.Final-90e1eb2 org.apache.activemq.default.servlet:5445 for CORE protocol
+ 14:47:44,362 INFO [org.apache.activemq.core.server] (ServerService Thread Pool -- 58) HQ221020: Started Netty Acceptor version 3.6.6.Final-90e1eb2 127.0.0.1:61616 for CORE protocol
+ 14:47:44,364 INFO [org.apache.activemq.core.server] (ServerService Thread Pool -- 58) HQ221020: Started Netty Acceptor version 3.6.6.Final-90e1eb2 org.apache.activemq.default.servlet:61616 for CORE protocol
14:47:44,366 INFO [org.apache.activemq.core.server] (ServerService Thread Pool -- 58) HQ221007: Server is now live
14:47:44,366 INFO [org.apache.activemq.core.server] (ServerService Thread Pool -- 58) HQ221001: ActiveMQ Server version 2.4.0.Beta2 (Andromedian Flyer, 123) [bcc1cd10-2bfb-11e3-ad5f-9f88840f9e1a]
14:47:44,435 INFO [org.jboss.as.messaging] (ServerService Thread Pool -- 58) JBAS011601: Bound messaging object to jndi name java:/ConnectionFactory
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/docs/user-manual/en/client-reconnection.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/client-reconnection.md b/docs/user-manual/en/client-reconnection.md
index e3d4720..d7ceb0d 100644
--- a/docs/user-manual/en/client-reconnection.md
+++ b/docs/user-manual/en/client-reconnection.md
@@ -115,7 +115,7 @@ JMS connection factory instances then you can specify these parameters
in the JNDI context environment in, e.g. `jndi.properties`:
java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
- java.naming.provider.url = tcp://localhost:5445
+ java.naming.provider.url = tcp://localhost:61616
connection.ConnectionFactory.retryInterval=1000
connection.ConnectionFactory.retryIntervalMultiplier=1.5
connection.ConnectionFactory.maxRetryInterval=60000
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/docs/user-manual/en/clusters.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/clusters.md b/docs/user-manual/en/clusters.md
index db1a5a5..1976e96 100644
--- a/docs/user-manual/en/clusters.md
+++ b/docs/user-manual/en/clusters.md
@@ -469,7 +469,7 @@ JMS connection factory instances then you can specify these parameters
in the JNDI context environment in, e.g. `jndi.properties`:
java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
- java.naming.provider.url=tcp://myhost:5445,myhost2:5445
+ java.naming.provider.url=tcp://myhost:61616,myhost2:61616
The `java.naming.provider.url` contains a list of servers to use for the
connection factory. When this connection factory used client application
@@ -485,11 +485,11 @@ connection factory. Here's an example:
``` java
HashMap<String, Object> map = new HashMap<String, Object>();
map.put("host", "myhost");
-map.put("port", "5445");
+map.put("port", "61616");
TransportConfiguration server1 = new TransportConfiguration(NettyConnectorFactory.class.getName(), map);
HashMap<String, Object> map2 = new HashMap<String, Object>();
map2.put("host", "myhost2");
-map2.put("port", "5446");
+map2.put("port", "61617");
TransportConfiguration server2 = new TransportConfiguration(NettyConnectorFactory.class.getName(), map2);
ActiveMQConnectionFactory cf = ActiveMQJMSClient.createConnectionFactoryWithHA(JMSFactoryType.CF, server1, server2);
@@ -502,11 +502,11 @@ If you are using the core API then the same can be done as follows:
``` java
HashMap<String, Object> map = new HashMap<String, Object>();
map.put("host", "myhost");
-map.put("port", "5445");
+map.put("port", "61616");
TransportConfiguration server1 = new TransportConfiguration(NettyConnectorFactory.class.getName(), map);
HashMap<String, Object> map2 = new HashMap<String, Object>();
map2.put("host", "myhost2");
-map2.put("port", "5446");
+map2.put("port", "61617");
TransportConfiguration server2 = new TransportConfiguration(NettyConnectorFactory.class.getName(), map2);
ServerLocator locator = ActiveMQClient.createServerLocatorWithHA(server1, server2);
@@ -846,7 +846,7 @@ in the JNDI context environment in, e.g. `jndi.properties`, to specify
the load balancing policy directly:
java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
- java.naming.provider.url=tcp://localhost:5445
+ java.naming.provider.url=tcp://localhost:61616
connection.ConnectionFactory.loadBalancingPolicyClassName=org.apache.activemq.api.core.client.loadbalance.RandomConnectionLoadBalancingPolicy
The above example would instantiate a JMS connection factory that uses
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/docs/user-manual/en/configuring-transports.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/configuring-transports.md b/docs/user-manual/en/configuring-transports.md
index c79fbff..1b22ad1 100644
--- a/docs/user-manual/en/configuring-transports.md
+++ b/docs/user-manual/en/configuring-transports.md
@@ -14,7 +14,7 @@ One of the most important concepts in ActiveMQ transports is the
defined in xml in the configuration file `activemq-configuration.xml`.
<acceptors>
- <acceptor name="netty">tcp://localhost:5446</acceptor>
+ <acceptor name="netty">tcp://localhost:61617</acceptor>
</acceptors>
Acceptors are always defined inside an `acceptors` element. There can be
@@ -26,7 +26,7 @@ ActiveMQ server.
In the above example we're defining an acceptor that uses
[Netty](http://netty.io/) to listen for connections at port
-`5446`.
+`61617`.
The `acceptor` element contains a `URI` that defines the kind of Acceptor
to create along with its configuration. The `schema` part of the `URI`
@@ -41,7 +41,7 @@ valid key-value pairs depends on the specific transport be used and are
passed straight through to the underlying transport. These are set on the
`URI` as part of the query, like so:
- <acceptor name="netty">tcp://localhost:5446?sslEnabled=true;key-store-path=/path</acceptor>
+ <acceptor name="netty">tcp://localhost:61617?sslEnabled=true;key-store-path=/path</acceptor>
## Understanding Connectors
@@ -53,7 +53,7 @@ Let's look at a connector defined in our `activemq-configuration.xml`
file:
<connectors>
- <connector name="netty">tcp://localhost:5446</connector>
+ <connector name="netty">tcp://localhost:61617</connector>
</connectors>
Connectors can be defined inside a `connectors` element. There can be
@@ -82,7 +82,7 @@ couple of reasons for this:
simple example:
java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
- connectionFactory.MyConnectionFactory=tcp://myhost:5445
+ connectionFactory.MyConnectionFactory=tcp://myhost:61616
## Configuring the transport directly from the client side.
@@ -98,13 +98,13 @@ configuration, instead we just create the parameters and tell the
Here's an example of creating a `ClientSessionFactory` which will
connect directly to the acceptor we defined earlier in this chapter, it
uses the standard Netty TCP transport and will try and connect on port
-5446 to localhost (default):
+61617 to localhost (default):
``` java
Map<String, Object> connectionParams = new HashMap<String, Object>();
connectionParams.put(org.apache.activemq.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME,
- 5446);
+ 61617);
TransportConfiguration transportConfiguration =
new TransportConfiguration(
@@ -127,7 +127,7 @@ on the server side or define a connection factory in `activemq-jms.xml`:
``` java
Map<String, Object> connectionParams = new HashMap<String, Object>();
-connectionParams.put(org.apache.activemq.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, 5446);
+connectionParams.put(org.apache.activemq.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, 61617);
TransportConfiguration transportConfiguration =
new TransportConfiguration(
@@ -164,7 +164,7 @@ Sockets are being used and also use the appropriate decoders
It is possible to limit which protocols are supported by using the
`protocols` parameter on the Acceptor like so:
- <connector name="netty">tcp://localhost:5446?protocols=CORE,AMQP</connector>
+ <connector name="netty">tcp://localhost:61617?protocols=CORE,AMQP</connector>
> **Note**
@@ -232,7 +232,7 @@ Netty for simple TCP:
- `port`. This specified the port to connect to (when configuring a
connector) or to listen on (when configuring an acceptor). The
- default value for this property is `5445`.
+ default value for this property is `61616`.
- `tcpNoDelay`. If this is `true` then [Nagle's
algorithm](http://en.wikipedia.org/wiki/Nagle%27s_algorithm) will be
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/docs/user-manual/en/flow-control.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/flow-control.md b/docs/user-manual/en/flow-control.md
index 46ce823..0bff66e 100644
--- a/docs/user-manual/en/flow-control.md
+++ b/docs/user-manual/en/flow-control.md
@@ -102,7 +102,7 @@ environment, e.g. `jndi.properties`. Here's a simple example using the
by default:
java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
- java.naming.provider.url=tcp://localhost:5445
+ java.naming.provider.url=tcp://localhost:61616
connection.ConnectionFactory.consumerWindowSize=0
If the connection factory is directly instantiated, the consumer window
@@ -140,7 +140,7 @@ max rate can be configured in the JNDI context environment, e.g.
connection factory which is available in the context by default:
java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
- java.naming.provider.url=tcp://localhost:5445
+ java.naming.provider.url=tcp://localhost:61616
connection.ConnectionFactory.consumerMaxRate=10
If the connection factory is directly instantiated, the max rate size
@@ -194,7 +194,7 @@ e.g. `jndi.properties`. Here's a simple example using the
by default:
java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
- java.naming.provider.url=tcp://localhost:5445
+ java.naming.provider.url=tcp://localhost:61616
connection.ConnectionFactory.producerWindowSize=10
If the connection factory is directly instantiated, the producer window
@@ -289,7 +289,7 @@ max rate size can be configured in the JNDI context environment, e.g.
connection factory which is available in the context by default:
java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
- java.naming.provider.url=tcp://localhost:5445
+ java.naming.provider.url=tcp://localhost:61616
connection.ConnectionFactory.producerMaxRate=10
If the connection factory is directly instantiated, the max rate size
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/docs/user-manual/en/ha.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/ha.md b/docs/user-manual/en/ha.md
index 69b830a..7ff5675 100644
--- a/docs/user-manual/en/ha.md
+++ b/docs/user-manual/en/ha.md
@@ -594,7 +594,7 @@ replication as in the previous chapter. `shared-store` is also supported
If the HA Policy is colocated then connectors and acceptors will be
inherited from the live server creating it and offset depending on the
setting of `backup-port-offset` configuration element. If this is set to
-say 100 (which is the default) and a connector is using port 5445 then
+say 100 (which is the default) and a connector is using port 61616 then
this will be set to 5545 for the first server created, 5645 for the
second and so on.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/docs/user-manual/en/large-messages.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/large-messages.md b/docs/user-manual/en/large-messages.md
index e26ae6b..2919385 100644
--- a/docs/user-manual/en/large-messages.md
+++ b/docs/user-manual/en/large-messages.md
@@ -86,7 +86,7 @@ environment, e.g. `jndi.properties`. Here's a simple example using the
by default:
java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
- java.naming.provider.url=tcp://localhost:5445
+ java.naming.provider.url=tcp://localhost:61616
connection.ConnectionFactory.minLargeMessageSize=250000
@@ -122,7 +122,7 @@ e.g. `jndi.properties`. Here's a simple example using the
by default:
java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
- java.naming.provider.url=tcp://localhost:5445
+ java.naming.provider.url=tcp://localhost:61616
connection.ConnectionFactory.compressLargeMessages=true
## Streaming large messages
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/docs/user-manual/en/message-grouping.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/message-grouping.md b/docs/user-manual/en/message-grouping.md
index a9f27ef..80ab40b 100644
--- a/docs/user-manual/en/message-grouping.md
+++ b/docs/user-manual/en/message-grouping.md
@@ -68,7 +68,7 @@ Here's a simple example using the "ConnectionFactory" connection factory
which is available in the context by default
java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
- java.naming.provider.url=tcp://localhost:5445
+ java.naming.provider.url=tcp://localhost:61616
connection.ConnectionFactory.autoGroup=true
Alternatively you can set the group id via the connection factory. All
@@ -79,7 +79,7 @@ Here's a simple example using the "ConnectionFactory" connection factory
which is available in the context by default:
java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
- java.naming.provider.url=tcp://localhost:5445
+ java.naming.provider.url=tcp://localhost:61616
connection.ConnectionFactory.groupID=Group-0
## Example
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/docs/user-manual/en/pre-acknowledge.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/pre-acknowledge.md b/docs/user-manual/en/pre-acknowledge.md
index 388183a..e55a240 100644
--- a/docs/user-manual/en/pre-acknowledge.md
+++ b/docs/user-manual/en/pre-acknowledge.md
@@ -46,7 +46,7 @@ This can be configured in a client's JNDI context environment, e.g.
`jndi.properties`, like this:
java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
- java.naming.provider.url=tcp://localhost:5445
+ java.naming.provider.url=tcp://localhost:61616
connection.ConnectionFactory.preAcknowledge=true
Alternatively, to use pre-acknowledgement mode using the JMS API, create
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/docs/user-manual/en/thread-pooling.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/thread-pooling.md b/docs/user-manual/en/thread-pooling.md
index 4a7613e..fe94e0c 100644
--- a/docs/user-manual/en/thread-pooling.md
+++ b/docs/user-manual/en/thread-pooling.md
@@ -150,7 +150,7 @@ by default:
java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
- java.naming.provider.url=tcp://localhost:5445
+ java.naming.provider.url=tcp://localhost:61616
connection.ConnectionFactory.useGlobalPools=false
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/docs/user-manual/en/tools.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/tools.md b/docs/user-manual/en/tools.md
index cb18451..5427c87 100644
--- a/docs/user-manual/en/tools.md
+++ b/docs/user-manual/en/tools.md
@@ -78,7 +78,7 @@ by eliminating the need so specify a classpath. These tools are:
Here's an example:
- java -jar activemq-tools-<version>-jar-with-dependencies.jar import /home/user/exportData.xml 127.0.0.1 5445 false false
+ java -jar activemq-tools-<version>-jar-with-dependencies.jar import /home/user/exportData.xml 127.0.0.1 61616 false false
Like the `export` tool the `import` tool is single threaded so
depending on the size of the XML file it may take awhile for the
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/docs/user-manual/en/using-jms.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/using-jms.md b/docs/user-manual/en/using-jms.md
index 81aac79..7fa536e 100644
--- a/docs/user-manual/en/using-jms.md
+++ b/docs/user-manual/en/using-jms.md
@@ -99,15 +99,15 @@ Here is a list of all the supported URL schemes:
Most clients won't be connecting to an embedded broker. Clients will
most commonly connect across a network a remote broker. Here's a simple
example of a client configuring a connection factory to connect to a
-remote broker running on myhost:5445:
+remote broker running on myhost:61616:
java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
- connectionFactory.ConnectionFactory=tcp://myhost:5445
+ connectionFactory.ConnectionFactory=tcp://myhost:61616
In the example above the client is using the `tcp` scheme for the
provider URL. A client may also specify multiple comma-delimited
host:port combinations in the URL (e.g.
-`(tcp://remote-host1:5445,remote-host2:5445)`). Whether there is one or
+`(tcp://remote-host1:61616,remote-host2:61616)`). Whether there is one or
many host:port combinations in the URL they are treated as the *initial
connector(s)* for the underlying connection.
@@ -120,7 +120,7 @@ traditional URL query string format (e.g.
`scheme://host:port?key1=value1&key2=value2`) to customize the
underlying transport mechanism. For example, if a client wanted to
connect to a remote server using TCP and SSL it would create a connection
-factory like so, `tcp://remote-host:5445?ssl-enabled=true`.
+factory like so, `tcp://remote-host:61616?ssl-enabled=true`.
All the properties available for the `tcp` scheme are described in [the
documentation regarding the Netty
@@ -130,7 +130,7 @@ Note if you are using the `tcp` scheme and multiple addresses then a query
can be applied to all the url's or just to an individual connector, so where
you have
-- `(tcp://remote-host1:5445?httpEnabled=true,remote-host2:5445?httpEnabled=true)?clientID=1234`
+- `(tcp://remote-host1:61616?httpEnabled=true,remote-host2:61616?httpEnabled=true)?clientID=1234`
then the `httpEnabled` property is only set on the individual connectors where as the `clientId`
is set on the actual connection factory. Any connector specific properties set on the whole
@@ -181,7 +181,7 @@ The default type for the default connection factory is of type `javax.jms.Connec
This can be changed by setting the type like so
java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
- java.naming.provider.url=tcp://localhost:5445?type=CF
+ java.naming.provider.url=tcp://localhost:61616?type=CF
In this example it is still set to the default, below shows a list of types that can be set.
@@ -233,7 +233,7 @@ And if the client wanted to bind this queue to "queues/OrderQueue" then
the JNDI properties would be configured like so:
java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
- java.naming.provider.url=tcp://myhost:5445
+ java.naming.provider.url=tcp://myhost:61616
queue.queues/OrderQueue=OrderQueue
It is also possible to look-up JMS destinations which haven't been
@@ -256,7 +256,7 @@ initialized using those properties:
InitialContext ic = new InitialContext();
//Now we'll look up the connection factory from which we can create
-//connections to myhost:5445:
+//connections to myhost:61616:
ConnectionFactory cf = (ConnectionFactory)ic.lookup("ConnectionFactory");
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/docs/user-manual/en/using-server.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/using-server.md b/docs/user-manual/en/using-server.md
index 5b62c15..35d1fdc 100644
--- a/docs/user-manual/en/using-server.md
+++ b/docs/user-manual/en/using-server.md
@@ -97,12 +97,12 @@ It is also possible to use system property substitution in all the
configuration files. by replacing a value with the name of a system
property. Here is an example of this with a connector configuration:
- <connector name="netty">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5445}</connector>
+ <connector name="netty">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:61616}</connector>
Here you can see we have replaced 2 values with system properties
`activemq.remoting.netty.host` and `activemq.remoting.netty.port`. These
values will be replaced by the value found in the system property if
-there is one, if not they default back to localhost or 5445
+there is one, if not they default back to localhost or 61616
respectively. It is also possible to not supply a default. i.e.
`${activemq.remoting.netty.host}`, however the system property *must* be
supplied in that case.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/core/embedded-remote/src/main/java/org/apache/activemq/core/example/EmbeddedRemoteExample.java
----------------------------------------------------------------------
diff --git a/examples/core/embedded-remote/src/main/java/org/apache/activemq/core/example/EmbeddedRemoteExample.java b/examples/core/embedded-remote/src/main/java/org/apache/activemq/core/example/EmbeddedRemoteExample.java
index 97dfc57..9842615 100644
--- a/examples/core/embedded-remote/src/main/java/org/apache/activemq/core/example/EmbeddedRemoteExample.java
+++ b/examples/core/embedded-remote/src/main/java/org/apache/activemq/core/example/EmbeddedRemoteExample.java
@@ -54,7 +54,7 @@ public class EmbeddedRemoteExample
*/
Map<String,Object> map = new HashMap<String,Object>();
map.put("host", "localhost");
- map.put("port", 5445);
+ map.put("port", 61616);
// -------------------------------------------------------
ServerLocator serverLocator = ActiveMQClient.createServerLocatorWithoutHA(new TransportConfiguration(NettyConnectorFactory.class.getName(), map));
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/core/embedded-remote/src/main/java/org/apache/activemq/core/example/EmbeddedServer.java
----------------------------------------------------------------------
diff --git a/examples/core/embedded-remote/src/main/java/org/apache/activemq/core/example/EmbeddedServer.java b/examples/core/embedded-remote/src/main/java/org/apache/activemq/core/example/EmbeddedServer.java
index 945696f..ccf8975 100644
--- a/examples/core/embedded-remote/src/main/java/org/apache/activemq/core/example/EmbeddedServer.java
+++ b/examples/core/embedded-remote/src/main/java/org/apache/activemq/core/example/EmbeddedServer.java
@@ -51,7 +51,7 @@ public class EmbeddedServer
*/
Map<String, Object> map = new HashMap<String, Object>();
map.put("host", "localhost");
- map.put("port", 5445);
+ map.put("port", 61616);
TransportConfiguration transpConf = new TransportConfiguration(NettyAcceptorFactory.class.getName(),map);
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/core/perf/perf.properties
----------------------------------------------------------------------
diff --git a/examples/core/perf/perf.properties b/examples/core/perf/perf.properties
index b4b3b09..9a53c8b 100644
--- a/examples/core/perf/perf.properties
+++ b/examples/core/perf/perf.properties
@@ -26,7 +26,7 @@ throttle-rate=-1
address=perfAddress
queue-name=perfQueue
host=localhost
-port=5445
+port=61616
tcp-buffer=2048576
tcp-no-delay=false
confirmation-window=1048576
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/core/perf/src/main/resources/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/core/perf/src/main/resources/server0/activemq-configuration.xml b/examples/core/perf/src/main/resources/server0/activemq-configuration.xml
index d91759d..842ef3f 100644
--- a/examples/core/perf/src/main/resources/server0/activemq-configuration.xml
+++ b/examples/core/perf/src/main/resources/server0/activemq-configuration.xml
@@ -31,7 +31,7 @@ under the License.
<paging-directory>target/server0/data/messaging/paging</paging-directory>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5445?tcpNoDelay=false;tcpSendBufferSize=1048576;tcpReceiveBufferSize=1048576</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61616?tcpNoDelay=false;tcpSendBufferSize=1048576;tcpReceiveBufferSize=1048576</acceptor>
</acceptors>
<security-enabled>false</security-enabled>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/core/perf/src/main/resources/server0/hornetq-configuration-messaging-lab.xml
----------------------------------------------------------------------
diff --git a/examples/core/perf/src/main/resources/server0/hornetq-configuration-messaging-lab.xml b/examples/core/perf/src/main/resources/server0/hornetq-configuration-messaging-lab.xml
index 970f9a5..ce83e85 100644
--- a/examples/core/perf/src/main/resources/server0/hornetq-configuration-messaging-lab.xml
+++ b/examples/core/perf/src/main/resources/server0/hornetq-configuration-messaging-lab.xml
@@ -31,7 +31,7 @@ under the License.
<paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://172.16.8.10:5445?tcpNoDelay=false;tcpSendBufferSize=1048576;tcpReceiveBufferSize=1048576</acceptor>
+ <acceptor name="netty-acceptor">tcp://172.16.8.10:61616?tcpNoDelay=false;tcpSendBufferSize=1048576;tcpReceiveBufferSize=1048576</acceptor>
</acceptors>
<security-enabled>false</security-enabled>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/core/vertx-connector/src/main/resources/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/core/vertx-connector/src/main/resources/server0/activemq-configuration.xml b/examples/core/vertx-connector/src/main/resources/server0/activemq-configuration.xml
index c9e48ec..bef7764 100644
--- a/examples/core/vertx-connector/src/main/resources/server0/activemq-configuration.xml
+++ b/examples/core/vertx-connector/src/main/resources/server0/activemq-configuration.xml
@@ -36,12 +36,12 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">tcp://localhost:5445</connector>
+ <connector name="netty-connector">tcp://localhost:61616</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61616</acceptor>
</acceptors>
<!-- Other config -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/activemq-jms-examples-common/src/main/java/org/apache/activemq/common/example/ActiveMQExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/activemq-jms-examples-common/src/main/java/org/apache/activemq/common/example/ActiveMQExample.java b/examples/jms/activemq-jms-examples-common/src/main/java/org/apache/activemq/common/example/ActiveMQExample.java
index 6527893..fcfbfc4 100644
--- a/examples/jms/activemq-jms-examples-common/src/main/java/org/apache/activemq/common/example/ActiveMQExample.java
+++ b/examples/jms/activemq-jms-examples-common/src/main/java/org/apache/activemq/common/example/ActiveMQExample.java
@@ -159,7 +159,7 @@ public abstract class ActiveMQExample
{
HashMap<String, Object> params = new HashMap<String, Object>();
params.put("host", "localhost");
- params.put("port", 5445 + id);
+ params.put("port", 61616 + id);
TransportConfiguration transportConfiguration = new TransportConfiguration(NettyConnectorFactory.class.getName(), params);
ActiveMQConnectionFactory cf = ActiveMQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, transportConfiguration);
cf.createConnection().close();
@@ -180,7 +180,7 @@ public abstract class ActiveMQExample
ClientSession session = ((ActiveMQConnection) connection).getInitialSession();
TransportConfiguration transportConfiguration = session.getSessionFactory().getConnectorConfiguration();
String port = (String) transportConfiguration.getParams().get("port");
- return Integer.valueOf(port) - 5445;
+ return Integer.valueOf(port) - 61616;
}
protected Connection getServerConnection(int server, Connection... connections)
@@ -190,7 +190,7 @@ public abstract class ActiveMQExample
ClientSession session = ((ActiveMQConnection) connection).getInitialSession();
TransportConfiguration transportConfiguration = session.getSessionFactory().getConnectorConfiguration();
String port = (String) transportConfiguration.getParams().get("port");
- if(Integer.valueOf(port) == server + 5445)
+ if(Integer.valueOf(port) == server + 61616)
{
return connection;
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/activemq-ra-rar/src/main/resources/ra.xml
----------------------------------------------------------------------
diff --git a/examples/jms/activemq-ra-rar/src/main/resources/ra.xml b/examples/jms/activemq-ra-rar/src/main/resources/ra.xml
index f24a30c..c21311c 100644
--- a/examples/jms/activemq-ra-rar/src/main/resources/ra.xml
+++ b/examples/jms/activemq-ra-rar/src/main/resources/ra.xml
@@ -48,7 +48,7 @@
</config-property>
<config-property>
<description>The transport configuration. These values must be in the form of key=val;key=val;,
- if multiple connectors are used then each set must be separated by a comma i.e. host=host1;port=5445,host=host2;port=5446.
+ if multiple connectors are used then each set must be separated by a comma i.e. host=host1;port=61616,host=host2;port=61617.
Each set of params maps to the connector classname specified.
</description>
<config-property-name>ConnectionParameters</config-property-name>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/aerogear/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/aerogear/pom.xml b/examples/jms/aerogear/pom.xml
index 0004bc0..d395c2e 100644
--- a/examples/jms/aerogear/pom.xml
+++ b/examples/jms/aerogear/pom.xml
@@ -90,7 +90,7 @@ under the License.
<configuration>
<clientClass>org.apache.activemq.jms.example.AerogearExample</clientClass>
<args>
- <param>tcp://localhost:5445</param>
+ <param>tcp://localhost:61616</param>
</args>
</configuration>
</execution>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/aerogear/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/aerogear/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/aerogear/src/main/resources/activemq/server0/activemq-configuration.xml
index dcb6d17..5853529 100644
--- a/examples/jms/aerogear/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/aerogear/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -39,7 +39,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61616</acceptor>
</acceptors>
<!-- We need to create a core queue for the JMS queue explicitly because the connector will be deployed
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/aerogear/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/aerogear/src/main/resources/jndi.properties b/examples/jms/aerogear/src/main/resources/jndi.properties
index 85eda3d..1cb3686 100644
--- a/examples/jms/aerogear/src/main/resources/jndi.properties
+++ b/examples/jms/aerogear/src/main/resources/jndi.properties
@@ -16,5 +16,5 @@
# under the License.
java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
-connectionFactory.ConnectionFactory=tcp://localhost:5445
+connectionFactory.ConnectionFactory=tcp://localhost:61616
queue.queue/exampleQueue=exampleQueue
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/applet/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/applet/pom.xml b/examples/jms/applet/pom.xml
index f9564e3..3b63af8 100644
--- a/examples/jms/applet/pom.xml
+++ b/examples/jms/applet/pom.xml
@@ -71,7 +71,7 @@ under the License.
<configuration>
<clientClass>org.apache.activemq.jms.example.AppletExample</clientClass>
<args>
- <param>tcp://localhost:5445</param>
+ <param>tcp://localhost:61616</param>
</args>
<systemProperties>
<property>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/applet/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/applet/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/applet/src/main/resources/activemq/server0/activemq-configuration.xml
index 3d7c79a..d885047 100644
--- a/examples/jms/applet/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/applet/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -39,7 +39,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61616</acceptor>
</acceptors>
<!-- Other config -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/application-layer-failover/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/application-layer-failover/pom.xml b/examples/jms/application-layer-failover/pom.xml
index 0f24886..e87947b 100644
--- a/examples/jms/application-layer-failover/pom.xml
+++ b/examples/jms/application-layer-failover/pom.xml
@@ -78,8 +78,8 @@ under the License.
<configuration>
<clientClass>org.apache.activemq.jms.example.ApplicationLayerFailoverExample</clientClass>
<args>
- <param>tcp://localhost:5445</param>
- <param>tcp://localhost:5446</param>
+ <param>tcp://localhost:61616</param>
+ <param>tcp://localhost:61617</param>
</args>
<systemProperties>
<property>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/application-layer-failover/src/main/java/org/apache/activemq/jms/example/ApplicationLayerFailoverExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/application-layer-failover/src/main/java/org/apache/activemq/jms/example/ApplicationLayerFailoverExample.java b/examples/jms/application-layer-failover/src/main/java/org/apache/activemq/jms/example/ApplicationLayerFailoverExample.java
index 98373ac..9051ba7 100644
--- a/examples/jms/application-layer-failover/src/main/java/org/apache/activemq/jms/example/ApplicationLayerFailoverExample.java
+++ b/examples/jms/application-layer-failover/src/main/java/org/apache/activemq/jms/example/ApplicationLayerFailoverExample.java
@@ -154,7 +154,7 @@ public class ApplicationLayerFailoverExample extends ActiveMQExample
// Step 1. Get an initial context for looking up JNDI from the server
Hashtable<String, Object> properties = new Hashtable<String, Object>();
properties.put("java.naming.factory.initial", "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
- properties.put("connectionFactory.ConnectionFactory", "tcp://127.0.0.1:" + (5445 + server));
+ properties.put("connectionFactory.ConnectionFactory", "tcp://127.0.0.1:" + (61616 + server));
properties.put("queue.queue/exampleQueue", "exampleQueue");
initialContext = new InitialContext(properties);
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/application-layer-failover/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/application-layer-failover/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/application-layer-failover/src/main/resources/activemq/server0/activemq-configuration.xml
index 0348796..2b2b61f 100644
--- a/examples/jms/application-layer-failover/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/application-layer-failover/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -29,7 +29,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61616</acceptor>
</acceptors>
<!-- Other config -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/application-layer-failover/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/application-layer-failover/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/application-layer-failover/src/main/resources/activemq/server1/activemq-configuration.xml
index 3dd991d..4230f2d 100644
--- a/examples/jms/application-layer-failover/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/application-layer-failover/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -32,7 +32,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61617</acceptor>
</acceptors>
<!-- Other config -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/bridge/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/bridge/pom.xml b/examples/jms/bridge/pom.xml
index 31fde74..9392292 100644
--- a/examples/jms/bridge/pom.xml
+++ b/examples/jms/bridge/pom.xml
@@ -82,8 +82,8 @@ under the License.
<configuration>
<clientClass>org.apache.activemq.jms.example.BridgeExample</clientClass>
<args>
- <param>tcp://localhost:5445</param>
- <param>tcp://localhost:5446</param>
+ <param>tcp://localhost:61616</param>
+ <param>tcp://localhost:61617</param>
</args>
<systemProperties>
<property>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/bridge/src/main/java/org/apache/activemq/jms/example/BridgeExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/bridge/src/main/java/org/apache/activemq/jms/example/BridgeExample.java b/examples/jms/bridge/src/main/java/org/apache/activemq/jms/example/BridgeExample.java
index 502a3e8..45d3951 100644
--- a/examples/jms/bridge/src/main/java/org/apache/activemq/jms/example/BridgeExample.java
+++ b/examples/jms/bridge/src/main/java/org/apache/activemq/jms/example/BridgeExample.java
@@ -59,7 +59,7 @@ public class BridgeExample extends ActiveMQExample
Hashtable<String, Object> properties = new Hashtable<String, Object>();
properties.put("java.naming.factory.initial", "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
- properties.put("connectionFactory.ConnectionFactory", "tcp://127.0.0.1:5445");
+ properties.put("connectionFactory.ConnectionFactory", "tcp://127.0.0.1:61616");
properties.put("queue.queue/sausage-factory", "sausage-factory");
ic0 = new InitialContext(properties);
@@ -75,7 +75,7 @@ public class BridgeExample extends ActiveMQExample
properties = new Hashtable<String, Object>();
properties.put("java.naming.factory.initial", "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
- properties.put("connectionFactory.ConnectionFactory", "tcp://127.0.0.1:5446");
+ properties.put("connectionFactory.ConnectionFactory", "tcp://127.0.0.1:61617");
properties.put("queue.queue/mincing-machine", "mincing-machine");
ic1 = new InitialContext(properties);
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/bridge/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/bridge/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/bridge/src/main/resources/activemq/server0/activemq-configuration.xml
index c20cdba..9f06f6c 100644
--- a/examples/jms/bridge/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/bridge/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -39,12 +39,12 @@ under the License.
<!-- Connectors -->
<connectors>
<!-- Connector to the other node -->
- <connector name="remote-connector">tcp://localhost:5446</connector>
+ <connector name="remote-connector">tcp://localhost:61617</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61616</acceptor>
</acceptors>
<!-- We need to create a core queue for the JMS queue explicitly because the bridge will be deployed