Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ACTIVEMQ6-80 - update acceptor config to use URI's 

https://issues.apache.org/jira/browse/ACTIVEMQ6-80

The configuration of acceptors and connectors now takes a uri rather than params
This commit is contained in:
Andy Taylor 2015-02-18 12:13:08 +00:00
parent e385ab0a58
commit 64d0547268
190 changed files with 800 additions and 1385 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
activemq-commons/src/main/java/org/apache/activemq/utils/uri/URIFactory.java
View File

@ -25,12 +25,12 @@ import java.util.concurrent.ConcurrentHashMap;
/**
* @author clebertsuconic
*/
public class URIFactory<T>
public class URIFactory<T, P>
{
private URI defaultURI;
private final Map<String, URISchema<T>> schemas = new ConcurrentHashMap<>();
private final Map<String, URISchema<T, P>> schemas = new ConcurrentHashMap<>();
public URI getDefaultURI()
{
@ -42,7 +42,7 @@ public class URIFactory<T>
this.defaultURI = uri;
}
public void registerSchema(URISchema<T> schemaFactory)
public void registerSchema(URISchema<T, P> schemaFactory)
{
schemas.put(schemaFactory.getSchemaName(), schemaFactory);
schemaFactory.setFactory(this);
@ -53,23 +53,14 @@ public class URIFactory<T>
schemas.remove(schemaName);
}
public T newObject(String uriString) throws Exception
public URI expandURI(String uriString) throws Exception
{
URI uri = normalise(uriString);
URISchema<T> 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<T> schemaFactory = schemas.get(uri.getScheme());
URISchema<T, P> schemaFactory = schemas.get(uri.getScheme());
if (schemaFactory == null)
{
@ -77,12 +68,12 @@ public class URIFactory<T>
}
return schemaFactory.newObject(uri);
return schemaFactory.newObject(uri, param);
}
public void populateObject(URI uri, T bean) throws Exception
{
URISchema<T> schemaFactory = schemas.get(uri.getScheme());
URISchema<T, P> schemaFactory = schemas.get(uri.getScheme());
if (schemaFactory == null)
{
@ -94,7 +85,7 @@ public class URIFactory<T>
public URI createSchema(String scheme, T bean) throws Exception
{
URISchema<T> schemaFactory = schemas.get(scheme);
URISchema<T, P> schemaFactory = schemas.get(scheme);
if (schemaFactory == null)
{
@ -144,8 +135,8 @@ public class URIFactory<T>
builder.append(connectorURIS[i]);
}
}
return new URI(builder.toString());
return new URI(builder.toString().replace(";", "&"));
}
return new URI(uri);
return new URI(uri.replace(";", "&"));
}
}

26
activemq-commons/src/main/java/org/apache/activemq/utils/uri/URISchema.java
View File

