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:50 UTC
[1/8] activemq-6 git commit: ACTIVEMQ6-82 activemq.conf file for
runtime opts
Repository: activemq-6
Updated Branches:
refs/heads/master 323337148 -> e52622cff
ACTIVEMQ6-82 activemq.conf file for runtime opts
Linux support only. Allows users to define java args and a number of other
runtime configuration parameters outside of the run scripts. This will
be followed up with support for cmd.
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/2b71aa13
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/2b71aa13
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/2b71aa13
Branch: refs/heads/master
Commit: 2b71aa13e863e92d865aa40bde776cee42ad1bb4
Parents: 57d02ab
Author: Martyn Taylor <mt...@redhat.com>
Authored: Tue Feb 24 12:08:08 2015 +0000
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Tue Feb 24 15:07:05 2015 +0000
----------------------------------------------------------------------
.../activemq/src/main/resources/bin/activemq | 4 +--
.../src/main/resources/bin/activemq.conf | 34 ++++++++++++++++++++
2 files changed, 36 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/2b71aa13/distribution/activemq/src/main/resources/bin/activemq
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/bin/activemq b/distribution/activemq/src/main/resources/bin/activemq
index e4ee3da..141f110 100755
--- a/distribution/activemq/src/main/resources/bin/activemq
+++ b/distribution/activemq/src/main/resources/bin/activemq
@@ -95,8 +95,8 @@ for i in `ls $ACTIVEMQ_HOME/lib/*.jar`; do
CLASSPATH=$i:$CLASSPATH
done
+source $ACTIVEMQ_HOME/bin/activemq.conf
-JAVA_ARGS="-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M -Dactivemq.home=$ACTIVEMQ_HOME -Ddata.dir=$ACTIVEMQ_HOME/data -Djava.util.logging.manager=org.jboss.logmanager.LogManager -Dlogging.configuration=file:$ACTIVEMQ_HOME/config/logging.properties -Djava.library.path=$ACTIVEMQ_HOME/bin/lib/linux-i686:$ACTIVEMQ_HOME/bin/lib/linux-x86_64"
-#JAVA_ARGS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005"
+JAVA_ARGS="$JAVA_ARGS $ACTIVEMQ_CLUSTER_PROPS -Dactivemq.home=$ACTIVEMQ_HOME -Djava.library.path=$ACTIVEMQ_HOME/bin/lib/linux-i686:$ACTIVEMQ_HOME/bin/lib/linux-x86_64 -Ddata.dir=$ACTIVEMQ_DATA_DIR -Djava.util.logging.manager=$ACTIVEMQ_LOG_MANAGER -Dlogging.configuration=$ACTIVEMQ_LOGGING_CONF $DEBUG_ARGS"
exec "$JAVACMD" $JAVA_ARGS -classpath $CLASSPATH org.apache.activemq.cli.ActiveMQ $@
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/2b71aa13/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
new file mode 100644
index 0000000..e83bb2b
--- /dev/null
+++ b/distribution/activemq/src/main/resources/bin/activemq.conf
@@ -0,0 +1,34 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# Path to logging configuration file
+ACTIVEMQ_LOGGING_CONF="file:$ACTIVEMQ_HOME/config/logging.properties"
+
+# Path to data directory
+ACTIVEMQ_DATA_DIR=$ACTIVEMQ_HOME/data
+
+# Log manager class
+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"
+
+# Java Opts
+JAVA_ARGS="-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M"
+
+# Debug args: Uncomment to enable debug
+#DEBUG_ARGS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005"
[5/8] activemq-6 git commit: Replace all references of port 5445 with
61616
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/activemq-configuration.xml
index e833e20..2fa4eb8 100644
--- a/examples/jms/jms-completion-listener/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/jms-completion-listener/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/jms-completion-listener/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/jms-completion-listener/src/main/resources/jndi.properties b/examples/jms/jms-completion-listener/src/main/resources/jndi.properties
index 85eda3d..1cb3686 100644
--- a/examples/jms/jms-completion-listener/src/main/resources/jndi.properties
+++ b/examples/jms/jms-completion-listener/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/jms-context/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-context/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/jms-context/src/main/resources/activemq/server0/activemq-configuration.xml
index e833e20..2fa4eb8 100644
--- a/examples/jms/jms-context/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/jms-context/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/jms-context/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/jms-context/src/main/resources/jndi.properties b/examples/jms/jms-context/src/main/resources/jndi.properties
index 85eda3d..1cb3686 100644
--- a/examples/jms/jms-context/src/main/resources/jndi.properties
+++ b/examples/jms/jms-context/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/jms-shared-consumer/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-shared-consumer/pom.xml b/examples/jms/jms-shared-consumer/pom.xml
index 593791b..6aa4679 100644
--- a/examples/jms/jms-shared-consumer/pom.xml
+++ b/examples/jms/jms-shared-consumer/pom.xml
@@ -72,7 +72,7 @@ under the License.
<configuration>
<clientClass>org.apache.activemq.jms.example.JMSSharedConsumerExample</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/jms-shared-consumer/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-configuration.xml
index bd07b67..6b3cef3 100644
--- a/examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/jms-shared-consumer/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/jms-shared-consumer/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/jms-shared-consumer/src/main/resources/jndi.properties b/examples/jms/jms-shared-consumer/src/main/resources/jndi.properties
index 9c96675..09611dc 100644
--- a/examples/jms/jms-shared-consumer/src/main/resources/jndi.properties
+++ b/examples/jms/jms-shared-consumer/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
topic.topic/exampleTopic=exampleTopic
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/jmx/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jmx/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/jmx/src/main/resources/activemq/server0/activemq-configuration.xml
index bd47d9c..c70bcb9 100644
--- a/examples/jms/jmx/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/jmx/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -43,7 +43,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty">tcp://localhost:5445</acceptor>
+ <acceptor name="netty">tcp://localhost:61616</acceptor>
</acceptors>
<!-- Other config -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/jmx/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/jmx/src/main/resources/jndi.properties b/examples/jms/jmx/src/main/resources/jndi.properties
index 85eda3d..1cb3686 100644
--- a/examples/jms/jmx/src/main/resources/jndi.properties
+++ b/examples/jms/jmx/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/large-message/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/large-message/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/large-message/src/main/resources/activemq/server0/activemq-configuration.xml
index e833e20..2fa4eb8 100644
--- a/examples/jms/large-message/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/large-message/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/large-message/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/large-message/src/main/resources/jndi.properties b/examples/jms/large-message/src/main/resources/jndi.properties
index 85eda3d..1cb3686 100644
--- a/examples/jms/large-message/src/main/resources/jndi.properties
+++ b/examples/jms/large-message/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/last-value-queue/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/last-value-queue/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/last-value-queue/src/main/resources/activemq/server0/activemq-configuration.xml
index 19ed6b8..a00a58b 100644
--- a/examples/jms/last-value-queue/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/last-value-queue/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/last-value-queue/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/last-value-queue/src/main/resources/jndi.properties b/examples/jms/last-value-queue/src/main/resources/jndi.properties
index 85eda3d..1cb3686 100644
--- a/examples/jms/last-value-queue/src/main/resources/jndi.properties
+++ b/examples/jms/last-value-queue/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/management-notifications/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-configuration.xml
index fd12ee3..4a532d3 100644
--- a/examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/management-notifications/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -45,7 +45,7 @@ under the License.
<!-- Netty standard TCP acceptor -->
<acceptors>
- <acceptor name="netty">tcp://localhost:5445</acceptor>
+ <acceptor name="netty">tcp://localhost:61616</acceptor>
</acceptors>
<!-- Other configs -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/management-notifications/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/management-notifications/src/main/resources/jndi.properties b/examples/jms/management-notifications/src/main/resources/jndi.properties
index a9953c3..474a7c3 100644
--- a/examples/jms/management-notifications/src/main/resources/jndi.properties
+++ b/examples/jms/management-notifications/src/main/resources/jndi.properties
@@ -16,6 +16,6 @@
# 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
topic.topic/notificationsTopic=notificationsTopic
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/management/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/management/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/management/src/main/resources/activemq/server0/activemq-configuration.xml
index 0aec9a6..3db6d3e 100644
--- a/examples/jms/management/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/management/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -42,7 +42,7 @@ under the License.
<!-- Netty standard TCP acceptor -->
<acceptors>
- <acceptor name="netty">tcp://localhost:5445</acceptor>
+ <acceptor name="netty">tcp://localhost:61616</acceptor>
</acceptors>
<security-settings>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/management/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/management/src/main/resources/jndi.properties b/examples/jms/management/src/main/resources/jndi.properties
index 85eda3d..1cb3686 100644
--- a/examples/jms/management/src/main/resources/jndi.properties
+++ b/examples/jms/management/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/message-counters/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-counters/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/message-counters/src/main/resources/activemq/server0/activemq-configuration.xml
index ea8b41c..7578f2b 100644
--- a/examples/jms/message-counters/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/message-counters/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -48,7 +48,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/message-counters/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/message-counters/src/main/resources/jndi.properties b/examples/jms/message-counters/src/main/resources/jndi.properties
index 82edb2e..91e4c81 100644
--- a/examples/jms/message-counters/src/main/resources/jndi.properties
+++ b/examples/jms/message-counters/src/main/resources/jndi.properties
@@ -16,6 +16,6 @@
# 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
queue.queue/expiryQueue=expiryQueue
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/message-group/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-group/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/message-group/src/main/resources/activemq/server0/activemq-configuration.xml
index e833e20..2fa4eb8 100644
--- a/examples/jms/message-group/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/message-group/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/message-group/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/message-group/src/main/resources/jndi.properties b/examples/jms/message-group/src/main/resources/jndi.properties
index 85eda3d..1cb3686 100644
--- a/examples/jms/message-group/src/main/resources/jndi.properties
+++ b/examples/jms/message-group/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/message-group2/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-group2/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/message-group2/src/main/resources/activemq/server0/activemq-configuration.xml
index e833e20..2fa4eb8 100644
--- a/examples/jms/message-group2/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/message-group2/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/message-group2/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/message-group2/src/main/resources/jndi.properties b/examples/jms/message-group2/src/main/resources/jndi.properties
index 58fe8fb..3e289a0 100644
--- a/examples/jms/message-group2/src/main/resources/jndi.properties
+++ b/examples/jms/message-group2/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?groupID=Group-0
+connectionFactory.ConnectionFactory=tcp://localhost:61616?groupID=Group-0
queue.queue/exampleQueue=exampleQueue
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/message-priority/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/message-priority/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/message-priority/src/main/resources/activemq/server0/activemq-configuration.xml
index e833e20..2fa4eb8 100644
--- a/examples/jms/message-priority/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/message-priority/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/message-priority/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/message-priority/src/main/resources/jndi.properties b/examples/jms/message-priority/src/main/resources/jndi.properties
index 85eda3d..1cb3686 100644
--- a/examples/jms/message-priority/src/main/resources/jndi.properties
+++ b/examples/jms/message-priority/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/multiple-failover-failback/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-configuration.xml
index 59e7dde..47b8581 100644
--- a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -45,12 +45,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>
<broadcast-groups>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-configuration.xml
index a9f7a92..1893c49 100644
--- a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -45,12 +45,12 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">tcp://localhost:5446</connector>
+ <connector name="netty-connector">tcp://localhost:61617</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61617</acceptor>
</acceptors>
<broadcast-groups>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-configuration.xml
index db8e60d..b58acf7 100644
--- a/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-configuration.xml
+++ b/examples/jms/multiple-failover-failback/src/main/resources/activemq/server2/activemq-configuration.xml
@@ -44,12 +44,12 @@ under the License.
</ha-policy>
<connectors>
- <connector name="netty-connector">tcp://localhost:5447</connector>
+ <connector name="netty-connector">tcp://localhost:61618</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5447</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61618</acceptor>
</acceptors>
<broadcast-groups>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/multiple-failover-failback/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/jndi.properties b/examples/jms/multiple-failover-failback/src/main/resources/jndi.properties
index 8f3fcff..0dac60e 100644
--- a/examples/jms/multiple-failover-failback/src/main/resources/jndi.properties
+++ b/examples/jms/multiple-failover-failback/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?ha=true&retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1
+connectionFactory.ConnectionFactory=tcp://localhost:61616?ha=true&retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1
queue.queue/exampleQueue=exampleQueue
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-configuration.xml
index 1cd448e..e9d0b3b 100644
--- a/examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/multiple-failover/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -45,12 +45,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>
<broadcast-groups>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-configuration.xml
index a9f7a92..1893c49 100644
--- a/examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/multiple-failover/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -45,12 +45,12 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">tcp://localhost:5446</connector>
+ <connector name="netty-connector">tcp://localhost:61617</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61617</acceptor>
</acceptors>
<broadcast-groups>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-configuration.xml
index a43467c..678f5ef 100644
--- a/examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-configuration.xml
+++ b/examples/jms/multiple-failover/src/main/resources/activemq/server2/activemq-configuration.xml
@@ -45,12 +45,12 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">tcp://localhost:5447</connector>
+ <connector name="netty-connector">tcp://localhost:61618</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5447</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61618</acceptor>
</acceptors>
<broadcast-groups>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/multiple-failover/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/multiple-failover/src/main/resources/jndi.properties b/examples/jms/multiple-failover/src/main/resources/jndi.properties
index 8f3fcff..0dac60e 100644
--- a/examples/jms/multiple-failover/src/main/resources/jndi.properties
+++ b/examples/jms/multiple-failover/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?ha=true&retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1
+connectionFactory.ConnectionFactory=tcp://localhost:61616?ha=true&retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1
queue.queue/exampleQueue=exampleQueue
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/activemq-configuration.xml
index e833e20..2fa4eb8 100644
--- a/examples/jms/no-consumer-buffering/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/no-consumer-buffering/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/no-consumer-buffering/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/no-consumer-buffering/src/main/resources/jndi.properties b/examples/jms/no-consumer-buffering/src/main/resources/jndi.properties
index 40afd87..8507871 100644
--- a/examples/jms/no-consumer-buffering/src/main/resources/jndi.properties
+++ b/examples/jms/no-consumer-buffering/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?consumerWindowSize=0
+connectionFactory.ConnectionFactory=tcp://localhost:61616?consumerWindowSize=0
queue.queue/exampleQueue=exampleQueue
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml
index 7fc63e1..3720459 100644
--- a/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/non-transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -38,12 +38,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>
<broadcast-groups>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml
index e9ba4ed..3e9396e 100644
--- a/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/non-transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -38,12 +38,12 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">tcp://localhost:5446</connector>
+ <connector name="netty-connector">tcp://localhost:61617</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61617</acceptor>
</acceptors>
<broadcast-groups>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/non-transaction-failover/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/non-transaction-failover/src/main/resources/jndi.properties b/examples/jms/non-transaction-failover/src/main/resources/jndi.properties
index 8f3fcff..0dac60e 100644
--- a/examples/jms/non-transaction-failover/src/main/resources/jndi.properties
+++ b/examples/jms/non-transaction-failover/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?ha=true&retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1
+connectionFactory.ConnectionFactory=tcp://localhost:61616?ha=true&retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1
queue.queue/exampleQueue=exampleQueue
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/openwire/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/openwire/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/openwire/src/main/resources/activemq/server0/activemq-configuration.xml
index 33a5e16..7c28bff 100644
--- a/examples/jms/openwire/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/openwire/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -38,12 +38,12 @@ under the License.
<paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
<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>
<acceptor name="openwire-acceptor">tcp://localhost:61616?protocols=OPENWIRE</acceptor>
</acceptors>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/paging/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/paging/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/paging/src/main/resources/activemq/server0/activemq-configuration.xml
index 8d4e76d..b4e8eca 100644
--- a/examples/jms/paging/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/paging/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -42,12 +42,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/paging/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/paging/src/main/resources/jndi.properties b/examples/jms/paging/src/main/resources/jndi.properties
index a85328e..8855e7e 100644
--- a/examples/jms/paging/src/main/resources/jndi.properties
+++ b/examples/jms/paging/src/main/resources/jndi.properties
@@ -16,6 +16,6 @@
# 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
queue.queue/pagingQueue=pagingQueue
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/perf/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/perf/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/perf/src/main/resources/activemq/server0/activemq-configuration.xml
index c88eca2..38bed8c 100644
--- a/examples/jms/perf/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/perf/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -33,7 +33,7 @@ under the License.
<!-- 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>
<queues>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/perf/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/perf/src/main/resources/jndi.properties b/examples/jms/perf/src/main/resources/jndi.properties
index 4a50fa8..d13d7eb 100644
--- a/examples/jms/perf/src/main/resources/jndi.properties
+++ b/examples/jms/perf/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?tcp-no-delay=false&tcp-send-buffer-size=1048576&tcp-receive-buffer-size=1048576
+connectionFactory.ConnectionFactory=tcp://localhost:61616?tcp-no-delay=false&tcp-send-buffer-size=1048576&tcp-receive-buffer-size=1048576
queue.perfQueue=perfQueue
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/pre-acknowledge/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/pre-acknowledge/pom.xml b/examples/jms/pre-acknowledge/pom.xml
index babd14d..e329618 100644
--- a/examples/jms/pre-acknowledge/pom.xml
+++ b/examples/jms/pre-acknowledge/pom.xml
@@ -72,7 +72,7 @@ under the License.
<configuration>
<clientClass>org.apache.activemq.jms.example.PreacknowledgeExample</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/pre-acknowledge/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-configuration.xml
index cbbf258..18970ea 100644
--- a/examples/jms/pre-acknowledge/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/pre-acknowledge/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/pre-acknowledge/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/pre-acknowledge/src/main/resources/jndi.properties b/examples/jms/pre-acknowledge/src/main/resources/jndi.properties
index 85eda3d..1cb3686 100644
--- a/examples/jms/pre-acknowledge/src/main/resources/jndi.properties
+++ b/examples/jms/pre-acknowledge/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/producer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml
index e833e20..2fa4eb8 100644
--- a/examples/jms/producer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/producer-rate-limit/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/producer-rate-limit/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/producer-rate-limit/src/main/resources/jndi.properties b/examples/jms/producer-rate-limit/src/main/resources/jndi.properties
index 3ab55a5..297686b 100644
--- a/examples/jms/producer-rate-limit/src/main/resources/jndi.properties
+++ b/examples/jms/producer-rate-limit/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?producerMaxRate=50
+connectionFactory.ConnectionFactory=tcp://localhost:61616?producerMaxRate=50
queue.queue/exampleQueue=exampleQueue
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/proton-cpp/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/proton-cpp/readme.html b/examples/jms/proton-cpp/readme.html
index ebc2906..4af53bc 100644
--- a/examples/jms/proton-cpp/readme.html
+++ b/examples/jms/proton-cpp/readme.html
@@ -48,7 +48,7 @@ under the License.
<p>You don't need to do anything special to configure the ActiveMQ server to accept AMQP clients. </p>
<p>Just for the sake of documentation though we are setting the port of ActiveMQ on this example as 5672 which is the port qpid have by default. </p>
-<p>This is totally optional and you don't need to follow this convention. You can use any port you chose including ActiveMQ's 5445 default port</p>
+<p>This is totally optional and you don't need to follow this convention. You can use any port you chose including ActiveMQ's 61616 default port</p>
<pre class="prettyprint">
<code>
<acceptor name="proton-acceptor">tcp://localhost:5672</acceptor>
@@ -70,7 +70,7 @@ under the License.
<li> Create an amqp qpid 1.0 connection.</li>
<pre class="prettyprint">
<code>
- std::string broker = argc > 1 ? argv[1] : "localhost:5445";
+ std::string broker = argc > 1 ? argv[1] : "localhost:61616";
std::string address = argc > 2 ? argv[2] : "jms.queue.exampleQueue";
std::string connectionOptions = argc > 3 ? argv[3] : "{protocol:amqp1.0}"; // Look at the <a href="http://qpid.apache.org/releases/qpid-0.30/programming/book/connections.html#connection-options">docs</a> for more options
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/proton-cpp/src/main/cpp/hello.cpp
----------------------------------------------------------------------
diff --git a/examples/jms/proton-cpp/src/main/cpp/hello.cpp b/examples/jms/proton-cpp/src/main/cpp/hello.cpp
index a14eff5..214d255 100644
--- a/examples/jms/proton-cpp/src/main/cpp/hello.cpp
+++ b/examples/jms/proton-cpp/src/main/cpp/hello.cpp
@@ -32,7 +32,7 @@
using namespace qpid::messaging;
int main(int argc, char** argv) {
- std::string broker = argc > 1 ? argv[1] : "localhost:5445";
+ std::string broker = argc > 1 ? argv[1] : "localhost:61616";
std::string address = argc > 2 ? argv[2] : "jms.queue.exampleQueue";
// Connection options documented at http://qpid.apache.org/releases/qpid-0.30/programming/book/connections.html#connection-options
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-configuration.xml
index da9abde..3caa202 100644
--- a/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/proton-cpp/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -40,7 +40,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
- <acceptor name="proton-acceptor">tcp://localhost:5445</acceptor>
+ <acceptor name="proton-acceptor">tcp://localhost:61616</acceptor>
</acceptors>
<!-- Other config -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/proton-j/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/proton-j/pom.xml b/examples/jms/proton-j/pom.xml
index 73584c3..713fc4e 100644
--- a/examples/jms/proton-j/pom.xml
+++ b/examples/jms/proton-j/pom.xml
@@ -73,7 +73,7 @@ under the License.
<configuration>
<clientClass>org.apache.activemq.jms.example.ProtonJExample</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/proton-j/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/proton-j/readme.html b/examples/jms/proton-j/readme.html
index 5d396ae..8fb4c66 100644
--- a/examples/jms/proton-j/readme.html
+++ b/examples/jms/proton-j/readme.html
@@ -33,7 +33,7 @@ under the License.
<p>You don't need to do anything special to configure the ActiveMQ server to accept AMQP clients. </p>
<p>Just for the sake of documentation though we are setting the port of ActiveMQ on this example as 5672 which is the port qpid have by default. </p>
-<p>This is totally optional and you don't need to follow this convention. You can use any port you chose including ActiveMQ's 5445 default port</p>
+<p>This is totally optional and you don't need to follow this convention. You can use any port you chose including ActiveMQ's 61616 default port</p>
<pre class="prettyprint">
<code>
<acceptor name="proton-acceptor">tcp://localhost:5672</acceptor>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/queue-message-redistribution/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-message-redistribution/pom.xml b/examples/jms/queue-message-redistribution/pom.xml
index 3ccbc29..a4bc93c 100644
--- a/examples/jms/queue-message-redistribution/pom.xml
+++ b/examples/jms/queue-message-redistribution/pom.xml
@@ -97,8 +97,8 @@ under the License.
<configuration>
<clientClass>org.apache.activemq.jms.example.QueueMessageRedistributionExample</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/queue-message-redistribution/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-configuration.xml
index dc1f92c..6c5f21f 100644
--- a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -40,12 +40,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>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-configuration.xml
index 5680352..16274c2 100644
--- a/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/queue-message-redistribution/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -41,12 +41,12 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">tcp://localhost:5446</connector>
+ <connector name="netty-connector">tcp://localhost:61617</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61617</acceptor>
</acceptors>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-configuration.xml
index 98556f1..50f82e6 100644
--- a/examples/jms/queue-requestor/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/queue-requestor/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/queue-requestor/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/queue-requestor/src/main/resources/jndi.properties b/examples/jms/queue-requestor/src/main/resources/jndi.properties
index 85eda3d..1cb3686 100644
--- a/examples/jms/queue-requestor/src/main/resources/jndi.properties
+++ b/examples/jms/queue-requestor/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/queue-selector/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-configuration.xml
index b5c4724..cd6c1bb 100644
--- a/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/queue-selector/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -38,7 +38,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/queue-selector/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/queue-selector/src/main/resources/jndi.properties b/examples/jms/queue-selector/src/main/resources/jndi.properties
index 85eda3d..1cb3686 100644
--- a/examples/jms/queue-selector/src/main/resources/jndi.properties
+++ b/examples/jms/queue-selector/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/queue/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/queue/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/queue/src/main/resources/activemq/server0/activemq-configuration.xml
index e833e20..2fa4eb8 100644
--- a/examples/jms/queue/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/queue/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/queue/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/queue/src/main/resources/jndi.properties b/examples/jms/queue/src/main/resources/jndi.properties
index 85eda3d..1cb3686 100644
--- a/examples/jms/queue/src/main/resources/jndi.properties
+++ b/examples/jms/queue/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/reattach-node/src/main/java/org/apache/activemq/jms/example/ReattachExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/reattach-node/src/main/java/org/apache/activemq/jms/example/ReattachExample.java b/examples/jms/reattach-node/src/main/java/org/apache/activemq/jms/example/ReattachExample.java
index eeb5856..0dcf91e 100644
--- a/examples/jms/reattach-node/src/main/java/org/apache/activemq/jms/example/ReattachExample.java
+++ b/examples/jms/reattach-node/src/main/java/org/apache/activemq/jms/example/ReattachExample.java
@@ -140,7 +140,7 @@ public class ReattachExample 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://localhost:5446");
+ properties.put("connectionFactory.ConnectionFactory", "tcp://localhost:61617");
InitialContext initialContext = new InitialContext(properties);
ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("ConnectionFactory");
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-configuration.xml
index fa9d71e..296ae7b 100644
--- a/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/reattach-node/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -40,20 +40,20 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">tcp://localhost:5445</connector>
+ <connector name="netty-connector">tcp://localhost:61616</connector>
<!-- We just use this connector so we can send management operations while the other acceptor
is stopped -->
- <connector name="netty-connector2">tcp://localhost:5446</connector>
+ <connector name="netty-connector2">tcp://localhost:61617</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61616</acceptor>
<!-- We just use this acceptor so we can send management operations while the other acceptor
is stopped -->
- <acceptor name="netty-acceptor2">tcp://localhost:5446</acceptor>
+ <acceptor name="netty-acceptor2">tcp://localhost:61617</acceptor>
</acceptors>
<!-- Other config -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/reattach-node/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/reattach-node/src/main/resources/jndi.properties b/examples/jms/reattach-node/src/main/resources/jndi.properties
index 639551e..fced747 100644
--- a/examples/jms/reattach-node/src/main/resources/jndi.properties
+++ b/examples/jms/reattach-node/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?retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1&failoverOnServerShutdown=true&confirmationWindowSize=1048576
+connectionFactory.ConnectionFactory=tcp://localhost:61616?retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1&failoverOnServerShutdown=true&confirmationWindowSize=1048576
queue.queue/exampleQueue=exampleQueue
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-configuration.xml
index 0521eef..b613ea1 100644
--- a/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/replicated-failback-static/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -51,13 +51,13 @@ under the License.
</ha-policy>
<connectors>
- <connector name="netty-connector">tcp://localhost:5445</connector>
- <connector name="netty-backup-connector">tcp://localhost:5446</connector>
+ <connector name="netty-connector">tcp://localhost:61616</connector>
+ <connector name="netty-backup-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>
<cluster-connections>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-configuration.xml
index 98de370..33ba3ae 100644
--- a/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/replicated-failback-static/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -53,13 +53,13 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-live-connector">tcp://localhost:5445</connector>
- <connector name="netty-connector">tcp://localhost:5446</connector>
+ <connector name="netty-live-connector">tcp://localhost:61616</connector>
+ <connector name="netty-connector">tcp://localhost:61617</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61617</acceptor>
</acceptors>
<cluster-connections>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/replicated-failback-static/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback-static/src/main/resources/jndi.properties b/examples/jms/replicated-failback-static/src/main/resources/jndi.properties
index 8f3fcff..0dac60e 100644
--- a/examples/jms/replicated-failback-static/src/main/resources/jndi.properties
+++ b/examples/jms/replicated-failback-static/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?ha=true&retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1
+connectionFactory.ConnectionFactory=tcp://localhost:61616?ha=true&retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1
queue.queue/exampleQueue=exampleQueue
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-configuration.xml
index 9dc9a18..4f13e44 100644
--- a/examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/replicated-failback/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -51,12 +51,12 @@ under the License.
</ha-policy>
<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>
<broadcast-groups>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-configuration.xml
index 68a35ab..6eb92a5 100644
--- a/examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/replicated-failback/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -51,13 +51,13 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-live-connector">tcp://localhost:5445</connector>
- <connector name="netty-connector">tcp://localhost:5446</connector>
+ <connector name="netty-live-connector">tcp://localhost:61616</connector>
+ <connector name="netty-connector">tcp://localhost:61617</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61617</acceptor>
</acceptors>
<broadcast-groups>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/replicated-failback/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-failback/src/main/resources/jndi.properties b/examples/jms/replicated-failback/src/main/resources/jndi.properties
index 8f3fcff..0dac60e 100644
--- a/examples/jms/replicated-failback/src/main/resources/jndi.properties
+++ b/examples/jms/replicated-failback/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?ha=true&retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1
+connectionFactory.ConnectionFactory=tcp://localhost:61616?ha=true&retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1
queue.queue/exampleQueue=exampleQueue
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-configuration.xml
index f14e592..9279edc 100644
--- a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -45,12 +45,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>
<broadcast-groups>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-configuration.xml
index a99710f..87b0335 100644
--- a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -45,12 +45,12 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">tcp://localhost:5446</connector>
+ <connector name="netty-connector">tcp://localhost:61617</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61617</acceptor>
</acceptors>
<broadcast-groups>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-configuration.xml
index 5362696..72af4a2 100644
--- a/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-configuration.xml
+++ b/examples/jms/replicated-multiple-failover/src/main/resources/activemq/server2/activemq-configuration.xml
@@ -44,12 +44,12 @@ under the License.
</ha-policy>
<connectors>
- <connector name="netty-connector">tcp://localhost:5447</connector>
+ <connector name="netty-connector">tcp://localhost:61618</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5447</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61618</acceptor>
</acceptors>
<broadcast-groups>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/replicated-multiple-failover/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/jndi.properties b/examples/jms/replicated-multiple-failover/src/main/resources/jndi.properties
index 8f3fcff..0dac60e 100644
--- a/examples/jms/replicated-multiple-failover/src/main/resources/jndi.properties
+++ b/examples/jms/replicated-multiple-failover/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?ha=true&retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1
+connectionFactory.ConnectionFactory=tcp://localhost:61616?ha=true&retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1
queue.queue/exampleQueue=exampleQueue
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml
index b56aa5f..ca04009 100644
--- a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -46,12 +46,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>
<broadcast-groups>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml
index 1cf9e8e..f935634 100644
--- a/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/replicated-transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -46,12 +46,12 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">tcp://localhost:5446</connector>
+ <connector name="netty-connector">tcp://localhost:61617</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61617</acceptor>
</acceptors>
<broadcast-groups>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/replicated-transaction-failover/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/replicated-transaction-failover/src/main/resources/jndi.properties b/examples/jms/replicated-transaction-failover/src/main/resources/jndi.properties
index 8f3fcff..0dac60e 100644
--- a/examples/jms/replicated-transaction-failover/src/main/resources/jndi.properties
+++ b/examples/jms/replicated-transaction-failover/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?ha=true&retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1
+connectionFactory.ConnectionFactory=tcp://localhost:61616?ha=true&retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1
queue.queue/exampleQueue=exampleQueue
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/request-reply/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/request-reply/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/request-reply/src/main/resources/activemq/server0/activemq-configuration.xml
index 98556f1..50f82e6 100644
--- a/examples/jms/request-reply/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/request-reply/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/request-reply/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/request-reply/src/main/resources/jndi.properties b/examples/jms/request-reply/src/main/resources/jndi.properties
index 8f3fcff..0dac60e 100644
--- a/examples/jms/request-reply/src/main/resources/jndi.properties
+++ b/examples/jms/request-reply/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?ha=true&retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1
+connectionFactory.ConnectionFactory=tcp://localhost:61616?ha=true&retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1
queue.queue/exampleQueue=exampleQueue
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/rest/dup-send/src/main/resources/activemq-client.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/dup-send/src/main/resources/activemq-client.xml b/examples/jms/rest/dup-send/src/main/resources/activemq-client.xml
index cbd272e..1a20ecb 100644
--- a/examples/jms/rest/dup-send/src/main/resources/activemq-client.xml
+++ b/examples/jms/rest/dup-send/src/main/resources/activemq-client.xml
@@ -29,7 +29,7 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">tcp://localhost:5445</connector>
+ <connector name="netty-connector">tcp://localhost:61616</connector>
</connectors>
</core>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/rest/dup-send/src/main/resources/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/dup-send/src/main/resources/activemq-configuration.xml b/examples/jms/rest/dup-send/src/main/resources/activemq-configuration.xml
index ef952b0..640bf6e 100644
--- a/examples/jms/rest/dup-send/src/main/resources/activemq-configuration.xml
+++ b/examples/jms/rest/dup-send/src/main/resources/activemq-configuration.xml
@@ -38,7 +38,7 @@ under the License.
<acceptors>
<acceptor name="in-vm">vm://0</acceptor>
- <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/rest/jms-to-rest/src/main/resources/activemq-client.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/jms-to-rest/src/main/resources/activemq-client.xml b/examples/jms/rest/jms-to-rest/src/main/resources/activemq-client.xml
index cbd272e..1a20ecb 100644
--- a/examples/jms/rest/jms-to-rest/src/main/resources/activemq-client.xml
+++ b/examples/jms/rest/jms-to-rest/src/main/resources/activemq-client.xml
@@ -29,7 +29,7 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">tcp://localhost:5445</connector>
+ <connector name="netty-connector">tcp://localhost:61616</connector>
</connectors>
</core>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/rest/jms-to-rest/src/main/resources/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/jms-to-rest/src/main/resources/activemq-configuration.xml b/examples/jms/rest/jms-to-rest/src/main/resources/activemq-configuration.xml
index ef952b0..640bf6e 100644
--- a/examples/jms/rest/jms-to-rest/src/main/resources/activemq-configuration.xml
+++ b/examples/jms/rest/jms-to-rest/src/main/resources/activemq-configuration.xml
@@ -38,7 +38,7 @@ under the License.
<acceptors>
<acceptor name="in-vm">vm://0</acceptor>
- <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/rest/push/src/main/resources/activemq-client.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/push/src/main/resources/activemq-client.xml b/examples/jms/rest/push/src/main/resources/activemq-client.xml
index cbd272e..1a20ecb 100644
--- a/examples/jms/rest/push/src/main/resources/activemq-client.xml
+++ b/examples/jms/rest/push/src/main/resources/activemq-client.xml
@@ -29,7 +29,7 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">tcp://localhost:5445</connector>
+ <connector name="netty-connector">tcp://localhost:61616</connector>
</connectors>
</core>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/rest/push/src/main/resources/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/push/src/main/resources/activemq-configuration.xml b/examples/jms/rest/push/src/main/resources/activemq-configuration.xml
index 13a6ea1..19ab6b3 100644
--- a/examples/jms/rest/push/src/main/resources/activemq-configuration.xml
+++ b/examples/jms/rest/push/src/main/resources/activemq-configuration.xml
@@ -39,7 +39,7 @@ under the License.
<acceptors>
<acceptor name="in-vm">vm://0</acceptor>
- <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/scale-down/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/scale-down/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/scale-down/src/main/resources/activemq/server0/activemq-configuration.xml
index 0877ab5..eded681 100644
--- a/examples/jms/scale-down/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/scale-down/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -40,12 +40,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>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/scale-down/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/scale-down/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/scale-down/src/main/resources/activemq/server1/activemq-configuration.xml
index 23f8577..e2959c2 100644
--- a/examples/jms/scale-down/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/scale-down/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -40,13 +40,13 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">tcp://localhost:5446</connector>
- <connector name="server0-connector">tcp://localhost:5445</connector>
+ <connector name="netty-connector">tcp://localhost:61617</connector>
+ <connector name="server0-connector">tcp://localhost:61616</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61617</acceptor>
</acceptors>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/scheduled-message/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/scheduled-message/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/scheduled-message/src/main/resources/activemq/server0/activemq-configuration.xml
index e833e20..2fa4eb8 100644
--- a/examples/jms/scheduled-message/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/scheduled-message/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/scheduled-message/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/scheduled-message/src/main/resources/jndi.properties b/examples/jms/scheduled-message/src/main/resources/jndi.properties
index 85eda3d..1cb3686 100644
--- a/examples/jms/scheduled-message/src/main/resources/jndi.properties
+++ b/examples/jms/scheduled-message/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
[3/8] activemq-6 git commit: Update default protocol support /
configuration
Posted by an...@apache.org.
Update default protocol support / configuration
Updates the out of the box configuration files as shipped with the
distribution. Changes the default connector to use port 61616 to aid
migration of ActiveMQ 5.x clients. Configures acceptors with port and
protocol as follows:
61616: Core protocol, OpenWire, STOMP, AMQP
5445: Core Protocol, STOMP (aimed at legacy HornetQ clients)
5672: AMQP
61613: Stomp
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/c43e3008
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/c43e3008
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/c43e3008
Branch: refs/heads/master
Commit: c43e3008b646ab84844361d2379d5ece55eed07b
Parents: 6612320
Author: Martyn Taylor <mt...@redhat.com>
Authored: Tue Feb 24 13:47:25 2015 +0000
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Tue Feb 24 15:07:05 2015 +0000
----------------------------------------------------------------------
.../config/clustered/activemq-configuration.xml | 21 ++++++++++++++------
.../non-clustered/activemq-configuration.xml | 17 ++++++++++++----
.../replicated/activemq-configuration.xml | 21 ++++++++++++++------
.../shared-store/activemq-configuration.xml | 21 ++++++++++++++------
4 files changed, 58 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/c43e3008/distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml b/distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml
index e360edb..b9cba87 100644
--- a/distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml
+++ b/distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml
@@ -37,13 +37,22 @@ under the License.
<large-messages-directory>${data.dir:../data}/large-messages</large-messages-directory>
<connectors>
- <connector name="netty">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5445}</connector>
- <connector name="netty-throughput">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.batch.port:5455}?batchDelay=50</connector>
+ <!-- Default Connector. Returned to clients during broadcast and distributed around cluster. See broadcast and discovery-groups -->
+ <connector name="activemq">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:61616}</connector>
</connectors>
<acceptors>
- <acceptor name="netty">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5445}</acceptor>
- <acceptor name="netty-throughput">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.batch.port:5455}?batchDelay=50;directDeliver=false</acceptor>
+ <!-- Default ActiveMQ Acceptor. Multi-protocol adapter. Currently supports Core, OpenWire, Stomp and AMQP -->
+ <acceptor name="activemq">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:61616}</acceptor>
+
+ <!-- AMQP Connector. Listens on default AMQP port for AMQP traffic. -->
+ <acceptor name="amqp">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5672}?protocols=AMQP</acceptor>
+
+ <!-- STOMP Acceptor. Enables ActiveMQ Core protocol, OpenWire and STOMP. -->
+ <acceptor name="stomp">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:61613}?protocols=STOMP</acceptor>
+
+ <!-- HornetQ Compatibility Acceptor. Enables ActiveMQ Core and STOMP for legacy HornetQ clients -->
+ <acceptor name="hornetq">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5445}?protocols=CORE,STOMP</acceptor>
</acceptors>
<broadcast-groups>
@@ -51,7 +60,7 @@ under the License.
<group-address>231.7.7.7</group-address>
<group-port>9876</group-port>
<broadcast-period>5000</broadcast-period>
- <connector-ref>netty</connector-ref>
+ <connector-ref>activemq</connector-ref>
</broadcast-group>
</broadcast-groups>
@@ -66,7 +75,7 @@ under the License.
<cluster-connections>
<cluster-connection name="my-cluster">
<address>jms</address>
- <connector-ref>netty</connector-ref>
+ <connector-ref>activemq</connector-ref>
<discovery-group-ref discovery-group-name="dg-group1"/>
</cluster-connection>
</cluster-connections>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/c43e3008/distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml b/distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml
index 163fa94..047028e 100644
--- a/distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml
+++ b/distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml
@@ -35,13 +35,22 @@ under the License.
<large-messages-directory>${data.dir:../data}/large-messages</large-messages-directory>
<connectors>
- <connector name="netty">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5445}</connector>
- <connector name="netty-throughput">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.batch.port:5455}?batchDelay=50</connector>
+ <!-- Default Connector. Returned to clients during broadcast and distributed around cluster. See broadcast and discovery-groups -->
+ <connector name="activemq">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:61616}</connector>
</connectors>
<acceptors>
- <acceptor name="netty">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5445}</acceptor>
- <acceptor name="netty-throughput">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.batch.port:5455}?batchDelay=50;directDeliver=false</acceptor>
+ <!-- Default ActiveMQ Acceptor. Multi-protocol adapter. Currently supports Core, OpenWire, Stomp and AMQP -->
+ <acceptor name="activemq">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:61616}</acceptor>
+
+ <!-- AMQP Connector. Listens on default AMQP port for AMQP traffic. -->
+ <acceptor name="amqp">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5672}?protocols=AMQP</acceptor>
+
+ <!-- STOMP Acceptor. Enables ActiveMQ Core protocol, OpenWire and STOMP. -->
+ <acceptor name="stomp">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:61613}?protocols=STOMP</acceptor>
+
+ <!-- HornetQ Compatibility Acceptor. Enables ActiveMQ Core and STOMP for legacy HornetQ clients -->
+ <acceptor name="hornetq">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5445}?protocols=CORE,STOMP</acceptor>
</acceptors>
<security-settings>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/c43e3008/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml b/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml
index 0a90c9e..eae0c2f 100644
--- a/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml
+++ b/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml
@@ -42,13 +42,22 @@ under the License.
<large-messages-directory>${data.dir:../data}/large-messages</large-messages-directory>
<connectors>
- <connector name="netty">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5445}</connector>
- <connector name="netty-throughput">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.batch.port:5455}?batchDelay=50</connector>
+ <!-- Default Connector. Returned to clients during broadcast. -->
+ <connector name="activemq">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:61616}</connector>
</connectors>
<acceptors>
- <acceptor name="netty">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5445}</acceptor>
- <acceptor name="netty-throughput">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.batch.port:5455}?batchDelay=50;directDeliver=false</acceptor>
+ <!-- Default ActiveMQ Acceptor. Multi-protocol adapter. Currently supports Core, OpenWire, Stomp and AMQP -->
+ <acceptor name="activemq">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:61616}</acceptor>
+
+ <!-- AMQP Connector. Listens on default AMQP port for AMQP traffic. -->
+ <acceptor name="amqp">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5672}?protocols=AMQP</acceptor>
+
+ <!-- STOMP Acceptor. Enables ActiveMQ Core protocol, OpenWire and STOMP. -->
+ <acceptor name="stomp">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:61613}?protocols=STOMP</acceptor>
+
+ <!-- HornetQ Compatibility Acceptor. Enables ActiveMQ Core and STOMP for legacy HornetQ clients -->
+ <acceptor name="hornetq">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5445}?protocols=CORE,STOMP</acceptor>
</acceptors>
<broadcast-groups>
@@ -56,7 +65,7 @@ under the License.
<group-address>231.7.7.7</group-address>
<group-port>9876</group-port>
<broadcast-period>5000</broadcast-period>
- <connector-ref>netty</connector-ref>
+ <connector-ref>activemq</connector-ref>
</broadcast-group>
</broadcast-groups>
@@ -71,7 +80,7 @@ under the License.
<cluster-connections>
<cluster-connection name="my-cluster">
<address>jms</address>
- <connector-ref>netty</connector-ref>
+ <connector-ref>activemq</connector-ref>
<discovery-group-ref discovery-group-name="dg-group1"/>
</cluster-connection>
</cluster-connections>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/c43e3008/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml b/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml
index c796a10..b865a3e 100644
--- a/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml
+++ b/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml
@@ -42,13 +42,22 @@ under the License.
<large-messages-directory>${data.dir:../data}/large-messages</large-messages-directory>
<connectors>
- <connector name="netty">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5445}</connector>
- <connector name="netty-throughput">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.batch.port:5455}?batchDelay=50</connector>
+ <!-- Default Connector. Returned to clients during broadcast and distributed around cluster. See broadcast and discovery-groups -->
+ <connector name="activemq">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:61616}</connector>
</connectors>
<acceptors>
- <acceptor name="netty">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5445}</acceptor>
- <acceptor name="netty-throughput">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.batch.port:5455}?batchDelay=50;directDeliver=false</acceptor>
+ <!-- Default ActiveMQ Acceptor. Multi-protocol adapter. Currently supports Core, OpenWire, Stomp and AMQP -->
+ <acceptor name="activemq">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:61616}</acceptor>
+
+ <!-- AMQP Acceptor. Listens on default STOMP port for AMQP traffic. -->
+ <acceptor name="amqp">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5672}?protocols=AMQP</acceptor>
+
+ <!-- STOMP Acceptor. Enables ActiveMQ Core protocol, OpenWire and STOMP. -->
+ <acceptor name="stomp">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:61613}?protocols=STOMP</acceptor>
+
+ <!-- HornetQ Compatibility Acceptor. Enables ActiveMQ Core and STOMP for legacy HornetQ clients -->
+ <acceptor name="hornetq">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5445}?protocols=CORE,STOMP</acceptor>
</acceptors>
<broadcast-groups>
@@ -56,7 +65,7 @@ under the License.
<group-address>231.7.7.7</group-address>
<group-port>9876</group-port>
<broadcast-period>5000</broadcast-period>
- <connector-ref>netty</connector-ref>
+ <connector-ref>activemq</connector-ref>
</broadcast-group>
</broadcast-groups>
@@ -71,7 +80,7 @@ under the License.
<cluster-connections>
<cluster-connection name="my-cluster">
<address>jms</address>
- <connector-ref>netty</connector-ref>
+ <connector-ref>activemq</connector-ref>
<discovery-group-ref discovery-group-name="dg-group1"/>
</cluster-connection>
</cluster-connections>
[6/8] activemq-6 git commit: Replace all references of port 5445 with
61616
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/bridge/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/bridge/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/bridge/src/main/resources/activemq/server1/activemq-configuration.xml
index 377b6ec..85373cf 100644
--- a/examples/jms/bridge/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/bridge/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -38,7 +38,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/browser/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/browser/pom.xml b/examples/jms/browser/pom.xml
index dff0859..e9b54db 100644
--- a/examples/jms/browser/pom.xml
+++ b/examples/jms/browser/pom.xml
@@ -64,7 +64,7 @@ under the License.
<configuration>
<clientClass>org.apache.activemq.jms.example.QueueBrowserExample</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/browser/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/browser/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/browser/src/main/resources/activemq/server0/activemq-configuration.xml
index 39cabf0..68a6041 100644
--- a/examples/jms/browser/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/browser/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/browser/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/browser/src/main/resources/jndi.properties b/examples/jms/browser/src/main/resources/jndi.properties
index 85eda3d..1cb3686 100644
--- a/examples/jms/browser/src/main/resources/jndi.properties
+++ b/examples/jms/browser/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/client-kickoff/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-kickoff/pom.xml b/examples/jms/client-kickoff/pom.xml
index 82c93aa..b7a482e 100644
--- a/examples/jms/client-kickoff/pom.xml
+++ b/examples/jms/client-kickoff/pom.xml
@@ -95,7 +95,7 @@ under the License.
<configuration>
<clientClass>org.apache.activemq.jms.example.ClientKickoffExample</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/client-kickoff/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-configuration.xml
index e82b033..7b35ae7 100644
--- a/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -40,7 +40,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty">tcp://localhost:5445</acceptor>
+ <acceptor name="netty">tcp://localhost:61616</acceptor>
</acceptors>
</core>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/client-kickoff/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/client-kickoff/src/main/resources/jndi.properties b/examples/jms/client-kickoff/src/main/resources/jndi.properties
index 26a519c..40ed640 100644
--- a/examples/jms/client-kickoff/src/main/resources/jndi.properties
+++ b/examples/jms/client-kickoff/src/main/resources/jndi.properties
@@ -16,4 +16,4 @@
# under the License.
java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
-connectionFactory.ConnectionFactory=tcp://localhost:5445
+connectionFactory.ConnectionFactory=tcp://localhost:61616
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-configuration.xml
index 506976d..5b45f63 100644
--- a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -44,12 +44,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>
<broadcast-groups>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-configuration.xml
index a9f7a92..1893c49 100644
--- a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -45,12 +45,12 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">tcp://localhost:5446</connector>
+ <connector name="netty-connector">tcp://localhost:61617</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61617</acceptor>
</acceptors>
<broadcast-groups>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/client-side-failoverlistener/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/jndi.properties b/examples/jms/client-side-failoverlistener/src/main/resources/jndi.properties
index 8f3fcff..0dac60e 100644
--- a/examples/jms/client-side-failoverlistener/src/main/resources/jndi.properties
+++ b/examples/jms/client-side-failoverlistener/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?ha=true&retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1
+connectionFactory.ConnectionFactory=tcp://localhost:61616?ha=true&retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1
queue.queue/exampleQueue=exampleQueue
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-configuration.xml
index eb835cb..61156f0 100644
--- a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -38,12 +38,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>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-configuration.xml
index aca7ad5..b61f74e 100644
--- a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -36,12 +36,12 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">tcp://localhost:5446</connector>
+ <connector name="netty-connector">tcp://localhost:61617</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61617</acceptor>
</acceptors>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-configuration.xml
index f26bdb3..68ca521 100644
--- a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-configuration.xml
+++ b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-configuration.xml
@@ -34,12 +34,12 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">tcp://localhost:5447</connector>
+ <connector name="netty-connector">tcp://localhost:61618</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5447</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61618</acceptor>
</acceptors>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/clustered-durable-subscription/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-durable-subscription/pom.xml b/examples/jms/clustered-durable-subscription/pom.xml
index 78cbb07..4cf3be3 100644
--- a/examples/jms/clustered-durable-subscription/pom.xml
+++ b/examples/jms/clustered-durable-subscription/pom.xml
@@ -89,8 +89,8 @@ under the License.
<configuration>
<clientClass>org.apache.activemq.jms.example.ClusteredDurableSubscriptionExample</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/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml
index 2673e6b..a5a7bad 100644
--- a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -40,12 +40,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>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-configuration.xml
index a4ea6c6..8edf2df 100644
--- a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -40,12 +40,12 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">tcp://localhost:5446</connector>
+ <connector name="netty-connector">tcp://localhost:61617</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61617</acceptor>
</acceptors>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/clustered-grouping/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-grouping/pom.xml b/examples/jms/clustered-grouping/pom.xml
index d7a3f74..d079f2c 100644
--- a/examples/jms/clustered-grouping/pom.xml
+++ b/examples/jms/clustered-grouping/pom.xml
@@ -117,9 +117,9 @@ under the License.
<configuration>
<clientClass>org.apache.activemq.jms.example.ClusteredGroupingExample</clientClass>
<args>
- <param>tcp://localhost:5445</param>
- <param>tcp://localhost:5446</param>
- <param>tcp://localhost:5447</param>
+ <param>tcp://localhost:61616</param>
+ <param>tcp://localhost:61617</param>
+ <param>tcp://localhost:61618</param>
</args>
<systemProperties>
<property>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-configuration.xml
index bbad3cc..f92bdb4 100644
--- a/examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -41,12 +41,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>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-configuration.xml
index 8e6d4cb..a57852d 100644
--- a/examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -40,12 +40,12 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">tcp://localhost:5446</connector>
+ <connector name="netty-connector">tcp://localhost:61617</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61617</acceptor>
</acceptors>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-configuration.xml
index fc09c3e..ab6e98f 100644
--- a/examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-configuration.xml
+++ b/examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-configuration.xml
@@ -40,12 +40,12 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">tcp://localhost:5447</connector>
+ <connector name="netty-connector">tcp://localhost:61618</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5447</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61618</acceptor>
</acceptors>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/clustered-jgroups/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/pom.xml b/examples/jms/clustered-jgroups/pom.xml
index cad1d0f..7a10bc1 100644
--- a/examples/jms/clustered-jgroups/pom.xml
+++ b/examples/jms/clustered-jgroups/pom.xml
@@ -93,8 +93,8 @@ under the License.
<configuration>
<clientClass>org.apache.activemq.jms.example.ClusteredJgroupsExample</clientClass>
<args>
- <param>tcp://localhost:5445</param>
- <param>tcp://localhost:5446</param>
+ <param>tcp://localhost:61616</param>
+ <param>tcp://localhost:61617</param>
</args>
</configuration>
</execution>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-configuration.xml
index 34d88c5..cb6abfd 100644
--- a/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -41,12 +41,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>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/client-jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/client-jndi.properties b/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/client-jndi.properties
index 26a519c..40ed640 100644
--- a/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/client-jndi.properties
+++ b/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/client-jndi.properties
@@ -16,4 +16,4 @@
# under the License.
java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
-connectionFactory.ConnectionFactory=tcp://localhost:5445
+connectionFactory.ConnectionFactory=tcp://localhost:61616
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-configuration.xml
index e4b0fa5..6a6b1da 100644
--- a/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -40,12 +40,12 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">tcp://localhost:5446</connector>
+ <connector name="netty-connector">tcp://localhost:61617</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61617</acceptor>
</acceptors>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/client-jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/client-jndi.properties b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/client-jndi.properties
index aa37aba..e305f48 100644
--- a/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/client-jndi.properties
+++ b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/client-jndi.properties
@@ -16,4 +16,4 @@
# under the License.
java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
-java.naming.provider.url=tcp://localhost:5446
+java.naming.provider.url=tcp://localhost:61617
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/clustered-queue/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-queue/pom.xml b/examples/jms/clustered-queue/pom.xml
index d88f681..597015f 100644
--- a/examples/jms/clustered-queue/pom.xml
+++ b/examples/jms/clustered-queue/pom.xml
@@ -89,8 +89,8 @@ under the License.
<configuration>
<clientClass>org.apache.activemq.jms.example.ClusteredQueueExample</clientClass>
<args>
- <param>tcp://localhost:5445</param>
- <param>tcp://localhost:5446</param>
+ <param>tcp://localhost:61616</param>
+ <param>tcp://localhost:61617</param>
</args>
</configuration>
</execution>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-configuration.xml
index 24648ce..cd5ec4d 100644
--- a/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -40,12 +40,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>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-configuration.xml
index c719783..25f49d2 100644
--- a/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -40,12 +40,12 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">tcp://localhost:5446</connector>
+ <connector name="netty-connector">tcp://localhost:61617</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61617</acceptor>
</acceptors>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/clustered-standalone/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-standalone/pom.xml b/examples/jms/clustered-standalone/pom.xml
index 07a06ea..a5d6e0b 100644
--- a/examples/jms/clustered-standalone/pom.xml
+++ b/examples/jms/clustered-standalone/pom.xml
@@ -105,9 +105,9 @@ under the License.
<configuration>
<clientClass>org.apache.activemq.jms.example.ClusteredStandaloneExample</clientClass>
<args>
- <param>tcp://localhost:5445</param>
- <param>tcp://localhost:5446</param>
- <param>tcp://localhost:5447</param>
+ <param>tcp://localhost:61616</param>
+ <param>tcp://localhost:61617</param>
+ <param>tcp://localhost:61618</param>
</args>
<systemProperties>
<property>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-configuration.xml
index fa59e43..d13506a 100644
--- a/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -40,12 +40,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>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-configuration.xml
index f09493a..b7fc5e5 100644
--- a/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -40,12 +40,12 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">tcp://localhost:5446</connector>
+ <connector name="netty-connector">tcp://localhost:61617</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61617</acceptor>
</acceptors>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-configuration.xml
index 43863bc..3f0bdd1 100644
--- a/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-configuration.xml
+++ b/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-configuration.xml
@@ -40,12 +40,12 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">tcp://localhost:5447</connector>
+ <connector name="netty-connector">tcp://localhost:61618</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5447</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61618</acceptor>
</acceptors>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/clustered-static-discovery/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/pom.xml b/examples/jms/clustered-static-discovery/pom.xml
index e8cfb0a..7839916 100644
--- a/examples/jms/clustered-static-discovery/pom.xml
+++ b/examples/jms/clustered-static-discovery/pom.xml
@@ -97,10 +97,10 @@ under the License.
<configuration>
<clientClass>org.apache.activemq.jms.example.StaticClusteredQueueExample</clientClass>
<args>
- <param>tcp://localhost:5445</param>
- <param>tcp://localhost:5446</param>
- <param>tcp://localhost:5447</param>
- <param>tcp://localhost:5448</param>
+ <param>tcp://localhost:61616</param>
+ <param>tcp://localhost:61617</param>
+ <param>tcp://localhost:61618</param>
+ <param>tcp://localhost:61619</param>
</args>
<systemProperties>
<property>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-configuration.xml
index 509ca52..4f04ecb 100644
--- a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -41,14 +41,14 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">tcp://localhost:5445</connector>
+ <connector name="netty-connector">tcp://localhost:61616</connector>
<!-- connector to the server1 -->
- <connector name="server1-connector">tcp://localhost:5446</connector>
+ <connector name="server1-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>
<cluster-connections>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-configuration.xml
index 8ea3eda..27ea9f8 100644
--- a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -40,14 +40,14 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">tcp://localhost:5446</connector>
+ <connector name="netty-connector">tcp://localhost:61617</connector>
<!-- connector to the server0 -->
- <connector name="server0-connector">tcp://localhost:5445</connector>
+ <connector name="server0-connector">tcp://localhost:61616</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61617</acceptor>
</acceptors>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-configuration.xml
index 44a4f31..a3b1e6c 100644
--- a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-configuration.xml
+++ b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-configuration.xml
@@ -37,14 +37,14 @@
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">tcp://localhost:5447</connector>
+ <connector name="netty-connector">tcp://localhost:61618</connector>
<!-- connector to the server0 -->
- <connector name="server0-connector">tcp://localhost:5445</connector>
+ <connector name="server0-connector">tcp://localhost:61616</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5447</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61618</acceptor>
</acceptors>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-configuration.xml b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-configuration.xml
index 84f7a9c..9dd03a6 100644
--- a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-configuration.xml
+++ b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-configuration.xml
@@ -37,14 +37,14 @@
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">tcp://localhost:5448</connector>
+ <connector name="netty-connector">tcp://localhost:61619</connector>
<!-- connector to the server0 -->
- <connector name="server0-connector">tcp://localhost:5445</connector>
+ <connector name="server0-connector">tcp://localhost:61616</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5448</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61619</acceptor>
</acceptors>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/clustered-static-oneway/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-oneway/pom.xml b/examples/jms/clustered-static-oneway/pom.xml
index e2ff59c..64574a1 100644
--- a/examples/jms/clustered-static-oneway/pom.xml
+++ b/examples/jms/clustered-static-oneway/pom.xml
@@ -87,9 +87,9 @@ under the License.
<configuration>
<clientClass>org.apache.activemq.jms.example.ClusterStaticOnewayExample</clientClass>
<args>
- <param>tcp://localhost:5445</param>
- <param>tcp://localhost:5446</param>
- <param>tcp://localhost:5447</param>
+ <param>tcp://localhost:61616</param>
+ <param>tcp://localhost:61617</param>
+ <param>tcp://localhost:61618</param>
</args>
<systemProperties>
<property>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-configuration.xml
index 20a37b4..3b1e2a8 100644
--- a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -38,14 +38,14 @@
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">tcp://localhost:5445</connector>
+ <connector name="netty-connector">tcp://localhost:61616</connector>
<!-- connector to the server1 -->
- <connector name="server1-connector">tcp://localhost:5446</connector>
+ <connector name="server1-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>
<cluster-connections>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-configuration.xml
index 2f2c329..17f5463 100644
--- a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -37,14 +37,14 @@
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">tcp://localhost:5446</connector>
+ <connector name="netty-connector">tcp://localhost:61617</connector>
<!-- connector to the server0 -->
- <connector name="server2-connector">tcp://localhost:5447</connector>
+ <connector name="server2-connector">tcp://localhost:61618</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61617</acceptor>
</acceptors>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-configuration.xml
index d626302..5913b63 100644
--- a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-configuration.xml
+++ b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-configuration.xml
@@ -37,12 +37,12 @@
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">tcp://localhost:5447</connector>
+ <connector name="netty-connector">tcp://localhost:61618</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5447</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61618</acceptor>
</acceptors>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/clustered-topic/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-topic/pom.xml b/examples/jms/clustered-topic/pom.xml
index f4adfcd..689bb04 100644
--- a/examples/jms/clustered-topic/pom.xml
+++ b/examples/jms/clustered-topic/pom.xml
@@ -97,8 +97,8 @@ under the License.
<configuration>
<clientClass>org.apache.activemq.jms.example.ClusteredTopicExample</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/clustered-topic/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-configuration.xml
index ef3fdcb..a97eb07 100644
--- a/examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -41,12 +41,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>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-configuration.xml
index c97ea00..d23c090 100644
--- a/examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -40,12 +40,12 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">tcp://localhost:5446</connector>
+ <connector name="netty-connector">tcp://localhost:61617</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61617</acceptor>
</acceptors>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/colocated-failover-scale-down/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover-scale-down/pom.xml b/examples/jms/colocated-failover-scale-down/pom.xml
index 4b2fb8d..50e8f80 100644
--- a/examples/jms/colocated-failover-scale-down/pom.xml
+++ b/examples/jms/colocated-failover-scale-down/pom.xml
@@ -89,8 +89,8 @@ under the License.
<configuration>
<clientClass>org.apache.activemq.jms.example.ColocatedFailoverScaleDownExample</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/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-configuration.xml
index 101f097..779f66f 100644
--- a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -41,13 +41,13 @@ under the License.
<connectors>
<connector name="invm-connector">vm://0</connector>
- <connector name="netty-connector">tcp://localhost:5445</connector>
+ <connector name="netty-connector">tcp://localhost:61616</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
<acceptor name="invm-acceptor">vm://0</acceptor>
- <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61616</acceptor>
</acceptors>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-configuration.xml
index 55ca5b7..f8e1a17 100644
--- a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -41,13 +41,13 @@ under the License.
<!-- Connectors -->
<connectors>
<connector name="invm-connector">vm://0</connector>
- <connector name="netty-connector">tcp://localhost:5446</connector>
+ <connector name="netty-connector">tcp://localhost:61617</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
<acceptor name="invm-acceptor">vm://0</acceptor>
- <acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61617</acceptor>
</acceptors>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/colocated-failover/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover/pom.xml b/examples/jms/colocated-failover/pom.xml
index 80fe7bd..6373c0d 100644
--- a/examples/jms/colocated-failover/pom.xml
+++ b/examples/jms/colocated-failover/pom.xml
@@ -89,8 +89,8 @@ under the License.
<configuration>
<clientClass>org.apache.activemq.jms.example.ColocatedFailoverExample</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/colocated-failover/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-configuration.xml
index e83342a..f125585 100644
--- a/examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -40,12 +40,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>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-configuration.xml
index 136591d..f2c8d50 100644
--- a/examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -40,12 +40,12 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">tcp://localhost:5446</connector>
+ <connector name="netty-connector">tcp://localhost:61617</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61617</acceptor>
</acceptors>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/consumer-rate-limit/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/consumer-rate-limit/pom.xml b/examples/jms/consumer-rate-limit/pom.xml
index bf1d928..d70eaf0 100644
--- a/examples/jms/consumer-rate-limit/pom.xml
+++ b/examples/jms/consumer-rate-limit/pom.xml
@@ -72,7 +72,7 @@ under the License.
<configuration>
<clientClass>org.apache.activemq.jms.example.ConsumerRateLimitExample</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/consumer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml
index e833e20..2fa4eb8 100644
--- a/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/consumer-rate-limit/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/consumer-rate-limit/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/consumer-rate-limit/src/main/resources/jndi.properties b/examples/jms/consumer-rate-limit/src/main/resources/jndi.properties
index 9692146..e3393f8 100644
--- a/examples/jms/consumer-rate-limit/src/main/resources/jndi.properties
+++ b/examples/jms/consumer-rate-limit/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?consumerMaxRate=10
+connectionFactory.ConnectionFactory=tcp://localhost:61616?consumerMaxRate=10
queue.queue/exampleQueue=exampleQueue
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/dead-letter/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/dead-letter/pom.xml b/examples/jms/dead-letter/pom.xml
index c831b6b..bf8a0f9 100644
--- a/examples/jms/dead-letter/pom.xml
+++ b/examples/jms/dead-letter/pom.xml
@@ -72,7 +72,7 @@ under the License.
<configuration>
<clientClass>org.apache.activemq.jms.example.DeadLetterExample</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/dead-letter/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-configuration.xml
index 6649f23..669916d 100644
--- a/examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -42,7 +42,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/dead-letter/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/dead-letter/src/main/resources/jndi.properties b/examples/jms/dead-letter/src/main/resources/jndi.properties
index d9700fd..9049249 100644
--- a/examples/jms/dead-letter/src/main/resources/jndi.properties
+++ b/examples/jms/dead-letter/src/main/resources/jndi.properties
@@ -16,6 +16,6 @@
# 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
queue.queue/deadLetterQueue=deadLetterQueue
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/delayed-redelivery/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/delayed-redelivery/pom.xml b/examples/jms/delayed-redelivery/pom.xml
index bbbdcf8..23066e9 100644
--- a/examples/jms/delayed-redelivery/pom.xml
+++ b/examples/jms/delayed-redelivery/pom.xml
@@ -64,7 +64,7 @@ under the License.
<configuration>
<clientClass>org.apache.activemq.jms.example.DelayedRedeliveryExample</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/delayed-redelivery/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-configuration.xml
index 8e40c34..4939305 100644
--- a/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -42,7 +42,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/delayed-redelivery/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/delayed-redelivery/src/main/resources/jndi.properties b/examples/jms/delayed-redelivery/src/main/resources/jndi.properties
index 85eda3d..1cb3686 100644
--- a/examples/jms/delayed-redelivery/src/main/resources/jndi.properties
+++ b/examples/jms/delayed-redelivery/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/divert/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/divert/pom.xml b/examples/jms/divert/pom.xml
index 6058585..bedf25b 100644
--- a/examples/jms/divert/pom.xml
+++ b/examples/jms/divert/pom.xml
@@ -82,8 +82,8 @@ under the License.
<configuration>
<clientClass>org.apache.activemq.jms.example.DivertExample</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/divert/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/divert/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/divert/src/main/resources/activemq/server0/activemq-configuration.xml
index 6d331be..8ef5e97 100644
--- a/examples/jms/divert/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/divert/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -55,13 +55,13 @@ under the License.
<connectors>
<!-- 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/examples/jms/divert/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/divert/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/divert/src/main/resources/activemq/server1/activemq-configuration.xml
index c955aba..7177beb 100644
--- a/examples/jms/divert/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/divert/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -43,7 +43,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/durable-subscription/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/durable-subscription/pom.xml b/examples/jms/durable-subscription/pom.xml
index f47116b..3ed9152 100644
--- a/examples/jms/durable-subscription/pom.xml
+++ b/examples/jms/durable-subscription/pom.xml
@@ -72,7 +72,7 @@ under the License.
<configuration>
<clientClass>org.apache.activemq.jms.example.DurableSubscriptionExample</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/durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml
index f18535f..058b434 100644
--- a/examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -40,7 +40,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/durable-subscription/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/durable-subscription/src/main/resources/jndi.properties b/examples/jms/durable-subscription/src/main/resources/jndi.properties
index 9c96675..09611dc 100644
--- a/examples/jms/durable-subscription/src/main/resources/jndi.properties
+++ b/examples/jms/durable-subscription/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
topic.topic/exampleTopic=exampleTopic
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/embedded-simple/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/embedded-simple/pom.xml b/examples/jms/embedded-simple/pom.xml
index 5cac971..d9cc90b 100644
--- a/examples/jms/embedded-simple/pom.xml
+++ b/examples/jms/embedded-simple/pom.xml
@@ -68,8 +68,8 @@ under the License.
<configuration>
<clientClass>org.apache.activemq.jms.example.EmbeddedExample</clientClass>
<args>
- <param>tcp://localhost:5445</param>
- <param>tcp://localhost:5445</param>
+ <param>tcp://localhost:61616</param>
+ <param>tcp://localhost:61616</param>
</args>
<systemProperties>
<property>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/embedded/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/embedded/pom.xml b/examples/jms/embedded/pom.xml
index 24dcabb..effa977 100644
--- a/examples/jms/embedded/pom.xml
+++ b/examples/jms/embedded/pom.xml
@@ -68,8 +68,8 @@ under the License.
<configuration>
<clientClass>org.apache.activemq.jms.example.EmbeddedExample</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/expiry/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/expiry/pom.xml b/examples/jms/expiry/pom.xml
index 5e65867..68d1eda 100644
--- a/examples/jms/expiry/pom.xml
+++ b/examples/jms/expiry/pom.xml
@@ -72,7 +72,7 @@ under the License.
<configuration>
<clientClass>org.apache.activemq.jms.example.ExpiryExample</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/expiry/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/expiry/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/expiry/src/main/resources/activemq/server0/activemq-configuration.xml
index 0dcab02..ffe273b 100644
--- a/examples/jms/expiry/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/expiry/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -42,7 +42,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/expiry/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/expiry/src/main/resources/jndi.properties b/examples/jms/expiry/src/main/resources/jndi.properties
index 82edb2e..91e4c81 100644
--- a/examples/jms/expiry/src/main/resources/jndi.properties
+++ b/examples/jms/expiry/src/main/resources/jndi.properties
@@ -16,6 +16,6 @@
# 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
queue.queue/expiryQueue=expiryQueue
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/ha-policy-autobackup/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/ha-policy-autobackup/pom.xml b/examples/jms/ha-policy-autobackup/pom.xml
index f8d0a4d..b27492f 100644
--- a/examples/jms/ha-policy-autobackup/pom.xml
+++ b/examples/jms/ha-policy-autobackup/pom.xml
@@ -89,8 +89,8 @@ under the License.
<configuration>
<clientClass>org.apache.activemq.jms.example.HAPolicyAutoBackupExample</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/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-configuration.xml
index 7230910..08ee255 100644
--- a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -40,15 +40,15 @@ under the License.
<connectors>
<connector name="invm-connector">vm://0</connector>
- <connector name="netty-connector">tcp://localhost:5445</connector>
+ <connector name="netty-connector">tcp://localhost:61616</connector>
<!-- connector to the server1 -->
- <connector name="server1-connector">tcp://localhost:5446</connector>
+ <connector name="server1-connector">tcp://localhost:61617</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
<acceptor name="invm-acceptor">vm://0</acceptor>
- <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61616</acceptor>
</acceptors>
<!-- HA configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-configuration.xml
index 2bdb0b8..d40f743 100644
--- a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -40,15 +40,15 @@ under the License.
<!-- Connectors -->
<connectors>
<connector name="invm-connector">vm://0</connector>
- <connector name="netty-connector">tcp://localhost:5446</connector>
+ <connector name="netty-connector">tcp://localhost:61617</connector>
<!-- connector to the server0 -->
- <connector name="server0-connector">tcp://localhost:5445</connector>
+ <connector name="server0-connector">tcp://localhost:61616</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
<acceptor name="invm-acceptor">vm://0</acceptor>
- <acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61617</acceptor>
</acceptors>
<!-- HA configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/http-transport/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/http-transport/pom.xml b/examples/jms/http-transport/pom.xml
index 0d77308..851eb80 100644
--- a/examples/jms/http-transport/pom.xml
+++ b/examples/jms/http-transport/pom.xml
@@ -72,7 +72,7 @@ under the License.
<configuration>
<clientClass>org.apache.activemq.jms.example.HttpTransportExample</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/instantiate-connection-factory/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/instantiate-connection-factory/pom.xml b/examples/jms/instantiate-connection-factory/pom.xml
index d23099e..c3c4942 100644
--- a/examples/jms/instantiate-connection-factory/pom.xml
+++ b/examples/jms/instantiate-connection-factory/pom.xml
@@ -82,7 +82,7 @@ under the License.
<configuration>
<clientClass>org.apache.activemq.jms.example.InstantiateConnectionFactoryExample</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/instantiate-connection-factory/readme.html
----------------------------------------------------------------------
diff --git a/examples/jms/instantiate-connection-factory/readme.html b/examples/jms/instantiate-connection-factory/readme.html
index 809929c..5d026d5 100644
--- a/examples/jms/instantiate-connection-factory/readme.html
+++ b/examples/jms/instantiate-connection-factory/readme.html
@@ -58,12 +58,12 @@ under the License.
<li>Instantiate the TransportConfiguration object. The TransportConfiguration instance encapsulates
the connection details of the server we're connecting to. In this case we're using Netty as a transport, and
- we're specifying to connect on port 5446.</li>
+ we're specifying to connect on port 61617.</li>
<pre class="prettyprint">
<code>
Map<String, Object> connectionParams = new HashMap<String, Object>();
- connectionParams.put(PORT_PROP_NAME, 5446);
+ connectionParams.put(PORT_PROP_NAME, 61617);
TransportConfiguration transportConfiguration = new TransportConfiguration(NettyConnectorFactory.class.getName(),
connectionParams);
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/instantiate-connection-factory/src/main/java/org/apache/activemq/jms/example/InstantiateConnectionFactoryExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/instantiate-connection-factory/src/main/java/org/apache/activemq/jms/example/InstantiateConnectionFactoryExample.java b/examples/jms/instantiate-connection-factory/src/main/java/org/apache/activemq/jms/example/InstantiateConnectionFactoryExample.java
index 781fb48..4459f7e 100644
--- a/examples/jms/instantiate-connection-factory/src/main/java/org/apache/activemq/jms/example/InstantiateConnectionFactoryExample.java
+++ b/examples/jms/instantiate-connection-factory/src/main/java/org/apache/activemq/jms/example/InstantiateConnectionFactoryExample.java
@@ -64,7 +64,7 @@ public class InstantiateConnectionFactoryExample extends ActiveMQExample
// The server port etc.
Map<String, Object> connectionParams = new HashMap<String, Object>();
- connectionParams.put(TransportConstants.PORT_PROP_NAME, 5446);
+ connectionParams.put(TransportConstants.PORT_PROP_NAME, 61617);
TransportConfiguration transportConfiguration = new TransportConfiguration(NettyConnectorFactory.class.getName(),
connectionParams);
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-configuration.xml
index 0df5630..701671f 100644
--- a/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -39,7 +39,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/interceptor/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/interceptor/pom.xml b/examples/jms/interceptor/pom.xml
index 75cd2a6..2390d58 100644
--- a/examples/jms/interceptor/pom.xml
+++ b/examples/jms/interceptor/pom.xml
@@ -77,7 +77,7 @@ under the License.
<configuration>
<clientClass>org.apache.activemq.jms.example.InterceptorExample</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/interceptor/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/interceptor/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/interceptor/src/main/resources/activemq/server0/activemq-configuration.xml
index ffda884..2b58d76 100644
--- a/examples/jms/interceptor/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/interceptor/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -44,7 +44,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/interceptor/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/interceptor/src/main/resources/jndi.properties b/examples/jms/interceptor/src/main/resources/jndi.properties
index 85eda3d..1cb3686 100644
--- a/examples/jms/interceptor/src/main/resources/jndi.properties
+++ b/examples/jms/interceptor/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/jms-auto-closeable/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-configuration.xml
index d2b2d69..ecbe10d 100644
--- a/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/jms-auto-closeable/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/jms-auto-closeable/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/jms-auto-closeable/src/main/resources/jndi.properties b/examples/jms/jms-auto-closeable/src/main/resources/jndi.properties
index 85eda3d..1cb3686 100644
--- a/examples/jms/jms-auto-closeable/src/main/resources/jndi.properties
+++ b/examples/jms/jms-auto-closeable/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/jms-bridge/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-bridge/pom.xml b/examples/jms/jms-bridge/pom.xml
index 5b1d6d4..4002626 100644
--- a/examples/jms/jms-bridge/pom.xml
+++ b/examples/jms/jms-bridge/pom.xml
@@ -82,7 +82,7 @@ under the License.
<configuration>
<clientClass>org.apache.activemq.jms.example.JMSBridgeExample</clientClass>
<args>
- <param>tcp://localhost:5445</param>
+ <param>tcp://localhost:61616</param>
<param>tcp://localhost:5455</param>
</args>
<systemProperties>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-configuration.xml
index 9dc2cbc..6ae6887 100644
--- a/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -37,7 +37,7 @@ under the License.
<paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
<acceptors>
- <acceptor name="netty">tcp://localhost:5445</acceptor>
+ <acceptor name="netty">tcp://localhost:61616</acceptor>
</acceptors>
<security-settings>
[7/8] activemq-6 git commit: Replace all references of port 5445 with
61616
Posted by an...@apache.org.
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
[2/8] activemq-6 git commit: Fix distribution bootstrap configs
Posted by an...@apache.org.
Fix distribution bootstrap configs
Some of the distribution configuration files were outdated, using the
old configuration format. This patch updates the config to allow the
server to parse and run accordingly.
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/57d02ab3
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/57d02ab3
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/57d02ab3
Branch: refs/heads/master
Commit: 57d02ab3610d47360ce32cc91f029203286ce447
Parents: c43e300
Author: Martyn Taylor <mt...@redhat.com>
Authored: Tue Feb 24 14:28:18 2015 +0000
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Tue Feb 24 15:07:05 2015 +0000
----------------------------------------------------------------------
.../src/main/resources/config/clustered/bootstrap.xml | 10 ++++++----
.../src/main/resources/config/replicated/bootstrap.xml | 10 ++++++----
.../src/main/resources/config/shared-store/bootstrap.xml | 10 ++++++----
3 files changed, 18 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/57d02ab3/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml b/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml
index 74608dc..fd5ed54 100644
--- a/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml
+++ b/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml
@@ -18,11 +18,13 @@
<broker xmlns="http://activemq.org/schema">
- <core configuration="file:${activemq.home}/config/clustered/activemq-configuration.xml"/>
+ <basic-security>
+ <users>file:${activemq.home}/config/non-clustered/activemq-users.properties</users>
+ <roles>file:${activemq.home}/config/non-clustered/activemq-roles.properties</roles>
+ <default-user>guest</default-user>
+ </basic-security>
- <jms configuration="file:${activemq.home}/config/clustered/activemq-jms.xml"/>
-
- <file-security configuration="file:${activemq.home}/config/non-clustered/activemq-users.xml"/>
+ <server configuration="file:${activemq.home}/config/clustered/activemq-configuration.xml"/>
<web bind="http://localhost:8161" path="web">
<app url="jolokia" war="jolokia-war-1.2.3.war"/>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/57d02ab3/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml b/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml
index 54c266c..e296de0 100644
--- a/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml
+++ b/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml
@@ -18,11 +18,13 @@
<broker xmlns="http://activemq.org/schema">
- <core configuration="file:${activemq.home}/config/replicated/activemq-configuration.xml"/>
+ <basic-security>
+ <users>file:${activemq.home}/config/non-clustered/activemq-users.properties</users>
+ <roles>file:${activemq.home}/config/non-clustered/activemq-roles.properties</roles>
+ <default-user>guest</default-user>
+ </basic-security>
- <jms configuration="file:${activemq.home}/config/replicated/activemq-jms.xml"/>
-
- <file-security configuration="file:${activemq.home}/config/non-clustered/activemq-users.xml"/>
+ <server configuration="file:${activemq.home}/config/replicated/activemq-configuration.xml"/>
<web bind="http://localhost:8161" path="web">
<app url="jolokia" war="jolokia-war-1.2.3.war"/>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/57d02ab3/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml b/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml
index 9139f50..0157e8a 100644
--- a/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml
+++ b/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml
@@ -18,11 +18,13 @@
<broker xmlns="http://activemq.org/schema">
- <core configuration="file:${activemq.home}/config/shared-store/activemq-configuration.xml"/>
+ <basic-security>
+ <users>file:${activemq.home}/config/non-clustered/activemq-users.properties</users>
+ <roles>file:${activemq.home}/config/non-clustered/activemq-roles.properties</roles>
+ <default-user>guest</default-user>
+ </basic-security>
- <jms configuration="file:${activemq.home}/config/shared-store/activemq-jms.xml"/>
-
- <file-security configuration="file:${activemq.home}/config/non-clustered/activemq-users.xml"/>
+ <server configuration="file:${activemq.home}/config/shared-store/activemq-configuration.xml"/>
<web bind="http://localhost:8161" path="web">
<app url="jolokia" war="jolokia-war-1.2.3.war"/>
[8/8] activemq-6 git commit: merge #110 - Distribution config
Posted by an...@apache.org.
merge #110 - Distribution config
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/e52622cf
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/e52622cf
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/e52622cf
Branch: refs/heads/master
Commit: e52622cffac2eca0a41a2d4d6c3e4a708fb2a04b
Parents: 3233371 e194b78
Author: Andy Taylor <an...@gmail.com>
Authored: Wed Feb 25 13:29:15 2015 +0000
Committer: Andy Taylor <an...@gmail.com>
Committed: Wed Feb 25 13:29:15 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 +--
.../activemq/src/main/resources/bin/activemq | 4 +--
.../src/main/resources/bin/activemq.conf | 34 ++++++++++++++++++++
.../config/clustered/activemq-configuration.xml | 21 ++++++++----
.../resources/config/clustered/bootstrap.xml | 10 +++---
.../non-clustered/activemq-configuration.xml | 17 +++++++---
.../replicated/activemq-configuration.xml | 21 ++++++++----
.../resources/config/replicated/bootstrap.xml | 10 +++---
.../shared-store/activemq-configuration.xml | 21 ++++++++----
.../resources/config/shared-store/bootstrap.xml | 10 +++---
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 +++----
308 files changed, 606 insertions(+), 533 deletions(-)
----------------------------------------------------------------------
[4/8] activemq-6 git commit: Replace all references of port 5445 with
61616
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/security/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/security/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/security/src/main/resources/activemq/server0/activemq-configuration.xml
index 7f24b65..c87229c 100644
--- a/examples/jms/security/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/security/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -42,7 +42,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/security/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/security/src/main/resources/jndi.properties b/examples/jms/security/src/main/resources/jndi.properties
index f7af861..6b6ec9f 100644
--- a/examples/jms/security/src/main/resources/jndi.properties
+++ b/examples/jms/security/src/main/resources/jndi.properties
@@ -16,7 +16,7 @@
# under the License.
java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
-connectionFactory.ConnectionFactory=tcp://localhost:5445
+connectionFactory.ConnectionFactory=tcp://localhost:61616
topic.topic/genericTopic=genericTopic
topic.topic/europeTopic=news.europe.europeTopic
topic.topic/usTopic=news.us.usTopic
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/activemq-configuration.xml
index e833e20..2fa4eb8 100644
--- a/examples/jms/send-acknowledgements/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/send-acknowledgements/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/send-acknowledgements/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/send-acknowledgements/src/main/resources/jndi.properties b/examples/jms/send-acknowledgements/src/main/resources/jndi.properties
index ed1d694..948acfe 100644
--- a/examples/jms/send-acknowledgements/src/main/resources/jndi.properties
+++ b/examples/jms/send-acknowledgements/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?confirmationWindowSize=1048576
+connectionFactory.ConnectionFactory=tcp://localhost:61616?confirmationWindowSize=1048576
queue.queue/exampleQueue=exampleQueue
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/static-selector-jms/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/static-selector-jms/pom.xml b/examples/jms/static-selector-jms/pom.xml
index 64a5b97..3f42e98 100644
--- a/examples/jms/static-selector-jms/pom.xml
+++ b/examples/jms/static-selector-jms/pom.xml
@@ -72,7 +72,7 @@ under the License.
<configuration>
<clientClass>org.apache.activemq.jms.example.StaticSelectorJMSExample</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/static-selector-jms/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-configuration.xml
index 1769b73..46c156b 100644
--- a/examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -41,7 +41,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/static-selector-jms/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/static-selector-jms/src/main/resources/jndi.properties b/examples/jms/static-selector-jms/src/main/resources/jndi.properties
index 85eda3d..1cb3686 100644
--- a/examples/jms/static-selector-jms/src/main/resources/jndi.properties
+++ b/examples/jms/static-selector-jms/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/static-selector/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/static-selector/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/static-selector/src/main/resources/activemq/server0/activemq-configuration.xml
index e755488..56e4f05 100644
--- a/examples/jms/static-selector/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/static-selector/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>
<queues>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/static-selector/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/static-selector/src/main/resources/jndi.properties b/examples/jms/static-selector/src/main/resources/jndi.properties
index 85eda3d..1cb3686 100644
--- a/examples/jms/static-selector/src/main/resources/jndi.properties
+++ b/examples/jms/static-selector/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/stomp-websockets/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp-websockets/pom.xml b/examples/jms/stomp-websockets/pom.xml
index d27809e..7f4c847 100644
--- a/examples/jms/stomp-websockets/pom.xml
+++ b/examples/jms/stomp-websockets/pom.xml
@@ -67,7 +67,7 @@ under the License.
<configuration>
<clientClass>org.apache.activemq.jms.example.StompWebSocketExample</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/stomp-websockets/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-configuration.xml
index 606430b..12b2288 100644
--- a/examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -40,7 +40,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
<!-- a regular Netty acceptor used by the JMS client -->
- <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61616</acceptor>
<!-- the stomp-acceptor is configured for the Stomp over Web Sockets and -->
<!-- will listen on port 61614) -->
<acceptor name="stomp-websocket">tcp://localhost:61614</acceptor>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/stomp-websockets/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/stomp-websockets/src/main/resources/jndi.properties b/examples/jms/stomp-websockets/src/main/resources/jndi.properties
index b509e71..cfa37b1 100644
--- a/examples/jms/stomp-websockets/src/main/resources/jndi.properties
+++ b/examples/jms/stomp-websockets/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
topic.topic/chat=chat
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/stomp/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/stomp/src/main/resources/activemq/server0/activemq-configuration.xml
index 4d0879e..91311e5 100644
--- a/examples/jms/stomp/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/stomp/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -40,7 +40,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
<!-- a regular Netty acceptor used by the JMS client -->
- <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61616</acceptor>
<!-- the stomp-acceptor is configured for the Stomp protocol only and -->
<!-- will listen on port 61613 (default Stomp port) -->
<acceptor name="stomp-acceptor">tcp://localhost:61613?protocols=STOMP</acceptor>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/stomp/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/stomp/src/main/resources/jndi.properties b/examples/jms/stomp/src/main/resources/jndi.properties
index 85eda3d..1cb3686 100644
--- a/examples/jms/stomp/src/main/resources/jndi.properties
+++ b/examples/jms/stomp/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/stomp1.1/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-configuration.xml
index 4d0879e..91311e5 100644
--- a/examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -40,7 +40,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
<!-- a regular Netty acceptor used by the JMS client -->
- <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61616</acceptor>
<!-- the stomp-acceptor is configured for the Stomp protocol only and -->
<!-- will listen on port 61613 (default Stomp port) -->
<acceptor name="stomp-acceptor">tcp://localhost:61613?protocols=STOMP</acceptor>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/stomp1.1/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/stomp1.1/src/main/resources/jndi.properties b/examples/jms/stomp1.1/src/main/resources/jndi.properties
index 85eda3d..1cb3686 100644
--- a/examples/jms/stomp1.1/src/main/resources/jndi.properties
+++ b/examples/jms/stomp1.1/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/stomp1.2/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-configuration.xml
index 4d0879e..91311e5 100644
--- a/examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -40,7 +40,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
<!-- a regular Netty acceptor used by the JMS client -->
- <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61616</acceptor>
<!-- the stomp-acceptor is configured for the Stomp protocol only and -->
<!-- will listen on port 61613 (default Stomp port) -->
<acceptor name="stomp-acceptor">tcp://localhost:61613?protocols=STOMP</acceptor>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/stomp1.2/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/stomp1.2/src/main/resources/jndi.properties b/examples/jms/stomp1.2/src/main/resources/jndi.properties
index 85eda3d..1cb3686 100644
--- a/examples/jms/stomp1.2/src/main/resources/jndi.properties
+++ b/examples/jms/stomp1.2/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/stop-server-failover/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stop-server-failover/pom.xml b/examples/jms/stop-server-failover/pom.xml
index 0e11b9f..8e4dc24 100644
--- a/examples/jms/stop-server-failover/pom.xml
+++ b/examples/jms/stop-server-failover/pom.xml
@@ -97,8 +97,8 @@ under the License.
<configuration>
<clientClass>org.apache.activemq.jms.example.StopServerFailoverExample</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/stop-server-failover/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-configuration.xml
index 808b21e..c5ce28c 100644
--- a/examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -45,12 +45,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>
<broadcast-groups>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-configuration.xml
index 377c653..abcaed0 100644
--- a/examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -45,12 +45,12 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">tcp://localhost:5446</connector>
+ <connector name="netty-connector">tcp://localhost:61617</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61617</acceptor>
</acceptors>
<broadcast-groups>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/stop-server-failover/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/stop-server-failover/src/main/resources/jndi.properties b/examples/jms/stop-server-failover/src/main/resources/jndi.properties
index 8f3fcff..0dac60e 100644
--- a/examples/jms/stop-server-failover/src/main/resources/jndi.properties
+++ b/examples/jms/stop-server-failover/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?ha=true&retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1
+connectionFactory.ConnectionFactory=tcp://localhost:61616?ha=true&retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1
queue.queue/exampleQueue=exampleQueue
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/symmetric-cluster/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/pom.xml b/examples/jms/symmetric-cluster/pom.xml
index 9b994ae..5d03609 100644
--- a/examples/jms/symmetric-cluster/pom.xml
+++ b/examples/jms/symmetric-cluster/pom.xml
@@ -187,11 +187,11 @@ under the License.
<configuration>
<clientClass>org.apache.activemq.jms.example.SymmetricClusterExample</clientClass>
<args>
- <param>tcp://localhost:5445</param>
- <param>tcp://localhost:5446</param>
- <param>tcp://localhost:5447</param>
- <param>tcp://localhost:5448</param>
- <param>tcp://localhost:5449</param>
+ <param>tcp://localhost:61616</param>
+ <param>tcp://localhost:61617</param>
+ <param>tcp://localhost:61618</param>
+ <param>tcp://localhost:61619</param>
+ <param>tcp://localhost:61620</param>
<param>tcp://localhost:5450</param>
</args>
<systemProperties>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-configuration.xml
index 3cadff0..7156cb9 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -43,13 +43,13 @@ 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>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-configuration.xml
index 50cfcc9..8bde0be 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -42,12 +42,12 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">tcp://localhost:5446</connector>
+ <connector name="netty-connector">tcp://localhost:61617</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61617</acceptor>
</acceptors>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-configuration.xml
index adf6332..4384dcc 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-configuration.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-configuration.xml
@@ -42,12 +42,12 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">tcp://localhost:5447</connector>
+ <connector name="netty-connector">tcp://localhost:61618</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5447</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61618</acceptor>
</acceptors>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-configuration.xml
index d3ad53f..2c91ddf 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-configuration.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-configuration.xml
@@ -42,12 +42,12 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">tcp://localhost:5448</connector>
+ <connector name="netty-connector">tcp://localhost:61619</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5448</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61619</acceptor>
</acceptors>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-configuration.xml
index dda3757..6851e6c 100644
--- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-configuration.xml
+++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-configuration.xml
@@ -41,12 +41,12 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">tcp://localhost:5449</connector>
+ <connector name="netty-connector">tcp://localhost:61620</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5449</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61620</acceptor>
</acceptors>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-configuration.xml
index 51d379b..85896d0 100644
--- a/examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -40,12 +40,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/temp-queue/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/temp-queue/src/main/resources/jndi.properties b/examples/jms/temp-queue/src/main/resources/jndi.properties
index 85eda3d..1cb3686 100644
--- a/examples/jms/temp-queue/src/main/resources/jndi.properties
+++ b/examples/jms/temp-queue/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/topic-hierarchies/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-configuration.xml
index 14ce6cb..e02e91f 100644
--- a/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -50,7 +50,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/topic-hierarchies/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/topic-hierarchies/src/main/resources/jndi.properties b/examples/jms/topic-hierarchies/src/main/resources/jndi.properties
index 26a519c..40ed640 100644
--- a/examples/jms/topic-hierarchies/src/main/resources/jndi.properties
+++ b/examples/jms/topic-hierarchies/src/main/resources/jndi.properties
@@ -16,4 +16,4 @@
# under the License.
java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
-connectionFactory.ConnectionFactory=tcp://localhost:5445
+connectionFactory.ConnectionFactory=tcp://localhost:61616
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-configuration.xml
index 985fce4..58180dd 100644
--- a/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/topic-selector-example1/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/topic-selector-example1/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/topic-selector-example1/src/main/resources/jndi.properties b/examples/jms/topic-selector-example1/src/main/resources/jndi.properties
index 9c96675..09611dc 100644
--- a/examples/jms/topic-selector-example1/src/main/resources/jndi.properties
+++ b/examples/jms/topic-selector-example1/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
topic.topic/exampleTopic=exampleTopic
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-configuration.xml
index 985fce4..58180dd 100644
--- a/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/topic-selector-example2/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/topic-selector-example2/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/topic-selector-example2/src/main/resources/jndi.properties b/examples/jms/topic-selector-example2/src/main/resources/jndi.properties
index 9c96675..09611dc 100644
--- a/examples/jms/topic-selector-example2/src/main/resources/jndi.properties
+++ b/examples/jms/topic-selector-example2/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
topic.topic/exampleTopic=exampleTopic
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/topic/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic/pom.xml b/examples/jms/topic/pom.xml
index 0415b58..0bda45c 100644
--- a/examples/jms/topic/pom.xml
+++ b/examples/jms/topic/pom.xml
@@ -72,7 +72,7 @@ under the License.
<configuration>
<clientClass>org.apache.activemq.jms.example.TopicExample</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/topic/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/topic/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/topic/src/main/resources/activemq/server0/activemq-configuration.xml
index 985fce4..58180dd 100644
--- a/examples/jms/topic/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/topic/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/topic/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/topic/src/main/resources/jndi.properties b/examples/jms/topic/src/main/resources/jndi.properties
index 9c96675..09611dc 100644
--- a/examples/jms/topic/src/main/resources/jndi.properties
+++ b/examples/jms/topic/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
topic.topic/exampleTopic=exampleTopic
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml
index aeaab28..75f9e5d 100644
--- a/examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -46,12 +46,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>
<broadcast-groups>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml
index f35dc75..1bc395c 100644
--- a/examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -45,12 +45,12 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">tcp://localhost:5446</connector>
+ <connector name="netty-connector">tcp://localhost:61617</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61617</acceptor>
</acceptors>
<broadcast-groups>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/transaction-failover/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/transaction-failover/src/main/resources/jndi.properties b/examples/jms/transaction-failover/src/main/resources/jndi.properties
index 8f3fcff..0dac60e 100644
--- a/examples/jms/transaction-failover/src/main/resources/jndi.properties
+++ b/examples/jms/transaction-failover/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?ha=true&retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1
+connectionFactory.ConnectionFactory=tcp://localhost:61616?ha=true&retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1
queue.queue/exampleQueue=exampleQueue
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/transactional/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/transactional/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/transactional/src/main/resources/activemq/server0/activemq-configuration.xml
index e833e20..2fa4eb8 100644
--- a/examples/jms/transactional/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/transactional/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/transactional/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/transactional/src/main/resources/jndi.properties b/examples/jms/transactional/src/main/resources/jndi.properties
index 85eda3d..1cb3686 100644
--- a/examples/jms/transactional/src/main/resources/jndi.properties
+++ b/examples/jms/transactional/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/xa-heuristic/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-configuration.xml
index e833e20..2fa4eb8 100644
--- a/examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/xa-heuristic/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/xa-heuristic/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/xa-heuristic/src/main/resources/jndi.properties b/examples/jms/xa-heuristic/src/main/resources/jndi.properties
index 51335e0..bf09643 100644
--- a/examples/jms/xa-heuristic/src/main/resources/jndi.properties
+++ b/examples/jms/xa-heuristic/src/main/resources/jndi.properties
@@ -16,6 +16,6 @@
# under the License.
java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
-connectionFactory.ConnectionFactory=tcp://localhost:5445
-connectionFactory.XAConnectionFactory=tcp://localhost:5445?type=XA_CF
+connectionFactory.ConnectionFactory=tcp://localhost:61616
+connectionFactory.XAConnectionFactory=tcp://localhost:61616?type=XA_CF
queue.queue/exampleQueue=exampleQueue
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-configuration.xml
index e833e20..2fa4eb8 100644
--- a/examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/xa-receive/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/xa-receive/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/xa-receive/src/main/resources/jndi.properties b/examples/jms/xa-receive/src/main/resources/jndi.properties
index 51335e0..bf09643 100644
--- a/examples/jms/xa-receive/src/main/resources/jndi.properties
+++ b/examples/jms/xa-receive/src/main/resources/jndi.properties
@@ -16,6 +16,6 @@
# under the License.
java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
-connectionFactory.ConnectionFactory=tcp://localhost:5445
-connectionFactory.XAConnectionFactory=tcp://localhost:5445?type=XA_CF
+connectionFactory.ConnectionFactory=tcp://localhost:61616
+connectionFactory.XAConnectionFactory=tcp://localhost:61616?type=XA_CF
queue.queue/exampleQueue=exampleQueue
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/jms/xa-send/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/xa-send/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/xa-send/src/main/resources/activemq/server0/activemq-configuration.xml
index e833e20..2fa4eb8 100644
--- a/examples/jms/xa-send/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/xa-send/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/xa-send/src/main/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/examples/jms/xa-send/src/main/resources/jndi.properties b/examples/jms/xa-send/src/main/resources/jndi.properties
index 51335e0..bf09643 100644
--- a/examples/jms/xa-send/src/main/resources/jndi.properties
+++ b/examples/jms/xa-send/src/main/resources/jndi.properties
@@ -16,6 +16,6 @@
# under the License.
java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
-connectionFactory.ConnectionFactory=tcp://localhost:5445
-connectionFactory.XAConnectionFactory=tcp://localhost:5445?type=XA_CF
+connectionFactory.ConnectionFactory=tcp://localhost:61616
+connectionFactory.XAConnectionFactory=tcp://localhost:61616?type=XA_CF
queue.queue/exampleQueue=exampleQueue
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/soak/normal/pom.xml
----------------------------------------------------------------------
diff --git a/examples/soak/normal/pom.xml b/examples/soak/normal/pom.xml
index 16fc559..d0715b9 100644
--- a/examples/soak/normal/pom.xml
+++ b/examples/soak/normal/pom.xml
@@ -114,7 +114,7 @@ under the License.
<configuration>
<clientClass>org.apache.activemq.jms.soak.example.SoakReceiver</clientClass>
<args>
- <param>tcp://localhost:5445</param>
+ <param>tcp://localhost:61616</param>
</args>
</configuration>
</execution>
@@ -126,7 +126,7 @@ under the License.
<configuration>
<clientClass>org.apache.activemq.jms.soak.example.SoakSender</clientClass>
<args>
- <param>tcp://localhost:5445</param>
+ <param>tcp://localhost:61616</param>
</args>
</configuration>
</execution>
@@ -160,7 +160,7 @@ under the License.
<configuration>
<clientClass>org.apache.activemq.jms.soak.example.SoakReceiver</clientClass>
<args>
- <param>tcp://localhost:5445</param>
+ <param>tcp://localhost:61616</param>
</args>
</configuration>
</execution>
@@ -172,7 +172,7 @@ under the License.
<configuration>
<clientClass>org.apache.activemq.jms.soak.example.SoakSender</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/soak/normal/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/soak/normal/server0/activemq-configuration.xml b/examples/soak/normal/server0/activemq-configuration.xml
index 82c2eff..8a168b3 100644
--- a/examples/soak/normal/server0/activemq-configuration.xml
+++ b/examples/soak/normal/server0/activemq-configuration.xml
@@ -26,12 +26,12 @@ under the License.
</jms>
<core xmlns="urn:activemq:core">
<connectors>
- <connector name="netty-connector">tcp://localhost:5445?tcpNoDelay=false;tcpSendBufferSize=1048576?tcpReceiveBufferSize=1048576</connector>
+ <connector name="netty-connector">tcp://localhost:61616?tcpNoDelay=false;tcpSendBufferSize=1048576?tcpReceiveBufferSize=1048576</connector>
</connectors>
<!-- 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/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakReceiver.java
----------------------------------------------------------------------
diff --git a/examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakReceiver.java b/examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakReceiver.java
index 3f6b530..63b5abd 100644
--- a/examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakReceiver.java
+++ b/examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakReceiver.java
@@ -52,7 +52,7 @@ public class SoakReceiver
String jndiURL = System.getProperty("jndi.address");
if(jndiURL == null)
{
- jndiURL = args.length > 0 ? args[0] : "tcp://localhost:5445";
+ jndiURL = args.length > 0 ? args[0] : "tcp://localhost:61616";
}
System.out.println("Connecting to JNDI at " + jndiURL);
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakSender.java
----------------------------------------------------------------------
diff --git a/examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakSender.java b/examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakSender.java
index 1b9e7f4..1b13f17 100644
--- a/examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakSender.java
+++ b/examples/soak/normal/src/main/java/org/apache/activemq/jms/soak/example/SoakSender.java
@@ -44,7 +44,7 @@ public class SoakSender
String jndiURL = System.getProperty("jndi.address");
if(jndiURL == null)
{
- jndiURL = args.length > 0 ? args[0] : "tcp://localhost:5445";
+ jndiURL = args.length > 0 ? args[0] : "tcp://localhost:61616";
}
System.out.println("Connecting to JNDI at " + jndiURL);
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/tests/config/server-start-stop-backup-config1.xml
----------------------------------------------------------------------
diff --git a/tests/config/server-start-stop-backup-config1.xml b/tests/config/server-start-stop-backup-config1.xml
index 292315d..7996fdb 100644
--- a/tests/config/server-start-stop-backup-config1.xml
+++ b/tests/config/server-start-stop-backup-config1.xml
@@ -25,12 +25,12 @@
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">tcp://localhost:5446</connector>
+ <connector name="netty-connector">tcp://localhost:61617</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61617</acceptor>
</acceptors>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/tests/config/server-start-stop-live-config1.xml
----------------------------------------------------------------------
diff --git a/tests/config/server-start-stop-live-config1.xml b/tests/config/server-start-stop-live-config1.xml
index 6f832ef..749d902 100644
--- a/tests/config/server-start-stop-live-config1.xml
+++ b/tests/config/server-start-stop-live-config1.xml
@@ -25,9 +25,9 @@
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">tcp://localhost:5445</connector>
+ <connector name="netty-connector">tcp://localhost:61616</connector>
- <connector name="backup-connector">tcp://localhost:5446</connector>
+ <connector name="backup-connector">tcp://localhost:61617</connector>
</connectors>
<!-- Acceptors -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/JmsNettyNioStressTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/JmsNettyNioStressTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/JmsNettyNioStressTest.java
index 8826810..832181d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/JmsNettyNioStressTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/JmsNettyNioStressTest.java
@@ -88,7 +88,7 @@ public class JmsNettyNioStressTest extends ServiceTestBase
{
// first set up the server
Map<String, Object> params = new HashMap<String, Object>();
- params.put(TransportConstants.PORT_PROP_NAME, 5445);
+ params.put(TransportConstants.PORT_PROP_NAME, 61616);
params.put(TransportConstants.HOST_PROP_NAME, "localhost");
params.put(TransportConstants.USE_NIO_PROP_NAME, true);
// minimize threads to maximize possibility for deadlock
@@ -101,7 +101,7 @@ public class JmsNettyNioStressTest extends ServiceTestBase
// now the client side
Map<String, Object> connectionParams = new HashMap<String, Object>();
- connectionParams.put(TransportConstants.PORT_PROP_NAME, 5445);
+ connectionParams.put(TransportConstants.PORT_PROP_NAME, 61616);
connectionParams.put(TransportConstants.HOST_PROP_NAME, "localhost");
connectionParams.put(TransportConstants.USE_NIO_PROP_NAME, true);
connectionParams.put(TransportConstants.BATCH_DELAY, 50);
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java
index 2253cc5..d9b6afa 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java
@@ -99,18 +99,18 @@ public class AutomaticColocatedQuorumVoteTest extends ServiceTestBase
assertEquals(server1.getNodeID(), backupServer0.getNodeID());
Set<TransportConfiguration> backupAcceptors0 = backupServer0.getConfiguration().getAcceptorConfigurations();
assertEquals(1, backupAcceptors0.size());
- assertEquals("5545", backupAcceptors0.iterator().next().getParams().get("port"));
+ assertEquals("61716", backupAcceptors0.iterator().next().getParams().get("port"));
Set<TransportConfiguration> backupAcceptors1 = backupServer1.getConfiguration().getAcceptorConfigurations();
assertEquals(1, backupAcceptors1.size());
- assertEquals("5546", backupAcceptors1.iterator().next().getParams().get("port"));
+ assertEquals("61717", backupAcceptors1.iterator().next().getParams().get("port"));
Map<String, TransportConfiguration> connectorConfigurations0 = backupServer0.getConfiguration().getConnectorConfigurations();
assertEquals(2, connectorConfigurations0.size());
- assertEquals("5545", connectorConfigurations0.get("liveConnector0").getParams().get("port"));
- assertEquals("5446", connectorConfigurations0.get("remoteConnector0").getParams().get("port"));
+ assertEquals("61716", connectorConfigurations0.get("liveConnector0").getParams().get("port"));
+ assertEquals("61617", connectorConfigurations0.get("remoteConnector0").getParams().get("port"));
Map<String, TransportConfiguration> connectorConfigurations1 = backupServer1.getConfiguration().getConnectorConfigurations();
assertEquals(2, connectorConfigurations1.size());
- assertEquals("5546", connectorConfigurations1.get("liveConnector1").getParams().get("port"));
- assertEquals("5445", connectorConfigurations1.get("remoteConnector1").getParams().get("port"));
+ assertEquals("61717", connectorConfigurations1.get("liveConnector1").getParams().get("port"));
+ assertEquals("61616", connectorConfigurations1.get("remoteConnector1").getParams().get("port"));
if (!replicated)
{
assertEquals(server0.getConfiguration().getJournalDirectory(), backupServer1.getConfiguration().getJournalDirectory());
@@ -186,12 +186,12 @@ public class AutomaticColocatedQuorumVoteTest extends ServiceTestBase
assertEquals(0, backupAcceptors1.size());
Map<String, TransportConfiguration> connectorConfigurations0 = backupServer0.getConfiguration().getConnectorConfigurations();
assertEquals(2, connectorConfigurations0.size());
- assertEquals("5445", connectorConfigurations0.get("liveConnector0").getParams().get("port"));
- assertEquals("5446", connectorConfigurations0.get("remoteConnector0").getParams().get("port"));
+ assertEquals("61616", connectorConfigurations0.get("liveConnector0").getParams().get("port"));
+ assertEquals("61617", connectorConfigurations0.get("remoteConnector0").getParams().get("port"));
Map<String, TransportConfiguration> connectorConfigurations1 = backupServer1.getConfiguration().getConnectorConfigurations();
assertEquals(2, connectorConfigurations1.size());
- assertEquals("5446", connectorConfigurations1.get("liveConnector1").getParams().get("port"));
- assertEquals("5445", connectorConfigurations1.get("remoteConnector1").getParams().get("port"));
+ assertEquals("61617", connectorConfigurations1.get("liveConnector1").getParams().get("port"));
+ assertEquals("61616", connectorConfigurations1.get("remoteConnector1").getParams().get("port"));
if (!replicated)
{
assertEquals(server0.getConfiguration().getJournalDirectory(), backupServer1.getConfiguration().getJournalDirectory());
@@ -366,14 +366,14 @@ public class AutomaticColocatedQuorumVoteTest extends ServiceTestBase
private TransportConfiguration getAcceptorTransportConfiguration(int node)
{
HashMap<String, Object> params = new HashMap<>();
- params.put("port", "" + (5445 + node));
+ params.put("port", "" + (61616 + node));
return new TransportConfiguration(NETTY_ACCEPTOR_FACTORY, params);
}
private TransportConfiguration getConnectorTransportConfiguration(String name, int node)
{
HashMap<String, Object> params = new HashMap<>();
- params.put("port", "" + (5445 + node));
+ params.put("port", "" + (61616 + node));
return new TransportConfiguration(NETTY_CONNECTOR_FACTORY, params, name);
}
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailoverTestBase.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailoverTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailoverTestBase.java
index a83661c..e8cb152 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailoverTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailoverTestBase.java
@@ -275,7 +275,7 @@ public abstract class FailoverTestBase extends ServiceTestBase
try
{
- ServerSocket serverSocket = new ServerSocket(5445);
+ ServerSocket serverSocket = new ServerSocket(61616);
serverSocket.close();
}
catch (IOException e)
@@ -284,7 +284,7 @@ public abstract class FailoverTestBase extends ServiceTestBase
}
try
{
- ServerSocket serverSocket = new ServerSocket(5446);
+ ServerSocket serverSocket = new ServerSocket(61617);
serverSocket.close();
}
catch (IOException e)
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/SimpleJNDIClientTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/SimpleJNDIClientTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/SimpleJNDIClientTest.java
index 22edf72..c116154 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/SimpleJNDIClientTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/SimpleJNDIClientTest.java
@@ -76,7 +76,7 @@ public class SimpleJNDIClientTest extends UnitTestCase
Hashtable<String, Object> props = new Hashtable<>();
props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
props.put("connectionFactory.VmConnectionFactory", "vm://0");
- props.put("connectionFactory.TCPConnectionFactory", "tcp://localhost:5445");
+ props.put("connectionFactory.TCPConnectionFactory", "tcp://localhost:61616");
props.put("connectionFactory.UDPConnectionFactory", "udp://" + getUDPDiscoveryAddress() + ":" + getUDPDiscoveryPort());
props.put("connectionFactory.JGroupsConnectionFactory", "jgroups://mychannelid?file=test-jgroups-file_ping.xml");
Context ctx = new InitialContext(props);
@@ -182,7 +182,7 @@ public class SimpleJNDIClientTest extends UnitTestCase
{
Hashtable props = new Hashtable<>();
props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
- props.put("connectionFactory.myConnectionFactory", "tcp://127.0.0.1:5445");
+ props.put("connectionFactory.myConnectionFactory", "tcp://127.0.0.1:61616");
Context ctx = new InitialContext(props);
ConnectionFactory connectionFactory = (ConnectionFactory) ctx.lookup("myConnectionFactory");
@@ -195,7 +195,7 @@ public class SimpleJNDIClientTest extends UnitTestCase
{
Hashtable props = new Hashtable<>();
props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
- props.put("connectionFactory.myConnectionFactory", "tcp://127.0.0.1:5445?ha=true");
+ props.put("connectionFactory.myConnectionFactory", "tcp://127.0.0.1:61616?ha=true");
Context ctx = new InitialContext(props);
ActiveMQConnectionFactory cf = (ActiveMQConnectionFactory) ctx.lookup("myConnectionFactory");
@@ -329,7 +329,7 @@ public class SimpleJNDIClientTest extends UnitTestCase
{
Hashtable props = new Hashtable<>();
props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
- props.put("connectionFactory.myConnectionFactory", "tcp://127.0.0.1:5445/httpEnabled=true&foo=bar,tcp://127.0.0.2:5446?httpEnabled=false?clientID=myClientID");
+ props.put("connectionFactory.myConnectionFactory", "tcp://127.0.0.1:61616/httpEnabled=true&foo=bar,tcp://127.0.0.2:61617?httpEnabled=false?clientID=myClientID");
Context ctx = new InitialContext(props);
ConnectionFactory connectionFactory = (ConnectionFactory) ctx.lookup("myConnectionFactory");
@@ -342,7 +342,7 @@ public class SimpleJNDIClientTest extends UnitTestCase
{
Hashtable props = new Hashtable<>();
props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
- props.put("connectionFactory.myConnectionFactory", "tcp://127.0.0.1:5445?" +
+ props.put("connectionFactory.myConnectionFactory", "tcp://127.0.0.1:61616?" +
TransportConstants.SSL_ENABLED_PROP_NAME + "=mySSLEnabledPropValue&" +
TransportConstants.HTTP_ENABLED_PROP_NAME + "=myHTTPEnabledPropValue&" +
TransportConstants.HTTP_CLIENT_IDLE_PROP_NAME + "=myHTTPClientIdlePropValue&" +
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/OpenWireTestBase.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/OpenWireTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/OpenWireTestBase.java
index 6cd907f..0032e62 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/OpenWireTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/openwire/OpenWireTestBase.java
@@ -32,7 +32,6 @@ import org.apache.activemq.api.core.TransportConfiguration;
import org.apache.activemq.api.jms.management.JMSServerControl;
import org.apache.activemq.core.config.Configuration;
import org.apache.activemq.core.registry.JndiBindingRegistry;
-import org.apache.activemq.core.remoting.impl.netty.TransportConstants;
import org.apache.activemq.core.security.Role;
import org.apache.activemq.core.server.ActiveMQServer;
import org.apache.activemq.core.settings.impl.AddressSettings;
@@ -69,8 +68,6 @@ public class OpenWireTestBase extends ServiceTestBase
super.setUp();
server = this.createServer(realStore, true);
HashMap<String, Object> params = new HashMap<String, Object>();
- params.put(TransportConstants.PORT_PROP_NAME, "61616");
- params.put(TransportConstants.PROTOCOLS_PROP_NAME, "OPENWIRE");
TransportConfiguration transportConfiguration = new TransportConfiguration(NETTY_ACCEPTOR_FACTORY, params);
Configuration serverConfig = server.getConfiguration();
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ResourceAdapterTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ResourceAdapterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ResourceAdapterTest.java
index 1b33cc6..5f00dc2 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ResourceAdapterTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/ResourceAdapterTest.java
@@ -365,7 +365,7 @@ public class ResourceAdapterTest extends ActiveMQRATestBase
spec.setDestination(MDBQUEUE);
// now override the connector class
spec.setConnectorClassName(NETTY_CONNECTOR_FACTORY);
- spec.setConnectionParameters("port=5445");
+ spec.setConnectionParameters("port=61616");
DummyMessageEndpoint endpoint = new DummyMessageEndpoint(new CountDownLatch(1));
DummyMessageEndpointFactory endpointFactory = new DummyMessageEndpointFactory(endpoint, false);
qResourceAdapter.endpointActivation(endpointFactory, spec);
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/ScaleDown3NodeTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/ScaleDown3NodeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/ScaleDown3NodeTest.java
index d902c60..09e3338 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/ScaleDown3NodeTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/ScaleDown3NodeTest.java
@@ -63,7 +63,7 @@ public class ScaleDown3NodeTest extends ClusterTestBase
setupClusterConnection("cluster0", "testAddress", false, 1, isNetty(), 1, 0, 2);
setupClusterConnection("cluster0", "testAddress", false, 1, isNetty(), 2, 0, 1);
String scaleDownConnector = servers[0].getConfiguration().getClusterConfigurations().get(0).getStaticConnectors().get(0);
- Assert.assertEquals(5446, servers[0].getConfiguration().getConnectorConfigurations().get(scaleDownConnector).getParams().get(TransportConstants.PORT_PROP_NAME));
+ Assert.assertEquals(61617, servers[0].getConfiguration().getConnectorConfigurations().get(scaleDownConnector).getParams().get(TransportConstants.PORT_PROP_NAME));
scaleDownConfiguration0.getConnectors().add(scaleDownConnector);
startServers(0, 1, 2);
setupSessionFactory(0, isNetty());
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/tests/integration-tests/src/test/java/org/apache/activemq/tests/util/TransportConfigurationUtils.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/util/TransportConfigurationUtils.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/util/TransportConfigurationUtils.java
index ec399d1..a204a7b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/util/TransportConfigurationUtils.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/util/TransportConfigurationUtils.java
@@ -102,7 +102,7 @@ public final class TransportConfigurationUtils
if (classname.contains("netty"))
{
Map<String, Object> serverParams = new HashMap<String, Object>();
- Integer port = live ? 5445 : 5545;
+ Integer port = live ? 61616 : 5545;
serverParams.put(org.apache.activemq.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, port);
return new TransportConfiguration(classname, serverParams);
}
@@ -117,7 +117,7 @@ public final class TransportConfigurationUtils
if (classname.contains("netty"))
{
Map<String, Object> serverParams = new HashMap<String, Object>();
- Integer port = live ? 5445 : 5545;
+ Integer port = live ? 61616 : 5545;
serverParams.put(org.apache.activemq.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, port);
return new TransportConfiguration(classname, serverParams, name);
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml b/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml
index 9897b32..9eb1525 100644
--- a/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml
+++ b/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml
@@ -19,7 +19,7 @@
xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
<connectors>
- <connector name="netty-connector">tcp://localhost:5445</connector>
+ <connector name="netty-connector">tcp://localhost:61616</connector>
</connectors>
<paging-directory>/tmp/activemq-unit-test/live1/paging</paging-directory>
@@ -28,7 +28,7 @@
<large-messages-directory>/tmp/activemq-unit-test/live1/largemessages</large-messages-directory>
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61616</acceptor>
</acceptors>
<broadcast-groups>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/tests/integration-tests/src/test/resources/server-start-stop-config1.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/resources/server-start-stop-config1.xml b/tests/integration-tests/src/test/resources/server-start-stop-config1.xml
index 5d2f065..8a9a348 100644
--- a/tests/integration-tests/src/test/resources/server-start-stop-config1.xml
+++ b/tests/integration-tests/src/test/resources/server-start-stop-config1.xml
@@ -23,13 +23,13 @@
<core xmlns="urn:activemq:core">
<connectors>
- <connector name="netty-connector">tcp://localhost:5445</connector>
+ <connector name="netty-connector">tcp://localhost:61616</connector>
</connectors>
<journal-directory>/tmp/activemq-unit-test/start-stop-data</journal-directory>
<acceptors>
- <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:61616</acceptor>
</acceptors>
<security-enabled>false</security-enabled>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/tests/jms-tests/src/test/resources/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/tests/jms-tests/src/test/resources/activemq-configuration.xml b/tests/jms-tests/src/test/resources/activemq-configuration.xml
index a507aad..10f6a8d 100644
--- a/tests/jms-tests/src/test/resources/activemq-configuration.xml
+++ b/tests/jms-tests/src/test/resources/activemq-configuration.xml
@@ -24,7 +24,7 @@
<!-- Connectors -->
<connectors>
- <connector name="netty">tcp://localhost:5445</connector>
+ <connector name="netty">tcp://localhost:61616</connector>
<connector name="in-vm">vm://0</connector>
</connectors>
@@ -33,7 +33,7 @@
<!-- In VM acceptor -->
<acceptor name="in-vm">vm://0</acceptor>
<!-- Netty TCP Acceptor -->
- <acceptor name="netty">tcp://localhost:5445</acceptor>
+ <acceptor name="netty">tcp://localhost:61616</acceptor>
</acceptors>
<journal-min-files>2</journal-min-files>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/tests/joram-tests/src/test/java/org/apache/activemq/jms/ActiveMQAdmin.java
----------------------------------------------------------------------
diff --git a/tests/joram-tests/src/test/java/org/apache/activemq/jms/ActiveMQAdmin.java b/tests/joram-tests/src/test/java/org/apache/activemq/jms/ActiveMQAdmin.java
index 4e9779b..fec80ff 100644
--- a/tests/joram-tests/src/test/java/org/apache/activemq/jms/ActiveMQAdmin.java
+++ b/tests/joram-tests/src/test/java/org/apache/activemq/jms/ActiveMQAdmin.java
@@ -75,7 +75,7 @@ public class ActiveMQAdmin implements Admin
{
Hashtable<String, String> env = new Hashtable<String, String>();
env.put("java.naming.factory.initial", "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
- env.put("java.naming.provider.url", "tcp://localhost:5445");
+ env.put("java.naming.provider.url", "tcp://localhost:61616");
context = new InitialContext(env);
}
catch (NamingException e)
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/PTPTestCase.java
----------------------------------------------------------------------
diff --git a/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/PTPTestCase.java b/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/PTPTestCase.java
index d49d55e..21fae65 100644
--- a/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/PTPTestCase.java
+++ b/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/PTPTestCase.java
@@ -122,7 +122,7 @@ public abstract class PTPTestCase extends JMSTestCase
Hashtable props = new Hashtable<>();
props.put(Context.INITIAL_CONTEXT_FACTORY, ActiveMQInitialContextFactory.class.getCanonicalName());
- props.put("connectionFactory." + PTPTestCase.QCF_NAME, "tcp://127.0.0.1:5445?type=QUEUE_CF");
+ props.put("connectionFactory." + PTPTestCase.QCF_NAME, "tcp://127.0.0.1:61616?type=QUEUE_CF");
props.put("queue." + PTPTestCase.QUEUE_NAME, PTPTestCase.QUEUE_NAME);
Context ctx = new InitialContext(props);
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/PubSubTestCase.java
----------------------------------------------------------------------
diff --git a/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/PubSubTestCase.java b/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/PubSubTestCase.java
index 8f6666b..71348c5 100644
--- a/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/PubSubTestCase.java
+++ b/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/PubSubTestCase.java
@@ -122,7 +122,7 @@ public abstract class PubSubTestCase extends JMSTestCase
Hashtable props = new Hashtable<>();
props.put(Context.INITIAL_CONTEXT_FACTORY, ActiveMQInitialContextFactory.class.getCanonicalName());
- props.put("connectionFactory." + PubSubTestCase.TCF_NAME, "tcp://127.0.0.1:5445?type=TOPIC_CF");
+ props.put("connectionFactory." + PubSubTestCase.TCF_NAME, "tcp://127.0.0.1:61616?type=TOPIC_CF");
props.put("topic." + PubSubTestCase.TOPIC_NAME, PubSubTestCase.TOPIC_NAME);
Context ctx = new InitialContext(props);
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/UnifiedTestCase.java
----------------------------------------------------------------------
diff --git a/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/UnifiedTestCase.java b/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/UnifiedTestCase.java
index 70d4b5b..f69bba9 100644
--- a/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/UnifiedTestCase.java
+++ b/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/UnifiedTestCase.java
@@ -171,9 +171,9 @@ public abstract class UnifiedTestCase extends JMSTestCase
Hashtable props = new Hashtable<>();
props.put(Context.INITIAL_CONTEXT_FACTORY, ActiveMQInitialContextFactory.class.getCanonicalName());
- props.put("connectionFactory." + UnifiedTestCase.CF_NAME, "tcp://127.0.0.1:5445");
- props.put("connectionFactory." + UnifiedTestCase.QCF_NAME, "tcp://127.0.0.1:5445?type=QUEUE_CF");
- props.put("connectionFactory." + UnifiedTestCase.TCF_NAME, "tcp://127.0.0.1:5445?type=TOPIC_CF");
+ props.put("connectionFactory." + UnifiedTestCase.CF_NAME, "tcp://127.0.0.1:61616");
+ props.put("connectionFactory." + UnifiedTestCase.QCF_NAME, "tcp://127.0.0.1:61616?type=QUEUE_CF");
+ props.put("connectionFactory." + UnifiedTestCase.TCF_NAME, "tcp://127.0.0.1:61616?type=TOPIC_CF");
props.put("queue." + UnifiedTestCase.DESTINATION_NAME, UnifiedTestCase.DESTINATION_NAME);
props.put("queue." + UnifiedTestCase.QUEUE_NAME, UnifiedTestCase.QUEUE_NAME);
props.put("topic." + UnifiedTestCase.TOPIC_NAME, UnifiedTestCase.TOPIC_NAME);
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/ra/ActiveMQResourceAdapterConfigTest.java
----------------------------------------------------------------------
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/ra/ActiveMQResourceAdapterConfigTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/ra/ActiveMQResourceAdapterConfigTest.java
index 4f3d414..df8d3a9 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/ra/ActiveMQResourceAdapterConfigTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/ra/ActiveMQResourceAdapterConfigTest.java
@@ -55,7 +55,7 @@ public class ActiveMQResourceAdapterConfigTest extends UnitTestCase
" </config-property>\n" +
" <config-property>\n" +
" <description>The transport configuration. These values must be in the form of key=val;key=val;,\n" +
- " if multiple connectors are used then each set must be separated by a comma i.e. host=host1;port=5445,host=host2;port=5446.\n" +
+ " if multiple connectors are used then each set must be separated by a comma i.e. host=host1;port=61616,host=host2;port=61617.\n" +
" Each set of params maps to the connector classname specified.\n" +
" </description>\n" +
" <config-property-name>ConnectionParameters</config-property-name>\n" +
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e194b780/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/ra/ResourceAdapterTest.java
----------------------------------------------------------------------
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/ra/ResourceAdapterTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/ra/ResourceAdapterTest.java
index 3d1a720..53fc427 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/ra/ResourceAdapterTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/ra/ResourceAdapterTest.java
@@ -307,7 +307,7 @@ public class ResourceAdapterTest extends ServiceTestBase
{
ActiveMQResourceAdapter ra = new ActiveMQResourceAdapter();
ra.setConnectorClassName(NETTY_CONNECTOR_FACTORY + "," + INVM_CONNECTOR_FACTORY + "," + NETTY_CONNECTOR_FACTORY);
- ra.setConnectionParameters("host=host1;port=5445, serverid=0, host=host2;port=5446");
+ ra.setConnectionParameters("host=host1;port=61616, serverid=0, host=host2;port=61617");
ActiveMQConnectionFactory factory = ra.createActiveMQConnectionFactory(new ConnectionFactoryProperties());
TransportConfiguration[] configurations = factory.getServerLocator().getStaticTransportConfigurations();
assertNotNull(configurations);
@@ -315,14 +315,14 @@ public class ResourceAdapterTest extends ServiceTestBase
assertEquals(NETTY_CONNECTOR_FACTORY, configurations[0].getFactoryClassName());
assertEquals(2, configurations[0].getParams().size());
assertEquals("host1", configurations[0].getParams().get("host"));
- assertEquals("5445", configurations[0].getParams().get("port"));
+ assertEquals("61616", configurations[0].getParams().get("port"));
assertEquals(INVM_CONNECTOR_FACTORY, configurations[1].getFactoryClassName());
assertEquals(1, configurations[1].getParams().size());
assertEquals("0", configurations[1].getParams().get("serverid"));
assertEquals(NETTY_CONNECTOR_FACTORY, configurations[2].getFactoryClassName());
assertEquals(2, configurations[2].getParams().size());
assertEquals("host2", configurations[2].getParams().get("host"));
- assertEquals("5446", configurations[2].getParams().get("port"));
+ assertEquals("61617", configurations[2].getParams().get("port"));
}
@Test
@@ -353,7 +353,7 @@ public class ResourceAdapterTest extends ServiceTestBase
{
ActiveMQResourceAdapter ra = new ActiveMQResourceAdapter();
ra.setConnectorClassName(NETTY_CONNECTOR_FACTORY + "," + INVM_CONNECTOR_FACTORY + "," + NETTY_CONNECTOR_FACTORY);
- ra.setConnectionParameters("host=host1;port=5445, serverid=0, host=host2;port=5446");
+ ra.setConnectionParameters("host=host1;port=61616, serverid=0, host=host2;port=61617");
ConnectionFactoryProperties overrideProperties = new ConnectionFactoryProperties();
ArrayList<String> value = new ArrayList<String>();
value.add(INVM_CONNECTOR_FACTORY);
@@ -366,7 +366,7 @@ public class ResourceAdapterTest extends ServiceTestBase
connectionParameters.add(map1);
Map<String, Object> map2 = new HashMap<String, Object>();
map2.put("host", "myhost");
- map2.put("port", "5445");
+ map2.put("port", "61616");
connectionParameters.add(map2);
Map<String, Object> map3 = new HashMap<String, Object>();
map3.put("serverid", "1");
@@ -382,7 +382,7 @@ public class ResourceAdapterTest extends ServiceTestBase
assertEquals(NETTY_CONNECTOR_FACTORY, configurations[1].getFactoryClassName());
assertEquals(2, configurations[1].getParams().size());
assertEquals("myhost", configurations[1].getParams().get("host"));
- assertEquals("5445", configurations[1].getParams().get("port"));
+ assertEquals("61616", configurations[1].getParams().get("port"));
assertEquals(INVM_CONNECTOR_FACTORY, configurations[2].getFactoryClassName());
assertEquals(1, configurations[2].getParams().size());
assertEquals("1", configurations[2].getParams().get("serverid"));