You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2015/02/19 20:49:42 UTC
[2/5] activemq-6 git commit: ACTIVEMQ6-80 - update acceptor config to
use URI's
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-configuration.xml
index 22a572e..8e40c34 100644
--- a/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -42,9 +42,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Other config -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/examples/jms/divert/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/divert/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/divert/src/main/resources/activemq/server0/activemq-configuration.xml
index f3d4034..6d331be 100644
--- a/examples/jms/divert/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/divert/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -55,19 +55,13 @@ under the License.
<connectors>
<!-- This connector corresponds to the New York server -->
- <connector name="newyork-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5446"/>
- </connector>
+ <connector name="newyork-connector">tcp://localhost:5446</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5445"/>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Divert configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/examples/jms/divert/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/divert/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/divert/src/main/resources/activemq/server1/activemq-configuration.xml
index 00a0f55..c955aba 100644
--- a/examples/jms/divert/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/divert/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -43,10 +43,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5446"/>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
</acceptors>
<!-- Other config -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml
index 234fe3c..f18535f 100644
--- a/examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -40,10 +40,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5445"/>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Other config -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/examples/jms/embedded-simple/src/main/resources/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/embedded-simple/src/main/resources/activemq-configuration.xml b/examples/jms/embedded-simple/src/main/resources/activemq-configuration.xml
index 5524d10..fdc8811 100644
--- a/examples/jms/embedded-simple/src/main/resources/activemq-configuration.xml
+++ b/examples/jms/embedded-simple/src/main/resources/activemq-configuration.xml
@@ -32,9 +32,7 @@ under the License.
<persistence-enabled>false</persistence-enabled>
<acceptors>
- <acceptor name="in-vm">
- <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
- </acceptor>
+ <acceptor name="in-vm">vm://0</acceptor>
</acceptors>
<!-- Other config -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/examples/jms/expiry/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/expiry/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/expiry/src/main/resources/activemq/server0/activemq-configuration.xml
index bdbb007..0dcab02 100644
--- a/examples/jms/expiry/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/expiry/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -42,9 +42,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Other config -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-configuration.xml
index 6dc0b1c..7230910 100644
--- a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -39,29 +39,16 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="invm-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
- </connector>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5445"/>
- </connector>
+ <connector name="invm-connector">vm://0</connector>
+ <connector name="netty-connector">tcp://localhost:5445</connector>
<!-- connector to the server1 -->
- <connector name="server1-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5446"/>
- </connector>
+ <connector name="server1-connector">tcp://localhost:5446</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="invm-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
- </acceptor>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5445"/>
- </acceptor>
+ <acceptor name="invm-acceptor">vm://0</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- HA configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-configuration.xml
index 3346551..2bdb0b8 100644
--- a/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -39,29 +39,16 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="invm-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
- </connector>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5446"/>
- </connector>
+ <connector name="invm-connector">vm://0</connector>
+ <connector name="netty-connector">tcp://localhost:5446</connector>
<!-- connector to the server0 -->
- <connector name="server0-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5445"/>
- </connector>
+ <connector name="server0-connector">tcp://localhost:5445</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="invm-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
- </acceptor>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5446"/>
- </acceptor>
+ <acceptor name="invm-acceptor">vm://0</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
</acceptors>
<!-- HA configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/examples/jms/http-transport/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/http-transport/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/http-transport/src/main/resources/activemq/server0/activemq-configuration.xml
index 4cb457b..5b3af96 100644
--- a/examples/jms/http-transport/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/http-transport/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -40,10 +40,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="8080"/>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:8080</acceptor>
</acceptors>
<!-- Other config -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-configuration.xml
index 6857c91..0df5630 100644
--- a/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -39,10 +39,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5446"/>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
</acceptors>
<!-- Other config -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/examples/jms/interceptor/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/interceptor/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/interceptor/src/main/resources/activemq/server0/activemq-configuration.xml
index 1005b59..ffda884 100644
--- a/examples/jms/interceptor/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/interceptor/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -44,9 +44,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Other config -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-configuration.xml
index f69eef9..d2b2d69 100644
--- a/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -39,9 +39,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Other config -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-configuration.xml
index 26f3455..9dc2cbc 100644
--- a/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -37,9 +37,7 @@ under the License.
<paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
<acceptors>
- <acceptor name="netty">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- </acceptor>
+ <acceptor name="netty">tcp://localhost:5445</acceptor>
</acceptors>
<security-settings>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-configuration.xml
index 0d32af4..f0564f0 100644
--- a/examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -37,12 +37,7 @@ under the License.
<paging-directory>${build.directory}/server1/data/messaging/paging</paging-directory>
<acceptors>
- <acceptor name="netty">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <!-- the server accepts connections on all the server addresses -->
- <param key="host" value="localhost"/>
- <param key="port" value="5455"/>
- </acceptor>
+ <acceptor name="netty">tcp://localhost:5455</acceptor>
</acceptors>
<security-settings>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 bb8c2d1..e833e20 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,9 +39,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Other config -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 bb8c2d1..e833e20 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,9 +39,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Other config -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 25974c3..bd07b67 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,9 +39,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Other config -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 17a8278..bd47d9c 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,9 +43,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- </acceptor>
+ <acceptor name="netty">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Other config -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 bb8c2d1..e833e20 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,9 +39,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Other config -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 9159d3d..19ed6b8 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,9 +39,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Other config -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 d67d043..fd12ee3 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,9 +45,7 @@ under the License.
<!-- Netty standard TCP acceptor -->
<acceptors>
- <acceptor name="netty">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- </acceptor>
+ <acceptor name="netty">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Other configs -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 aa92a27..0aec9a6 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,9 +42,7 @@ under the License.
<!-- Netty standard TCP acceptor -->
<acceptors>
- <acceptor name="netty">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- </acceptor>
+ <acceptor name="netty">tcp://localhost:5445</acceptor>
</acceptors>
<security-settings>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 77fcd01..ea8b41c 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,9 +48,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Other config -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 bb8c2d1..e833e20 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,9 +39,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Other config -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 bb8c2d1..e833e20 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,9 +39,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Other config -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 bb8c2d1..e833e20 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,9 +39,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Other config -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 3fd3d77..59e7dde 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,18 +45,12 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5445"/>
- </connector>
+ <connector name="netty-connector">tcp://localhost:5445</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5445"/>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<broadcast-groups>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 cb4d05f..a9f7a92 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,18 +45,12 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5446"/>
- </connector>
+ <connector name="netty-connector">tcp://localhost:5446</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5446"/>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
</acceptors>
<broadcast-groups>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 39c8a74..db8e60d 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,18 +44,12 @@ under the License.
</ha-policy>
<connectors>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5447"/>
- </connector>
+ <connector name="netty-connector">tcp://localhost:5447</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5447"/>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5447</acceptor>
</acceptors>
<broadcast-groups>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 0d509e1..1cd448e 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,18 +45,12 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5445"/>
- </connector>
+ <connector name="netty-connector">tcp://localhost:5445</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5445"/>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<broadcast-groups>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 cb4d05f..a9f7a92 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,18 +45,12 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5446"/>
- </connector>
+ <connector name="netty-connector">tcp://localhost:5446</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5446"/>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
</acceptors>
<broadcast-groups>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 731f023..a43467c 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,18 +45,12 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5447"/>
- </connector>
+ <connector name="netty-connector">tcp://localhost:5447</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5447"/>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5447</acceptor>
</acceptors>
<broadcast-groups>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 bb8c2d1..e833e20 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,9 +39,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Other config -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 90beb6f..7fc63e1 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,18 +38,12 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5445"/>
- </connector>
+ <connector name="netty-connector">tcp://localhost:5445</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5445"/>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<broadcast-groups>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 54aaac1..e9ba4ed 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,18 +38,12 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5446"/>
- </connector>
+ <connector name="netty-connector">tcp://localhost:5446</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5446"/>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
</acceptors>
<broadcast-groups>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 a440ba4..33a5e16 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,21 +38,13 @@ under the License.
<paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
<connectors>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- </connector>
+ <connector name="netty-connector">tcp://localhost:5445</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- </acceptor>
- <acceptor name="openwire-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="protocols" value="OPENWIRE"/>
- <param key="port" value="61616"/>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
+ <acceptor name="openwire-acceptor">tcp://localhost:61616?protocols=OPENWIRE</acceptor>
</acceptors>
<!-- Other config -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 886d572..8d4e76d 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,16 +42,12 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- </connector>
+ <connector name="netty-connector">tcp://localhost:5445</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Other config -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 93e4cfb..c88eca2 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,12 +33,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="tcp-no-delay" value="false"/>
- <param key="tcp-send-buffer-size" value="1048576"/>
- <param key="tcp-receive-buffer-size" value="1048576"/>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5445?tcpNoDelay=false;tcpSendBufferSize=1048576;tcpReceiveBufferSize=1048576</acceptor>
</acceptors>
<queues>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 4e5a4d3..cbbf258 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,9 +39,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Other config -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 bb8c2d1..e833e20 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,9 +39,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Other config -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 e74ceba..da9abde 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,9 +40,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
- <acceptor name="proton-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- </acceptor>
+ <acceptor name="proton-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Other config -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-configuration.xml
index 93e5eb2..1363c97 100644
--- a/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/proton-j/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -40,10 +40,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
- <acceptor name="proton-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5672"/>
- </acceptor>
+ <acceptor name="proton-acceptor">tcp://localhost:5672</acceptor>
</acceptors>
<queues>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-configuration.xml
index 5c443a1..5b09034 100644
--- a/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/proton-ruby/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -39,11 +39,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
- <acceptor name="proton-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="protocol" value="AMQP"/>
- <param key="port" value="5672"/>
- </acceptor>
+ <acceptor name="proton-acceptor">tcp://localhost:5672?protocols=AMQP;</acceptor>
</acceptors>
<queues>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 c084fdf..dc1f92c 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,18 +40,12 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5445"/>
- </connector>
+ <connector name="netty-connector">tcp://localhost:5445</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5445"/>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 be1c3ca..5680352 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,18 +41,12 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5446"/>
- </connector>
+ <connector name="netty-connector">tcp://localhost:5446</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5446"/>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
</acceptors>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 96f76e5..98556f1 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,9 +39,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Other config -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 48d96e9..b5c4724 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,9 +38,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Other config -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 bb8c2d1..e833e20 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,9 +39,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Other config -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 1bec9b0..fa9d71e 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,32 +40,20 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5445"/>
- </connector>
+ <connector name="netty-connector">tcp://localhost:5445</connector>
<!-- We just use this connector so we can send management operations while the other acceptor
is stopped -->
- <connector name="netty-connector2">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5446"/>
- </connector>
+ <connector name="netty-connector2">tcp://localhost:5446</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5445"/>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
<!-- We just use this acceptor so we can send management operations while the other acceptor
is stopped -->
- <acceptor name="netty-acceptor2">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5446"/>
- </acceptor>
+ <acceptor name="netty-acceptor2">tcp://localhost:5446</acceptor>
</acceptors>
<!-- Other config -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 a85e98e..0521eef 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,22 +51,13 @@ under the License.
</ha-policy>
<connectors>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5445"/>
- </connector>
- <connector name="netty-backup-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5446"/>
- </connector>
+ <connector name="netty-connector">tcp://localhost:5445</connector>
+ <connector name="netty-backup-connector">tcp://localhost:5446</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5445"/>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<cluster-connections>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 d3bb79d..98de370 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,22 +53,13 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-live-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5445"/>
- </connector>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5446"/>
- </connector>
+ <connector name="netty-live-connector">tcp://localhost:5445</connector>
+ <connector name="netty-connector">tcp://localhost:5446</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5446"/>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
</acceptors>
<cluster-connections>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 3aef7ff..9dc9a18 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,18 +51,12 @@ under the License.
</ha-policy>
<connectors>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5445"/>
- </connector>
+ <connector name="netty-connector">tcp://localhost:5445</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5445"/>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<broadcast-groups>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 81b8429..68a35ab 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,22 +51,13 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-live-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5445"/>
- </connector>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5446"/>
- </connector>
+ <connector name="netty-live-connector">tcp://localhost:5445</connector>
+ <connector name="netty-connector">tcp://localhost:5446</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5446"/>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
</acceptors>
<broadcast-groups>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 65db741..f14e592 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,18 +45,12 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5445"/>
- </connector>
+ <connector name="netty-connector">tcp://localhost:5445</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5445"/>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<broadcast-groups>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 72f1db7..a99710f 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,18 +45,12 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5446"/>
- </connector>
+ <connector name="netty-connector">tcp://localhost:5446</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5446"/>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
</acceptors>
<broadcast-groups>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 7d41ed2..5362696 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,18 +44,12 @@ under the License.
</ha-policy>
<connectors>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5447"/>
- </connector>
+ <connector name="netty-connector">tcp://localhost:5447</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5447"/>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5447</acceptor>
</acceptors>
<broadcast-groups>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 1ceffc4..b56aa5f 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,18 +46,12 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5445"/>
- </connector>
+ <connector name="netty-connector">tcp://localhost:5445</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5445"/>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<broadcast-groups>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 3acc2ae..1cf9e8e 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,18 +46,12 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5446"/>
- </connector>
+ <connector name="netty-connector">tcp://localhost:5446</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5446"/>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
</acceptors>
<broadcast-groups>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 96f76e5..98556f1 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,9 +39,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Other config -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 692e56f..ef952b0 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
@@ -33,19 +33,12 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="in-vm">
- <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
- </connector>
+ <connector name="in-vm">vm://0</connector>
</connectors>
<acceptors>
- <acceptor name="in-vm">
- <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
- </acceptor>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5445"/>
- </acceptor>
+ <acceptor name="in-vm">vm://0</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Other config -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/examples/jms/rest/javascript-chat/src/main/resources/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/javascript-chat/src/main/resources/activemq-configuration.xml b/examples/jms/rest/javascript-chat/src/main/resources/activemq-configuration.xml
index af87f14..01bb590 100644
--- a/examples/jms/rest/javascript-chat/src/main/resources/activemq-configuration.xml
+++ b/examples/jms/rest/javascript-chat/src/main/resources/activemq-configuration.xml
@@ -33,15 +33,11 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="in-vm">
- <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
- </connector>
+ <connector name="in-vm">vm://0</connector>
</connectors>
<acceptors>
- <acceptor name="in-vm">
- <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
- </acceptor>
+ <acceptor name="in-vm">vm://0</acceptor>
</acceptors>
<!-- Other config -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 692e56f..ef952b0 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
@@ -33,19 +33,12 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="in-vm">
- <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
- </connector>
+ <connector name="in-vm">vm://0</connector>
</connectors>
<acceptors>
- <acceptor name="in-vm">
- <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
- </acceptor>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5445"/>
- </acceptor>
+ <acceptor name="in-vm">vm://0</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Other config -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 8421a91..13a6ea1 100644
--- a/examples/jms/rest/push/src/main/resources/activemq-configuration.xml
+++ b/examples/jms/rest/push/src/main/resources/activemq-configuration.xml
@@ -34,19 +34,12 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="in-vm">
- <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
- </connector>
+ <connector name="in-vm">vm://0</connector>
</connectors>
<acceptors>
- <acceptor name="in-vm">
- <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
- </acceptor>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5445"/>
- </acceptor>
+ <acceptor name="in-vm">vm://0</acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Other config -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 5724d64..0877ab5 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,18 +40,12 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5445"/>
- </connector>
+ <connector name="netty-connector">tcp://localhost:5445</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5445"/>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 5217112..23f8577 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,22 +40,13 @@ under the License.
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5446"/>
- </connector>
- <connector name="server0-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5445"/>
- </connector>
+ <connector name="netty-connector">tcp://localhost:5446</connector>
+ <connector name="server0-connector">tcp://localhost:5445</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5446"/>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
</acceptors>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 bb8c2d1..e833e20 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,9 +39,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Other config -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 79fa52f..7f24b65 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,9 +42,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Other config -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/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 bb8c2d1..e833e20 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,9 +39,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
- <acceptor name="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Other config -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/examples/jms/spring-integration/src/main/resources/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/spring-integration/src/main/resources/activemq-configuration.xml b/examples/jms/spring-integration/src/main/resources/activemq-configuration.xml
index 5524d10..fdc8811 100644
--- a/examples/jms/spring-integration/src/main/resources/activemq-configuration.xml
+++ b/examples/jms/spring-integration/src/main/resources/activemq-configuration.xml
@@ -32,9 +32,7 @@ under the License.
<persistence-enabled>false</persistence-enabled>
<acceptors>
- <acceptor name="in-vm">
- <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
- </acceptor>
+ <acceptor name="in-vm">vm://0</acceptor>
</acceptors>
<!-- Other config -->