@ -33,13 +33,13 @@ import org.apache.commons.beanutils.FluentPropertyBeanIntrospector;
* @author clebertsuconic
*/
public abstract class URISchema<T>
public abstract class URISchema<T, P>
{
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<T>
return internalNewURI(bean);
}
private URIFactory<T> parentFactory;
private URIFactory<T, P> parentFactory;
void setFactory(URIFactory<T> factory)
void setFactory(URIFactory<T, P> factory)
{
this.parentFactory = parentFactory;
}
protected URIFactory<T> getFactory()
protected URIFactory<T, P> getFactory()
{
return parentFactory;
}
@ -78,7 +78,7 @@ public abstract class URISchema<T>
protected URI getDefaultURI()
{
URIFactory<T> factory = getFactory();
URIFactory<T, P> factory = getFactory();
if (factory == null)
{
return null;
@ -107,12 +107,12 @@ public abstract class URISchema<T>
* @return
* @throws Exception
*/
public T newObject(URI uri, Map<String, String> propertyOverrides) throws Exception
public T newObject(URI uri, Map<String, String> 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<String, String> query) throws Exception;
protected abstract T internalNewObject(URI uri, Map<String, String> query, P param) throws Exception;
protected abstract URI internalNewURI(T bean) throws Exception;
@ -204,15 +204,15 @@ public abstract class URISchema<T>
{
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<String, String> entry : query.entrySet())
{

16
activemq-commons/src/test/java/org/apache/activemq/utils/URIParserTest.java
View File

@ -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<FruitBase>
class FruitParser extends URIFactory<FruitBase, String>
{
FruitParser()
{
@ -95,7 +95,7 @@ public class URIParserTest
}
}
class FruitSchema extends URISchema<FruitBase>
class FruitSchema extends URISchema<FruitBase, String>
{
@Override
public String getSchemaName()
@ -105,7 +105,7 @@ public class URIParserTest
@Override
public FruitBase internalNewObject(URI uri, Map<String, String> query) throws Exception
public FruitBase internalNewObject(URI uri, Map<String, String> query, String fruitName) throws Exception
{
return setData(uri, new Fruit(getSchemaName()), query);
}
@ -117,7 +117,7 @@ public class URIParserTest
}
}
class FruitBaseSchema extends URISchema<FruitBase>
class FruitBaseSchema extends URISchema<FruitBase, String>
{
@Override
public String getSchemaName()
@ -127,7 +127,7 @@ public class URIParserTest
@Override
public FruitBase internalNewObject(URI uri, Map<String, String> query) throws Exception
public FruitBase internalNewObject(URI uri, Map<String, String> query, String fruitName) throws Exception
{
return setData(uri, new FruitBase(getSchemaName()), query);
}

2
activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ActiveMQClient.java
View File

@ -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);
}
/**

2
activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/TransportConstants.java
View File

@ -187,7 +187,7 @@ public class TransportConstants
public static final Set<String> 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";

3
activemq-core-client/src/main/java/org/apache/activemq/uri/AbstractServerLocatorSchema.java
View File

@ -25,8 +25,9 @@ import java.util.Map;
/**
* @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
*/
public abstract class AbstractServerLocatorSchema extends URISchema<ServerLocator>
public abstract class AbstractServerLocatorSchema extends URISchema<ServerLocator, String>
{
protected ConnectionOptions newConnectionOptions(URI uri, Map<String, String> query) throws Exception
{
return setData(uri, new ConnectionOptions(), query);

29
activemq-core-client/src/main/java/org/apache/activemq/uri/AbstractTransportConfigurationSchema.java Normal file
View File

@ -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 <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
*/
public abstract class AbstractTransportConfigurationSchema extends URISchema<List<TransportConfiguration>, String>
{
}

35
activemq-core-client/src/main/java/org/apache/activemq/uri/ConnectorTransportConfigurationParser.java Normal file
View File

@ -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 <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
*/
public class ConnectorTransportConfigurationParser extends URIFactory<List<TransportConfiguration>, String>
{
public ConnectorTransportConfigurationParser()
{
registerSchema(new TCPTransportConfigurationSchema(TransportConstants.ALLOWABLE_CONNECTOR_KEYS));
registerSchema(new InVMTransportConfigurationSchema());
}
}

12
activemq-core-client/src/main/java/org/apache/activemq/uri/InVMServerLocatorSchema.java
View File

@ -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<String, String> query) throws Exception
protected ServerLocator internalNewObject(URI uri, Map<String, String> 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<String, Object> 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

64
activemq-core-client/src/main/java/org/apache/activemq/uri/InVMTransportConfigurationSchema.java Normal file
View File

@ -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 <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
*/
public class InVMTransportConfigurationSchema extends AbstractTransportConfigurationSchema
{
@Override
public String getSchemaName()
{
return SchemaConstants.VM;
}
@Override
protected List<TransportConfiguration> internalNewObject(URI uri, Map<String, String> query, String name) throws Exception
{
List<TransportConfiguration> configurations = new ArrayList<>();
configurations.add(createTransportConfiguration(uri, name, getFactoryName()));
return configurations;
}
@Override
protected URI internalNewURI(List<TransportConfiguration> 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<String, Object> inVmTransportConfig = new HashMap<>();
inVmTransportConfig.put("serverId", uri.getHost());
return new TransportConfiguration(factoryName, inVmTransportConfig, name);
}
}

8
activemq-core-client/src/main/java/org/apache/activemq/uri/JGroupsServerLocatorSchema.java
View File

@ -41,11 +41,11 @@ public class JGroupsServerLocatorSchema extends AbstractServerLocatorSchema
}
@Override
protected ServerLocator internalNewObject(URI uri, Map<String, String> query) throws Exception
protected ServerLocator internalNewObject(URI uri, Map<String, String> 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<String, String> query) throws Exception
public static DiscoveryGroupConfiguration getDiscoveryGroupConfiguration(URI uri, Map<String, String> 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;

2
activemq-core-client/src/main/java/org/apache/activemq/uri/ServerLocatorParser.java
View File

@ -22,7 +22,7 @@ import org.apache.activemq.utils.uri.URIFactory;
/**
* @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
*/
public class ServerLocatorParser extends URIFactory<ServerLocator>
public class ServerLocatorParser extends URIFactory<ServerLocator, String>
{
public ServerLocatorParser()
{

47
activemq-core-client/src/main/java/org/apache/activemq/uri/TCPServerLocatorSchema.java
View File

@ -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<String, String> query) throws Exception
protected ServerLocator internalNewObject(URI uri, Map<String, String> query, String name) throws Exception
{
ConnectionOptions options = newConnectionOptions(uri, query);
TransportConfiguration[] configurations = getTransportConfigurations(uri, query);
List<TransportConfiguration> 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<String, String> query) throws URISyntaxException
{
HashMap<String, Object> props = new HashMap<>();
URISchema.setData(uri, props, TransportConstants.ALLOWABLE_CONNECTOR_KEYS, query);
List<TransportConfiguration> 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<String, Object> 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
{

95
activemq-core-client/src/main/java/org/apache/activemq/uri/TCPTransportConfigurationSchema.java Normal file
View File

@ -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 <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
*/
public class TCPTransportConfigurationSchema extends AbstractTransportConfigurationSchema
{
private final Set<String> allowableProperties;
public TCPTransportConfigurationSchema(Set<String> allowableProperties)
{
this.allowableProperties = allowableProperties;
}
@Override
public String getSchemaName()
{
return SchemaConstants.TCP;
}
@Override
protected List<TransportConfiguration> internalNewObject(URI uri, Map<String, String> query, String name) throws Exception
{
return getTransportConfigurations(uri, query, allowableProperties, name, getFactoryName());
}
@Override
protected URI internalNewURI(List<TransportConfiguration> bean) throws Exception
{
return null;
}
public static List<TransportConfiguration> getTransportConfigurations(URI uri, Map<String, String> query, Set<String> allowableProperties, String name, String factoryName) throws URISyntaxException
{
HashMap<String, Object> props = new HashMap<>();
URISchema.setData(uri, props, allowableProperties, query);
List<TransportConfiguration> 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<String, Object> 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();
}
}

7
activemq-core-client/src/main/java/org/apache/activemq/uri/UDPServerLocatorSchema.java
View File

@ -46,11 +46,11 @@ public class UDPServerLocatorSchema extends AbstractServerLocatorSchema
}
@Override
protected ServerLocator internalNewObject(URI uri, Map<String, String> query) throws Exception
protected ServerLocator internalNewObject(URI uri, Map<String, String> 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<String, String> query, String host, int port) throws Exception
public static DiscoveryGroupConfiguration getDiscoveryGroupConfiguration(URI uri, Map<String, String> 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);

6
activemq-jms-client/src/main/java/org/apache/activemq/api/jms/ActiveMQJMSClient.java
View File

@ -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);
}
/**

2
activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQConnectionFactory.java
View File

@ -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)

6
activemq-jms-client/src/main/java/org/apache/activemq/jndi/ActiveMQInitialContextFactory.java
View File

@ -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);
}
}

2
activemq-jms-client/src/main/java/org/apache/activemq/uri/AbstractCFSchema.java
View File

@ -28,7 +28,7 @@ import org.apache.activemq.utils.uri.URISchema;
* @author clebertsuconic
*/
public abstract class AbstractCFSchema extends URISchema<ActiveMQConnectionFactory>
public abstract class AbstractCFSchema extends URISchema<ActiveMQConnectionFactory, String>
{
protected JMSConnectionOptions newConectionOptions(URI uri, Map<String, String> query) throws Exception

2
activemq-jms-client/src/main/java/org/apache/activemq/uri/ConnectionFactoryParser.java
View File

@ -24,7 +24,7 @@ import org.apache.activemq.utils.uri.URIFactory;
* @author clebertsuconic
*/
public class ConnectionFactoryParser extends URIFactory<ActiveMQConnectionFactory>
public class ConnectionFactoryParser extends URIFactory<ActiveMQConnectionFactory, String>
{
public ConnectionFactoryParser()
{

6
activemq-jms-client/src/main/java/org/apache/activemq/uri/InVMSchema.java
View File

@ -36,10 +36,12 @@ public class InVMSchema extends AbstractCFSchema
}
@Override
protected ActiveMQConnectionFactory internalNewObject(URI uri, Map<String, String> query) throws Exception
protected ActiveMQConnectionFactory internalNewObject(URI uri, Map<String, String> 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);
}

4
activemq-jms-client/src/main/java/org/apache/activemq/uri/JGroupsSchema.java
View File

@ -43,11 +43,11 @@ public class JGroupsSchema extends AbstractCFSchema
}
@Override
public ActiveMQConnectionFactory internalNewObject(URI uri, Map<String, String> query) throws Exception
public ActiveMQConnectionFactory internalNewObject(URI uri, Map<String, String> 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())

16
activemq-jms-client/src/main/java/org/apache/activemq/uri/TCPSchema.java
View File

@ -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<String, String> query) throws Exception
protected ActiveMQConnectionFactory internalNewObject(URI uri, Map<String, String> query, String name) throws Exception
{
JMSConnectionOptions options = newConectionOptions(uri, query);
TransportConfiguration[] configurations = TCPServerLocatorSchema.getTransportConfigurations(uri, query);
List<TransportConfiguration> 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);

4
activemq-jms-client/src/main/java/org/apache/activemq/uri/UDPSchema.java
View File

@ -40,11 +40,11 @@ public class UDPSchema extends AbstractCFSchema
}
@Override
public ActiveMQConnectionFactory internalNewObject(URI uri, Map<String, String> query) throws Exception
public ActiveMQConnectionFactory internalNewObject(URI uri, Map<String, String> 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())

42
activemq-jms-client/src/test/java/org/apache/activemq/uri/ConnectionFactoryURITest.java
View File

@ -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<String, Object> 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<String, Object> 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<String, Object> params = connector.getParams();
for (Map.Entry<String, Object> 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();

8
activemq-rest/src/test/resources/activemq-configuration.xml
View File

@ -28,15 +28,11 @@
<!-- Connectors -->
<connectors>
<connector name="in-vm">
<factory-class>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
</connector>
<connector name="in-vm">vm://0</connector>
</connectors>
<acceptors>
<acceptor name="in-vm">
<factory-class>org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
</acceptor>
<acceptor name="in-vm">vm://0</acceptor>
</acceptors>
<!-- Other config -->

52
activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileConfigurationParser.java
View File

@ -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<String, Object> params = new HashMap<String, Object>();
AcceptorTransportConfigurationParser parser = new AcceptorTransportConfigurationParser();
List<TransportConfiguration> configurations = parser.newObject(parser.expandURI(uri), name);
Map<String, Object> 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<TransportConfiguration> configurations = parser.newObject(parser.expandURI(uri), name);
Map<String, Object> 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<String> POLICY_LIST = new ArrayList<>();

35
activemq-server/src/main/java/org/apache/activemq/uri/AcceptorTransportConfigurationParser.java Normal file
View File

@ -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 <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
*/
public class AcceptorTransportConfigurationParser extends URIFactory<List<TransportConfiguration>, String>
{
public AcceptorTransportConfigurationParser()
{
registerSchema(new TCPAcceptorTransportConfigurationSchema(TransportConstants.ALLOWABLE_ACCEPTOR_KEYS));
registerSchema(new InVMAcceptorTransportConfigurationSchema());
}
}

30
activemq-server/src/main/java/org/apache/activemq/uri/InVMAcceptorTransportConfigurationSchema.java Normal file
View File

@ -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 <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
*/
public class InVMAcceptorTransportConfigurationSchema extends InVMTransportConfigurationSchema
{
protected String getFactoryName()
{
return InVMAcceptorFactory.class.getName();
}
}

36
activemq-server/src/main/java/org/apache/activemq/uri/TCPAcceptorTransportConfigurationSchema.java Normal file
View File

@ -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 <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
*/
public class TCPAcceptorTransportConfigurationSchema extends TCPTransportConfigurationSchema
{
public TCPAcceptorTransportConfigurationSchema(Set<String> allowableProperties)
{
super(allowableProperties);
}
public String getFactoryName()
{
return NettyAcceptorFactory.class.getName();
}
}

65
activemq-server/src/main/resources/schema/activemq-configuration.xsd
View File

@ -324,33 +324,7 @@
</xsd:annotation>
<xsd:complexType>
<xsd:sequence>
<xsd:element name="connector" maxOccurs="unbounded" minOccurs="0">
<xsd:complexType>
<xsd:sequence>
<xsd:element maxOccurs="1" minOccurs="1" name="factory-class" type="xsd:string">
<xsd:annotation>
<xsd:documentation>
Name of the ConnectorFactory implementation
</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="param" type="paramType" maxOccurs="unbounded" minOccurs="0">
<xsd:annotation>
<xsd:documentation>
A key-value pair used to configure the connector. A connector can have many param's
</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
<xsd:attribute name="name" type="xsd:ID" use="required">
<xsd:annotation>
<xsd:documentation>
Name of the connector
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
</xsd:complexType>
</xsd:element>
<xsd:element name="connector" type="transportType" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
@ -363,33 +337,7 @@
</xsd:annotation>
<xsd:complexType>
<xsd:sequence>
<xsd:element name="acceptor" maxOccurs="unbounded" minOccurs="1">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="factory-class" type="xsd:string" maxOccurs="1" minOccurs="1">
<xsd:annotation>
<xsd:documentation>
Name of the AcceptorFactory implementation
</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="param" type="paramType" maxOccurs="unbounded" minOccurs="0">
<xsd:annotation>
<xsd:documentation>
A key-value pair used to configure the acceptor. An acceptor can have many param
</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="optional">
<xsd:annotation>
<xsd:documentation>
Name of the acceptor
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
</xsd:complexType>
</xsd:element>
<xsd:element name="acceptor" type="transportType" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
@ -2191,4 +2139,13 @@
</xsd:annotation>
</xsd:attribute>
</xsd:complexType>
<xsd:complexType name="transportType">
<xsd:simpleContent>
<xsd:extension base="xsd:string">
<xsd:attribute name="name" type="xsd:string">
</xsd:attribute>
</xsd:extension>
</xsd:simpleContent>
</xsd:complexType>
</xsd:schema>

37
activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.java
View File

@ -145,39 +145,14 @@ public class FileConfigurationParserTest extends UnitTestCase
"<large-messages-directory>${jboss.server.data.dir}/activemq/largemessages</large-messages-directory>" + "\n" +
"<paging-directory>${jboss.server.data.dir}/activemq/paging</paging-directory>" + "\n" +
"<connectors>" + "\n" +
"<connector name=\"netty\">" + "\n" +
"<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>" + "\n" +
"<param key=\"host\" value=\"${jboss.bind.address:localhost}\"/>" + "\n" +
"<param key=\"port\" value=\"${activemq.remoting.netty.port:5445}\"/>" + "\n" +
"</connector>" + "\n" +
"<connector name=\"netty-throughput\">" + "\n" +
"<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>" + "\n" +
"<param key=\"host\" value=\"${jboss.bind.address:localhost}\"/>" + "\n" +
"<param key=\"port\" value=\"${activemq.remoting.netty.batch.port:5455}\"/>" + "\n" +
"<param key=\"batch-delay\" value=\"50\"/>" + "\n" +
"</connector>" + "\n" +
"<connector name=\"in-vm\">" + "\n" +
"<factory-class>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>" + "\n" +
"<param key=\"server-id\" value=\"${activemq.server-id:0}\"/>" + "\n" +
"</connector>" + "\n" +
"<connector name=\"netty\">tcp://localhost:5445</connector>" + "\n" +
"<connector name=\"netty-throughput\">tcp://localhost:5545</connector>" + "\n" +
"<connector name=\"in-vm\">vm://0</connector>" + "\n" +
"</connectors>" + "\n" +
"<acceptors>" + "\n" +
"<acceptor name=\"netty\">" + "\n" +
"<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>" + "\n" +
"<param key=\"host\" value=\"${jboss.bind.address:localhost}\"/>" + "\n" +
"<param key=\"port\" value=\"${activemq.remoting.netty.port:5445}\"/>" + "\n" +
"</acceptor>" + "\n" +
"<acceptor name=\"netty-throughput\">" + "\n" +
"<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>" + "\n" +
"<param key=\"host\" value=\"${jboss.bind.address:localhost}\"/>" + "\n" +
"<param key=\"port\" value=\"${activemq.remoting.netty.batch.port:5455}\"/>" + "\n" +
"<param key=\"batch-delay\" value=\"50\"/>" + "\n" +
"<param key=\"direct-deliver\" value=\"false\"/>" + "\n" +
"</acceptor>" + "\n" +
"<acceptor name=\"in-vm\">" + "\n" +
"<factory-class>org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>" + "\n" +
"<param key=\"server-id\" value=\"0\"/>" + "\n" +
"</acceptor>" + "\n" +
"<acceptor name=\"netty\">tcp://localhost:5545</acceptor>" + "\n" +
"<acceptor name=\"netty-throughput\">tcp://localhost:5545</acceptor>" + "\n" +
"<acceptor name=\"in-vm\">vm://0</acceptor>" + "\n" +
"</acceptors>" + "\n" +
"<security-settings>" + "\n" +
"<security-setting match=\"#\">" + "\n" +

28
activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationTest.java
View File

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

37
activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java
View File

@ -75,39 +75,14 @@ public class WrongRoleFileConfigurationParserTest extends UnitTestCase
"<large-messages-directory>${jboss.server.data.dir}/activemq/largemessages</large-messages-directory>" + "\n" +
"<paging-directory>${jboss.server.data.dir}/activemq/paging</paging-directory>" + "\n" +
"<connectors>" + "\n" +
"<connector name=\"netty\">" + "\n" +
"<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>" + "\n" +
"<param key=\"host\" value=\"${jboss.bind.address:localhost}\"/>" + "\n" +
"<param key=\"port\" value=\"${activemq.remoting.netty.port:5445}\"/>" + "\n" +
"</connector>" + "\n" +
"<connector name=\"netty-throughput\">" + "\n" +
"<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>" + "\n" +
"<param key=\"host\" value=\"${jboss.bind.address:localhost}\"/>" + "\n" +
"<param key=\"port\" value=\"${activemq.remoting.netty.batch.port:5455}\"/>" + "\n" +
"<param key=\"batch-delay\" value=\"50\"/>" + "\n" +
"</connector>" + "\n" +
"<connector name=\"in-vm\">" + "\n" +
"<factory-class>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>" + "\n" +
"<param key=\"server-id\" value=\"${activemq.server-id:0}\"/>" + "\n" +
"</connector>" + "\n" +
"<connector name=\"netty\">tcp://localhost:5445</connector>" + "\n" +
"<connector name=\"netty-throughput\">tcp://localhost:5545</connector>" + "\n" +
"<connector name=\"in-vm\">vm://0</connector>" + "\n" +
"</connectors>" + "\n" +
"<acceptors>" + "\n" +
"<acceptor name=\"netty\">" + "\n" +
"<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>" + "\n" +
"<param key=\"host\" value=\"${jboss.bind.address:localhost}\"/>" + "\n" +
"<param key=\"port\" value=\"${activemq.remoting.netty.port:5445}\"/>" + "\n" +
"</acceptor>" + "\n" +
"<acceptor name=\"netty-throughput\">" + "\n" +
"<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>" + "\n" +
"<param key=\"host\" value=\"${jboss.bind.address:localhost}\"/>" + "\n" +
"<param key=\"port\" value=\"${activemq.remoting.netty.batch.port:5455}\"/>" + "\n" +
"<param key=\"batch-delay\" value=\"50\"/>" + "\n" +
"<param key=\"direct-deliver\" value=\"false\"/>" + "\n" +
"</acceptor>" + "\n" +
"<acceptor name=\"in-vm\">" + "\n" +
"<factory-class>org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>" + "\n" +
"<param key=\"server-id\" value=\"0\"/>" + "\n" +
"</acceptor>" + "\n" +
"<acceptor name=\"netty\">tcp://localhost:5545</acceptor>" + "\n" +
"<acceptor name=\"netty-throughput\">tcp://localhost:5545</acceptor>" + "\n" +
"<acceptor name=\"in-vm\">vm://0</acceptor>" + "\n" +
"</acceptors>" + "\n" +
"<security-settings>" + "\n" +
"<security-setting match=\"#\">" + "\n" +

26
activemq-server/src/test/resources/ConfigurationTest-full-config.xml
View File

@ -60,30 +60,12 @@
</remoting-outgoing-interceptors>
<persist-delivery-count-before-delivery>true</persist-delivery-count-before-delivery>
<connectors>
<connector name="connector1">
<factory-class>org.apache.activemq.tests.unit.core.config.impl.TestConnectorFactory1</factory-class>
<param key="a1" value="v1"/>
<param key="a2" value="123"/>
<param key="a3" value="345"/>
<param key="a4" value="v4"/>
</connector>
<connector name="connector2">
<factory-class>org.apache.activemq.tests.unit.core.config.impl.TestConnectorFactory2</factory-class>
<param key="b1" value="w1"/>
<param key="b2" value="234"/>
</connector>
<connector name="connector1">tcp://localhost1:5678?localAddress=mylocal;localPort=99</connector>
<connector name="connector2">vm://5</connector>
</connectors>
<acceptors>
<acceptor name="acceptor1">
<factory-class>org.apache.activemq.tests.unit.core.config.impl.TestAcceptorFactory1</factory-class>
<param key="d1" value="y1"/>
<param key="d2" value="456"/>
</acceptor>
<acceptor name="acceptor2">
<factory-class>org.apache.activemq.tests.unit.core.config.impl.TestAcceptorFactory2</factory-class>
<param key="e1" value="z1"/>
<param key="e2" value="567"/>
</acceptor>
<acceptor>tcp://0.0.0.0:5445?tcpNoDelay=456;connectionTtl=44</acceptor>
<acceptor>vm://0?e1=z1;e2=567</acceptor>
</acceptors>
<broadcast-groups>
<broadcast-group name="bg1">

8
distribution/activemq/pom.xml
View File

@ -165,6 +165,14 @@
<artifactId>jolokia-war</artifactId>
<type>war</type>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
</dependencies>
<profiles>

2
distribution/activemq/src/main/assembly/dep.xml
View File

@ -64,6 +64,8 @@
<include>org.eclipse.jetty.aggregate:jetty-all</include>
<include>org.apache.geronimo.specs:</include>
<include>org.apache.geronimo.specs:geronimo-servlet_3.0_spec</include>
<include>commons-beanutils:commons-beanutils</include>
<include>commons-logging:commons-logging</include>
</includes>
<!--excludes>
<exclude>org.apache.activemq:activemq-website</exclude>

29
distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml
View File

@ -37,34 +37,13 @@ under the License.
<large-messages-directory>${data.dir:../data}/large-messages</large-messages-directory>
<connectors>
<connector name="netty">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="host" value="${activemq.remoting.netty.host:localhost}"/>
<param key="port" value="${activemq.remoting.netty.port:5445}"/>
</connector>
<connector name="netty-throughput">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="host" value="${activemq.remoting.netty.host:localhost}"/>
<param key="port" value="${activemq.remoting.netty.batch.port:5455}"/>
<param key="batch-delay" value="50"/>
</connector>
<connector name="netty">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5445}</connector>
<connector name="netty-throughput">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.batch.port:5455}?batchDelay=50</connector>
</connectors>
<acceptors>
<acceptor name="netty">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="host" value="${activemq.remoting.netty.host:localhost}"/>
<param key="port" value="${activemq.remoting.netty.port:5445}"/>
</acceptor>
<acceptor name="netty-throughput">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="host" value="${activemq.remoting.netty.host:localhost}"/>
<param key="port" value="${activemq.remoting.netty.batch.port:5455}"/>
<param key="batch-delay" value="50"/>
<param key="direct-deliver" value="false"/>
</acceptor>
<acceptor name="netty">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5445}</acceptor>
<acceptor name="netty-throughput">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.batch.port:5455}?batchDelay=50;directDeliver=false</acceptor>
</acceptors>
<broadcast-groups>

