diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/uri/URIFactory.java b/activemq-commons/src/main/java/org/apache/activemq/utils/uri/URIFactory.java index 452bedd6a6..0a1df923e1 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/utils/uri/URIFactory.java +++ b/activemq-commons/src/main/java/org/apache/activemq/utils/uri/URIFactory.java @@ -25,12 +25,12 @@ import java.util.concurrent.ConcurrentHashMap; /** * @author clebertsuconic */ -public class URIFactory +public class URIFactory { private URI defaultURI; - private final Map> schemas = new ConcurrentHashMap<>(); + private final Map> schemas = new ConcurrentHashMap<>(); public URI getDefaultURI() { @@ -42,7 +42,7 @@ public class URIFactory this.defaultURI = uri; } - public void registerSchema(URISchema schemaFactory) + public void registerSchema(URISchema schemaFactory) { schemas.put(schemaFactory.getSchemaName(), schemaFactory); schemaFactory.setFactory(this); @@ -53,23 +53,14 @@ public class URIFactory schemas.remove(schemaName); } - public T newObject(String uriString) throws Exception + public URI expandURI(String uriString) throws Exception { - URI uri = normalise(uriString); - URISchema schemaFactory = schemas.get(uri.getScheme()); - - if (schemaFactory == null) - { - throw new NullPointerException("Schema " + uri.getScheme() + " not found"); - } - - - return schemaFactory.newObject(uri); + return normalise(uriString); } - public T newObject(URI uri) throws Exception + public T newObject(URI uri, P param) throws Exception { - URISchema schemaFactory = schemas.get(uri.getScheme()); + URISchema schemaFactory = schemas.get(uri.getScheme()); if (schemaFactory == null) { @@ -77,12 +68,12 @@ public class URIFactory } - return schemaFactory.newObject(uri); + return schemaFactory.newObject(uri, param); } public void populateObject(URI uri, T bean) throws Exception { - URISchema schemaFactory = schemas.get(uri.getScheme()); + URISchema schemaFactory = schemas.get(uri.getScheme()); if (schemaFactory == null) { @@ -94,7 +85,7 @@ public class URIFactory public URI createSchema(String scheme, T bean) throws Exception { - URISchema schemaFactory = schemas.get(scheme); + URISchema schemaFactory = schemas.get(scheme); if (schemaFactory == null) { @@ -144,8 +135,8 @@ public class URIFactory builder.append(connectorURIS[i]); } } - return new URI(builder.toString()); + return new URI(builder.toString().replace(";", "&")); } - return new URI(uri); + return new URI(uri.replace(";", "&")); } } diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/uri/URISchema.java b/activemq-commons/src/main/java/org/apache/activemq/utils/uri/URISchema.java index 26ec4cd9e5..7b07c88cf5 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/utils/uri/URISchema.java +++ b/activemq-commons/src/main/java/org/apache/activemq/utils/uri/URISchema.java @@ -33,13 +33,13 @@ import org.apache.commons.beanutils.FluentPropertyBeanIntrospector; * @author clebertsuconic */ -public abstract class URISchema +public abstract class URISchema { public abstract String getSchemaName(); - public T newObject(URI uri) throws Exception + public T newObject(URI uri, P param) throws Exception { - return newObject(uri, null); + return newObject(uri, null, param); } public void populateObject(URI uri, T bean) throws Exception @@ -52,15 +52,15 @@ public abstract class URISchema return internalNewURI(bean); } - private URIFactory parentFactory; + private URIFactory parentFactory; - void setFactory(URIFactory factory) + void setFactory(URIFactory factory) { this.parentFactory = parentFactory; } - protected URIFactory getFactory() + protected URIFactory getFactory() { return parentFactory; } @@ -78,7 +78,7 @@ public abstract class URISchema protected URI getDefaultURI() { - URIFactory factory = getFactory(); + URIFactory factory = getFactory(); if (factory == null) { return null; @@ -107,12 +107,12 @@ public abstract class URISchema * @return * @throws Exception */ - public T newObject(URI uri, Map propertyOverrides) throws Exception + public T newObject(URI uri, Map propertyOverrides, P param) throws Exception { - return internalNewObject(uri, parseQuery(uri.getQuery(), propertyOverrides)); + return internalNewObject(uri, parseQuery(uri.getQuery(), propertyOverrides), param); } - protected abstract T internalNewObject(URI uri, Map query) throws Exception; + protected abstract T internalNewObject(URI uri, Map query, P param) throws Exception; protected abstract URI internalNewURI(T bean) throws Exception; @@ -204,15 +204,15 @@ public abstract class URISchema { if (allowableProperties.contains("host")) { - properties.put("host", uri.getHost()); + properties.put("host", "" + uri.getHost()); } if (allowableProperties.contains("port")) { - properties.put("port", uri.getPort()); + properties.put("port", "" + uri.getPort()); } if (allowableProperties.contains("userInfo")) { - properties.put("userInfo", uri.getUserInfo()); + properties.put("userInfo", "" + uri.getUserInfo()); } for (Map.Entry entry : query.entrySet()) { diff --git a/activemq-commons/src/test/java/org/apache/activemq/utils/URIParserTest.java b/activemq-commons/src/test/java/org/apache/activemq/utils/URIParserTest.java index 1654ec4fdf..3e0176e090 100644 --- a/activemq-commons/src/test/java/org/apache/activemq/utils/URIParserTest.java +++ b/activemq-commons/src/test/java/org/apache/activemq/utils/URIParserTest.java @@ -41,7 +41,7 @@ public class URIParserTest public void testSchemaFruit() throws Throwable { FruitParser parser = new FruitParser(); - Fruit fruit = (Fruit)parser.newObject(new URI("fruit://some:guy@fair-market:3030?color=green&fluentName=something")); + Fruit fruit = (Fruit)parser.newObject(new URI("fruit://some:guy@fair-market:3030?color=green&fluentName=something"), null); Assert.assertEquals("fruit", fruit.getName()); Assert.assertEquals(3030, fruit.getPort()); @@ -62,7 +62,7 @@ public class URIParserTest public void testSchemaNoHosPropertyt() throws Throwable { FruitParser parser = new FruitParser(); - FruitBase fruit = parser.newObject(new URI("base://some:guy@fair-market:3030?color=green&fluentName=something")); + FruitBase fruit = parser.newObject(new URI("base://some:guy@fair-market:3030?color=green&fluentName=something"), null); Assert.assertEquals("base", fruit.getName()); Assert.assertEquals("green", fruit.getColor()); Assert.assertEquals("something", fruit.getFluentName()); @@ -77,7 +77,7 @@ public class URIParserTest public void testSchemaNoHostOnURL() throws Throwable { FruitParser parser = new FruitParser(); - Fruit fruit = (Fruit)parser.newObject(new URI("fruit://some:guy@port?color=green&fluentName=something")); + Fruit fruit = (Fruit)parser.newObject(new URI("fruit://some:guy@port?color=green&fluentName=something"), null); System.out.println("fruit:" + fruit); Assert.assertEquals("fruit", fruit.getName()); @@ -86,7 +86,7 @@ public class URIParserTest } - class FruitParser extends URIFactory + class FruitParser extends URIFactory { FruitParser() { @@ -95,7 +95,7 @@ public class URIParserTest } } - class FruitSchema extends URISchema + class FruitSchema extends URISchema { @Override public String getSchemaName() @@ -105,7 +105,7 @@ public class URIParserTest @Override - public FruitBase internalNewObject(URI uri, Map query) throws Exception + public FruitBase internalNewObject(URI uri, Map query, String fruitName) throws Exception { return setData(uri, new Fruit(getSchemaName()), query); } @@ -117,7 +117,7 @@ public class URIParserTest } } - class FruitBaseSchema extends URISchema + class FruitBaseSchema extends URISchema { @Override public String getSchemaName() @@ -127,7 +127,7 @@ public class URIParserTest @Override - public FruitBase internalNewObject(URI uri, Map query) throws Exception + public FruitBase internalNewObject(URI uri, Map query, String fruitName) throws Exception { return setData(uri, new FruitBase(getSchemaName()), query); } diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ActiveMQClient.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ActiveMQClient.java index 90c0f6e4a9..e16da52bc3 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ActiveMQClient.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ActiveMQClient.java @@ -123,7 +123,7 @@ public final class ActiveMQClient public static ServerLocator createServerLocator(final String url) throws Exception { ServerLocatorParser parser = new ServerLocatorParser(); - return parser.newObject(new URI(url)); + return parser.newObject(new URI(url), null); } /** diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/TransportConstants.java b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/TransportConstants.java index f7aeb35d2f..625323d792 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/TransportConstants.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/TransportConstants.java @@ -187,7 +187,7 @@ public class TransportConstants public static final Set ALLOWABLE_ACCEPTOR_KEYS; - public static final String CONNECTION_TTL = "connection-ttl"; + public static final String CONNECTION_TTL = "connectionTtl"; public static final String STOMP_ENABLE_MESSAGE_ID = "stomp-enable-message-id"; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/uri/AbstractServerLocatorSchema.java b/activemq-core-client/src/main/java/org/apache/activemq/uri/AbstractServerLocatorSchema.java index 01297f4c10..986a1724c7 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/uri/AbstractServerLocatorSchema.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/uri/AbstractServerLocatorSchema.java @@ -25,8 +25,9 @@ import java.util.Map; /** * @author Andy Taylor */ -public abstract class AbstractServerLocatorSchema extends URISchema +public abstract class AbstractServerLocatorSchema extends URISchema { + protected ConnectionOptions newConnectionOptions(URI uri, Map query) throws Exception { return setData(uri, new ConnectionOptions(), query); diff --git a/activemq-core-client/src/main/java/org/apache/activemq/uri/AbstractTransportConfigurationSchema.java b/activemq-core-client/src/main/java/org/apache/activemq/uri/AbstractTransportConfigurationSchema.java new file mode 100644 index 0000000000..61e6817482 --- /dev/null +++ b/activemq-core-client/src/main/java/org/apache/activemq/uri/AbstractTransportConfigurationSchema.java @@ -0,0 +1,29 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.activemq.uri; + +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.utils.uri.URISchema; + +import java.util.List; + +/** + * @author Andy Taylor + */ +public abstract class AbstractTransportConfigurationSchema extends URISchema, String> +{ +} diff --git a/activemq-core-client/src/main/java/org/apache/activemq/uri/ConnectorTransportConfigurationParser.java b/activemq-core-client/src/main/java/org/apache/activemq/uri/ConnectorTransportConfigurationParser.java new file mode 100644 index 0000000000..f3effd9a92 --- /dev/null +++ b/activemq-core-client/src/main/java/org/apache/activemq/uri/ConnectorTransportConfigurationParser.java @@ -0,0 +1,35 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.activemq.uri; + +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq.utils.uri.URIFactory; + +import java.util.List; + +/** + * @author Andy Taylor + */ +public class ConnectorTransportConfigurationParser extends URIFactory, String> +{ + public ConnectorTransportConfigurationParser() + { + registerSchema(new TCPTransportConfigurationSchema(TransportConstants.ALLOWABLE_CONNECTOR_KEYS)); + registerSchema(new InVMTransportConfigurationSchema()); + } +} diff --git a/activemq-core-client/src/main/java/org/apache/activemq/uri/InVMServerLocatorSchema.java b/activemq-core-client/src/main/java/org/apache/activemq/uri/InVMServerLocatorSchema.java index 54c3254f42..124f0ac520 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/uri/InVMServerLocatorSchema.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/uri/InVMServerLocatorSchema.java @@ -24,7 +24,6 @@ import org.apache.activemq.utils.uri.URISchema; import java.net.URI; import java.net.URISyntaxException; -import java.util.HashMap; import java.util.Map; /** @@ -39,19 +38,14 @@ public class InVMServerLocatorSchema extends AbstractServerLocatorSchema } @Override - protected ServerLocator internalNewObject(URI uri, Map query) throws Exception + protected ServerLocator internalNewObject(URI uri, Map query, String name) throws Exception { - TransportConfiguration tc = createTransportConfiguration(uri); + TransportConfiguration tc = InVMTransportConfigurationSchema.createTransportConfiguration(uri, name, "org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory"); ServerLocator factory = ActiveMQClient.createServerLocatorWithoutHA(tc); return URISchema.setData(uri, factory, query); } - public static TransportConfiguration createTransportConfiguration(URI uri) - { - Map inVmTransportConfig = new HashMap<>(); - inVmTransportConfig.put("serverId", uri.getHost()); - return new TransportConfiguration("org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory", inVmTransportConfig); - } + @Override protected URI internalNewURI(ServerLocator bean) throws Exception diff --git a/activemq-core-client/src/main/java/org/apache/activemq/uri/InVMTransportConfigurationSchema.java b/activemq-core-client/src/main/java/org/apache/activemq/uri/InVMTransportConfigurationSchema.java new file mode 100644 index 0000000000..793972e651 --- /dev/null +++ b/activemq-core-client/src/main/java/org/apache/activemq/uri/InVMTransportConfigurationSchema.java @@ -0,0 +1,64 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.activemq.uri; + +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.utils.uri.SchemaConstants; + +import java.net.URI; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @author Andy Taylor + */ +public class InVMTransportConfigurationSchema extends AbstractTransportConfigurationSchema +{ + @Override + public String getSchemaName() + { + return SchemaConstants.VM; + } + + @Override + protected List internalNewObject(URI uri, Map query, String name) throws Exception + { + List configurations = new ArrayList<>(); + configurations.add(createTransportConfiguration(uri, name, getFactoryName())); + return configurations; + } + + @Override + protected URI internalNewURI(List bean) throws Exception + { + return null; + } + + protected String getFactoryName() + { + return "org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory"; + } + + public static TransportConfiguration createTransportConfiguration(URI uri, String name, String factoryName) + { + Map inVmTransportConfig = new HashMap<>(); + inVmTransportConfig.put("serverId", uri.getHost()); + return new TransportConfiguration(factoryName, inVmTransportConfig, name); + } +} diff --git a/activemq-core-client/src/main/java/org/apache/activemq/uri/JGroupsServerLocatorSchema.java b/activemq-core-client/src/main/java/org/apache/activemq/uri/JGroupsServerLocatorSchema.java index b840bcb64d..cef9e60af6 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/uri/JGroupsServerLocatorSchema.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/uri/JGroupsServerLocatorSchema.java @@ -41,11 +41,11 @@ public class JGroupsServerLocatorSchema extends AbstractServerLocatorSchema } @Override - protected ServerLocator internalNewObject(URI uri, Map query) throws Exception + protected ServerLocator internalNewObject(URI uri, Map query, String name) throws Exception { ConnectionOptions options = newConnectionOptions(uri, query); - DiscoveryGroupConfiguration dcConfig = getDiscoveryGroupConfiguration(uri, query); + DiscoveryGroupConfiguration dcConfig = getDiscoveryGroupConfiguration(uri, query, name); if (options.isHa()) { @@ -80,7 +80,7 @@ public class JGroupsServerLocatorSchema extends AbstractServerLocatorSchema return new URI(SchemaConstants.JGROUPS, null, auth, -1, null, query, null); } - public static DiscoveryGroupConfiguration getDiscoveryGroupConfiguration(URI uri, Map query) throws Exception + public static DiscoveryGroupConfiguration getDiscoveryGroupConfiguration(URI uri, Map query, String name) throws Exception { BroadcastEndpointFactory endpointFactory; if (query.containsKey("file")) @@ -94,7 +94,7 @@ public class JGroupsServerLocatorSchema extends AbstractServerLocatorSchema URISchema.setData(uri, endpointFactory, query); - DiscoveryGroupConfiguration dcConfig = new DiscoveryGroupConfiguration().setBroadcastEndpointFactory(endpointFactory); + DiscoveryGroupConfiguration dcConfig = new DiscoveryGroupConfiguration().setName(name).setBroadcastEndpointFactory(endpointFactory); URISchema.setData(uri, dcConfig, query); return dcConfig; diff --git a/activemq-core-client/src/main/java/org/apache/activemq/uri/ServerLocatorParser.java b/activemq-core-client/src/main/java/org/apache/activemq/uri/ServerLocatorParser.java index c77250ae20..090795362b 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/uri/ServerLocatorParser.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/uri/ServerLocatorParser.java @@ -22,7 +22,7 @@ import org.apache.activemq.utils.uri.URIFactory; /** * @author Andy Taylor */ -public class ServerLocatorParser extends URIFactory +public class ServerLocatorParser extends URIFactory { public ServerLocatorParser() { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/uri/TCPServerLocatorSchema.java b/activemq-core-client/src/main/java/org/apache/activemq/uri/TCPServerLocatorSchema.java index ee92c84cf9..959865b8b7 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/uri/TCPServerLocatorSchema.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/uri/TCPServerLocatorSchema.java @@ -25,9 +25,6 @@ import org.apache.activemq.utils.uri.SchemaConstants; import org.apache.activemq.utils.uri.URISchema; import java.net.URI; -import java.net.URISyntaxException; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -42,54 +39,26 @@ public class TCPServerLocatorSchema extends AbstractServerLocatorSchema return SchemaConstants.TCP; } + @Override - protected ServerLocator internalNewObject(URI uri, Map query) throws Exception + protected ServerLocator internalNewObject(URI uri, Map query, String name) throws Exception { ConnectionOptions options = newConnectionOptions(uri, query); - TransportConfiguration[] configurations = getTransportConfigurations(uri, query); - + List configurations = + TCPTransportConfigurationSchema.getTransportConfigurations(uri, query, TransportConstants.ALLOWABLE_CONNECTOR_KEYS, name, NettyConnectorFactory.class.getName()); + TransportConfiguration[] tcs = new TransportConfiguration[configurations.size()]; + configurations.toArray(tcs); if (options.isHa()) { - return ActiveMQClient.createServerLocatorWithHA(configurations); + return ActiveMQClient.createServerLocatorWithHA(tcs); } else { - return ActiveMQClient.createServerLocatorWithoutHA(configurations); + return ActiveMQClient.createServerLocatorWithoutHA(tcs); } } - public static TransportConfiguration[] getTransportConfigurations(URI uri, Map query) throws URISyntaxException - { - HashMap props = new HashMap<>(); - - URISchema.setData(uri, props, TransportConstants.ALLOWABLE_CONNECTOR_KEYS, query); - List transportConfigurations = new ArrayList<>(); - - transportConfigurations.add(new TransportConfiguration(NettyConnectorFactory.class.getName(), - props, - uri.toString())); - String connectors = uri.getFragment(); - - if (connectors != null) - { - String[] split = connectors.split(","); - for (String s : split) - { - URI extraUri = new URI(s); - HashMap newProps = new HashMap<>(); - URISchema.setData(extraUri, newProps, TransportConstants.ALLOWABLE_CONNECTOR_KEYS, query); - URISchema.setData(extraUri, newProps, TransportConstants.ALLOWABLE_CONNECTOR_KEYS, URISchema.parseQuery(extraUri.getQuery(), null)); - transportConfigurations.add(new TransportConfiguration(NettyConnectorFactory.class.getName(), - newProps, - extraUri.toString())); - } - } - TransportConfiguration[] configurations = new TransportConfiguration[transportConfigurations.size()]; - transportConfigurations.toArray(configurations); - return configurations; - } - @Override protected URI internalNewURI(ServerLocator bean) throws Exception { diff --git a/activemq-core-client/src/main/java/org/apache/activemq/uri/TCPTransportConfigurationSchema.java b/activemq-core-client/src/main/java/org/apache/activemq/uri/TCPTransportConfigurationSchema.java new file mode 100644 index 0000000000..c519851ab7 --- /dev/null +++ b/activemq-core-client/src/main/java/org/apache/activemq/uri/TCPTransportConfigurationSchema.java @@ -0,0 +1,95 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.activemq.uri; + +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq.utils.uri.SchemaConstants; +import org.apache.activemq.utils.uri.URISchema; + +import java.net.URI; +import java.net.URISyntaxException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * @author Andy Taylor + */ +public class TCPTransportConfigurationSchema extends AbstractTransportConfigurationSchema +{ + private final Set allowableProperties; + + public TCPTransportConfigurationSchema(Set allowableProperties) + { + this.allowableProperties = allowableProperties; + } + + @Override + public String getSchemaName() + { + return SchemaConstants.TCP; + } + + @Override + protected List internalNewObject(URI uri, Map query, String name) throws Exception + { + return getTransportConfigurations(uri, query, allowableProperties, name, getFactoryName()); + } + + @Override + protected URI internalNewURI(List bean) throws Exception + { + return null; + } + + public static List getTransportConfigurations(URI uri, Map query, Set allowableProperties, String name, String factoryName) throws URISyntaxException + { + HashMap props = new HashMap<>(); + + URISchema.setData(uri, props, allowableProperties, query); + List transportConfigurations = new ArrayList<>(); + + transportConfigurations.add(new TransportConfiguration(factoryName, + props, + name)); + String connectors = uri.getFragment(); + + if (connectors != null) + { + String[] split = connectors.split(","); + for (String s : split) + { + URI extraUri = new URI(s); + HashMap newProps = new HashMap<>(); + URISchema.setData(extraUri, newProps, allowableProperties, query); + URISchema.setData(extraUri, newProps, allowableProperties, URISchema.parseQuery(extraUri.getQuery(), null)); + transportConfigurations.add(new TransportConfiguration(factoryName, + newProps, + name + ":" + extraUri.toString())); + } + } + return transportConfigurations; + } + + protected String getFactoryName() + { + return NettyConnectorFactory.class.getName(); + } +} diff --git a/activemq-core-client/src/main/java/org/apache/activemq/uri/UDPServerLocatorSchema.java b/activemq-core-client/src/main/java/org/apache/activemq/uri/UDPServerLocatorSchema.java index ef1d96b73c..9b1a39bdef 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/uri/UDPServerLocatorSchema.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/uri/UDPServerLocatorSchema.java @@ -46,11 +46,11 @@ public class UDPServerLocatorSchema extends AbstractServerLocatorSchema } @Override - protected ServerLocator internalNewObject(URI uri, Map query) throws Exception + protected ServerLocator internalNewObject(URI uri, Map query, String name) throws Exception { ConnectionOptions options = newConnectionOptions(uri, query); - DiscoveryGroupConfiguration dgc = getDiscoveryGroupConfiguration(uri, query, getHost(uri), getPort(uri)); + DiscoveryGroupConfiguration dgc = getDiscoveryGroupConfiguration(uri, query, getHost(uri), getPort(uri), name); if (options.isHa()) { @@ -72,7 +72,7 @@ public class UDPServerLocatorSchema extends AbstractServerLocatorSchema return new URI(SchemaConstants.UDP, null, endpoint.getGroupAddress(), endpoint.getGroupPort(), null, query, null); } - public static DiscoveryGroupConfiguration getDiscoveryGroupConfiguration(URI uri, Map query, String host, int port) throws Exception + public static DiscoveryGroupConfiguration getDiscoveryGroupConfiguration(URI uri, Map query, String host, int port, String name) throws Exception { UDPBroadcastEndpointFactory endpointFactoryConfiguration = new UDPBroadcastEndpointFactory() .setGroupAddress(host) @@ -81,6 +81,7 @@ public class UDPServerLocatorSchema extends AbstractServerLocatorSchema URISchema.setData(uri, endpointFactoryConfiguration, query); DiscoveryGroupConfiguration dgc = URISchema.setData(uri, new DiscoveryGroupConfiguration(), query) + .setName(name) .setBroadcastEndpointFactory(endpointFactoryConfiguration); URISchema.setData(uri, dgc, query); diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/ActiveMQJMSClient.java b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/ActiveMQJMSClient.java index 181de27d05..7e92cd4f82 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/ActiveMQJMSClient.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/ActiveMQJMSClient.java @@ -31,8 +31,6 @@ import org.apache.activemq.jms.client.ActiveMQXAQueueConnectionFactory; import org.apache.activemq.jms.client.ActiveMQXATopicConnectionFactory; import org.apache.activemq.uri.ConnectionFactoryParser; -import java.net.URI; - /** * A utility class for creating ActiveMQ client-side JMS managed resources. * @@ -45,10 +43,10 @@ public class ActiveMQJMSClient * * @return the ActiveMQConnectionFactory */ - public static ActiveMQConnectionFactory createConnectionFactory(final String url) throws Exception + public static ActiveMQConnectionFactory createConnectionFactory(final String url, String name) throws Exception { ConnectionFactoryParser parser = new ConnectionFactoryParser(); - return parser.newObject(new URI(url)); + return parser.newObject(parser.expandURI(url), name); } /** diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQConnectionFactory.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQConnectionFactory.java index 5383077781..f85288ea8f 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQConnectionFactory.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQConnectionFactory.java @@ -112,7 +112,7 @@ public class ActiveMQConnectionFactory implements Externalizable, Referenceable, try { URI uri = new URI(url); - serverLocator = locatorParser.newObject(uri); + serverLocator = locatorParser.newObject(uri, null); parser.populateObject(uri, this); } catch (Exception e) diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jndi/ActiveMQInitialContextFactory.java b/activemq-jms-client/src/main/java/org/apache/activemq/jndi/ActiveMQInitialContextFactory.java index 2f9735eebf..b398129e2a 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/jndi/ActiveMQInitialContextFactory.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/jndi/ActiveMQInitialContextFactory.java @@ -60,7 +60,7 @@ public class ActiveMQInitialContextFactory implements InitialContextFactory String jndiName = key.substring(connectionFactoryPrefix.length()); try { - ActiveMQConnectionFactory factory = createConnectionFactory((String) environment.get(key)); + ActiveMQConnectionFactory factory = createConnectionFactory((String) environment.get(key), jndiName); data.put(jndiName, factory); } catch (Exception e) @@ -175,9 +175,9 @@ public class ActiveMQInitialContextFactory implements InitialContextFactory /** * Factory method to create a new connection factory from the given environment */ - protected ActiveMQConnectionFactory createConnectionFactory(String uri) throws Exception + protected ActiveMQConnectionFactory createConnectionFactory(String uri, String name) throws Exception { ConnectionFactoryParser parser = new ConnectionFactoryParser(); - return parser.newObject(uri); + return parser.newObject(parser.expandURI(uri), name); } } diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/uri/AbstractCFSchema.java b/activemq-jms-client/src/main/java/org/apache/activemq/uri/AbstractCFSchema.java index 7608afbe6e..ebbfc5a6fe 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/uri/AbstractCFSchema.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/uri/AbstractCFSchema.java @@ -28,7 +28,7 @@ import org.apache.activemq.utils.uri.URISchema; * @author clebertsuconic */ -public abstract class AbstractCFSchema extends URISchema +public abstract class AbstractCFSchema extends URISchema { protected JMSConnectionOptions newConectionOptions(URI uri, Map query) throws Exception diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/uri/ConnectionFactoryParser.java b/activemq-jms-client/src/main/java/org/apache/activemq/uri/ConnectionFactoryParser.java index ec2e8db4fc..6ec6bf94c9 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/uri/ConnectionFactoryParser.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/uri/ConnectionFactoryParser.java @@ -24,7 +24,7 @@ import org.apache.activemq.utils.uri.URIFactory; * @author clebertsuconic */ -public class ConnectionFactoryParser extends URIFactory +public class ConnectionFactoryParser extends URIFactory { public ConnectionFactoryParser() { diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/uri/InVMSchema.java b/activemq-jms-client/src/main/java/org/apache/activemq/uri/InVMSchema.java index 4de3b24720..88e941f0aa 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/uri/InVMSchema.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/uri/InVMSchema.java @@ -36,10 +36,12 @@ public class InVMSchema extends AbstractCFSchema } @Override - protected ActiveMQConnectionFactory internalNewObject(URI uri, Map query) throws Exception + protected ActiveMQConnectionFactory internalNewObject(URI uri, Map query, String name) throws Exception { JMSConnectionOptions options = newConectionOptions(uri, query); - ActiveMQConnectionFactory factory = ActiveMQJMSClient.createConnectionFactoryWithoutHA(options.getFactoryTypeEnum(), InVMServerLocatorSchema.createTransportConfiguration(uri)); + ActiveMQConnectionFactory factory = + ActiveMQJMSClient.createConnectionFactoryWithoutHA(options.getFactoryTypeEnum(), + InVMTransportConfigurationSchema.createTransportConfiguration(uri, name, "org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory")); return URISchema.setData(uri, factory, query); } diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/uri/JGroupsSchema.java b/activemq-jms-client/src/main/java/org/apache/activemq/uri/JGroupsSchema.java index 4d92153ff8..6ab70b1b4a 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/uri/JGroupsSchema.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/uri/JGroupsSchema.java @@ -43,11 +43,11 @@ public class JGroupsSchema extends AbstractCFSchema } @Override - public ActiveMQConnectionFactory internalNewObject(URI uri, Map query) throws Exception + public ActiveMQConnectionFactory internalNewObject(URI uri, Map query, String name) throws Exception { JMSConnectionOptions options = newConectionOptions(uri, query); - DiscoveryGroupConfiguration dcConfig = JGroupsServerLocatorSchema.getDiscoveryGroupConfiguration(uri, query); + DiscoveryGroupConfiguration dcConfig = JGroupsServerLocatorSchema.getDiscoveryGroupConfiguration(uri, query, name); ActiveMQConnectionFactory factory; if (options.isHa()) diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/uri/TCPSchema.java b/activemq-jms-client/src/main/java/org/apache/activemq/uri/TCPSchema.java index a9b756564e..a8279a3c4f 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/uri/TCPSchema.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/uri/TCPSchema.java @@ -18,11 +18,14 @@ package org.apache.activemq.uri; import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.api.jms.ActiveMQJMSClient; +import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory; +import org.apache.activemq.core.remoting.impl.netty.TransportConstants; import org.apache.activemq.jms.client.ActiveMQConnectionFactory; import org.apache.activemq.utils.uri.SchemaConstants; import org.apache.activemq.utils.uri.URISchema; import java.net.URI; +import java.util.List; import java.util.Map; /** @@ -37,21 +40,26 @@ public class TCPSchema extends AbstractCFSchema } @Override - protected ActiveMQConnectionFactory internalNewObject(URI uri, Map query) throws Exception + protected ActiveMQConnectionFactory internalNewObject(URI uri, Map query, String name) throws Exception { JMSConnectionOptions options = newConectionOptions(uri, query); - TransportConfiguration[] configurations = TCPServerLocatorSchema.getTransportConfigurations(uri, query); + List configurations = + TCPTransportConfigurationSchema.getTransportConfigurations(uri, query, TransportConstants.ALLOWABLE_CONNECTOR_KEYS, name, NettyConnectorFactory.class.getName()); + + TransportConfiguration[] tcs = new TransportConfiguration[configurations.size()]; + + configurations.toArray(tcs); ActiveMQConnectionFactory factory; if (options.isHa()) { - factory = ActiveMQJMSClient.createConnectionFactoryWithHA(options.getFactoryTypeEnum(), configurations); + factory = ActiveMQJMSClient.createConnectionFactoryWithHA(options.getFactoryTypeEnum(), tcs); } else { - factory = ActiveMQJMSClient.createConnectionFactoryWithoutHA(options.getFactoryTypeEnum(), configurations); + factory = ActiveMQJMSClient.createConnectionFactoryWithoutHA(options.getFactoryTypeEnum(), tcs); } return URISchema.setData(uri, factory, query); diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/uri/UDPSchema.java b/activemq-jms-client/src/main/java/org/apache/activemq/uri/UDPSchema.java index fdf613bb5f..caffb91eb5 100644 --- a/activemq-jms-client/src/main/java/org/apache/activemq/uri/UDPSchema.java +++ b/activemq-jms-client/src/main/java/org/apache/activemq/uri/UDPSchema.java @@ -40,11 +40,11 @@ public class UDPSchema extends AbstractCFSchema } @Override - public ActiveMQConnectionFactory internalNewObject(URI uri, Map query) throws Exception + public ActiveMQConnectionFactory internalNewObject(URI uri, Map query, String name) throws Exception { JMSConnectionOptions options = newConectionOptions(uri, query); - DiscoveryGroupConfiguration dgc = UDPServerLocatorSchema.getDiscoveryGroupConfiguration(uri, query, getHost(uri), getPort(uri)); + DiscoveryGroupConfiguration dgc = UDPServerLocatorSchema.getDiscoveryGroupConfiguration(uri, query, getHost(uri), getPort(uri), name); ActiveMQConnectionFactory factory; if (options.isHa()) diff --git a/activemq-jms-client/src/test/java/org/apache/activemq/uri/ConnectionFactoryURITest.java b/activemq-jms-client/src/test/java/org/apache/activemq/uri/ConnectionFactoryURITest.java index 7e922fba64..7918da5d3e 100644 --- a/activemq-jms-client/src/test/java/org/apache/activemq/uri/ConnectionFactoryURITest.java +++ b/activemq-jms-client/src/test/java/org/apache/activemq/uri/ConnectionFactoryURITest.java @@ -56,7 +56,7 @@ public class ConnectionFactoryURITest @Test public void testQUEUE_XA_CF() throws Exception { - ActiveMQConnectionFactory factory = parser.newObject(new URI("tcp://localhost:3030?ha=true&type=QUEUE_XA_CF")); + ActiveMQConnectionFactory factory = parser.newObject(new URI("tcp://localhost:3030?ha=true&type=QUEUE_XA_CF"), null); Assert.assertTrue(ActiveMQXAQueueConnectionFactory.class.getName().equals(factory.getClass().getName())); } @@ -64,7 +64,7 @@ public class ConnectionFactoryURITest @Test public void testTOPICXA_CF() throws Exception { - ActiveMQConnectionFactory factory = parser.newObject(new URI("tcp://localhost:3030?ha=true&type=TOPIC_XA_CF")); + ActiveMQConnectionFactory factory = parser.newObject(new URI("tcp://localhost:3030?ha=true&type=TOPIC_XA_CF"), null); Assert.assertTrue(ActiveMQXATopicConnectionFactory.class.getName().equals(factory.getClass().getName())); } @@ -72,7 +72,7 @@ public class ConnectionFactoryURITest public void testQUEUE_CF() throws Exception { - ActiveMQConnectionFactory factory = parser.newObject(new URI("tcp://localhost:3030?ha=true&type=QUEUE_CF")); + ActiveMQConnectionFactory factory = parser.newObject(new URI("tcp://localhost:3030?ha=true&type=QUEUE_CF"), null); Assert.assertTrue(ActiveMQQueueConnectionFactory.class.getName().equals(factory.getClass().getName())); } @@ -80,7 +80,7 @@ public class ConnectionFactoryURITest @Test public void testTOPIC_CF() throws Exception { - ActiveMQConnectionFactory factory = parser.newObject(new URI("tcp://localhost:3030?ha=true&type=TOPIC_CF")); + ActiveMQConnectionFactory factory = parser.newObject(new URI("tcp://localhost:3030?ha=true&type=TOPIC_CF"), null); Assert.assertTrue(ActiveMQTopicConnectionFactory.class.getName().equals(factory.getClass().getName())); } @@ -88,7 +88,7 @@ public class ConnectionFactoryURITest @Test public void testCF() throws Exception { - ActiveMQConnectionFactory factory = parser.newObject(new URI("tcp://localhost:3030?ha=true&type=CF")); + ActiveMQConnectionFactory factory = parser.newObject(new URI("tcp://localhost:3030?ha=true&type=CF"), null); Assert.assertTrue(ActiveMQJMSConnectionFactory.class.getName().equals(factory.getClass().getName())); } @@ -96,7 +96,7 @@ public class ConnectionFactoryURITest @Test public void testNoCF() throws Exception { - ActiveMQConnectionFactory factory = parser.newObject(new URI("tcp://localhost:3030?ha=true")); + ActiveMQConnectionFactory factory = parser.newObject(new URI("tcp://localhost:3030?ha=true"), null); Assert.assertTrue(ActiveMQJMSConnectionFactory.class.getName().equals(factory.getClass().getName())); } @@ -109,7 +109,7 @@ public class ConnectionFactoryURITest BeanUtilsBean bean = new BeanUtilsBean(); ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory(true, (TransportConfiguration) null); populate(sb, bean, factory); - ActiveMQConnectionFactory factory2 = parser.newObject(new URI(sb.toString())); + ActiveMQConnectionFactory factory2 = parser.newObject(new URI(sb.toString()), null); checkEquals(bean, factory, factory2); } @@ -121,11 +121,11 @@ public class ConnectionFactoryURITest StringBuilder sb = new StringBuilder(); sb.append("tcp://localhost:3030?ha=true"); populateConnectorParams(props, allowableConnectorKeys, sb); - ActiveMQConnectionFactory factory = parser.newObject(new URI(sb.toString())); + ActiveMQConnectionFactory factory = parser.newObject(new URI(sb.toString()), null); Map params = factory.getStaticConnectors()[0].getParams(); Assert.assertEquals(params.get("host"), "localhost"); - Assert.assertEquals(params.get("port"), 3030); + Assert.assertEquals(params.get("port"), "3030"); for (Map.Entry entry : params.entrySet()) { if (!entry.getKey().equals("host") && !entry.getKey().equals("port")) @@ -152,7 +152,7 @@ public class ConnectionFactoryURITest populateConnectorParams(props3, allowableConnectorKeys, sb); sb.append(")?ha=true&clientID=myID"); - ActiveMQConnectionFactory factory = parser.newObject(sb.toString()); + ActiveMQConnectionFactory factory = parser.newObject(parser.expandURI((sb.toString())), null); TransportConfiguration[] staticConnectors = factory.getStaticConnectors(); Assert.assertEquals(3, staticConnectors.length); @@ -165,7 +165,7 @@ public class ConnectionFactoryURITest { TransportConfiguration connector = staticConnector; Assert.assertEquals(connector.getParams().get("host"), "localhost" + offfSet); - Assert.assertEquals(connector.getParams().get("port"), (5445 + offfSet)); + Assert.assertEquals(connector.getParams().get("port"), "" + (5445 + offfSet)); Map params = connector.getParams(); for (Map.Entry entry : params.entrySet()) { @@ -203,7 +203,7 @@ public class ConnectionFactoryURITest TransportConfiguration tc3 = new TransportConfiguration(NettyConnectorFactory.class.getName(), params2); ActiveMQConnectionFactory connectionFactoryWithHA = ActiveMQJMSClient.createConnectionFactoryWithHA(JMSFactoryType.CF, tc, tc2, tc3); URI tcp = parser.createSchema("tcp", connectionFactoryWithHA); - ActiveMQConnectionFactory factory = parser.newObject(tcp); + ActiveMQConnectionFactory factory = parser.newObject(tcp, null); BeanUtilsBean bean = new BeanUtilsBean(); checkEquals(bean, connectionFactoryWithHA, factory); } @@ -211,7 +211,7 @@ public class ConnectionFactoryURITest @Test public void testUDP() throws Exception { - ActiveMQConnectionFactory factory = parser.newObject(new URI("udp://localhost:3030?ha=true&type=QUEUE_XA_CF")); + ActiveMQConnectionFactory factory = parser.newObject(new URI("udp://localhost:3030?ha=true&type=QUEUE_XA_CF"), null); Assert.assertTrue(ActiveMQXAQueueConnectionFactory.class.getName().equals(factory.getClass().getName())); } @@ -224,7 +224,7 @@ public class ConnectionFactoryURITest BeanUtilsBean bean = new BeanUtilsBean(); ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory(true, (TransportConfiguration) null); populate(sb, bean, factory); - ActiveMQConnectionFactory factory2 = parser.newObject(new URI(sb.toString())); + ActiveMQConnectionFactory factory2 = parser.newObject(new URI(sb.toString()), null); checkEquals(bean, factory, factory2); } @@ -240,7 +240,7 @@ public class ConnectionFactoryURITest .setBroadcastEndpointFactory(endpoint); ActiveMQConnectionFactory connectionFactoryWithHA = ActiveMQJMSClient.createConnectionFactoryWithHA(discoveryGroupConfiguration, JMSFactoryType.CF); URI tcp = parser.createSchema("udp", connectionFactoryWithHA); - ActiveMQConnectionFactory factory = parser.newObject(tcp); + ActiveMQConnectionFactory factory = parser.newObject(tcp, null); DiscoveryGroupConfiguration dgc = factory.getDiscoveryGroupConfiguration(); Assert.assertNotNull(dgc); BroadcastEndpointFactory befc = dgc.getBroadcastEndpointFactory(); @@ -264,7 +264,7 @@ public class ConnectionFactoryURITest @Test public void testInvalidCFType() throws Exception { - ActiveMQConnectionFactory factory = parser.newObject(new URI("udp://localhost:3030?ha=true&type=QUEUE_XA_CFInvalid")); + ActiveMQConnectionFactory factory = parser.newObject(new URI("udp://localhost:3030?ha=true&type=QUEUE_XA_CFInvalid"), null); Assert.assertTrue(ActiveMQJMSConnectionFactory.class.getName().equals(factory.getClass().getName())); } @@ -272,7 +272,7 @@ public class ConnectionFactoryURITest @Test public void testJGroupsFile() throws Exception { - ActiveMQConnectionFactory factory = parser.newObject(new URI("jgroups://channel-name?file=/path/to/some/file/channel-file.xml&test=33")); + ActiveMQConnectionFactory factory = parser.newObject(new URI("jgroups://channel-name?file=/path/to/some/file/channel-file.xml&test=33"), null); Assert.assertTrue(ActiveMQJMSConnectionFactory.class.getName().equals(factory.getClass().getName())); JGroupsFileBroadcastEndpointFactory broadcastEndpointFactory = (JGroupsFileBroadcastEndpointFactory) factory.getDiscoveryGroupConfiguration().getBroadcastEndpointFactory(); @@ -283,7 +283,7 @@ public class ConnectionFactoryURITest @Test public void testJGroupsKeyValue() throws Exception { - ActiveMQConnectionFactory factory = parser.newObject(new URI("jgroups://channel-name?properties=param=value;param2=value2&test=33")); + ActiveMQConnectionFactory factory = parser.newObject(new URI("jgroups://channel-name?properties=param=value;param2=value2&test=33"), null); Assert.assertTrue(ActiveMQJMSConnectionFactory.class.getName().equals(factory.getClass().getName())); JGroupsPropertiesBroadcastEndpointFactory broadcastEndpointFactory = (JGroupsPropertiesBroadcastEndpointFactory) factory.getDiscoveryGroupConfiguration().getBroadcastEndpointFactory(); @@ -299,7 +299,7 @@ public class ConnectionFactoryURITest BeanUtilsBean bean = new BeanUtilsBean(); ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory(true, (TransportConfiguration) null); populate(sb, bean, factory); - ActiveMQConnectionFactory factory2 = parser.newObject(new URI(sb.toString())); + ActiveMQConnectionFactory factory2 = parser.newObject(new URI(sb.toString()), null); checkEquals(bean, factory, factory2); } @@ -317,7 +317,7 @@ public class ConnectionFactoryURITest .setBroadcastEndpointFactory(endpointFactory); ActiveMQConnectionFactory connectionFactoryWithHA = ActiveMQJMSClient.createConnectionFactoryWithHA(discoveryGroupConfiguration, JMSFactoryType.CF); URI tcp = parser.createSchema("jgroups", connectionFactoryWithHA); - ActiveMQConnectionFactory factory = parser.newObject(tcp); + ActiveMQConnectionFactory factory = parser.newObject(tcp, null); DiscoveryGroupConfiguration dgc = factory.getDiscoveryGroupConfiguration(); Assert.assertNotNull(dgc); BroadcastEndpointFactory befc = dgc.getBroadcastEndpointFactory(); @@ -348,7 +348,7 @@ public class ConnectionFactoryURITest .setBroadcastEndpointFactory(endpointFactory); ActiveMQConnectionFactory connectionFactoryWithHA = ActiveMQJMSClient.createConnectionFactoryWithHA(discoveryGroupConfiguration, JMSFactoryType.CF); URI tcp = parser.createSchema("jgroups", connectionFactoryWithHA); - ActiveMQConnectionFactory factory = parser.newObject(tcp); + ActiveMQConnectionFactory factory = parser.newObject(tcp, null); DiscoveryGroupConfiguration dgc = factory.getDiscoveryGroupConfiguration(); Assert.assertNotNull(dgc); BroadcastEndpointFactory broadcastEndpointFactory = dgc.getBroadcastEndpointFactory(); diff --git a/activemq-rest/src/test/resources/activemq-configuration.xml b/activemq-rest/src/test/resources/activemq-configuration.xml index f8cb882a78..5986c24bed 100644 --- a/activemq-rest/src/test/resources/activemq-configuration.xml +++ b/activemq-rest/src/test/resources/activemq-configuration.xml @@ -28,15 +28,11 @@ - - org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory - + vm://0 - - org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory - + vm://0 diff --git a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileConfigurationParser.java b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileConfigurationParser.java index a4010fe281..f03516bd9f 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileConfigurationParser.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileConfigurationParser.java @@ -60,6 +60,8 @@ import org.apache.activemq.core.server.group.impl.GroupingHandlerConfiguration; import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy; import org.apache.activemq.core.settings.impl.AddressSettings; import org.apache.activemq.core.settings.impl.SlowConsumerPolicy; +import org.apache.activemq.uri.AcceptorTransportConfigurationParser; +import org.apache.activemq.uri.ConnectorTransportConfigurationParser; import org.apache.activemq.utils.DefaultSensitiveStringCodec; import org.apache.activemq.utils.PasswordMaskingUtil; import org.apache.activemq.utils.SensitiveDataCodec; @@ -373,7 +375,7 @@ public final class FileConfigurationParser extends XMLConfigurationUtil { Element connectorNode = (Element) connectorNodes.item(i); - TransportConfiguration connectorConfig = parseTransportConfiguration(connectorNode, config); + TransportConfiguration connectorConfig = parseConnectorTransportConfiguration(connectorNode, config); if (connectorConfig.getName() == null) { @@ -398,7 +400,7 @@ public final class FileConfigurationParser extends XMLConfigurationUtil { Element acceptorNode = (Element) acceptorNodes.item(i); - TransportConfiguration acceptorConfig = parseTransportConfiguration(acceptorNode, config); + TransportConfiguration acceptorConfig = parseAcceptorTransportConfiguration(acceptorNode, config); config.getAcceptorConfigurations().add(acceptorConfig); } @@ -939,15 +941,19 @@ public final class FileConfigurationParser extends XMLConfigurationUtil .setDurable(durable); } - private TransportConfiguration parseTransportConfiguration(final Element e, final Configuration mainConfig) + private TransportConfiguration parseAcceptorTransportConfiguration(final Element e, final Configuration mainConfig) throws Exception { Node nameNode = e.getAttributes().getNamedItem("name"); String name = nameNode != null ? nameNode.getNodeValue() : null; - String clazz = getString(e, "factory-class", null, Validators.NOT_NULL_OR_EMPTY); + String uri = e.getChildNodes().item(0).getNodeValue(); - Map params = new HashMap(); + AcceptorTransportConfigurationParser parser = new AcceptorTransportConfigurationParser(); + + List configurations = parser.newObject(parser.expandURI(uri), name); + + Map params = configurations.get(0).getParams(); if (mainConfig.isMaskPassword()) { @@ -959,24 +965,34 @@ public final class FileConfigurationParser extends XMLConfigurationUtil } } - NodeList paramsNodes = e.getElementsByTagName("param"); + return configurations.get(0); + } - for (int i = 0; i < paramsNodes.getLength(); i++) + private TransportConfiguration parseConnectorTransportConfiguration(final Element e, final Configuration mainConfig) throws Exception + { + Node nameNode = e.getAttributes().getNamedItem("name"); + + String name = nameNode != null ? nameNode.getNodeValue() : null; + + String uri = e.getChildNodes().item(0).getNodeValue(); + + ConnectorTransportConfigurationParser parser = new ConnectorTransportConfigurationParser(); + + List configurations = parser.newObject(parser.expandURI(uri), name); + + Map params = configurations.get(0).getParams(); + + if (mainConfig.isMaskPassword()) { - Node paramNode = paramsNodes.item(i); + params.put(ActiveMQDefaultConfiguration.getPropMaskPassword(), mainConfig.isMaskPassword()); - NamedNodeMap attributes = paramNode.getAttributes(); - - Node nkey = attributes.getNamedItem("key"); - - String key = nkey.getTextContent(); - - Node nValue = attributes.getNamedItem("value"); - - params.put(key, nValue.getTextContent()); + if (mainConfig.getPasswordCodec() != null) + { + params.put(ActiveMQDefaultConfiguration.getPropPasswordCodec(), mainConfig.getPasswordCodec()); + } } - return new TransportConfiguration(clazz, params, name); + return configurations.get(0); } private static final ArrayList POLICY_LIST = new ArrayList<>(); diff --git a/activemq-server/src/main/java/org/apache/activemq/uri/AcceptorTransportConfigurationParser.java b/activemq-server/src/main/java/org/apache/activemq/uri/AcceptorTransportConfigurationParser.java new file mode 100644 index 0000000000..15d32e92ff --- /dev/null +++ b/activemq-server/src/main/java/org/apache/activemq/uri/AcceptorTransportConfigurationParser.java @@ -0,0 +1,35 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.activemq.uri; + +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.core.remoting.impl.netty.TransportConstants; +import org.apache.activemq.utils.uri.URIFactory; + +import java.util.List; + +/** + * @author Andy Taylor + */ +public class AcceptorTransportConfigurationParser extends URIFactory, String> +{ + public AcceptorTransportConfigurationParser() + { + registerSchema(new TCPAcceptorTransportConfigurationSchema(TransportConstants.ALLOWABLE_ACCEPTOR_KEYS)); + registerSchema(new InVMAcceptorTransportConfigurationSchema()); + } +} diff --git a/activemq-server/src/main/java/org/apache/activemq/uri/InVMAcceptorTransportConfigurationSchema.java b/activemq-server/src/main/java/org/apache/activemq/uri/InVMAcceptorTransportConfigurationSchema.java new file mode 100644 index 0000000000..51ce14519c --- /dev/null +++ b/activemq-server/src/main/java/org/apache/activemq/uri/InVMAcceptorTransportConfigurationSchema.java @@ -0,0 +1,30 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.activemq.uri; + +import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory; + +/** + * @author Andy Taylor + */ +public class InVMAcceptorTransportConfigurationSchema extends InVMTransportConfigurationSchema +{ + protected String getFactoryName() + { + return InVMAcceptorFactory.class.getName(); + } +} diff --git a/activemq-server/src/main/java/org/apache/activemq/uri/TCPAcceptorTransportConfigurationSchema.java b/activemq-server/src/main/java/org/apache/activemq/uri/TCPAcceptorTransportConfigurationSchema.java new file mode 100644 index 0000000000..01962d3f91 --- /dev/null +++ b/activemq-server/src/main/java/org/apache/activemq/uri/TCPAcceptorTransportConfigurationSchema.java @@ -0,0 +1,36 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.activemq.uri; + +import org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory; +import java.util.Set; + +/** + * @author Andy Taylor + */ +public class TCPAcceptorTransportConfigurationSchema extends TCPTransportConfigurationSchema +{ + public TCPAcceptorTransportConfigurationSchema(Set allowableProperties) + { + super(allowableProperties); + } + + public String getFactoryName() + { + return NettyAcceptorFactory.class.getName(); + } +} diff --git a/activemq-server/src/main/resources/schema/activemq-configuration.xsd b/activemq-server/src/main/resources/schema/activemq-configuration.xsd index 723cf57b67..10ab978d70 100644 --- a/activemq-server/src/main/resources/schema/activemq-configuration.xsd +++ b/activemq-server/src/main/resources/schema/activemq-configuration.xsd @@ -324,33 +324,7 @@ - - - - - - - Name of the ConnectorFactory implementation - - - - - - - A key-value pair used to configure the connector. A connector can have many param's - - - - - - - - Name of the connector - - - - - + @@ -363,33 +337,7 @@ - - - - - - - Name of the AcceptorFactory implementation - - - - - - - A key-value pair used to configure the acceptor. An acceptor can have many param - - - - - - - - Name of the acceptor - - - - - + @@ -2191,4 +2139,13 @@ + + + + + + + + + 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 7aee01be33..7c62f36da6 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 "${jboss.server.data.dir}/activemq/largemessages" + "\n" + "${jboss.server.data.dir}/activemq/paging" + "\n" + "" + "\n" + - "" + "\n" + - "org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory" + "\n" + - "" + "\n" + - "" + "\n" + - "" + "\n" + - "" + "\n" + - "org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory" + "\n" + - "" + "\n" + - "" + "\n" + - "" + "\n" + - "" + "\n" + - "" + "\n" + - "org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory" + "\n" + - "" + "\n" + - "" + "\n" + + "tcp://localhost:5445" + "\n" + + "tcp://localhost:5545" + "\n" + + "vm://0" + "\n" + "" + "\n" + "" + "\n" + - "" + "\n" + - "org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory" + "\n" + - "" + "\n" + - "" + "\n" + - "" + "\n" + - "" + "\n" + - "org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory" + "\n" + - "" + "\n" + - "" + "\n" + - "" + "\n" + - "" + "\n" + - "" + "\n" + - "" + "\n" + - "org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory" + "\n" + - "" + "\n" + - "" + "\n" + + "tcp://localhost:5545" + "\n" + + "tcp://localhost:5545" + "\n" + + "vm://0" + "\n" + "" + "\n" + "" + "\n" + "" + "\n" + 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 c7fc2c4900..3f55a55a42 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")); } } 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 bfb57e58e5..bbf4eea193 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 "${jboss.server.data.dir}/activemq/largemessages" + "\n" + "${jboss.server.data.dir}/activemq/paging" + "\n" + "" + "\n" + - "" + "\n" + - "org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory" + "\n" + - "" + "\n" + - "" + "\n" + - "" + "\n" + - "" + "\n" + - "org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory" + "\n" + - "" + "\n" + - "" + "\n" + - "" + "\n" + - "" + "\n" + - "" + "\n" + - "org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory" + "\n" + - "" + "\n" + - "" + "\n" + + "tcp://localhost:5445" + "\n" + + "tcp://localhost:5545" + "\n" + + "vm://0" + "\n" + "" + "\n" + "" + "\n" + - "" + "\n" + - "org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory" + "\n" + - "" + "\n" + - "" + "\n" + - "" + "\n" + - "" + "\n" + - "org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory" + "\n" + - "" + "\n" + - "" + "\n" + - "" + "\n" + - "" + "\n" + - "" + "\n" + - "" + "\n" + - "org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory" + "\n" + - "" + "\n" + - "" + "\n" + + "tcp://localhost:5545" + "\n" + + "tcp://localhost:5545" + "\n" + + "vm://0" + "\n" + "" + "\n" + "" + "\n" + "" + "\n" + diff --git a/activemq-server/src/test/resources/ConfigurationTest-full-config.xml b/activemq-server/src/test/resources/ConfigurationTest-full-config.xml index 79cded1696..0eaf7962b6 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 @@ true - - org.apache.activemq.tests.unit.core.config.impl.TestConnectorFactory1 - - - - - - - org.apache.activemq.tests.unit.core.config.impl.TestConnectorFactory2 - - - + tcp://localhost1:5678?localAddress=mylocal;localPort=99 + vm://5 - - org.apache.activemq.tests.unit.core.config.impl.TestAcceptorFactory1 - - - - - org.apache.activemq.tests.unit.core.config.impl.TestAcceptorFactory2 - - - + tcp://0.0.0.0:5445?tcpNoDelay=456;connectionTtl=44 + vm://0?e1=z1;e2=567 diff --git a/distribution/activemq/pom.xml b/distribution/activemq/pom.xml index b168313a5c..eb99e6b7fb 100644 --- a/distribution/activemq/pom.xml +++ b/distribution/activemq/pom.xml @@ -165,6 +165,14 @@ jolokia-war war + + commons-beanutils + commons-beanutils + + + commons-logging + commons-logging + diff --git a/distribution/activemq/src/main/assembly/dep.xml b/distribution/activemq/src/main/assembly/dep.xml index 15bffeb16b..22f7434dfa 100644 --- a/distribution/activemq/src/main/assembly/dep.xml +++ b/distribution/activemq/src/main/assembly/dep.xml @@ -64,6 +64,8 @@ org.eclipse.jetty.aggregate:jetty-all org.apache.geronimo.specs: org.apache.geronimo.specs:geronimo-servlet_3.0_spec + commons-beanutils:commons-beanutils + commons-logging:commons-logging - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - + tcp://localhost:5445?tcpNoDelay=false;tcpSendBufferSize=1048576;tcpReceiveBufferSize=1048576 false 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 fcfd7c596f..c9e48ec4d9 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - + tcp://localhost:5445 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 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 78e0af8cf7..dcb6d17b4f 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. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 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 fa76b9ebff..0348796135 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. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5445 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 87345a9e4c..3dd991d604 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. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5446 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 7ff1ccc110..c20cdbaa91 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5446 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5445 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5446 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 2c4daa24b0..39cabf0e11 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. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 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 a3937f7bf1..e82b033bcc 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. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 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 4b02342b3a..506976d7d9 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5445 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5445 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 cb4d05f25a..a9f7a92628 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5446 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5446 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 54ec786aca..eb835cb144 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5445 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5445 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 e896c56e4e..aca7ad5460 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5446 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5446 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 6bf473332a..f26bdb3c3e 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5447 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5447 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 e53259eed8..2673e6b66d 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5445 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5445 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 5a27ad7e19..a4ea6c6544 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5446 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5446 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 9d0e96b56f..bbad3cc8d1 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5445 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5445 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 d72d2f31ec..8e6d4cb341 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5446 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5446 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 b06a8f1fe2..fc09c3e6ee 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5447 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5447 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 7c5ad14cce..34d88c5ea5 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5445 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5445 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 f1238ea142..e4b0fa5b5d 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5446 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5446 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 a68192c75b..24648cef53 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5445 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5445 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 3a9588d25e..c719783bc7 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5446 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5446 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 4c275b13f9..fa59e43bea 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5445 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5445 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 1f12bb3a66..f09493a812 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5446 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5446 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 6721e1854e..43863bc548 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5447 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5447 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 b3a86a60d6..509ca523f6 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5445 - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5446 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5445 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 0026e8d765..8ea3eda19d 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5446 - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5445 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5446 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 ecf594d8ba..44a4f31914 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 @@ - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5447 - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5445 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5447 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 70b809e4e3..84f7a9cc7f 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 @@ - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5448 - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5445 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5448 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 8aa3505e71..0b52d8a677 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 @@ - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5445 - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5446 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5445 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 7ca95283c2..2f2c32990b 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 @@ - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5446 - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5447 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5446 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 fb52efabe3..d626302560 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 @@ - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5447 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5447 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 76a93e22ff..ef3fdcb4c5 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5445 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5445 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 dd5bd1938e..c97ea008f3 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5446 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5446 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 10daa9f47c..101f0974d1 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. - - org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + vm://0 + tcp://localhost:5445 - - org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + vm://0 + tcp://localhost:5445 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 f17aeb35cf..55ca5b7217 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. - - org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + vm://0 + tcp://localhost:5446 - - org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + vm://0 + tcp://localhost:5446 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 0537927e65..e83342a266 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5445 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5445 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 27150711fb..136591d781 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5446 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5446 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 bb8c2d13cb..e833e20cd0 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. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 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 04f259815a..6649f238d9 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. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 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 22a572e53c..8e40c346b8 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. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 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 f3d403489b..6d331bee5b 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5446 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5445 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 00a0f5546b..c955abae01 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. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5446 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 234fe3c0ab..f18535f680 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. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5445 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 5524d10cca..fdc8811736 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. false - - org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory - + vm://0 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 bdbb007e57..0dcab025e3 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. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 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 6dc0b1c9d6..7230910364 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. - - org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + vm://0 + tcp://localhost:5445 - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5446 - - org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + vm://0 + tcp://localhost:5445 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 33465514da..2bdb0b8b12 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. - - org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + vm://0 + tcp://localhost:5446 - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5445 - - org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + vm://0 + tcp://localhost:5446 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 4cb457b407..5b3af968e9 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. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:8080 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 6857c9181f..0df5630750 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. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5446 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 1005b59dbe..ffda884a5d 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. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 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 f69eef9f6d..d2b2d697c5 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. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 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 26f3455089..9dc2cbcbe5 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. ${build.directory}/server0/data/messaging/paging - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 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 0d32af49df..f0564f0dff 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. ${build.directory}/server1/data/messaging/paging - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - + tcp://localhost:5455 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 bb8c2d13cb..e833e20cd0 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. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 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 bb8c2d13cb..e833e20cd0 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. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 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 25974c3309..bd07b67edb 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. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 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 17a827840d..bd47d9c65d 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. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 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 bb8c2d13cb..e833e20cd0 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. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 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 9159d3df6d..19ed6b83a1 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. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 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 d67d043a59..fd12ee3f7d 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. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 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 aa92a27015..0aec9a6b8b 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. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 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 77fcd01235..ea8b41c2d0 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. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 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 bb8c2d13cb..e833e20cd0 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. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 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 bb8c2d13cb..e833e20cd0 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. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 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 bb8c2d13cb..e833e20cd0 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. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 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 3fd3d7701f..59e7dde6e1 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5445 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5445 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 cb4d05f25a..a9f7a92628 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5446 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5446 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 39c8a74671..db8e60d3e4 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5447 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5447 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 0d509e16f9..1cd448e867 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5445 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5445 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 cb4d05f25a..a9f7a92628 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5446 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5446 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 731f023ef7..a43467c6ca 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5447 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5447 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 bb8c2d13cb..e833e20cd0 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. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 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 90beb6fdcd..7fc63e16e8 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5445 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5445 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 54aaac13f9..e9ba4ed0b3 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5446 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5446 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 a440ba4ebd..33a5e16838 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. ${build.directory}/server0/data/messaging/paging - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - + tcp://localhost:5445 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - + tcp://localhost:5445 + tcp://localhost:61616?protocols=OPENWIRE 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 886d572751..8d4e76d56f 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - + tcp://localhost:5445 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 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 93e4cfbabb..c88eca2dfd 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. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - + tcp://localhost:5445?tcpNoDelay=false;tcpSendBufferSize=1048576;tcpReceiveBufferSize=1048576 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 4e5a4d3bfa..cbbf2586ec 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. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 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 bb8c2d13cb..e833e20cd0 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. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 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 e74ceba0ff..da9abde657 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. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 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 93e5eb2e58..1363c97a54 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. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5672 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 5c443a161a..5b09034613 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. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - + tcp://localhost:5672?protocols=AMQP; 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 c084fdf65a..dc1f92c13c 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5445 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5445 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 be1c3ca260..5680352c7e 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5446 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5446 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 96f76e5366..98556f10b5 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. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 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 48d96e9862..b5c4724309 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. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 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 bb8c2d13cb..e833e20cd0 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. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 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 1bec9b09cc..fa9d71ea19 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5445 - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5446 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5445 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5446 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 a85e98e74b..0521eefc67 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5445 + tcp://localhost:5446 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5445 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 d3bb79db10..98de370ec6 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5445 + tcp://localhost:5446 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5446 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 3aef7ff295..9dc9a188c8 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5445 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5445 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 81b8429560..68a35aba1e 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5445 + tcp://localhost:5446 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5446 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 65db741643..f14e5923c2 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5445 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5445 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 72f1db7723..a99710f010 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5446 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5446 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 7d41ed2f39..5362696a26 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5447 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5447 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 1ceffc42ac..b56aa5f9ef 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5445 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5445 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 3acc2ae24b..1cf9e8e1a2 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5446 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5446 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 96f76e5366..98556f10b5 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. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 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 692e56f970..ef952b03fe 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. - - org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory - + vm://0 - - org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + vm://0 + tcp://localhost:5445 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 af87f14f80..01bb590e99 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. - - org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory - + vm://0 - - org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory - + vm://0 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 692e56f970..ef952b03fe 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. - - org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory - + vm://0 - - org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + vm://0 + tcp://localhost:5445 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 8421a9132a..13a6ea1bc3 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. - - org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory - + vm://0 - - org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory - - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + vm://0 + tcp://localhost:5445 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 5724d64d4e..0877ab57cf 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5445 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5445 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 5217112114..23f8577953 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. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5446 + tcp://localhost:5445 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5446 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 bb8c2d13cb..e833e20cd0 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. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 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 79fa52f005..7f24b65cb0 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. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 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 bb8c2d13cb..e833e20cd0 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. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 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 5524d10cca..fdc8811736 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. false - - org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory - + vm://0 diff --git a/examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-configuration.xml index d5398a63cc..bd358ef399 100644 --- a/examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/ssl-enabled/src/main/resources/activemq/server0/activemq-configuration.xml @@ -39,14 +39,7 @@ under the License. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - - + tcp://localhost:5500?sslEnabled=true;keyStorePath=activemq/server0/activemq.example.keystore;keyStorePassword=activemqexample diff --git a/examples/jms/ssl-enabled/src/main/resources/jndi.properties b/examples/jms/ssl-enabled/src/main/resources/jndi.properties index 2bbd86808b..a93d970c3c 100644 --- a/examples/jms/ssl-enabled/src/main/resources/jndi.properties +++ b/examples/jms/ssl-enabled/src/main/resources/jndi.properties @@ -16,5 +16,5 @@ # under the License. java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory -connectionFactory.ConnectionFactory=tcp://localhost:5500?ssl-enabled=true&trust-store-path=activemq/server0/activemq.example.truststore&trust-store-password=activemqexample +connectionFactory.ConnectionFactory=tcp://localhost:5500?sslEnabled=true&trustStorePath=activemq/server0/activemq.example.truststore&trustStorePassword=activemqexample queue.queue/exampleQueue=exampleQueue diff --git a/examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-configuration.xml index 1a12151a23..1769b732c1 100644 --- a/examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/static-selector-jms/src/main/resources/activemq/server0/activemq-configuration.xml @@ -41,9 +41,7 @@ under the License. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 diff --git a/examples/jms/static-selector/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/static-selector/src/main/resources/activemq/server0/activemq-configuration.xml index 3c3142b177..e7554881ca 100644 --- a/examples/jms/static-selector/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/static-selector/src/main/resources/activemq/server0/activemq-configuration.xml @@ -39,9 +39,7 @@ under the License. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 diff --git a/examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-configuration.xml index 763b86d5ca..606430be84 100644 --- a/examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/stomp-websockets/src/main/resources/activemq/server0/activemq-configuration.xml @@ -40,15 +40,10 @@ under the License. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:61614 diff --git a/examples/jms/stomp/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/stomp/src/main/resources/activemq/server0/activemq-configuration.xml index 0158f024a2..4d0879e107 100644 --- a/examples/jms/stomp/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/stomp/src/main/resources/activemq/server0/activemq-configuration.xml @@ -40,16 +40,10 @@ under the License. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - + tcp://localhost:61613?protocols=STOMP diff --git a/examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-configuration.xml index 0158f024a2..4d0879e107 100644 --- a/examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/stomp1.1/src/main/resources/activemq/server0/activemq-configuration.xml @@ -40,16 +40,10 @@ under the License. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - + tcp://localhost:61613?protocols=STOMP diff --git a/examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-configuration.xml index 0158f024a2..4d0879e107 100644 --- a/examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/stomp1.2/src/main/resources/activemq/server0/activemq-configuration.xml @@ -40,16 +40,10 @@ under the License. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - + tcp://localhost:61613?protocols=STOMP diff --git a/examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-configuration.xml index aee53471d7..808b21e8bc 100644 --- a/examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/stop-server-failover/src/main/resources/activemq/server0/activemq-configuration.xml @@ -45,18 +45,12 @@ under the License. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5445 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5445 diff --git a/examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-configuration.xml index e72361cb9e..377c6532bd 100644 --- a/examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-configuration.xml +++ b/examples/jms/stop-server-failover/src/main/resources/activemq/server1/activemq-configuration.xml @@ -45,18 +45,12 @@ under the License. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5446 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5446 diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-configuration.xml index 5847fdfb8c..3cadff0d75 100644 --- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server0/activemq-configuration.xml @@ -43,19 +43,13 @@ under the License. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5445 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5445 diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-configuration.xml index 410c96d580..50cfcc9d09 100644 --- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-configuration.xml +++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server1/activemq-configuration.xml @@ -42,18 +42,12 @@ under the License. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5446 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5446 diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-configuration.xml index 9b7d175fbc..adf63328cd 100644 --- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-configuration.xml +++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server2/activemq-configuration.xml @@ -42,18 +42,12 @@ under the License. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5447 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5447 diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-configuration.xml index abb7e818bf..d3ad53ff00 100644 --- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-configuration.xml +++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server3/activemq-configuration.xml @@ -42,18 +42,12 @@ under the License. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5448 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5448 diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-configuration.xml index 8f7c05af31..dda3757bbc 100644 --- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-configuration.xml +++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server4/activemq-configuration.xml @@ -41,18 +41,12 @@ under the License. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5449 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5449 diff --git a/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-configuration.xml b/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-configuration.xml index 319b51dadd..a44e4e2135 100644 --- a/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-configuration.xml +++ b/examples/jms/symmetric-cluster/src/main/resources/activemq/server5/activemq-configuration.xml @@ -41,18 +41,12 @@ under the License. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5450 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5450 diff --git a/examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-configuration.xml index f0da9a7f7d..51d379b484 100644 --- a/examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/temp-queue/src/main/resources/activemq/server0/activemq-configuration.xml @@ -40,16 +40,12 @@ under the License. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - + tcp://localhost:5445 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 diff --git a/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-configuration.xml index 040919bd99..14ce6cb286 100644 --- a/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/topic-hierarchies/src/main/resources/activemq/server0/activemq-configuration.xml @@ -50,9 +50,7 @@ under the License. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 diff --git a/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-configuration.xml index 841da43cc8..985fce4d4b 100644 --- a/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/topic-selector-example1/src/main/resources/activemq/server0/activemq-configuration.xml @@ -39,9 +39,7 @@ under the License. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 diff --git a/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-configuration.xml index 841da43cc8..985fce4d4b 100644 --- a/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/topic-selector-example2/src/main/resources/activemq/server0/activemq-configuration.xml @@ -39,9 +39,7 @@ under the License. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 diff --git a/examples/jms/topic/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/topic/src/main/resources/activemq/server0/activemq-configuration.xml index 841da43cc8..985fce4d4b 100644 --- a/examples/jms/topic/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/topic/src/main/resources/activemq/server0/activemq-configuration.xml @@ -39,9 +39,7 @@ under the License. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 diff --git a/examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml index 911b4b39a2..aeaab28725 100644 --- a/examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/transaction-failover/src/main/resources/activemq/server0/activemq-configuration.xml @@ -46,18 +46,12 @@ under the License. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5445 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5445 diff --git a/examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml b/examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml index e53b6037ed..f35dc7521b 100644 --- a/examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml +++ b/examples/jms/transaction-failover/src/main/resources/activemq/server1/activemq-configuration.xml @@ -45,18 +45,12 @@ under the License. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5446 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5446 diff --git a/examples/jms/transactional/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/transactional/src/main/resources/activemq/server0/activemq-configuration.xml index bb8c2d13cb..e833e20cd0 100644 --- a/examples/jms/transactional/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/transactional/src/main/resources/activemq/server0/activemq-configuration.xml @@ -39,9 +39,7 @@ under the License. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 diff --git a/examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-configuration.xml index bb8c2d13cb..e833e20cd0 100644 --- a/examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/xa-heuristic/src/main/resources/activemq/server0/activemq-configuration.xml @@ -39,9 +39,7 @@ under the License. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 diff --git a/examples/jms/xa-heuristic/src/main/resources/jndi.properties b/examples/jms/xa-heuristic/src/main/resources/jndi.properties index 85eda3dd51..51335e091e 100644 --- a/examples/jms/xa-heuristic/src/main/resources/jndi.properties +++ b/examples/jms/xa-heuristic/src/main/resources/jndi.properties @@ -17,4 +17,5 @@ java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory connectionFactory.ConnectionFactory=tcp://localhost:5445 +connectionFactory.XAConnectionFactory=tcp://localhost:5445?type=XA_CF queue.queue/exampleQueue=exampleQueue diff --git a/examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-configuration.xml index bb8c2d13cb..e833e20cd0 100644 --- a/examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/xa-receive/src/main/resources/activemq/server0/activemq-configuration.xml @@ -39,9 +39,7 @@ under the License. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 diff --git a/examples/jms/xa-receive/src/main/resources/jndi.properties b/examples/jms/xa-receive/src/main/resources/jndi.properties index 85eda3dd51..51335e091e 100644 --- a/examples/jms/xa-receive/src/main/resources/jndi.properties +++ b/examples/jms/xa-receive/src/main/resources/jndi.properties @@ -17,4 +17,5 @@ java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory connectionFactory.ConnectionFactory=tcp://localhost:5445 +connectionFactory.XAConnectionFactory=tcp://localhost:5445?type=XA_CF queue.queue/exampleQueue=exampleQueue diff --git a/examples/jms/xa-send/src/main/resources/activemq/server0/activemq-configuration.xml b/examples/jms/xa-send/src/main/resources/activemq/server0/activemq-configuration.xml index bb8c2d13cb..e833e20cd0 100644 --- a/examples/jms/xa-send/src/main/resources/activemq/server0/activemq-configuration.xml +++ b/examples/jms/xa-send/src/main/resources/activemq/server0/activemq-configuration.xml @@ -39,9 +39,7 @@ under the License. - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 diff --git a/examples/jms/xa-send/src/main/resources/jndi.properties b/examples/jms/xa-send/src/main/resources/jndi.properties index 85eda3dd51..51335e091e 100644 --- a/examples/jms/xa-send/src/main/resources/jndi.properties +++ b/examples/jms/xa-send/src/main/resources/jndi.properties @@ -17,4 +17,5 @@ java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory connectionFactory.ConnectionFactory=tcp://localhost:5445 +connectionFactory.XAConnectionFactory=tcp://localhost:5445?type=XA_CF queue.queue/exampleQueue=exampleQueue diff --git a/examples/soak/normal/server0/activemq-configuration.xml b/examples/soak/normal/server0/activemq-configuration.xml index a8d5536c09..82c2efff5c 100644 --- a/examples/soak/normal/server0/activemq-configuration.xml +++ b/examples/soak/normal/server0/activemq-configuration.xml @@ -26,24 +26,12 @@ under the License. - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - + tcp://localhost:5445?tcpNoDelay=false;tcpSendBufferSize=1048576?tcpReceiveBufferSize=1048576 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - - - - + tcp://localhost:5445?tcpNoDelay=false;tcpSendBufferSize=1048576?tcpReceiveBufferSize=1048576 false diff --git a/pom.xml b/pom.xml index f1fd6c8b6b..1b749a5418 100644 --- a/pom.xml +++ b/pom.xml @@ -429,6 +429,15 @@ commons-beanutils commons-beanutils 1.9.2 + + + + + + commons-logging + commons-logging + 1.2 + diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/StompTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/StompTestBase.java index e7c781948e..2387c719a5 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/StompTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/stomp/StompTestBase.java @@ -107,7 +107,7 @@ public abstract class StompTestBase extends UnitTestCase // ------------------------------------------------------------------------- @Override @Before - public void setUp() throws Exception + public void setUp() throws Exception { super.setUp(); priorityQueue = new ArrayBlockingQueue(1000); diff --git a/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml b/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml index 84ab326d82..9897b32ff7 100644 --- a/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml +++ b/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml @@ -19,9 +19,7 @@ xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd"> - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - + tcp://localhost:5445 /tmp/activemq-unit-test/live1/paging @@ -30,9 +28,7 @@ /tmp/activemq-unit-test/live1/largemessages - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 diff --git a/tests/integration-tests/src/test/resources/colocated-server-start-stop-config2.xml b/tests/integration-tests/src/test/resources/colocated-server-start-stop-config2.xml index b5b201fa3c..560225e2f3 100644 --- a/tests/integration-tests/src/test/resources/colocated-server-start-stop-config2.xml +++ b/tests/integration-tests/src/test/resources/colocated-server-start-stop-config2.xml @@ -19,10 +19,7 @@ xsi:schemaLocation="urn:activemq schema/activemq-configuration.xsd"> - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + tcp://localhost:5645 /tmp/activemq-unit-test/live2/paging @@ -31,10 +28,7 @@ /tmp/activemq-unit-test/live2/largemessages - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5645 diff --git a/tests/integration-tests/src/test/resources/server-start-stop-config1.xml b/tests/integration-tests/src/test/resources/server-start-stop-config1.xml index 3a48c1e21f..5d2f0650d2 100644 --- a/tests/integration-tests/src/test/resources/server-start-stop-config1.xml +++ b/tests/integration-tests/src/test/resources/server-start-stop-config1.xml @@ -23,17 +23,13 @@ - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - + tcp://localhost:5445 /tmp/activemq-unit-test/start-stop-data - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - + tcp://localhost:5445 false diff --git a/tests/integration-tests/src/test/resources/spring-activemq-config.xml b/tests/integration-tests/src/test/resources/spring-activemq-config.xml index f4cd7710e9..e7dd1cc8ee 100644 --- a/tests/integration-tests/src/test/resources/spring-activemq-config.xml +++ b/tests/integration-tests/src/test/resources/spring-activemq-config.xml @@ -29,15 +29,11 @@ - - org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory - + vm://0 - - org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory - + vm://0 diff --git a/tests/jms-tests/src/test/resources/activemq-configuration.xml b/tests/jms-tests/src/test/resources/activemq-configuration.xml index 3cf56e4b36..a507aadbc2 100644 --- a/tests/jms-tests/src/test/resources/activemq-configuration.xml +++ b/tests/jms-tests/src/test/resources/activemq-configuration.xml @@ -24,30 +24,16 @@ - - - org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - - - - org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory - + tcp://localhost:5445 + vm://0 - - org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory - - - + vm://0 - - org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + tcp://localhost:5445 2