[hornetq-commits] JBoss hornetq SVN: r11788 - in branches/HORNETQ-316: hornetq-core/src/main/java/org/hornetq/api/core/client and 15 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Tue Nov 29 17:17:01 EST 2011
Author: igarashitm
Date: 2011-11-29 17:17:00 -0500 (Tue, 29 Nov 2011)
New Revision: 11788
Modified:
branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/api/core/DiscoveryGroupConstants.java
branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/api/core/client/HornetQClient.java
branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/core/client/impl/AbstractServerLocator.java
branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/core/client/impl/StaticServerLocatorImpl.java
branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/core/client/impl/UDPServerLocatorImpl.java
branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/core/config/BridgeConfiguration.java
branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/core/deployers/impl/FileConfigurationParser.java
branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/core/management/impl/BridgeControlImpl.java
branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/core/management/impl/HornetQServerControlImpl.java
branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/core/server/cluster/impl/BroadcastGroupImpl.java
branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java
branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java
branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/core/server/cluster/impl/StaticClusterConnectorImpl.java
branches/HORNETQ-316/hornetq-core/src/main/resources/schema/hornetq-configuration.xsd
branches/HORNETQ-316/hornetq-core/src/test/java/org/hornetq/core/config/impl/FileConfigurationTest.java
branches/HORNETQ-316/hornetq-core/src/test/resources/ConfigurationTest-full-config.xml
branches/HORNETQ-316/hornetq-jgroups-discovery/src/main/java/org/hornetq/integration/discovery/jgroups/JGroupsServerLocatorImpl.java
branches/HORNETQ-316/hornetq-ra/hornetq-ra-rar/src/main/resources/ra.xml
branches/HORNETQ-316/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionFactoryTest.java
branches/HORNETQ-316/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java
branches/HORNETQ-316/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java
branches/HORNETQ-316/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java
branches/HORNETQ-316/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java
branches/HORNETQ-316/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeWithPagingTest.java
branches/HORNETQ-316/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
branches/HORNETQ-316/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/BridgeControlTest.java
branches/HORNETQ-316/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java
branches/HORNETQ-316/tests/unit-tests/src/test/java/org/hornetq/tests/unit/ra/HornetQResourceAdapterConfigTest.java
Log:
https://issues.jboss.org/browse/HORNETQ-316 fixed some failed tests
Modified: branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/api/core/DiscoveryGroupConstants.java
===================================================================
--- branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/api/core/DiscoveryGroupConstants.java 2011-11-29 15:31:22 UTC (rev 11787)
+++ branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/api/core/DiscoveryGroupConstants.java 2011-11-29 22:17:00 UTC (rev 11788)
@@ -24,6 +24,8 @@
// for static connector
public static final String STATIC_CONNECTOR_NAMES_NAME = "static-connector-names";
public static final String STATIC_CONNECTOR_CONFIG_LIST_NAME = "static-connector-list";
+ public static final String STATIC_SERVER_LOCATOR_CLASS = "org.hornetq.core.client.impl.StaticServerLocatorImpl";
+ public static final String STATIC_CLUSTER_CONNECTOR_CLASS = "org.hornetq.core.server.cluster.impl.StaticClusterConnectorImpl";
// for UDP discovery
public static final String LOCAL_BIND_ADDRESS_NAME = "local-bind-address";
@@ -31,4 +33,6 @@
public static final String GROUP_PORT_NAME = "group-port";
public static final String INITIAL_WAIT_TIMEOUT_NAME = "initial-wait-timeout";
public static final String REFRESH_TIMEOUT_NAME = "refresh-timeout";
+ public static final String UDP_SERVER_LOCATOR_CLASS = "org.hornetq.core.client.impl.UDPServerLocatorImpl";
+ public static final String UDP_CLUSTER_CONNECTOR_CLASS = "org.hornetq.core.server.cluster.impl.UDPDiscoveryClusterConnectorImpl";
}
Modified: branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/api/core/client/HornetQClient.java
===================================================================
--- branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/api/core/client/HornetQClient.java 2011-11-29 15:31:22 UTC (rev 11787)
+++ branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/api/core/client/HornetQClient.java 2011-11-29 22:17:00 UTC (rev 11788)
@@ -121,8 +121,8 @@
Map<String, Object> params = new HashMap<String, Object>();
params.put(DiscoveryGroupConstants.STATIC_CONNECTOR_CONFIG_LIST_NAME, Arrays.asList(transportConfigurations));
DiscoveryGroupConfiguration config =
- new DiscoveryGroupConfiguration("org.hornetq.core.client.impl.StaticServerLocatorImpl",
- "org.hornetq.core.server.cluster.impl.StaticClusterConnectorImpl",
+ new DiscoveryGroupConfiguration(DiscoveryGroupConstants.STATIC_SERVER_LOCATOR_CLASS,
+ DiscoveryGroupConstants.STATIC_CLUSTER_CONNECTOR_CLASS,
params,
UUIDGenerator.getInstance().generateStringUUID());
return createServerLocatorWithoutHA(config);
@@ -171,8 +171,8 @@
Map<String, Object> params = new HashMap<String, Object>();
params.put(DiscoveryGroupConstants.STATIC_CONNECTOR_CONFIG_LIST_NAME, Arrays.asList(initialServers));
DiscoveryGroupConfiguration config =
- new DiscoveryGroupConfiguration("org.hornetq.core.client.impl.StaticServerLocatorImpl",
- "org.hornetq.core.server.cluster.impl.StaticClusterConnectorImpl",
+ new DiscoveryGroupConfiguration(DiscoveryGroupConstants.STATIC_SERVER_LOCATOR_CLASS,
+ DiscoveryGroupConstants.STATIC_CLUSTER_CONNECTOR_CLASS,
params,
UUIDGenerator.getInstance().generateStringUUID());
return createServerLocatorWithHA(config);
Modified: branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/core/client/impl/AbstractServerLocator.java
===================================================================
--- branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/core/client/impl/AbstractServerLocator.java 2011-11-29 15:31:22 UTC (rev 11787)
+++ branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/core/client/impl/AbstractServerLocator.java 2011-11-29 22:17:00 UTC (rev 11788)
@@ -1506,4 +1506,14 @@
{
return topologyArray;
}
+
+ protected synchronized DiscoveryGroup getDiscoveryGroup()
+ {
+ return discoveryGroup;
+ }
+
+ protected synchronized void setDiscoveryGroup(DiscoveryGroup dg)
+ {
+ this.discoveryGroup = dg;
+ }
}
Modified: branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/core/client/impl/StaticServerLocatorImpl.java
===================================================================
--- branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/core/client/impl/StaticServerLocatorImpl.java 2011-11-29 15:31:22 UTC (rev 11787)
+++ branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/core/client/impl/StaticServerLocatorImpl.java 2011-11-29 22:17:00 UTC (rev 11788)
@@ -23,8 +23,12 @@
import org.hornetq.api.core.HornetQException;
import org.hornetq.api.core.TransportConfiguration;
import org.hornetq.api.core.client.ClientSessionFactory;
+import org.hornetq.core.cluster.DiscoveryEntry;
+import org.hornetq.core.cluster.DiscoveryGroup;
+import org.hornetq.core.cluster.DiscoveryListener;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.remoting.FailureListener;
+import org.hornetq.core.server.management.NotificationService;
/**
* A StaticServerLocatorImpl
@@ -56,8 +60,40 @@
Map<String, Object> params = discoveryGroupConfiguration.getParams();
List<TransportConfiguration> initialConnectors =
(List<TransportConfiguration>)params.get(DiscoveryGroupConstants.STATIC_CONNECTOR_CONFIG_LIST_NAME);
- setStaticTransportConfigurations(initialConnectors.toArray(new TransportConfiguration[0]));
+ if (initialConnectors != null)
+ {
+ setStaticTransportConfigurations(initialConnectors.toArray(new TransportConfiguration[0]));
+ }
+ setDiscoveryGroup(new DiscoveryGroup()
+ {
+ @Override public void setNotificationService(NotificationService notificationService) {}
+ @Override public void start() throws Exception {}
+ @Override public void stop() throws Exception {}
+ @Override public void registerListener(DiscoveryListener listener) {}
+ @Override public void unregisterListener(DiscoveryListener listener) {}
+ @Override
+ public String getName()
+ {
+ return "StaticDiscoveryGroup";
+ }
+ @Override
+ public List<DiscoveryEntry> getDiscoveryEntries()
+ {
+ return null;
+ }
+ @Override
+ public boolean isStarted()
+ {
+ return true;
+ }
+ @Override
+ public boolean waitForBroadcast(long timeout)
+ {
+ return true;
+ }
+ });
+
e.fillInStackTrace();
}
@@ -79,22 +115,6 @@
}
/**
- * Create a ServerLocatorImpl using a static list of live servers
- *
- * @param transportConfigs
- */
- public StaticServerLocatorImpl(final boolean useHA, final TransportConfiguration... transportConfigs)
- {
- this(useHA ? new Topology(null) : null, useHA, null, transportConfigs);
- if (useHA)
- {
- // We only set the owner at where the Topology was created.
- // For that reason we can't set it at the main constructor
- getTopology().setOwner(this);
- }
- }
-
- /**
* Create a ServerLocatorImpl using UDP discovery to lookup cluster
*
* @param discoveryAddress
@@ -108,18 +128,6 @@
}
- /**
- * Create a ServerLocatorImpl using a static list of live servers
- *
- * @param transportConfigs
- */
- public StaticServerLocatorImpl(final Topology topology,
- final boolean useHA,
- final TransportConfiguration... transportConfigs)
- {
- this(topology, useHA, null, transportConfigs);
- }
-
@Override
public ClientSessionFactoryInternal connect() throws Exception
{
Modified: branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/core/client/impl/UDPServerLocatorImpl.java
===================================================================
--- branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/core/client/impl/UDPServerLocatorImpl.java 2011-11-29 15:31:22 UTC (rev 11787)
+++ branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/core/client/impl/UDPServerLocatorImpl.java 2011-11-29 22:17:00 UTC (rev 11788)
@@ -86,6 +86,8 @@
discoveryGroup.registerListener(this);
discoveryGroup.start();
+
+ setDiscoveryGroup(discoveryGroup);
}
private UDPServerLocatorImpl(final Topology topology,
Modified: branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/core/config/BridgeConfiguration.java
===================================================================
--- branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/core/config/BridgeConfiguration.java 2011-11-29 15:31:22 UTC (rev 11787)
+++ branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/core/config/BridgeConfiguration.java 2011-11-29 22:17:00 UTC (rev 11788)
@@ -16,11 +16,15 @@
import java.io.Serializable;
import java.util.List;
+import org.hornetq.api.core.DiscoveryGroupConfiguration;
+import org.hornetq.api.core.DiscoveryGroupConstants;
+import org.hornetq.api.core.TransportConfiguration;
+
/**
* A BridgeConfiguration
*
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- *
+ *
* Created 13 Jan 2009 09:32:43
*
*
@@ -37,10 +41,10 @@
private String filterString;
- private List<String> staticConnectors;
+ private List<TransportConfiguration> staticConnectors;
- private String discoveryGroupName;
-
+ private DiscoveryGroupConfiguration discoveryGroupConfiguration;
+
private boolean ha;
private String transformerClassName;
@@ -56,13 +60,13 @@
private int confirmationWindowSize;
private final long clientFailureCheckPeriod;
-
+
private String user;
-
+
private String password;
private final long connectionTTL;
-
+
private final long maxRetryInterval;
@@ -79,7 +83,7 @@
final int reconnectAttempts,
final boolean useDuplicateDetection,
final int confirmationWindowSize,
- final List<String> staticConnectors,
+ final DiscoveryGroupConfiguration discoveryGroupConfig,
final boolean ha,
final String user,
final String password)
@@ -95,45 +99,10 @@
this.useDuplicateDetection = useDuplicateDetection;
this.confirmationWindowSize = confirmationWindowSize;
this.clientFailureCheckPeriod = clientFailureCheckPeriod;
- this.staticConnectors = staticConnectors;
- this. user = user;
- this.password = password;
- this.connectionTTL = connectionTTL;
- this.maxRetryInterval = maxRetryInterval;
- discoveryGroupName = null;
- }
-
- public BridgeConfiguration(final String name,
- final String queueName,
- final String forwardingAddress,
- final String filterString,
- final String transformerClassName,
- final long clientFailureCheckPeriod,
- final long connectionTTL,
- final long retryInterval,
- final long maxRetryInterval,
- final double retryIntervalMultiplier,
- final int reconnectAttempts,
- final boolean useDuplicateDetection,
- final int confirmationWindowSize,
- final String discoveryGroupName,
- final boolean ha,
- final String user,
- final String password)
- {
- this.name = name;
- this.queueName = queueName;
- this.forwardingAddress = forwardingAddress;
- this.filterString = filterString;
- this.transformerClassName = transformerClassName;
- this.retryInterval = retryInterval;
- this.retryIntervalMultiplier = retryIntervalMultiplier;
- this.reconnectAttempts = reconnectAttempts;
- this.useDuplicateDetection = useDuplicateDetection;
- this.confirmationWindowSize = confirmationWindowSize;
- this.clientFailureCheckPeriod = clientFailureCheckPeriod;
- this.staticConnectors = null;
- this.discoveryGroupName = discoveryGroupName;
+ this.discoveryGroupConfiguration = discoveryGroupConfig;
+ this.staticConnectors =
+ (List<TransportConfiguration>)discoveryGroupConfig.getParams()
+ .get(DiscoveryGroupConstants.STATIC_CONNECTOR_CONFIG_LIST_NAME);
this.ha = ha;
this.user = user;
this.password = password;
@@ -182,16 +151,16 @@
return transformerClassName;
}
- public List<String> getStaticConnectors()
+ public List<TransportConfiguration> getStaticConnectors()
{
return staticConnectors;
}
- public String getDiscoveryGroupName()
+ public DiscoveryGroupConfiguration getDiscoveryGroupConfiguration()
{
- return discoveryGroupName;
+ return discoveryGroupConfiguration;
}
-
+
public boolean isHA()
{
return ha;
@@ -262,21 +231,21 @@
/**
* @param staticConnectors the staticConnectors to set
*/
- public void setStaticConnectors(final List<String> staticConnectors)
+ public void setStaticConnectors(final List<TransportConfiguration> staticConnectors)
{
this.staticConnectors = staticConnectors;
}
/**
- * @param discoveryGroupName the discoveryGroupName to set
+ * @param discoveryGroupConfig the discoveryGroupName to set
*/
- public void setDiscoveryGroupName(final String discoveryGroupName)
+ public void setDiscoveryGroupName(final DiscoveryGroupConfiguration discoveryGroupConfig)
{
- this.discoveryGroupName = discoveryGroupName;
+ this.discoveryGroupConfiguration = discoveryGroupConfig;
}
-
+
/**
- *
+ *
* @param ha is the bridge supporting HA?
*/
public void setHA(final boolean ha)
Modified: branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/core/deployers/impl/FileConfigurationParser.java
===================================================================
--- branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/core/deployers/impl/FileConfigurationParser.java 2011-11-29 15:31:22 UTC (rev 11787)
+++ branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/core/deployers/impl/FileConfigurationParser.java 2011-11-29 22:17:00 UTC (rev 11788)
@@ -994,12 +994,12 @@
switch (DiscoveryType.valueOf(type))
{
case STATIC:
- serverLocatorClassName = "org.hornetq.core.client.impl.StaticServerLocatorImpl";
- clusterConnectorClassName = "org.hornetq.core.server.cluster.impl.StaticClusterConnectorImpl";
+ serverLocatorClassName = DiscoveryGroupConstants.STATIC_SERVER_LOCATOR_CLASS;
+ clusterConnectorClassName = DiscoveryGroupConstants.STATIC_CLUSTER_CONNECTOR_CLASS;
break;
case UDP:
- serverLocatorClassName = "org.hornetq.core.client.impl.UDPServerLocatorImpl";
- clusterConnectorClassName = "org.hornetq.core.server.cluster.impl.UDPDiscoveryClusterConnectorImpl";
+ serverLocatorClassName = DiscoveryGroupConstants.UDP_SERVER_LOCATOR_CLASS;
+ clusterConnectorClassName = DiscoveryGroupConstants.UDP_CLUSTER_CONNECTOR_CLASS;
break;
case JGROUPS:
serverLocatorClassName = "org.hornetq.integration.discovery.jgroups.JGroupsServerLocatorImpl";
@@ -1127,15 +1127,16 @@
{
discoveryGroupName = child.getAttributes().getNamedItem("discovery-group-name").getNodeValue();
+ directConnections =
+ (List<TransportConfiguration>)mainConfig.getDiscoveryGroupConfigurations()
+ .get(discoveryGroupName)
+ .getParams()
+ .get(DiscoveryGroupConstants.STATIC_CONNECTOR_CONFIG_LIST_NAME);
+
Node attr = child.getAttributes().getNamedItem("allow-direct-connections-only");
if (attr != null)
{
allowDirectConnectionsOnly = "true".equalsIgnoreCase(attr.getNodeValue()) || allowDirectConnectionsOnly;
- directConnections =
- (List<TransportConfiguration>)mainConfig.getDiscoveryGroupConfigurations()
- .get(discoveryGroupName)
- .getParams()
- .get(DiscoveryGroupConstants.STATIC_CONNECTOR_CONFIG_LIST_NAME);
}
}
}
@@ -1258,54 +1259,27 @@
{
discoveryGroupName = child.getAttributes().getNamedItem("discovery-group-name").getNodeValue();
}
- else if (child.getNodeName().equals("static-connectors"))
- {
- getStaticConnectors(staticConnectorNames, child);
- }
}
BridgeConfiguration config;
- if (!staticConnectorNames.isEmpty())
- {
- config = new BridgeConfiguration(name,
- queueName,
- forwardingAddress,
- filterString,
- transformerClassName,
- clientFailureCheckPeriod,
- connectionTTL,
- retryInterval,
- maxRetryInterval,
- retryIntervalMultiplier,
- reconnectAttempts,
- useDuplicateDetection,
- confirmationWindowSize,
- staticConnectorNames,
- ha,
- user,
- password);
- }
- else
- {
- config = new BridgeConfiguration(name,
- queueName,
- forwardingAddress,
- filterString,
- transformerClassName,
- clientFailureCheckPeriod,
- connectionTTL,
- retryInterval,
- maxRetryInterval,
- retryIntervalMultiplier,
- reconnectAttempts,
- useDuplicateDetection,
- confirmationWindowSize,
- discoveryGroupName,
- ha,
- user,
- password);
- }
+ config = new BridgeConfiguration(name,
+ queueName,
+ forwardingAddress,
+ filterString,
+ transformerClassName,
+ clientFailureCheckPeriod,
+ connectionTTL,
+ retryInterval,
+ maxRetryInterval,
+ retryIntervalMultiplier,
+ reconnectAttempts,
+ useDuplicateDetection,
+ confirmationWindowSize,
+ mainConfig.getDiscoveryGroupConfigurations().get(discoveryGroupName),
+ ha,
+ user,
+ password);
mainConfig.getBridgeConfigurations().add(config);
}
Modified: branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/core/management/impl/BridgeControlImpl.java
===================================================================
--- branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/core/management/impl/BridgeControlImpl.java 2011-11-29 15:31:22 UTC (rev 11787)
+++ branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/core/management/impl/BridgeControlImpl.java 2011-11-29 22:17:00 UTC (rev 11788)
@@ -24,7 +24,7 @@
* A BridgeControl
*
* @author <a href="jmesnil at redhat.com">Jeff Mesnil</a>
- *
+ *
* Created 11 dec. 2008 17:09:04
*/
public class BridgeControlImpl extends AbstractControl implements BridgeControl
@@ -58,7 +58,7 @@
clearIO();
try
{
- return configuration.getStaticConnectors().toArray(new String[0]);
+ return configuration.getStaticConnectors().toArray(new String[0]);
}
finally
{
@@ -97,7 +97,7 @@
clearIO();
try
{
- return configuration.getDiscoveryGroupName();
+ return configuration.getDiscoveryGroupConfiguration().getName();
}
finally
{
@@ -208,7 +208,7 @@
blockOnIO();
}
}
-
+
public boolean isHA()
{
clearIO();
@@ -248,7 +248,7 @@
blockOnIO();
}
}
-
+
@Override
protected MBeanOperationInfo[] fillMBeanOperationInfo()
{
Modified: branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/core/management/impl/HornetQServerControlImpl.java
===================================================================
--- branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/core/management/impl/HornetQServerControlImpl.java 2011-11-29 15:31:22 UTC (rev 11787)
+++ branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/core/management/impl/HornetQServerControlImpl.java 2011-11-29 22:17:00 UTC (rev 11788)
@@ -35,6 +35,8 @@
import javax.management.NotificationListener;
import javax.transaction.xa.Xid;
+import org.hornetq.api.core.DiscoveryGroupConfiguration;
+import org.hornetq.api.core.DiscoveryGroupConstants;
import org.hornetq.api.core.HornetQException;
import org.hornetq.api.core.SimpleString;
import org.hornetq.api.core.TransportConfiguration;
@@ -70,6 +72,7 @@
import org.hornetq.core.transaction.impl.XidImpl;
import org.hornetq.spi.core.protocol.RemotingConnection;
import org.hornetq.utils.SecurityFormatter;
+import org.hornetq.utils.UUIDGenerator;
import org.hornetq.utils.json.JSONArray;
import org.hornetq.utils.json.JSONObject;
@@ -1717,14 +1720,28 @@
reconnectAttempts,
useDuplicateDetection,
confirmationWindowSize,
- connectorNames,
+ server.getConfiguration().getDiscoveryGroupConfigurations().get(connectorNames),
ha,
user,
password);
}
else
{
+ Map<String, Object> params = new HashMap<String, Object>();
+ params.put(DiscoveryGroupConstants.STATIC_CONNECTOR_NAMES_NAME, connectorNames);
List<String> connectors = toList(connectorNames);
+ List<TransportConfiguration> connectorConfs = new ArrayList<TransportConfiguration>();
+ for(int i=0; i>connectors.size(); i++)
+ {
+ connectorConfs.add(server.getConfiguration().getConnectorConfigurations().get(connectors.get(i)));
+ }
+ params.put(DiscoveryGroupConstants.STATIC_CONNECTOR_CONFIG_LIST_NAME, connectorConfs);
+ DiscoveryGroupConfiguration dg = new DiscoveryGroupConfiguration(DiscoveryGroupConstants.STATIC_SERVER_LOCATOR_CLASS,
+ DiscoveryGroupConstants.STATIC_CLUSTER_CONNECTOR_CLASS,
+ params,
+ UUIDGenerator.getInstance().generateStringUUID());
+ server.getConfiguration().getDiscoveryGroupConfigurations().put(dg.getName(), dg);
+
config = new BridgeConfiguration(name,
queueName,
forwardingAddress,
@@ -1738,7 +1755,7 @@
reconnectAttempts,
useDuplicateDetection,
confirmationWindowSize,
- connectors,
+ dg,
ha,
user,
password);
Modified: branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/core/server/cluster/impl/BroadcastGroupImpl.java
===================================================================
--- branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/core/server/cluster/impl/BroadcastGroupImpl.java 2011-11-29 15:31:22 UTC (rev 11787)
+++ branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/core/server/cluster/impl/BroadcastGroupImpl.java 2011-11-29 22:17:00 UTC (rev 11788)
@@ -226,8 +226,8 @@
byte[] data = buff.toByteBuffer().array();
Map<String, Object> params = broadcastGroupConfiguration.getParams();
- Integer groupPort = (Integer)params.get(BroadcastGroupConstants.GROUP_PORT_NAME);
- InetAddress groupAddr = (InetAddress)params.get(BroadcastGroupConstants.GROUP_ADDRESS_NAME);
+ int groupPort = Integer.parseInt((String)params.get(BroadcastGroupConstants.GROUP_PORT_NAME));
+ InetAddress groupAddr = InetAddress.getByName((String)params.get(BroadcastGroupConstants.GROUP_ADDRESS_NAME));
DatagramPacket packet = new DatagramPacket(data, data.length, groupAddr, groupPort);
Modified: branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java
===================================================================
--- branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java 2011-11-29 15:31:22 UTC (rev 11787)
+++ branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java 2011-11-29 22:17:00 UTC (rev 11788)
@@ -19,6 +19,7 @@
import java.io.PrintWriter;
import java.io.StringWriter;
import java.lang.reflect.Constructor;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -29,6 +30,7 @@
import java.util.concurrent.ScheduledExecutorService;
import org.hornetq.api.core.DiscoveryGroupConfiguration;
+import org.hornetq.api.core.DiscoveryGroupConstants;
import org.hornetq.api.core.Pair;
import org.hornetq.api.core.SimpleString;
import org.hornetq.api.core.TransportConfiguration;
@@ -63,6 +65,7 @@
import org.hornetq.utils.Future;
import org.hornetq.utils.TypedProperties;
import org.hornetq.utils.UUID;
+import org.hornetq.utils.UUIDGenerator;
/**
*
@@ -243,8 +246,8 @@
String className = dg.getClusterConnectorClassName();
ClassLoader loader = Thread.currentThread().getContextClassLoader();
Class<?> clazz = loader.loadClass(className);
- Constructor<?> constructor = clazz.getConstructor(DiscoveryGroupConfiguration.class);
- clusterConnector = (ClusterConnector)constructor.newInstance(dg);
+ Constructor<?> constructor = clazz.getConstructor(ClusterConnectionImpl.class, DiscoveryGroupConfiguration.class);
+ clusterConnector = (ClusterConnector)constructor.newInstance(this, dg);
backupServerLocator = clusterConnector.createServerLocator(false);
@@ -744,7 +747,15 @@
final Queue queue,
final boolean start) throws Exception
{
- final ServerLocatorInternal targetLocator = new StaticServerLocatorImpl(topology, false, connector);
+ Map<String, Object> params = new HashMap<String, Object>();
+ params.put(DiscoveryGroupConstants.STATIC_CONNECTOR_CONFIG_LIST_NAME, Arrays.asList(connector));
+ DiscoveryGroupConfiguration dg =
+ new DiscoveryGroupConfiguration(DiscoveryGroupConstants.STATIC_SERVER_LOCATOR_CLASS,
+ DiscoveryGroupConstants.STATIC_CLUSTER_CONNECTOR_CLASS,
+ params,
+ UUIDGenerator.getInstance().generateStringUUID());
+
+ final ServerLocatorInternal targetLocator = new StaticServerLocatorImpl(topology, false, dg);
String nodeId;
Modified: branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java
===================================================================
--- branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java 2011-11-29 15:31:22 UTC (rev 11787)
+++ branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java 2011-11-29 22:17:00 UTC (rev 11788)
@@ -441,10 +441,10 @@
ServerLocatorInternal serverLocator;
DiscoveryGroupConfiguration discoveryGroupConfiguration = configuration.getDiscoveryGroupConfigurations()
- .get(config.getDiscoveryGroupName());
+ .get(config.getDiscoveryGroupConfiguration().getName());
if (discoveryGroupConfiguration == null)
{
- ClusterManagerImpl.log.warn("No discovery group configured with name '" + config.getDiscoveryGroupName() +
+ ClusterManagerImpl.log.warn("No discovery group configured with name '" + config.getDiscoveryGroupConfiguration().getName() +
"'. The bridge will not be deployed.");
return;
Modified: branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/core/server/cluster/impl/StaticClusterConnectorImpl.java
===================================================================
--- branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/core/server/cluster/impl/StaticClusterConnectorImpl.java 2011-11-29 15:31:22 UTC (rev 11787)
+++ branches/HORNETQ-316/hornetq-core/src/main/java/org/hornetq/core/server/cluster/impl/StaticClusterConnectorImpl.java 2011-11-29 22:17:00 UTC (rev 11788)
@@ -13,11 +13,7 @@
package org.hornetq.core.server.cluster.impl;
-import java.util.List;
-
import org.hornetq.api.core.DiscoveryGroupConfiguration;
-import org.hornetq.api.core.DiscoveryGroupConstants;
-import org.hornetq.api.core.TransportConfiguration;
import org.hornetq.core.client.impl.ServerLocatorInternal;
import org.hornetq.core.client.impl.StaticServerLocatorImpl;
@@ -27,26 +23,27 @@
public class StaticClusterConnectorImpl implements ClusterConnector
{
private final ClusterConnectionImpl clusterConnectionImpl;
- private final List<TransportConfiguration> tcConfigs;
+ private final DiscoveryGroupConfiguration discoveryConfig;
public StaticClusterConnectorImpl(ClusterConnectionImpl clusterConnectionImpl, DiscoveryGroupConfiguration dg)
{
this.clusterConnectionImpl = clusterConnectionImpl;
- this.tcConfigs = (List<TransportConfiguration>)dg.getParams().get(DiscoveryGroupConstants.STATIC_CONNECTOR_CONFIG_LIST_NAME);
+ this.discoveryConfig = dg;
}
@Override
public ServerLocatorInternal createServerLocator(boolean includeTopology)
{
- if (tcConfigs != null && tcConfigs.size() > 0)
+ if (discoveryConfig != null)
{
if (ClusterConnectionImpl.log.isDebugEnabled())
{
- ClusterConnectionImpl.log.debug(this.clusterConnectionImpl + "Creating a serverLocator for " + tcConfigs);
+ ClusterConnectionImpl.log.debug(this.clusterConnectionImpl + "Creating a serverLocator for " +
+ discoveryConfig);
}
StaticServerLocatorImpl locator = new StaticServerLocatorImpl(includeTopology ? this.clusterConnectionImpl.topology : null,
true,
- tcConfigs.toArray(new TransportConfiguration[0]));
+ discoveryConfig);
locator.setClusterConnection(true);
return locator;
}
@@ -62,7 +59,7 @@
@Override
public String toString()
{
- return "StaticClusterConnector [tcConfigs=" + tcConfigs + "]";
+ return "StaticClusterConnector [discoveryConfig=" + discoveryConfig + "]";
}
}
\ No newline at end of file
Modified: branches/HORNETQ-316/hornetq-core/src/main/resources/schema/hornetq-configuration.xsd
===================================================================
--- branches/HORNETQ-316/hornetq-core/src/main/resources/schema/hornetq-configuration.xsd 2011-11-29 15:31:22 UTC (rev 11787)
+++ branches/HORNETQ-316/hornetq-core/src/main/resources/schema/hornetq-configuration.xsd 2011-11-29 22:17:00 UTC (rev 11788)
@@ -220,10 +220,10 @@
<xsd:sequence>
<xsd:element maxOccurs="1" minOccurs="1" name="broadcast-type" type="broadcastType">
</xsd:element>
- <xsd:element maxOccurs="unbounded" minOccurs="0" name="connector-ref" type="xsd:string">
- </xsd:element>
<xsd:element maxOccurs="unbounded" minOccurs="0" name="param" type="paramType">
</xsd:element>
+ <xsd:element maxOccurs="unbounded" minOccurs="0" name="connector-ref" type="xsd:string">
+ </xsd:element>
</xsd:sequence>
<xsd:attribute name="name" type="xsd:ID" use="required"/>
</xsd:complexType>
Modified: branches/HORNETQ-316/hornetq-core/src/test/java/org/hornetq/core/config/impl/FileConfigurationTest.java
===================================================================
--- branches/HORNETQ-316/hornetq-core/src/test/java/org/hornetq/core/config/impl/FileConfigurationTest.java 2011-11-29 15:31:22 UTC (rev 11787)
+++ branches/HORNETQ-316/hornetq-core/src/test/java/org/hornetq/core/config/impl/FileConfigurationTest.java 2011-11-29 22:17:00 UTC (rev 11788)
@@ -154,7 +154,7 @@
}
}
- Assert.assertEquals(2, conf.getDiscoveryGroupConfigurations().size());
+ Assert.assertEquals(4, conf.getDiscoveryGroupConfigurations().size());
DiscoveryGroupConfiguration dc = conf.getDiscoveryGroupConfigurations().get("dg1");
Assert.assertEquals("dg1", dc.getName());
Assert.assertEquals("192.168.0.120", ConfigurationHelper.getStringProperty(DiscoveryGroupConstants.GROUP_ADDRESS_NAME, null, dc.getParams()));
@@ -208,8 +208,7 @@
Assert.assertEquals(0.2, bc.getRetryIntervalMultiplier());
Assert.assertEquals(2, bc.getReconnectAttempts());
Assert.assertEquals(true, bc.isUseDuplicateDetection());
- Assert.assertEquals("connector1", bc.getStaticConnectors().get(0));
- Assert.assertEquals(null, bc.getDiscoveryGroupName());
+ Assert.assertEquals("connector1", bc.getStaticConnectors().get(0).getName());
}
else
{
@@ -219,7 +218,7 @@
Assert.assertEquals(null, bc.getFilterString());
Assert.assertEquals(null, bc.getTransformerClassName());
Assert.assertEquals(null, bc.getStaticConnectors());
- Assert.assertEquals("dg1", bc.getDiscoveryGroupName());
+ Assert.assertEquals("dg1", bc.getDiscoveryGroupConfiguration().getName());
}
}
@@ -235,9 +234,9 @@
Assert.assertEquals(false, ccc.isForwardWhenNoConsumers());
Assert.assertEquals(1, ccc.getMaxHops());
Assert.assertEquals(123, ccc.getCallTimeout());
- Assert.assertEquals("connector1", ccc.getStaticConnectors().get(0));
- Assert.assertEquals("connector2", ccc.getStaticConnectors().get(1));
- Assert.assertEquals(null, ccc.getDiscoveryGroupConfiguration().getName());
+ Assert.assertEquals("connector1", ccc.getStaticConnectors().get(0).getName());
+ Assert.assertEquals("connector2", ccc.getStaticConnectors().get(1).getName());
+ Assert.assertEquals("static12", ccc.getDiscoveryGroupConfiguration().getName());
}
else
{
Modified: branches/HORNETQ-316/hornetq-core/src/test/resources/ConfigurationTest-full-config.xml
===================================================================
--- branches/HORNETQ-316/hornetq-core/src/test/resources/ConfigurationTest-full-config.xml 2011-11-29 15:31:22 UTC (rev 11787)
+++ branches/HORNETQ-316/hornetq-core/src/test/resources/ConfigurationTest-full-config.xml 2011-11-29 22:17:00 UTC (rev 11788)
@@ -82,34 +82,46 @@
</acceptor>
</acceptors>
<broadcast-groups>
- <broadcast-group name="bg1">
- <local-bind-port>10999</local-bind-port>
- <group-address>192.168.0.120</group-address>
- <group-port>11999</group-port>
- <broadcast-period>12345</broadcast-period>
+ <broadcast-group name="bg1">
+ <broadcast-type>UDP</broadcast-type>
+ <param key="local-bind-port" value="10999"/>
+ <param key="group-address" value="192.168.0.120"/>
+ <param key="group-port" value="11999"/>
+ <param key="broadcast-period" value="12345"/>
<connector-ref>connector1</connector-ref>
- </broadcast-group>
+ </broadcast-group>
<broadcast-group name="bg2">
- <local-bind-port>12999</local-bind-port>
- <group-address>192.168.0.121</group-address>
- <group-port>13999</group-port>
- <broadcast-period>23456</broadcast-period>
+ <broadcast-type>UDP</broadcast-type>
+ <param key="local-bind-port" value="12999"/>
+ <param key="group-address" value="192.168.0.121"/>
+ <param key="group-port" value="13999"/>
+ <param key="broadcast-period" value="23456"/>
<connector-ref>connector2</connector-ref>
</broadcast-group>
</broadcast-groups>
<discovery-groups>
<discovery-group name="dg1">
- <local-bind-address>172.16.8.10</local-bind-address>
- <group-address>192.168.0.120</group-address>
- <group-port>11999</group-port>
- <refresh-timeout>12345</refresh-timeout>
+ <discovery-type>UDP</discovery-type>
+ <param key="local-bind-address" value="172.16.8.10"/>
+ <param key="group-address" value="192.168.0.120"/>
+ <param key="group-port" value="11999"/>
+ <param key="refresh-timeout" value="12345"/>
</discovery-group>
<discovery-group name="dg2">
- <local-bind-address>172.16.8.11</local-bind-address>
- <group-address>192.168.0.121</group-address>
- <group-port>12999</group-port>
- <refresh-timeout>23456</refresh-timeout>
+ <discovery-type>UDP</discovery-type>
+ <param key="local-bind-address" value="172.16.8.11"/>
+ <param key="group-address" value="192.168.0.121"/>
+ <param key="group-port" value="12999"/>
+ <param key="refresh-timeout" value="23456"/>
</discovery-group>
+ <discovery-group name="static1">
+ <discovery-type>STATIC</discovery-type>
+ <param key="static-connector-names" value="connector1"/>
+ </discovery-group>
+ <discovery-group name="static12">
+ <discovery-type>STATIC</discovery-type>
+ <param key="static-connector-names" value="connector1,connector2"/>
+ </discovery-group>
</discovery-groups>
<diverts>
<divert name="divert1">
@@ -152,9 +164,7 @@
<reconnect-attempts>2</reconnect-attempts>
<failover-on-server-shutdown>false</failover-on-server-shutdown>
<use-duplicate-detection>true</use-duplicate-detection>
- <static-connectors>
- <connector-ref>connector1</connector-ref>
- </static-connectors>
+ <discovery-group-ref discovery-group-name="static1"/>
</bridge>
<bridge name="bridge2">
<queue-name>queue2</queue-name>
@@ -171,10 +181,7 @@
<forward-when-no-consumers>false</forward-when-no-consumers>
<max-hops>1</max-hops>
<call-timeout>123</call-timeout>
- <static-connectors>
- <connector-ref>connector1</connector-ref>
- <connector-ref>connector2</connector-ref>
- </static-connectors>
+ <discovery-group-ref discovery-group-name="static12"/>
</cluster-connection>
<cluster-connection name="cluster-connection2">
<address>queues2</address>
Modified: branches/HORNETQ-316/hornetq-jgroups-discovery/src/main/java/org/hornetq/integration/discovery/jgroups/JGroupsServerLocatorImpl.java
===================================================================
--- branches/HORNETQ-316/hornetq-jgroups-discovery/src/main/java/org/hornetq/integration/discovery/jgroups/JGroupsServerLocatorImpl.java 2011-11-29 15:31:22 UTC (rev 11787)
+++ branches/HORNETQ-316/hornetq-jgroups-discovery/src/main/java/org/hornetq/integration/discovery/jgroups/JGroupsServerLocatorImpl.java 2011-11-29 22:17:00 UTC (rev 11788)
@@ -96,6 +96,8 @@
discoveryGroup.registerListener(this);
discoveryGroup.start();
+
+ setDiscoveryGroup(discoveryGroup);
}
private JGroupsServerLocatorImpl(final Topology topology,
Modified: branches/HORNETQ-316/hornetq-ra/hornetq-ra-rar/src/main/resources/ra.xml
===================================================================
--- branches/HORNETQ-316/hornetq-ra/hornetq-ra-rar/src/main/resources/ra.xml 2011-11-29 15:31:22 UTC (rev 11787)
+++ branches/HORNETQ-316/hornetq-ra/hornetq-ra-rar/src/main/resources/ra.xml 2011-11-29 22:17:00 UTC (rev 11788)
@@ -230,7 +230,14 @@
<config-property-name>ClientID</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value></config-property-value>
- </config-property>-->
+ </config-property>
+ <config-property>
+ <description>Parameters for another discovery strategy plugin like hornetq-jgroups-discovery</description>
+ <config-property-name>DiscoveryPluginProperties</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ -->
<outbound-resourceadapter>
<connection-definition>
Modified: branches/HORNETQ-316/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionFactoryTest.java
===================================================================
--- branches/HORNETQ-316/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionFactoryTest.java 2011-11-29 15:31:22 UTC (rev 11787)
+++ branches/HORNETQ-316/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionFactoryTest.java 2011-11-29 22:17:00 UTC (rev 11788)
@@ -160,7 +160,7 @@
assertFactoryParams(locator,
tc,
- null,
+ locator.getDiscoveryGroupConfiguration(),
HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD,
HornetQClient.DEFAULT_CONNECTION_TTL,
HornetQClient.DEFAULT_CALL_TIMEOUT,
Modified: branches/HORNETQ-316/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java
===================================================================
--- branches/HORNETQ-316/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java 2011-11-29 15:31:22 UTC (rev 11787)
+++ branches/HORNETQ-316/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java 2011-11-29 22:17:00 UTC (rev 11788)
@@ -20,6 +20,7 @@
import junit.framework.Assert;
+import org.hornetq.api.core.DiscoveryGroupConfiguration;
import org.hornetq.api.core.HornetQException;
import org.hornetq.api.core.SimpleString;
import org.hornetq.api.core.TransportConfiguration;
@@ -116,8 +117,8 @@
final int reconnectAttempts = 1;
final int confirmationWindowSize = 1024;
- ArrayList<String> staticConnectors = new ArrayList<String>();
- staticConnectors.add(server1tc.getName());
+ DiscoveryGroupConfiguration dg = createStaticDiscoveryGroupConfiguration(server1tc);
+ server0.getConfiguration().getDiscoveryGroupConfigurations().put(dg.getName(), dg);
BridgeConfiguration bridgeConfiguration = new BridgeConfiguration(bridgeName,
queueName0,
@@ -132,7 +133,7 @@
reconnectAttempts,
true,
confirmationWindowSize,
- staticConnectors,
+ dg,
false,
ConfigurationImpl.DEFAULT_CLUSTER_USER,
ConfigurationImpl.DEFAULT_CLUSTER_PASSWORD);
@@ -258,8 +259,8 @@
final int reconnectAttempts = 3;
final int confirmationWindowSize = 1024;
- ArrayList<String> staticConnectors = new ArrayList<String>();
- staticConnectors.add(server1tc.getName());
+ DiscoveryGroupConfiguration dg = createStaticDiscoveryGroupConfiguration(server1tc);
+ server0.getConfiguration().getDiscoveryGroupConfigurations().put(dg.getName(), dg);
BridgeConfiguration bridgeConfiguration = new BridgeConfiguration(bridgeName,
queueName0,
@@ -274,7 +275,7 @@
reconnectAttempts,
true,
confirmationWindowSize,
- staticConnectors,
+ dg,
false,
ConfigurationImpl.DEFAULT_CLUSTER_USER,
ConfigurationImpl.DEFAULT_CLUSTER_PASSWORD);
@@ -386,8 +387,8 @@
final int reconnectAttempts = 3;
final int confirmationWindowSize = 1024;
- ArrayList<String> staticConnectors = new ArrayList<String>();
- staticConnectors.add(server1tc.getName());
+ DiscoveryGroupConfiguration dg = createStaticDiscoveryGroupConfiguration(server1tc);
+ server0.getConfiguration().getDiscoveryGroupConfigurations().put(dg.getName(), dg);
BridgeConfiguration bridgeConfiguration = new BridgeConfiguration(bridgeName,
queueName0,
@@ -402,7 +403,7 @@
reconnectAttempts,
true,
confirmationWindowSize,
- staticConnectors,
+ dg,
false,
ConfigurationImpl.DEFAULT_CLUSTER_USER,
ConfigurationImpl.DEFAULT_CLUSTER_PASSWORD);
@@ -530,8 +531,8 @@
final int confirmationWindowSize = 1024;
final long clientFailureCheckPeriod = 1000;
- ArrayList<String> staticConnectors = new ArrayList<String>();
- staticConnectors.add(server1tc.getName());
+ DiscoveryGroupConfiguration dg = createStaticDiscoveryGroupConfiguration(server1tc);
+ server0.getConfiguration().getDiscoveryGroupConfigurations().put(dg.getName(), dg);
BridgeConfiguration bridgeConfiguration = new BridgeConfiguration(bridgeName,
queueName0,
@@ -546,7 +547,7 @@
reconnectAttempts,
true,
confirmationWindowSize,
- staticConnectors,
+ dg,
false,
ConfigurationImpl.DEFAULT_CLUSTER_USER,
ConfigurationImpl.DEFAULT_CLUSTER_PASSWORD);
@@ -669,8 +670,8 @@
final int reconnectAttempts = 3;
final int confirmationWindowSize = 1024;
- ArrayList<String> staticConnectors = new ArrayList<String>();
- staticConnectors.add(server1tc.getName());
+ DiscoveryGroupConfiguration dg = createStaticDiscoveryGroupConfiguration(server1tc);
+ server0.getConfiguration().getDiscoveryGroupConfigurations().put(dg.getName(), dg);
BridgeConfiguration bridgeConfiguration = new BridgeConfiguration(bridgeName,
queueName0,
@@ -685,7 +686,7 @@
reconnectAttempts,
true,
confirmationWindowSize,
- staticConnectors,
+ dg,
false,
ConfigurationImpl.DEFAULT_CLUSTER_USER,
ConfigurationImpl.DEFAULT_CLUSTER_PASSWORD);
Modified: branches/HORNETQ-316/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java
===================================================================
--- branches/HORNETQ-316/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java 2011-11-29 15:31:22 UTC (rev 11787)
+++ branches/HORNETQ-316/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java 2011-11-29 22:17:00 UTC (rev 11788)
@@ -20,6 +20,7 @@
import junit.framework.Assert;
+import org.hornetq.api.core.DiscoveryGroupConfiguration;
import org.hornetq.api.core.SimpleString;
import org.hornetq.api.core.TransportConfiguration;
import org.hornetq.api.core.client.ClientConsumer;
@@ -99,8 +100,8 @@
server0.getConfiguration().setConnectorConfigurations(connectors);
- ArrayList<String> staticConnectors = new ArrayList<String>();
- staticConnectors.add(server1tc.getName());
+ DiscoveryGroupConfiguration dg = createStaticDiscoveryGroupConfiguration(server1tc);
+ server0.getConfiguration().getDiscoveryGroupConfigurations().put(dg.getName(), dg);
final String bridgeName = "bridge1";
@@ -117,7 +118,7 @@
0,
true,
1024,
- staticConnectors,
+ dg,
false,
ConfigurationImpl.DEFAULT_CLUSTER_USER,
ConfigurationImpl.DEFAULT_CLUSTER_PASSWORD);
@@ -269,8 +270,8 @@
server0.getConfiguration().setConnectorConfigurations(connectors);
- ArrayList<String> staticConnectors = new ArrayList<String>();
- staticConnectors.add(server1tc.getName());
+ DiscoveryGroupConfiguration dg = createStaticDiscoveryGroupConfiguration(server1tc);
+ server0.getConfiguration().getDiscoveryGroupConfigurations().put(dg.getName(), dg);
final String bridgeName = "bridge1";
@@ -287,7 +288,7 @@
-1,
true,
1024,
- staticConnectors,
+ dg,
false,
ConfigurationImpl.DEFAULT_CLUSTER_USER,
ConfigurationImpl.DEFAULT_CLUSTER_PASSWORD);
@@ -486,8 +487,8 @@
server0.getConfiguration().setConnectorConfigurations(connectors);
- ArrayList<String> staticConnectors = new ArrayList<String>();
- staticConnectors.add(server1tc.getName());
+ DiscoveryGroupConfiguration dg = createStaticDiscoveryGroupConfiguration(server1tc);
+ server0.getConfiguration().getDiscoveryGroupConfigurations().put(dg.getName(), dg);
final String bridgeName = "bridge1";
@@ -504,7 +505,7 @@
0,
false,
1024,
- staticConnectors,
+ dg,
false,
ConfigurationImpl.DEFAULT_CLUSTER_USER,
ConfigurationImpl.DEFAULT_CLUSTER_PASSWORD);
@@ -642,8 +643,8 @@
server0.getConfiguration().setConnectorConfigurations(connectors);
- ArrayList<String> staticConnectors = new ArrayList<String>();
- staticConnectors.add(server1tc.getName());
+ DiscoveryGroupConfiguration dg = createStaticDiscoveryGroupConfiguration(server1tc);
+ server0.getConfiguration().getDiscoveryGroupConfigurations().put(dg.getName(), dg);
final String bridgeName = "bridge1";
@@ -660,7 +661,7 @@
1,
true,
1024,
- staticConnectors,
+ dg,
false,
ConfigurationImpl.DEFAULT_CLUSTER_USER,
ConfigurationImpl.DEFAULT_CLUSTER_PASSWORD);
Modified: branches/HORNETQ-316/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java
===================================================================
--- branches/HORNETQ-316/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java 2011-11-29 15:31:22 UTC (rev 11787)
+++ branches/HORNETQ-316/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java 2011-11-29 22:17:00 UTC (rev 11788)
@@ -23,6 +23,7 @@
import junit.framework.Assert;
+import org.hornetq.api.core.DiscoveryGroupConfiguration;
import org.hornetq.api.core.HornetQBuffer;
import org.hornetq.api.core.SimpleString;
import org.hornetq.api.core.TransportConfiguration;
@@ -134,8 +135,8 @@
final int numMessages = 10;
- ArrayList<String> connectorConfig = new ArrayList<String>();
- connectorConfig.add(server1tc.getName());
+ DiscoveryGroupConfiguration dg = createStaticDiscoveryGroupConfiguration(server1tc);
+ server0.getConfiguration().getDiscoveryGroupConfigurations().put(dg.getName(), dg);
BridgeConfiguration bridgeConfiguration = new BridgeConfiguration("bridge1",
queueName0,
forwardAddress,
@@ -151,7 +152,7 @@
// Choose confirmation size to make sure acks
// are sent
numMessages * messageSize / 2,
- connectorConfig,
+ dg,
false,
ConfigurationImpl.DEFAULT_CLUSTER_USER,
ConfigurationImpl.DEFAULT_CLUSTER_PASSWORD);
@@ -342,8 +343,8 @@
final String filterString = "animal='goat'";
- ArrayList<String> staticConnectors = new ArrayList<String>();
- staticConnectors.add(server1tc.getName());
+ DiscoveryGroupConfiguration dg = createStaticDiscoveryGroupConfiguration(server1tc);
+ server0.getConfiguration().getDiscoveryGroupConfigurations().put(dg.getName(), dg);
BridgeConfiguration bridgeConfiguration = new BridgeConfiguration("bridge1",
queueName0,
forwardAddress,
@@ -357,7 +358,7 @@
-1,
false,
0,
- staticConnectors,
+ dg,
false,
ConfigurationImpl.DEFAULT_CLUSTER_USER,
ConfigurationImpl.DEFAULT_CLUSTER_PASSWORD);
@@ -531,8 +532,8 @@
server0.getConfiguration().setConnectorConfigurations(connectors);
- ArrayList<String> staticConnectors = new ArrayList<String>();
- staticConnectors.add(server1tc.getName());
+ DiscoveryGroupConfiguration dg = createStaticDiscoveryGroupConfiguration(server1tc);
+ server0.getConfiguration().getDiscoveryGroupConfigurations().put(dg.getName(), dg);
BridgeConfiguration bridgeConfiguration = new BridgeConfiguration("bridge1",
queueName0,
forwardAddress,
@@ -546,7 +547,7 @@
-1,
false,
1024,
- staticConnectors,
+ dg,
false,
ConfigurationImpl.DEFAULT_CLUSTER_USER,
ConfigurationImpl.DEFAULT_CLUSTER_PASSWORD);
@@ -691,8 +692,8 @@
server0.getConfiguration().setConnectorConfigurations(connectors);
- ArrayList<String> staticConnectors = new ArrayList<String>();
- staticConnectors.add(server1tc.getName());
+ DiscoveryGroupConfiguration dg = createStaticDiscoveryGroupConfiguration(server1tc);
+ server0.getConfiguration().getDiscoveryGroupConfigurations().put(dg.getName(), dg);
BridgeConfiguration bridgeConfiguration = new BridgeConfiguration("bridge1",
queueName0,
forwardAddress,
@@ -706,7 +707,7 @@
-1,
true,
0,
- staticConnectors,
+ dg,
false,
ConfigurationImpl.DEFAULT_CLUSTER_USER,
ConfigurationImpl.DEFAULT_CLUSTER_PASSWORD);
@@ -883,8 +884,8 @@
server0.getConfiguration().setConnectorConfigurations(connectors);
- ArrayList<String> staticConnectors = new ArrayList<String>();
- staticConnectors.add(server1tc.getName());
+ DiscoveryGroupConfiguration dg = createStaticDiscoveryGroupConfiguration(server1tc);
+ server0.getConfiguration().getDiscoveryGroupConfigurations().put(dg.getName(), dg);
BridgeConfiguration bridgeConfiguration = new BridgeConfiguration("bridge1",
queueName0,
@@ -899,7 +900,7 @@
-1,
false,
1024,
- staticConnectors,
+ dg,
false,
ConfigurationImpl.DEFAULT_CLUSTER_USER,
ConfigurationImpl.DEFAULT_CLUSTER_PASSWORD);
@@ -1036,8 +1037,8 @@
server0.getConfiguration().setConnectorConfigurations(connectors);
- ArrayList<String> staticConnectors = new ArrayList<String>();
- staticConnectors.add(server1tc.getName());
+ DiscoveryGroupConfiguration dg = createStaticDiscoveryGroupConfiguration(server1tc);
+ server0.getConfiguration().getDiscoveryGroupConfigurations().put(dg.getName(), dg);
BridgeConfiguration bridgeConfiguration = new BridgeConfiguration("bridge1",
queueName0,
@@ -1052,7 +1053,7 @@
-1,
false,
0,
- staticConnectors,
+ dg,
false,
ConfigurationImpl.DEFAULT_CLUSTER_USER,
ConfigurationImpl.DEFAULT_CLUSTER_PASSWORD);
@@ -1283,8 +1284,8 @@
server0.getConfiguration().setConnectorConfigurations(connectors);
- ArrayList<String> staticConnectors = new ArrayList<String>();
- staticConnectors.add(server1tc.getName());
+ DiscoveryGroupConfiguration dg = createStaticDiscoveryGroupConfiguration(server1tc);
+ server0.getConfiguration().getDiscoveryGroupConfigurations().put(dg.getName(), dg);
BridgeConfiguration bridgeConfiguration = new BridgeConfiguration("bridge1",
queueName0,
@@ -1299,7 +1300,7 @@
-1,
false,
0,
- staticConnectors,
+ dg,
false,
ConfigurationImpl.DEFAULT_CLUSTER_USER,
ConfigurationImpl.DEFAULT_CLUSTER_PASSWORD);
@@ -1434,8 +1435,8 @@
server0.getConfiguration().setConnectorConfigurations(connectors);
- ArrayList<String> staticConnectors = new ArrayList<String>();
- staticConnectors.add(server1tc.getName());
+ DiscoveryGroupConfiguration dg = createStaticDiscoveryGroupConfiguration(server1tc);
+ server0.getConfiguration().getDiscoveryGroupConfigurations().put(dg.getName(), dg);
BridgeConfiguration bridgeConfiguration = new BridgeConfiguration("bridge1",
queueName0,
@@ -1450,7 +1451,7 @@
-1,
false,
1024,
- staticConnectors,
+ dg,
false,
ConfigurationImpl.DEFAULT_CLUSTER_USER,
ConfigurationImpl.DEFAULT_CLUSTER_PASSWORD);
@@ -1592,8 +1593,8 @@
final int numMessages = 10;
- ArrayList<String> staticConnectors = new ArrayList<String>();
- staticConnectors.add(server1tc.getName());
+ DiscoveryGroupConfiguration dg = createStaticDiscoveryGroupConfiguration(server1tc);
+ server0.getConfiguration().getDiscoveryGroupConfigurations().put(dg.getName(), dg);
BridgeConfiguration bridgeConfiguration = new BridgeConfiguration("bridge1", queueName0, null, // pass a null
// forwarding
// address to
@@ -1612,7 +1613,7 @@
// Choose confirmation size to make sure acks
// are sent
numMessages * messageSize / 2,
- staticConnectors,
+ dg,
false,
ConfigurationImpl.DEFAULT_CLUSTER_USER,
ConfigurationImpl.DEFAULT_CLUSTER_PASSWORD);
Modified: branches/HORNETQ-316/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java
===================================================================
--- branches/HORNETQ-316/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java 2011-11-29 15:31:22 UTC (rev 11787)
+++ branches/HORNETQ-316/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java 2011-11-29 22:17:00 UTC (rev 11788)
@@ -109,8 +109,8 @@
final String bridgeName = "bridge1";
- ArrayList<String> staticConnectors = new ArrayList<String>();
- staticConnectors.add(server1tc.getName());
+ DiscoveryGroupConfiguration dg = createStaticDiscoveryGroupConfiguration(server1tc);
+ server0.getConfiguration().getDiscoveryGroupConfigurations().put(dg.getName(), dg);
BridgeConfiguration bridgeConfiguration = new BridgeConfiguration(bridgeName,
queueName0,
forwardAddress,
@@ -124,7 +124,7 @@
0,
true,
1024,
- staticConnectors,
+ dg,
false,
ConfigurationImpl.DEFAULT_CLUSTER_USER,
ConfigurationImpl.DEFAULT_CLUSTER_PASSWORD);
Modified: branches/HORNETQ-316/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeWithPagingTest.java
===================================================================
--- branches/HORNETQ-316/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeWithPagingTest.java 2011-11-29 15:31:22 UTC (rev 11787)
+++ branches/HORNETQ-316/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeWithPagingTest.java 2011-11-29 22:17:00 UTC (rev 11788)
@@ -20,6 +20,7 @@
import junit.framework.Assert;
+import org.hornetq.api.core.DiscoveryGroupConfiguration;
import org.hornetq.api.core.HornetQException;
import org.hornetq.api.core.Pair;
import org.hornetq.api.core.SimpleString;
@@ -106,8 +107,8 @@
final int confirmationWindowSize = 1024; // 1 kiB
- ArrayList<String> staticConnectors = new ArrayList<String>();
- staticConnectors.add(server1tc.getName());
+ DiscoveryGroupConfiguration dg = createStaticDiscoveryGroupConfiguration(server1tc);
+ server0.getConfiguration().getDiscoveryGroupConfigurations().put(dg.getName(), dg);
BridgeConfiguration bridgeConfiguration = new BridgeConfiguration(bridgeName,
queueName0,
forwardAddress,
@@ -121,7 +122,7 @@
reconnectAttempts,
false,
confirmationWindowSize,
- staticConnectors,
+ dg,
false,
ConfigurationImpl.DEFAULT_CLUSTER_USER,
ConfigurationImpl.DEFAULT_CLUSTER_PASSWORD);
Modified: branches/HORNETQ-316/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
===================================================================
--- branches/HORNETQ-316/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2011-11-29 15:31:22 UTC (rev 11787)
+++ branches/HORNETQ-316/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2011-11-29 22:17:00 UTC (rev 11788)
@@ -1782,7 +1782,7 @@
pairs.add(serverTotc);
}
- DiscoveryGroupConfiguration dg = createStaticDiscoveryGroupConfiguration(pairs.toArray(new TransportConfiguration[0]));
+ DiscoveryGroupConfiguration dg = createStaticDiscoveryGroupConfiguration(pairs != null ? pairs.toArray(new TransportConfiguration[0]) : null);
serverFrom.getConfiguration().getDiscoveryGroupConfigurations().put(dg.getName(), dg);
ClusterConnectionConfiguration clusterConf = new ClusterConnectionConfiguration(name,
Modified: branches/HORNETQ-316/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/BridgeControlTest.java
===================================================================
--- branches/HORNETQ-316/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/BridgeControlTest.java 2011-11-29 15:31:22 UTC (rev 11787)
+++ branches/HORNETQ-316/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/BridgeControlTest.java 2011-11-29 22:17:00 UTC (rev 11788)
@@ -23,6 +23,7 @@
import junit.framework.Assert;
+import org.hornetq.api.core.DiscoveryGroupConfiguration;
import org.hornetq.api.core.Pair;
import org.hornetq.api.core.SimpleString;
import org.hornetq.api.core.TransportConfiguration;
@@ -74,7 +75,7 @@
BridgeControl bridgeControl = createBridgeControl(bridgeConfig.getName(), mbeanServer);
Assert.assertEquals(bridgeConfig.getName(), bridgeControl.getName());
- Assert.assertEquals(bridgeConfig.getDiscoveryGroupName(), bridgeControl.getDiscoveryGroupName());
+ Assert.assertEquals(bridgeConfig.getDiscoveryGroupConfiguration().getName(), bridgeControl.getDiscoveryGroupName());
Assert.assertEquals(bridgeConfig.getQueueName(), bridgeControl.getQueueName());
Assert.assertEquals(bridgeConfig.getForwardingAddress(), bridgeControl.getForwardingAddress());
Assert.assertEquals(bridgeConfig.getFilterString(), bridgeControl.getFilterString());
@@ -159,6 +160,7 @@
RandomUtil.randomString(),
null,
false);
+ DiscoveryGroupConfiguration dg = createStaticDiscoveryGroupConfiguration(connectorConfig);
List<String> connectors = new ArrayList<String>();
connectors.add(connectorConfig.getName());
bridgeConfig = new BridgeConfiguration(RandomUtil.randomString(),
@@ -174,7 +176,7 @@
RandomUtil.randomPositiveInt(),
RandomUtil.randomBoolean(),
RandomUtil.randomPositiveInt(),
- connectors,
+ dg,
false,
ConfigurationImpl.DEFAULT_CLUSTER_USER,
ConfigurationImpl.DEFAULT_CLUSTER_PASSWORD);
@@ -193,6 +195,7 @@
conf_0.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName()));
conf_0.getConnectorConfigurations().put(connectorConfig.getName(), connectorConfig);
conf_0.getQueueConfigurations().add(sourceQueueConfig);
+ conf_0.getDiscoveryGroupConfigurations().put(dg.getName(), dg);
conf_0.getBridgeConfigurations().add(bridgeConfig);
server_1 = HornetQServers.newHornetQServer(conf_1, MBeanServerFactory.createMBeanServer(), false);
Modified: branches/HORNETQ-316/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java
===================================================================
--- branches/HORNETQ-316/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java 2011-11-29 15:31:22 UTC (rev 11787)
+++ branches/HORNETQ-316/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java 2011-11-29 22:17:00 UTC (rev 11788)
@@ -22,6 +22,7 @@
import junit.framework.Assert;
+import org.hornetq.api.core.DiscoveryGroupConfiguration;
import org.hornetq.api.core.Pair;
import org.hornetq.api.core.TransportConfiguration;
import org.hornetq.api.core.client.ClientSession;
@@ -74,7 +75,7 @@
CoreMessagingProxy proxy = createProxy(bridgeConfig.getName());
Assert.assertEquals(bridgeConfig.getName(), (String)proxy.retrieveAttributeValue("name"));
- Assert.assertEquals(bridgeConfig.getDiscoveryGroupName(),
+ Assert.assertEquals(bridgeConfig.getDiscoveryGroupConfiguration().getName(),
(String)proxy.retrieveAttributeValue("discoveryGroupName"));
Assert.assertEquals(bridgeConfig.getQueueName(), (String)proxy.retrieveAttributeValue("queueName"));
Assert.assertEquals(bridgeConfig.getForwardingAddress(),
@@ -137,6 +138,7 @@
RandomUtil.randomString(),
null,
false);
+ DiscoveryGroupConfiguration dg = createStaticDiscoveryGroupConfiguration(connectorConfig);
List<String> connectors = new ArrayList<String>();
connectors.add(connectorConfig.getName());
bridgeConfig = new BridgeConfiguration(RandomUtil.randomString(),
@@ -152,7 +154,7 @@
RandomUtil.randomPositiveInt(),
RandomUtil.randomBoolean(),
RandomUtil.randomPositiveInt(),
- connectors,
+ dg,
false,
ConfigurationImpl.DEFAULT_CLUSTER_USER,
ConfigurationImpl.DEFAULT_CLUSTER_PASSWORD);
@@ -171,6 +173,7 @@
conf_0.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName()));
conf_0.getConnectorConfigurations().put(connectorConfig.getName(), connectorConfig);
conf_0.getQueueConfigurations().add(sourceQueueConfig);
+ conf_0.getDiscoveryGroupConfigurations().put(dg.getName(), dg);
conf_0.getBridgeConfigurations().add(bridgeConfig);
server_1 = HornetQServers.newHornetQServer(conf_1, MBeanServerFactory.createMBeanServer(), false);
Modified: branches/HORNETQ-316/tests/unit-tests/src/test/java/org/hornetq/tests/unit/ra/HornetQResourceAdapterConfigTest.java
===================================================================
--- branches/HORNETQ-316/tests/unit-tests/src/test/java/org/hornetq/tests/unit/ra/HornetQResourceAdapterConfigTest.java 2011-11-29 15:31:22 UTC (rev 11787)
+++ branches/HORNETQ-316/tests/unit-tests/src/test/java/org/hornetq/tests/unit/ra/HornetQResourceAdapterConfigTest.java 2011-11-29 22:17:00 UTC (rev 11788)
@@ -290,6 +290,12 @@
" <config-property-name>SetupAttempts</config-property-name>\n" +
" <config-property-type>int</config-property-type>\n" +
" <config-property-value></config-property-value>\n" +
+ " </config-property>\n" +
+ " <config-property>\n" +
+ " <description>Parameters for another discovery strategy plugin like hornetq-jgroups-discovery</description>\n" +
+ " <config-property-name>DiscoveryPluginProperties</config-property-name>\n" +
+ " <config-property-type>java.lang.String</config-property-type>\n" +
+ " <config-property-value></config-property-value>\n" +
" </config-property>";
More information about the hornetq-commits
mailing list