29
distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml
View File

@ -35,34 +35,13 @@ under the License.
<large-messages-directory>${data.dir:../data}/large-messages</large-messages-directory>
<connectors>
<connector name="netty">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="host" value="${activemq.remoting.netty.host:localhost}"/>
<param key="port" value="${activemq.remoting.netty.port:5445}"/>
</connector>
<connector name="netty-throughput">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="host" value="${activemq.remoting.netty.host:localhost}"/>
<param key="port" value="${activemq.remoting.netty.batch.port:5455}"/>
<param key="batch-delay" value="50"/>
</connector>
<connector name="netty">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5445}</connector>
<connector name="netty-throughput">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.batch.port:5455}?batchDelay=50</connector>
</connectors>
<acceptors>
<acceptor name="netty">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="host" value="${activemq.remoting.netty.host:localhost}"/>
<param key="port" value="${activemq.remoting.netty.port:5445}"/>
</acceptor>
<acceptor name="netty-throughput">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="host" value="${activemq.remoting.netty.host:localhost}"/>
<param key="port" value="${activemq.remoting.netty.batch.port:5455}"/>
<param key="batch-delay" value="50"/>
<param key="direct-deliver" value="false"/>
</acceptor>
<acceptor name="netty">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5445}</acceptor>
<acceptor name="netty-throughput">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.batch.port:5455}?batchDelay=50;directDeliver=false</acceptor>
</acceptors>
<security-settings>

