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:54 UTC

[5/8] activemq-6 git commit: Replace all references of port 5445 with 61616

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>
          &lt;acceptor name="proton-acceptor"&gt;tcp://localhost:5672&lt;/acceptor&gt;
@@ -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>
          &lt;acceptor name="proton-acceptor"&gt;tcp://localhost:5672&lt;/acceptor&gt;

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