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:43 UTC
[3/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/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.java b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.java
index 7aee01b..7c62f36 100644
--- a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.java
+++ b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.java
@@ -145,39 +145,14 @@ public class FileConfigurationParserTest extends UnitTestCase
"<large-messages-directory>${jboss.server.data.dir}/activemq/largemessages</large-messages-directory>" + "\n" +
"<paging-directory>${jboss.server.data.dir}/activemq/paging</paging-directory>" + "\n" +
"<connectors>" + "\n" +
- "<connector name=\"netty\">" + "\n" +
- "<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>" + "\n" +
- "<param key=\"host\" value=\"${jboss.bind.address:localhost}\"/>" + "\n" +
- "<param key=\"port\" value=\"${activemq.remoting.netty.port:5445}\"/>" + "\n" +
- "</connector>" + "\n" +
- "<connector name=\"netty-throughput\">" + "\n" +
- "<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>" + "\n" +
- "<param key=\"host\" value=\"${jboss.bind.address:localhost}\"/>" + "\n" +
- "<param key=\"port\" value=\"${activemq.remoting.netty.batch.port:5455}\"/>" + "\n" +
- "<param key=\"batch-delay\" value=\"50\"/>" + "\n" +
- "</connector>" + "\n" +
- "<connector name=\"in-vm\">" + "\n" +
- "<factory-class>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>" + "\n" +
- "<param key=\"server-id\" value=\"${activemq.server-id:0}\"/>" + "\n" +
- "</connector>" + "\n" +
+ "<connector name=\"netty\">tcp://localhost:5445</connector>" + "\n" +
+ "<connector name=\"netty-throughput\">tcp://localhost:5545</connector>" + "\n" +
+ "<connector name=\"in-vm\">vm://0</connector>" + "\n" +
"</connectors>" + "\n" +
"<acceptors>" + "\n" +
- "<acceptor name=\"netty\">" + "\n" +
- "<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>" + "\n" +
- "<param key=\"host\" value=\"${jboss.bind.address:localhost}\"/>" + "\n" +
- "<param key=\"port\" value=\"${activemq.remoting.netty.port:5445}\"/>" + "\n" +
- "</acceptor>" + "\n" +
- "<acceptor name=\"netty-throughput\">" + "\n" +
- "<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>" + "\n" +
- "<param key=\"host\" value=\"${jboss.bind.address:localhost}\"/>" + "\n" +
- "<param key=\"port\" value=\"${activemq.remoting.netty.batch.port:5455}\"/>" + "\n" +
- "<param key=\"batch-delay\" value=\"50\"/>" + "\n" +
- "<param key=\"direct-deliver\" value=\"false\"/>" + "\n" +
- "</acceptor>" + "\n" +
- "<acceptor name=\"in-vm\">" + "\n" +
- "<factory-class>org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>" + "\n" +
- "<param key=\"server-id\" value=\"0\"/>" + "\n" +
- "</acceptor>" + "\n" +
+ "<acceptor name=\"netty\">tcp://localhost:5545</acceptor>" + "\n" +
+ "<acceptor name=\"netty-throughput\">tcp://localhost:5545</acceptor>" + "\n" +
+ "<acceptor name=\"in-vm\">vm://0</acceptor>" + "\n" +
"</acceptors>" + "\n" +
"<security-settings>" + "\n" +
"<security-setting match=\"#\">" + "\n" +
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationTest.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationTest.java b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationTest.java
index c7fc2c4..3f55a55 100644
--- a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationTest.java
+++ b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationTest.java
@@ -107,34 +107,30 @@ public class FileConfigurationTest extends ConfigurationImplTest
TransportConfiguration tc = conf.getConnectorConfigurations().get("connector1");
Assert.assertNotNull(tc);
- Assert.assertEquals("org.apache.activemq.tests.unit.core.config.impl.TestConnectorFactory1", tc.getFactoryClassName());
- Assert.assertEquals("v1", tc.getParams().get("a1"));
- Assert.assertEquals("123", tc.getParams().get("a2"));
- Assert.assertEquals("345", tc.getParams().get("a3"));
- Assert.assertEquals("v4", tc.getParams().get("a4"));
+ Assert.assertEquals("org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory", tc.getFactoryClassName());
+ Assert.assertEquals("mylocal", tc.getParams().get("localAddress"));
+ Assert.assertEquals("99", tc.getParams().get("localPort"));
+ Assert.assertEquals("localhost1", tc.getParams().get("host"));
+ Assert.assertEquals("5678", tc.getParams().get("port"));
tc = conf.getConnectorConfigurations().get("connector2");
Assert.assertNotNull(tc);
- Assert.assertEquals("org.apache.activemq.tests.unit.core.config.impl.TestConnectorFactory2", tc.getFactoryClassName());
- Assert.assertEquals("w1", tc.getParams().get("b1"));
- Assert.assertEquals("234", tc.getParams().get("b2"));
+ Assert.assertEquals("org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory", tc.getFactoryClassName());
+ Assert.assertEquals("5", tc.getParams().get("serverId"));
Assert.assertEquals(2, conf.getAcceptorConfigurations().size());
for (TransportConfiguration ac : conf.getAcceptorConfigurations())
{
- if (ac.getFactoryClassName().equals("org.apache.activemq.tests.unit.core.config.impl.TestAcceptorFactory1"))
+ if (ac.getFactoryClassName().equals("org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory"))
{
- Assert.assertEquals("org.apache.activemq.tests.unit.core.config.impl.TestAcceptorFactory1",
- ac.getFactoryClassName());
- Assert.assertEquals("y1", ac.getParams().get("d1"));
- Assert.assertEquals("456", ac.getParams().get("d2"));
+ Assert.assertEquals("456", ac.getParams().get("tcpNoDelay"));
+ Assert.assertEquals("44", ac.getParams().get("connectionTtl"));
}
else
{
- Assert.assertEquals("org.apache.activemq.tests.unit.core.config.impl.TestAcceptorFactory2",
+ Assert.assertEquals("org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory",
ac.getFactoryClassName());
- Assert.assertEquals("z1", ac.getParams().get("e1"));
- Assert.assertEquals("567", ac.getParams().get("e2"));
+ Assert.assertEquals("0", ac.getParams().get("serverId"));
}
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java
index bfb57e5..bbf4eea 100644
--- a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java
+++ b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java
@@ -75,39 +75,14 @@ public class WrongRoleFileConfigurationParserTest extends UnitTestCase
"<large-messages-directory>${jboss.server.data.dir}/activemq/largemessages</large-messages-directory>" + "\n" +
"<paging-directory>${jboss.server.data.dir}/activemq/paging</paging-directory>" + "\n" +
"<connectors>" + "\n" +
- "<connector name=\"netty\">" + "\n" +
- "<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>" + "\n" +
- "<param key=\"host\" value=\"${jboss.bind.address:localhost}\"/>" + "\n" +
- "<param key=\"port\" value=\"${activemq.remoting.netty.port:5445}\"/>" + "\n" +
- "</connector>" + "\n" +
- "<connector name=\"netty-throughput\">" + "\n" +
- "<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>" + "\n" +
- "<param key=\"host\" value=\"${jboss.bind.address:localhost}\"/>" + "\n" +
- "<param key=\"port\" value=\"${activemq.remoting.netty.batch.port:5455}\"/>" + "\n" +
- "<param key=\"batch-delay\" value=\"50\"/>" + "\n" +
- "</connector>" + "\n" +
- "<connector name=\"in-vm\">" + "\n" +
- "<factory-class>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>" + "\n" +
- "<param key=\"server-id\" value=\"${activemq.server-id:0}\"/>" + "\n" +
- "</connector>" + "\n" +
+ "<connector name=\"netty\">tcp://localhost:5445</connector>" + "\n" +
+ "<connector name=\"netty-throughput\">tcp://localhost:5545</connector>" + "\n" +
+ "<connector name=\"in-vm\">vm://0</connector>" + "\n" +
"</connectors>" + "\n" +
"<acceptors>" + "\n" +
- "<acceptor name=\"netty\">" + "\n" +
- "<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>" + "\n" +
- "<param key=\"host\" value=\"${jboss.bind.address:localhost}\"/>" + "\n" +
- "<param key=\"port\" value=\"${activemq.remoting.netty.port:5445}\"/>" + "\n" +
- "</acceptor>" + "\n" +
- "<acceptor name=\"netty-throughput\">" + "\n" +
- "<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>" + "\n" +
- "<param key=\"host\" value=\"${jboss.bind.address:localhost}\"/>" + "\n" +
- "<param key=\"port\" value=\"${activemq.remoting.netty.batch.port:5455}\"/>" + "\n" +
- "<param key=\"batch-delay\" value=\"50\"/>" + "\n" +
- "<param key=\"direct-deliver\" value=\"false\"/>" + "\n" +
- "</acceptor>" + "\n" +
- "<acceptor name=\"in-vm\">" + "\n" +
- "<factory-class>org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>" + "\n" +
- "<param key=\"server-id\" value=\"0\"/>" + "\n" +
- "</acceptor>" + "\n" +
+ "<acceptor name=\"netty\">tcp://localhost:5545</acceptor>" + "\n" +
+ "<acceptor name=\"netty-throughput\">tcp://localhost:5545</acceptor>" + "\n" +
+ "<acceptor name=\"in-vm\">vm://0</acceptor>" + "\n" +
"</acceptors>" + "\n" +
"<security-settings>" + "\n" +
"<security-setting match=\"#\">" + "\n" +
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/activemq-server/src/test/resources/ConfigurationTest-full-config.xml
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/resources/ConfigurationTest-full-config.xml b/activemq-server/src/test/resources/ConfigurationTest-full-config.xml
index 79cded1..0eaf796 100644
--- a/activemq-server/src/test/resources/ConfigurationTest-full-config.xml
+++ b/activemq-server/src/test/resources/ConfigurationTest-full-config.xml
@@ -60,30 +60,12 @@
</remoting-outgoing-interceptors>
<persist-delivery-count-before-delivery>true</persist-delivery-count-before-delivery>
<connectors>
- <connector name="connector1">
- <factory-class>org.apache.activemq.tests.unit.core.config.impl.TestConnectorFactory1</factory-class>
- <param key="a1" value="v1"/>
- <param key="a2" value="123"/>
- <param key="a3" value="345"/>
- <param key="a4" value="v4"/>
- </connector>
- <connector name="connector2">
- <factory-class>org.apache.activemq.tests.unit.core.config.impl.TestConnectorFactory2</factory-class>
- <param key="b1" value="w1"/>
- <param key="b2" value="234"/>
- </connector>
+ <connector name="connector1">tcp://localhost1:5678?localAddress=mylocal;localPort=99</connector>
+ <connector name="connector2">vm://5</connector>
</connectors>
<acceptors>
- <acceptor name="acceptor1">
- <factory-class>org.apache.activemq.tests.unit.core.config.impl.TestAcceptorFactory1</factory-class>
- <param key="d1" value="y1"/>
- <param key="d2" value="456"/>
- </acceptor>
- <acceptor name="acceptor2">
- <factory-class>org.apache.activemq.tests.unit.core.config.impl.TestAcceptorFactory2</factory-class>
- <param key="e1" value="z1"/>
- <param key="e2" value="567"/>
- </acceptor>
+ <acceptor>tcp://0.0.0.0:5445?tcpNoDelay=456;connectionTtl=44</acceptor>
+ <acceptor>vm://0?e1=z1;e2=567</acceptor>
</acceptors>
<broadcast-groups>
<broadcast-group name="bg1">
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/distribution/activemq/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/pom.xml b/distribution/activemq/pom.xml
index b168313..eb99e6b 100644
--- a/distribution/activemq/pom.xml
+++ b/distribution/activemq/pom.xml
@@ -165,6 +165,14 @@
<artifactId>jolokia-war</artifactId>
<type>war</type>
</dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/distribution/activemq/src/main/assembly/dep.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/assembly/dep.xml b/distribution/activemq/src/main/assembly/dep.xml
index 15bffeb..22f7434 100644
--- a/distribution/activemq/src/main/assembly/dep.xml
+++ b/distribution/activemq/src/main/assembly/dep.xml
@@ -64,6 +64,8 @@
<include>org.eclipse.jetty.aggregate:jetty-all</include>
<include>org.apache.geronimo.specs:</include>
<include>org.apache.geronimo.specs:geronimo-servlet_3.0_spec</include>
+ <include>commons-beanutils:commons-beanutils</include>
+ <include>commons-logging:commons-logging</include>
</includes>
<!--excludes>
<exclude>org.apache.activemq:activemq-website</exclude>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml b/distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml
index 103d567..e360edb 100644
--- a/distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml
+++ b/distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml
@@ -37,34 +37,13 @@ under the License.
<large-messages-directory>${data.dir:../data}/large-messages</large-messages-directory>
<connectors>
- <connector name="netty">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="host" value="${activemq.remoting.netty.host:localhost}"/>
- <param key="port" value="${activemq.remoting.netty.port:5445}"/>
- </connector>
-
- <connector name="netty-throughput">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="host" value="${activemq.remoting.netty.host:localhost}"/>
- <param key="port" value="${activemq.remoting.netty.batch.port:5455}"/>
- <param key="batch-delay" value="50"/>
- </connector>
+ <connector name="netty">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5445}</connector>
+ <connector name="netty-throughput">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.batch.port:5455}?batchDelay=50</connector>
</connectors>
<acceptors>
- <acceptor name="netty">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="host" value="${activemq.remoting.netty.host:localhost}"/>
- <param key="port" value="${activemq.remoting.netty.port:5445}"/>
- </acceptor>
-
- <acceptor name="netty-throughput">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="host" value="${activemq.remoting.netty.host:localhost}"/>
- <param key="port" value="${activemq.remoting.netty.batch.port:5455}"/>
- <param key="batch-delay" value="50"/>
- <param key="direct-deliver" value="false"/>
- </acceptor>
+ <acceptor name="netty">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5445}</acceptor>
+ <acceptor name="netty-throughput">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.batch.port:5455}?batchDelay=50;directDeliver=false</acceptor>
</acceptors>
<broadcast-groups>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml b/distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml
index 245d0bd..163fa94 100644
--- a/distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml
+++ b/distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml
@@ -35,34 +35,13 @@ under the License.
<large-messages-directory>${data.dir:../data}/large-messages</large-messages-directory>
<connectors>
- <connector name="netty">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="host" value="${activemq.remoting.netty.host:localhost}"/>
- <param key="port" value="${activemq.remoting.netty.port:5445}"/>
- </connector>
-
- <connector name="netty-throughput">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="host" value="${activemq.remoting.netty.host:localhost}"/>
- <param key="port" value="${activemq.remoting.netty.batch.port:5455}"/>
- <param key="batch-delay" value="50"/>
- </connector>
+ <connector name="netty">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5445}</connector>
+ <connector name="netty-throughput">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.batch.port:5455}?batchDelay=50</connector>
</connectors>
<acceptors>
- <acceptor name="netty">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="host" value="${activemq.remoting.netty.host:localhost}"/>
- <param key="port" value="${activemq.remoting.netty.port:5445}"/>
- </acceptor>
-
- <acceptor name="netty-throughput">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="host" value="${activemq.remoting.netty.host:localhost}"/>
- <param key="port" value="${activemq.remoting.netty.batch.port:5455}"/>
- <param key="batch-delay" value="50"/>
- <param key="direct-deliver" value="false"/>
- </acceptor>
+ <acceptor name="netty">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5445}</acceptor>
+ <acceptor name="netty-throughput">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.batch.port:5455}?batchDelay=50;directDeliver=false</acceptor>
</acceptors>
<security-settings>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml b/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml
index 2ae8d4d..0a90c9e 100644
--- a/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml
+++ b/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml
@@ -42,34 +42,13 @@ under the License.
<large-messages-directory>${data.dir:../data}/large-messages</large-messages-directory>
<connectors>
- <connector name="netty">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="host" value="${activemq.remoting.netty.host:localhost}"/>
- <param key="port" value="${activemq.remoting.netty.port:5445}"/>
- </connector>
-
- <connector name="netty-throughput">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="host" value="${activemq.remoting.netty.host:localhost}"/>
- <param key="port" value="${activemq.remoting.netty.batch.port:5455}"/>
- <param key="batch-delay" value="50"/>
- </connector>
+ <connector name="netty">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5445}</connector>
+ <connector name="netty-throughput">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.batch.port:5455}?batchDelay=50</connector>
</connectors>
<acceptors>
- <acceptor name="netty">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="host" value="${activemq.remoting.netty.host:localhost}"/>
- <param key="port" value="${activemq.remoting.netty.port:5445}"/>
- </acceptor>
-
- <acceptor name="netty-throughput">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="host" value="${activemq.remoting.netty.host:localhost}"/>
- <param key="port" value="${activemq.remoting.netty.batch.port:5455}"/>
- <param key="batch-delay" value="50"/>
- <param key="direct-deliver" value="false"/>
- </acceptor>
+ <acceptor name="netty">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5445}</acceptor>
+ <acceptor name="netty-throughput">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.batch.port:5455}?batchDelay=50;directDeliver=false</acceptor>
</acceptors>
<broadcast-groups>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml b/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml
index 1f00dae..c796a10 100644
--- a/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml
+++ b/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml
@@ -42,34 +42,13 @@ under the License.
<large-messages-directory>${data.dir:../data}/large-messages</large-messages-directory>
<connectors>
- <connector name="netty">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="host" value="${activemq.remoting.netty.host:localhost}"/>
- <param key="port" value="${activemq.remoting.netty.port:5445}"/>
- </connector>
-
- <connector name="netty-throughput">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="host" value="${activemq.remoting.netty.host:localhost}"/>
- <param key="port" value="${activemq.remoting.netty.batch.port:5455}"/>
- <param key="batch-delay" value="50"/>
- </connector>
+ <connector name="netty">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5445}</connector>
+ <connector name="netty-throughput">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.batch.port:5455}?batchDelay=50</connector>
</connectors>
<acceptors>
- <acceptor name="netty">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="host" value="${activemq.remoting.netty.host:localhost}"/>
- <param key="port" value="${activemq.remoting.netty.port:5445}"/>
- </acceptor>
-
- <acceptor name="netty-throughput">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="host" value="${activemq.remoting.netty.host:localhost}"/>
- <param key="port" value="${activemq.remoting.netty.batch.port:5455}"/>
- <param key="batch-delay" value="50"/>
- <param key="direct-deliver" value="false"/>
- </acceptor>
+ <acceptor name="netty">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5445}</acceptor>
+ <acceptor name="netty-throughput">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.batch.port:5455}?batchDelay=50;directDeliver=false</acceptor>
</acceptors>
<broadcast-groups>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/examples/core/perf/src/main/resources/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/core/perf/src/main/resources/server0/activemq-configuration.xml b/examples/core/perf/src/main/resources/server0/activemq-configuration.xml
index e2e6992..d91759d 100644
--- a/examples/core/perf/src/main/resources/server0/activemq-configuration.xml
+++ b/examples/core/perf/src/main/resources/server0/activemq-configuration.xml
@@ -31,12 +31,7 @@ under the License.
<paging-directory>target/server0/data/messaging/paging</paging-directory>
<!-- 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>
<security-enabled>false</security-enabled>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/examples/core/vertx-connector/src/main/resources/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/core/vertx-connector/src/main/resources/server0/activemq-configuration.xml b/examples/core/vertx-connector/src/main/resources/server0/activemq-configuration.xml
index fcfd7c5..c9e48ec 100644
--- a/examples/core/vertx-connector/src/main/resources/server0/activemq-configuration.xml
+++ b/examples/core/vertx-connector/src/main/resources/server0/activemq-configuration.xml
@@ -36,16 +36,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/aerogear/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/aerogear/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/aerogear/src/main/resources/activemq/server0/activemq-configuration.xml
index 78e0af8..dcb6d17 100644
--- a/examples/jms/aerogear/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/aerogear/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -39,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>
<!-- We need to create a core queue for the JMS queue explicitly because the connector will be deployed
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/examples/jms/applet/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/applet/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/applet/src/main/resources/activemq/server0/activemq-configuration.xml
index 7b03d2b..3d7c79a 100644
--- a/examples/jms/applet/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/applet/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -39,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/application-layer-failover/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/application-layer-failover/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/application-layer-failover/src/main/resources/activemq/server0/activemq-configuration.xml
index fa76b9e..0348796 100644
--- a/examples/jms/application-layer-failover/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/application-layer-failover/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -29,10 +29,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/application-layer-failover/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/application-layer-failover/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/application-layer-failover/src/main/resources/activemq/server1/activemq-configuration.xml
index 87345a9..3dd991d 100644
--- a/examples/jms/application-layer-failover/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/application-layer-failover/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -32,10 +32,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/bridge/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/bridge/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/bridge/src/main/resources/activemq/server0/activemq-configuration.xml
index 7ff1ccc..c20cdba 100644
--- a/examples/jms/bridge/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/bridge/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -39,18 +39,12 @@ under the License.
<!-- Connectors -->
<connectors>
<!-- Connector to the other node -->
- <connector name="remote-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5446"/>
- </connector>
+ <connector name="remote-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>
<!-- We need to create a core queue for the JMS queue explicitly because the bridge will be deployed
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/examples/jms/bridge/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/bridge/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/bridge/src/main/resources/activemq/server1/activemq-configuration.xml
index 8d6dc28..377b6ec 100644
--- a/examples/jms/bridge/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/bridge/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -38,10 +38,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/browser/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/browser/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/browser/src/main/resources/activemq/server0/activemq-configuration.xml
index 2c4daa2..39cabf0 100644
--- a/examples/jms/browser/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/browser/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -39,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/client-kickoff/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-configuration.xml
index a3937f7..e82b033 100644
--- a/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -40,9 +40,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>
</core>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-configuration.xml
index 4b02342..506976d 100644
--- a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -44,18 +44,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/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-configuration.xml
index cb4d05f..a9f7a92 100644
--- a/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -45,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/client-side-load-balancing/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-configuration.xml
index 54ec786..eb835cb 100644
--- a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -38,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>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-configuration.xml
index e896c56..aca7ad5 100644
--- a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -36,18 +36,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/client-side-load-balancing/src/main/resources/activemq/server2/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-configuration.xml
index 6bf4733..f26bdb3 100644
--- a/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-configuration.xml
+++ b/examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-configuration.xml
@@ -34,18 +34,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>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml
index e53259e..2673e6b 100644
--- a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -40,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/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-configuration.xml
index 5a27ad7..a4ea6c6 100644
--- a/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -40,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="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/clustered-grouping/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-configuration.xml
index 9d0e96b..bbad3cc 100644
--- a/examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -41,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="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/clustered-grouping/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-configuration.xml
index d72d2f3..8e6d4cb 100644
--- a/examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -40,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="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/clustered-grouping/src/main/resources/activemq/server2/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-configuration.xml
index b06a8f1..fc09c3e 100644
--- a/examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-configuration.xml
+++ b/examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-configuration.xml
@@ -40,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="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>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-configuration.xml
index 7c5ad14..34d88c5 100644
--- a/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -41,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="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/clustered-jgroups/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-configuration.xml
index f1238ea..e4b0fa5 100644
--- a/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -40,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="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/clustered-queue/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-configuration.xml
index a68192c..24648ce 100644
--- a/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -40,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/clustered-queue/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-configuration.xml
index 3a9588d..c719783 100644
--- a/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -40,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="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/clustered-standalone/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-configuration.xml
index 4c275b1..fa59e43 100644
--- a/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -40,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/clustered-standalone/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-configuration.xml
index 1f12bb3..f09493a 100644
--- a/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -40,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="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/clustered-standalone/src/main/resources/activemq/server2/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-configuration.xml
index 6721e18..43863bc 100644
--- a/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-configuration.xml
+++ b/examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-configuration.xml
@@ -40,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="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>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-configuration.xml
index b3a86a6..509ca52 100644
--- a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -41,23 +41,14 @@ 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>
<!-- 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="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/clustered-static-discovery/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-configuration.xml
index 0026e8d..8ea3eda 100644
--- a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -40,23 +40,14 @@ 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>
<!-- 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="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/clustered-static-discovery/src/main/resources/activemq/server2/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-configuration.xml
index ecf594d..44a4f31 100644
--- a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-configuration.xml
+++ b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-configuration.xml
@@ -37,23 +37,14 @@
<!-- 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>
<!-- 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="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>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-configuration.xml b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-configuration.xml
index 70b809e..84f7a9c 100644
--- a/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-configuration.xml
+++ b/examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-configuration.xml
@@ -37,23 +37,14 @@
<!-- Connectors -->
<connectors>
- <connector name="netty-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5448"/>
- </connector>
+ <connector name="netty-connector">tcp://localhost:5448</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="netty-acceptor">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
- <param key="port" value="5448"/>
- </acceptor>
+ <acceptor name="netty-acceptor">tcp://localhost:5448</acceptor>
</acceptors>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-configuration.xml
index 8aa3505..0b52d8a 100644
--- a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -38,23 +38,14 @@
<!-- 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>
<!-- 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="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/clustered-static-oneway/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-configuration.xml
index 7ca9528..2f2c329 100644
--- a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -37,23 +37,14 @@
<!-- 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>
<!-- connector to the server0 -->
- <connector name="server2-connector">
- <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
- <param key="port" value="5447"/>
- </connector>
+ <connector name="server2-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="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/clustered-static-oneway/src/main/resources/activemq/server2/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-configuration.xml
index fb52efa..d626302 100644
--- a/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-configuration.xml
+++ b/examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-configuration.xml
@@ -37,18 +37,12 @@
<!-- 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>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-configuration.xml
index 76a93e2..ef3fdcb 100644
--- a/examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -41,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="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/clustered-topic/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-configuration.xml
index dd5bd19..c97ea00 100644
--- a/examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -40,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="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/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-configuration.xml
index 10daa9f..101f097 100644
--- a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -40,24 +40,14 @@ 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>
</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>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-configuration.xml
index f17aeb3..55ca5b7 100644
--- a/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -40,24 +40,14 @@ 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>
</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>
<!-- Clustering configuration -->
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/64d05472/examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-configuration.xml
index 0537927..e83342a 100644
--- a/examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -40,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/colocated-failover/src/main/resources/activemq/server1/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-configuration.xml
index 2715071..136591d 100644
--- a/examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-configuration.xml
+++ b/examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-configuration.xml
@@ -40,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="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/consumer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml
index bb8c2d1..e833e20 100644
--- a/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -39,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/dead-letter/src/main/resources/activemq/server0/activemq-configuration.xml
----------------------------------------------------------------------
diff --git a/examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-configuration.xml
index 04f2598..6649f23 100644
--- a/examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-configuration.xml
+++ b/examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-configuration.xml
@@ -42,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 -->