29
distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml
View File

@ -42,34 +42,13 @@ under the License.
<large-messages-directory>${data.dir:../data}/large-messages</large-messages-directory>
<connectors>
<connector name="netty">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="host" value="${activemq.remoting.netty.host:localhost}"/>
<param key="port" value="${activemq.remoting.netty.port:5445}"/>
</connector>
<connector name="netty-throughput">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="host" value="${activemq.remoting.netty.host:localhost}"/>
<param key="port" value="${activemq.remoting.netty.batch.port:5455}"/>
<param key="batch-delay" value="50"/>
</connector>
<connector name="netty">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5445}</connector>
<connector name="netty-throughput">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.batch.port:5455}?batchDelay=50</connector>
</connectors>
<acceptors>
<acceptor name="netty">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="host" value="${activemq.remoting.netty.host:localhost}"/>
<param key="port" value="${activemq.remoting.netty.port:5445}"/>
</acceptor>
<acceptor name="netty-throughput">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="host" value="${activemq.remoting.netty.host:localhost}"/>
<param key="port" value="${activemq.remoting.netty.batch.port:5455}"/>
<param key="batch-delay" value="50"/>
<param key="direct-deliver" value="false"/>
</acceptor>
<acceptor name="netty">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5445}</acceptor>
<acceptor name="netty-throughput">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.batch.port:5455}?batchDelay=50;directDeliver=false</acceptor>
</acceptors>
<broadcast-groups>

