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"));