29
distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml
View File

@ -42,34 +42,13 @@ under the License.
<large-messages-directory>${data.dir:../data}/large-messages</large-messages-directory>
<connectors>
<connector name="netty">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="host" value="${activemq.remoting.netty.host:localhost}"/>
<param key="port" value="${activemq.remoting.netty.port:5445}"/>
</connector>
<connector name="netty-throughput">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="host" value="${activemq.remoting.netty.host:localhost}"/>
<param key="port" value="${activemq.remoting.netty.batch.port:5455}"/>
<param key="batch-delay" value="50"/>
</connector>
<connector name="netty">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5445}</connector>
<connector name="netty-throughput">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.batch.port:5455}?batchDelay=50</connector>
</connectors>
<acceptors>
<acceptor name="netty">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="host" value="${activemq.remoting.netty.host:localhost}"/>
<param key="port" value="${activemq.remoting.netty.port:5445}"/>
</acceptor>
<acceptor name="netty-throughput">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="host" value="${activemq.remoting.netty.host:localhost}"/>
<param key="port" value="${activemq.remoting.netty.batch.port:5455}"/>
<param key="batch-delay" value="50"/>
<param key="direct-deliver" value="false"/>
</acceptor>
<acceptor name="netty">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.port:5445}</acceptor>
<acceptor name="netty-throughput">tcp://${activemq.remoting.netty.host:localhost}:${activemq.remoting.netty.batch.port:5455}?batchDelay=50;directDeliver=false</acceptor>
</acceptors>
<broadcast-groups>

7
examples/core/perf/src/main/resources/server0/activemq-configuration.xml
View File

@ -31,12 +31,7 @@ under the License.
<paging-directory>target/server0/data/messaging/paging</paging-directory>
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="tcp-no-delay" value="false"/>
<param key="tcp-send-buffer-size" value="1048576"/>
<param key="tcp-receive-buffer-size" value="1048576"/>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5445?tcpNoDelay=false;tcpSendBufferSize=1048576;tcpReceiveBufferSize=1048576</acceptor>
</acceptors>
<security-enabled>false</security-enabled>

8
examples/core/vertx-connector/src/main/resources/server0/activemq-configuration.xml
View File

@ -36,16 +36,12 @@ under the License.
<!-- Connectors -->
<connectors>
<connector name="netty-connector">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
</connector>
<connector name="netty-connector">tcp://localhost:5445</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Other config -->

4
examples/jms/aerogear/src/main/resources/activemq/server0/activemq-configuration.xml
View File

@ -39,9 +39,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- We need to create a core queue for the JMS queue explicitly because the connector will be deployed

4
examples/jms/applet/src/main/resources/activemq/server0/activemq-configuration.xml
View File

@ -39,9 +39,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Other config -->

5
examples/jms/application-layer-failover/src/main/resources/activemq/server0/activemq-configuration.xml
View File

@ -29,10 +29,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="port" value="5445"/>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Other config -->

5
examples/jms/application-layer-failover/src/main/resources/activemq/server1/activemq-configuration.xml
View File

@ -32,10 +32,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="port" value="5446"/>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
</acceptors>
<!-- Other config -->

10
examples/jms/bridge/src/main/resources/activemq/server0/activemq-configuration.xml
View File

@ -39,18 +39,12 @@ under the License.
<!-- Connectors -->
<connectors>
<!-- Connector to the other node -->
<connector name="remote-connector">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="port" value="5446"/>
</connector>
<connector name="remote-connector">tcp://localhost:5446</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="port" value="5445"/>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- We need to create a core queue for the JMS queue explicitly because the bridge will be deployed

5
examples/jms/bridge/src/main/resources/activemq/server1/activemq-configuration.xml
View File

@ -38,10 +38,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="port" value="5446"/>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
</acceptors>
<!-- Other config -->

4
examples/jms/browser/src/main/resources/activemq/server0/activemq-configuration.xml
View File

@ -39,9 +39,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Other config -->

4
examples/jms/client-kickoff/src/main/resources/activemq/server0/activemq-configuration.xml
View File

@ -40,9 +40,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
<acceptor name="netty">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
</acceptor>
<acceptor name="netty">tcp://localhost:5445</acceptor>
</acceptors>
</core>

10
examples/jms/client-side-failoverlistener/src/main/resources/activemq/server0/activemq-configuration.xml
View File

@ -44,18 +44,12 @@ under the License.
<!-- Connectors -->
<connectors>
<connector name="netty-connector">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="port" value="5445"/>
</connector>
<connector name="netty-connector">tcp://localhost:5445</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="port" value="5445"/>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<broadcast-groups>

10
examples/jms/client-side-failoverlistener/src/main/resources/activemq/server1/activemq-configuration.xml
View File

@ -45,18 +45,12 @@ under the License.
<!-- Connectors -->
<connectors>
<connector name="netty-connector">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="port" value="5446"/>
</connector>
<connector name="netty-connector">tcp://localhost:5446</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="port" value="5446"/>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
</acceptors>
<broadcast-groups>

10
examples/jms/client-side-load-balancing/src/main/resources/activemq/server0/activemq-configuration.xml
View File

@ -38,18 +38,12 @@ under the License.
<!-- Connectors -->
<connectors>
<connector name="netty-connector">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="port" value="5445"/>
</connector>
<connector name="netty-connector">tcp://localhost:5445</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="port" value="5445"/>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Clustering configuration -->

10
examples/jms/client-side-load-balancing/src/main/resources/activemq/server1/activemq-configuration.xml
View File

@ -36,18 +36,12 @@ under the License.
<!-- Connectors -->
<connectors>
<connector name="netty-connector">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="port" value="5446"/>
</connector>
<connector name="netty-connector">tcp://localhost:5446</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="port" value="5446"/>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
</acceptors>
<!-- Clustering configuration -->

10
examples/jms/client-side-load-balancing/src/main/resources/activemq/server2/activemq-configuration.xml
View File

@ -34,18 +34,12 @@ under the License.
<!-- Connectors -->
<connectors>
<connector name="netty-connector">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="port" value="5447"/>
</connector>
<connector name="netty-connector">tcp://localhost:5447</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="port" value="5447"/>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5447</acceptor>
</acceptors>
<!-- Clustering configuration -->

10
examples/jms/clustered-durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml
View File

@ -40,18 +40,12 @@ under the License.
<!-- Connectors -->
<connectors>
<connector name="netty-connector">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="port" value="5445"/>
</connector>
<connector name="netty-connector">tcp://localhost:5445</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="port" value="5445"/>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Clustering configuration -->

10
examples/jms/clustered-durable-subscription/src/main/resources/activemq/server1/activemq-configuration.xml
View File

@ -40,18 +40,12 @@ under the License.
<!-- Connectors -->
<connectors>
<connector name="netty-connector">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="port" value="5446"/>
</connector>
<connector name="netty-connector">tcp://localhost:5446</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="port" value="5446"/>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
</acceptors>
<!-- Clustering configuration -->

10
examples/jms/clustered-grouping/src/main/resources/activemq/server0/activemq-configuration.xml
View File

@ -41,18 +41,12 @@ under the License.
<!-- Connectors -->
<connectors>
<connector name="netty-connector">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="port" value="5445"/>
</connector>
<connector name="netty-connector">tcp://localhost:5445</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="port" value="5445"/>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Clustering configuration -->

10
examples/jms/clustered-grouping/src/main/resources/activemq/server1/activemq-configuration.xml
View File

@ -40,18 +40,12 @@ under the License.
<!-- Connectors -->
<connectors>
<connector name="netty-connector">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="port" value="5446"/>
</connector>
<connector name="netty-connector">tcp://localhost:5446</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="port" value="5446"/>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
</acceptors>
<!-- Clustering configuration -->

10
examples/jms/clustered-grouping/src/main/resources/activemq/server2/activemq-configuration.xml
View File

@ -40,18 +40,12 @@ under the License.
<!-- Connectors -->
<connectors>
<connector name="netty-connector">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="port" value="5447"/>
</connector>
<connector name="netty-connector">tcp://localhost:5447</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="port" value="5447"/>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5447</acceptor>
</acceptors>
<!-- Clustering configuration -->

10
examples/jms/clustered-jgroups/src/main/resources/activemq/server0/activemq-configuration.xml
View File

@ -41,18 +41,12 @@ under the License.
<!-- Connectors -->
<connectors>
<connector name="netty-connector">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="port" value="5445"/>
</connector>
<connector name="netty-connector">tcp://localhost:5445</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="port" value="5445"/>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Clustering configuration -->

10
examples/jms/clustered-jgroups/src/main/resources/activemq/server1/activemq-configuration.xml
View File

@ -40,18 +40,12 @@ under the License.
<!-- Connectors -->
<connectors>
<connector name="netty-connector">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="port" value="5446"/>
</connector>
<connector name="netty-connector">tcp://localhost:5446</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="port" value="5446"/>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
</acceptors>
<!-- Clustering configuration -->

10
examples/jms/clustered-queue/src/main/resources/activemq/server0/activemq-configuration.xml
View File

@ -40,18 +40,12 @@ under the License.
<!-- Connectors -->
<connectors>
<connector name="netty-connector">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="port" value="5445"/>
</connector>
<connector name="netty-connector">tcp://localhost:5445</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="port" value="5445"/>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Clustering configuration -->

10
examples/jms/clustered-queue/src/main/resources/activemq/server1/activemq-configuration.xml
View File

@ -40,18 +40,12 @@ under the License.
<!-- Connectors -->
<connectors>
<connector name="netty-connector">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="port" value="5446"/>
</connector>
<connector name="netty-connector">tcp://localhost:5446</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="port" value="5446"/>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
</acceptors>
<!-- Clustering configuration -->

10
examples/jms/clustered-standalone/src/main/resources/activemq/server0/activemq-configuration.xml
View File

@ -40,18 +40,12 @@ under the License.
<!-- Connectors -->
<connectors>
<connector name="netty-connector">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="port" value="5445"/>
</connector>
<connector name="netty-connector">tcp://localhost:5445</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="port" value="5445"/>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Clustering configuration -->

10
examples/jms/clustered-standalone/src/main/resources/activemq/server1/activemq-configuration.xml
View File

@ -40,18 +40,12 @@ under the License.
<!-- Connectors -->
<connectors>
<connector name="netty-connector">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="port" value="5446"/>
</connector>
<connector name="netty-connector">tcp://localhost:5446</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="port" value="5446"/>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
</acceptors>
<!-- Clustering configuration -->

10
examples/jms/clustered-standalone/src/main/resources/activemq/server2/activemq-configuration.xml
View File

@ -40,18 +40,12 @@ under the License.
<!-- Connectors -->
<connectors>
<connector name="netty-connector">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="port" value="5447"/>
</connector>
<connector name="netty-connector">tcp://localhost:5447</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="port" value="5447"/>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5447</acceptor>
</acceptors>
<!-- Clustering configuration -->

15
examples/jms/clustered-static-discovery/src/main/resources/activemq/server0/activemq-configuration.xml
View File

@ -41,23 +41,14 @@ under the License.
<!-- Connectors -->
<connectors>
<connector name="netty-connector">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="port" value="5445"/>
</connector>
<connector name="netty-connector">tcp://localhost:5445</connector>
<!-- connector to the server1 -->
<connector name="server1-connector">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="port" value="5446"/>
</connector>
<connector name="server1-connector">tcp://localhost:5446</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="port" value="5445"/>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<cluster-connections>

15
examples/jms/clustered-static-discovery/src/main/resources/activemq/server1/activemq-configuration.xml
View File

@ -40,23 +40,14 @@ under the License.
<!-- Connectors -->
<connectors>
<connector name="netty-connector">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="port" value="5446"/>
</connector>
<connector name="netty-connector">tcp://localhost:5446</connector>
<!-- connector to the server0 -->
<connector name="server0-connector">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="port" value="5445"/>
</connector>
<connector name="server0-connector">tcp://localhost:5445</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="port" value="5446"/>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
</acceptors>
<!-- Clustering configuration -->

15
examples/jms/clustered-static-discovery/src/main/resources/activemq/server2/activemq-configuration.xml
View File

@ -37,23 +37,14 @@
<!-- Connectors -->
<connectors>
<connector name="netty-connector">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="port" value="5447"/>
</connector>
<connector name="netty-connector">tcp://localhost:5447</connector>
<!-- connector to the server0 -->
<connector name="server0-connector">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="port" value="5445"/>
</connector>
<connector name="server0-connector">tcp://localhost:5445</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="port" value="5447"/>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5447</acceptor>
</acceptors>
<!-- Clustering configuration -->

15
examples/jms/clustered-static-discovery/src/main/resources/activemq/server3/activemq-configuration.xml
View File

@ -37,23 +37,14 @@
<!-- Connectors -->
<connectors>
<connector name="netty-connector">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="port" value="5448"/>
</connector>
<connector name="netty-connector">tcp://localhost:5448</connector>
<!-- connector to the server0 -->
<connector name="server0-connector">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="port" value="5445"/>
</connector>
<connector name="server0-connector">tcp://localhost:5445</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="port" value="5448"/>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5448</acceptor>
</acceptors>
<!-- Clustering configuration -->

15
examples/jms/clustered-static-oneway/src/main/resources/activemq/server0/activemq-configuration.xml
View File

@ -38,23 +38,14 @@
<!-- Connectors -->
<connectors>
<connector name="netty-connector">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="port" value="5445"/>
</connector>
<connector name="netty-connector">tcp://localhost:5445</connector>
<!-- connector to the server1 -->
<connector name="server1-connector">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="port" value="5446"/>
</connector>
<connector name="server1-connector">tcp://localhost:5446</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="port" value="5445"/>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<cluster-connections>

15
examples/jms/clustered-static-oneway/src/main/resources/activemq/server1/activemq-configuration.xml
View File

@ -37,23 +37,14 @@
<!-- Connectors -->
<connectors>
<connector name="netty-connector">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="port" value="5446"/>
</connector>
<connector name="netty-connector">tcp://localhost:5446</connector>
<!-- connector to the server0 -->
<connector name="server2-connector">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="port" value="5447"/>
</connector>
<connector name="server2-connector">tcp://localhost:5447</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="port" value="5446"/>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
</acceptors>
<!-- Clustering configuration -->

10
examples/jms/clustered-static-oneway/src/main/resources/activemq/server2/activemq-configuration.xml
View File

@ -37,18 +37,12 @@
<!-- Connectors -->
<connectors>
<connector name="netty-connector">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="port" value="5447"/>
</connector>
<connector name="netty-connector">tcp://localhost:5447</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="port" value="5447"/>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5447</acceptor>
</acceptors>
<!-- Clustering configuration -->

10
examples/jms/clustered-topic/src/main/resources/activemq/server0/activemq-configuration.xml
View File

@ -41,18 +41,12 @@ under the License.
<!-- Connectors -->
<connectors>
<connector name="netty-connector">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="port" value="5445"/>
</connector>
<connector name="netty-connector">tcp://localhost:5445</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="port" value="5445"/>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Clustering configuration -->

10
examples/jms/clustered-topic/src/main/resources/activemq/server1/activemq-configuration.xml
View File

@ -40,18 +40,12 @@ under the License.
<!-- Connectors -->
<connectors>
<connector name="netty-connector">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="port" value="5446"/>
</connector>
<connector name="netty-connector">tcp://localhost:5446</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="port" value="5446"/>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
</acceptors>
<!-- Clustering configuration -->

18
examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server0/activemq-configuration.xml
View File

@ -40,24 +40,14 @@ under the License.
<!-- Connectors -->
<connectors>
<connector name="invm-connector">
<factory-class>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
</connector>
<connector name="netty-connector">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="port" value="5445"/>
</connector>
<connector name="invm-connector">vm://0</connector>
<connector name="netty-connector">tcp://localhost:5445</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
<acceptor name="invm-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
</acceptor>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="port" value="5445"/>
</acceptor>
<acceptor name="invm-acceptor">vm://0</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Clustering configuration -->

18
examples/jms/colocated-failover-scale-down/src/main/resources/activemq/server1/activemq-configuration.xml
View File

@ -40,24 +40,14 @@ under the License.
<!-- Connectors -->
<connectors>
<connector name="invm-connector">
<factory-class>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
</connector>
<connector name="netty-connector">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="port" value="5446"/>
</connector>
<connector name="invm-connector">vm://0</connector>
<connector name="netty-connector">tcp://localhost:5446</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
<acceptor name="invm-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
</acceptor>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="port" value="5446"/>
</acceptor>
<acceptor name="invm-acceptor">vm://0</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
</acceptors>
<!-- Clustering configuration -->

10
examples/jms/colocated-failover/src/main/resources/activemq/server0/activemq-configuration.xml
View File

@ -40,18 +40,12 @@ under the License.
<!-- Connectors -->
<connectors>
<connector name="netty-connector">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="port" value="5445"/>
</connector>
<connector name="netty-connector">tcp://localhost:5445</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="port" value="5445"/>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Clustering configuration -->

10
examples/jms/colocated-failover/src/main/resources/activemq/server1/activemq-configuration.xml
View File

@ -40,18 +40,12 @@ under the License.
<!-- Connectors -->
<connectors>
<connector name="netty-connector">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="port" value="5446"/>
</connector>
<connector name="netty-connector">tcp://localhost:5446</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="port" value="5446"/>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
</acceptors>
<!-- Clustering configuration -->

4
examples/jms/consumer-rate-limit/src/main/resources/activemq/server0/activemq-configuration.xml
View File

@ -39,9 +39,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Other config -->

4
examples/jms/dead-letter/src/main/resources/activemq/server0/activemq-configuration.xml
View File

@ -42,9 +42,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Other config -->

4
examples/jms/delayed-redelivery/src/main/resources/activemq/server0/activemq-configuration.xml
View File

@ -42,9 +42,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Other config -->

10
examples/jms/divert/src/main/resources/activemq/server0/activemq-configuration.xml
View File

@ -55,19 +55,13 @@ under the License.
<connectors>
<!-- This connector corresponds to the New York server -->
<connector name="newyork-connector">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="port" value="5446"/>
</connector>
<connector name="newyork-connector">tcp://localhost:5446</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="port" value="5445"/>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Divert configuration -->

5
examples/jms/divert/src/main/resources/activemq/server1/activemq-configuration.xml
View File

@ -43,10 +43,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="port" value="5446"/>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
</acceptors>
<!-- Other config -->

5
examples/jms/durable-subscription/src/main/resources/activemq/server0/activemq-configuration.xml
View File

@ -40,10 +40,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="port" value="5445"/>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Other config -->

4
examples/jms/embedded-simple/src/main/resources/activemq-configuration.xml
View File

@ -32,9 +32,7 @@ under the License.
<persistence-enabled>false</persistence-enabled>
<acceptors>
<acceptor name="in-vm">
<factory-class>org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
</acceptor>
<acceptor name="in-vm">vm://0</acceptor>
</acceptors>
<!-- Other config -->

4
examples/jms/expiry/src/main/resources/activemq/server0/activemq-configuration.xml
View File

@ -42,9 +42,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Other config -->

23
examples/jms/ha-policy-autobackup/src/main/resources/activemq/server0/activemq-configuration.xml
View File

@ -39,29 +39,16 @@ under the License.
<!-- Connectors -->
<connectors>
<connector name="invm-connector">
<factory-class>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
</connector>
<connector name="netty-connector">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="port" value="5445"/>
</connector>
<connector name="invm-connector">vm://0</connector>
<connector name="netty-connector">tcp://localhost:5445</connector>
<!-- connector to the server1 -->
<connector name="server1-connector">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="port" value="5446"/>
</connector>
<connector name="server1-connector">tcp://localhost:5446</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
<acceptor name="invm-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
</acceptor>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="port" value="5445"/>
</acceptor>
<acceptor name="invm-acceptor">vm://0</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- HA configuration -->

23
examples/jms/ha-policy-autobackup/src/main/resources/activemq/server1/activemq-configuration.xml
View File

@ -39,29 +39,16 @@ under the License.
<!-- Connectors -->
<connectors>
<connector name="invm-connector">
<factory-class>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
</connector>
<connector name="netty-connector">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="port" value="5446"/>
</connector>
<connector name="invm-connector">vm://0</connector>
<connector name="netty-connector">tcp://localhost:5446</connector>
<!-- connector to the server0 -->
<connector name="server0-connector">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="port" value="5445"/>
</connector>
<connector name="server0-connector">tcp://localhost:5445</connector>
</connectors>
<!-- Acceptors -->
<acceptors>
<acceptor name="invm-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
</acceptor>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="port" value="5446"/>
</acceptor>
<acceptor name="invm-acceptor">vm://0</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
</acceptors>
<!-- HA configuration -->

5
examples/jms/http-transport/src/main/resources/activemq/server0/activemq-configuration.xml
View File

@ -40,10 +40,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="port" value="8080"/>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:8080</acceptor>
</acceptors>
<!-- Other config -->

5
examples/jms/instantiate-connection-factory/src/main/resources/activemq/server0/activemq-configuration.xml
View File

@ -39,10 +39,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="port" value="5446"/>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5446</acceptor>
</acceptors>
<!-- Other config -->

4
examples/jms/interceptor/src/main/resources/activemq/server0/activemq-configuration.xml
View File

@ -44,9 +44,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Other config -->

4
examples/jms/jms-auto-closeable/src/main/resources/activemq/server0/activemq-configuration.xml
View File

@ -39,9 +39,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Other config -->

4
examples/jms/jms-bridge/src/main/resources/activemq/server0/activemq-configuration.xml
View File

@ -37,9 +37,7 @@ under the License.
<paging-directory>${build.directory}/server0/data/messaging/paging</paging-directory>
<acceptors>
<acceptor name="netty">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
</acceptor>
<acceptor name="netty">tcp://localhost:5445</acceptor>
</acceptors>
<security-settings>

7
examples/jms/jms-bridge/src/main/resources/activemq/server1/activemq-configuration.xml
View File

@ -37,12 +37,7 @@ under the License.
<paging-directory>${build.directory}/server1/data/messaging/paging</paging-directory>
<acceptors>
<acceptor name="netty">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<!-- the server accepts connections on all the server addresses -->
<param key="host" value="localhost"/>
<param key="port" value="5455"/>
</acceptor>
<acceptor name="netty">tcp://localhost:5455</acceptor>
</acceptors>
<security-settings>

4
examples/jms/jms-completion-listener/src/main/resources/activemq/server0/activemq-configuration.xml
View File

@ -39,9 +39,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Other config -->

4
examples/jms/jms-context/src/main/resources/activemq/server0/activemq-configuration.xml
View File

@ -39,9 +39,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Other config -->

4
examples/jms/jms-shared-consumer/src/main/resources/activemq/server0/activemq-configuration.xml
View File

@ -39,9 +39,7 @@ under the License.
<!-- Acceptors -->
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
</acceptor>
<acceptor name="netty-acceptor">tcp://localhost:5445</acceptor>
</acceptors>
<!-- Other config -->

Some files were not shown because too many files have changed in this diff Show More