http://git-wip-us.apache.org/repos/asf/activemq-6/blob/177e6820/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java index cc9d158..edccaf9 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java +++ b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java @@ -13,11 +13,12 @@ package org.hornetq.tests.integration.cluster.bridge; import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.hornetq.api.config.HornetQDefaultConfiguration; import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientConsumer; @@ -36,6 +37,8 @@ import org.hornetq.tests.integration.IntegrationTestLogger; import org.hornetq.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; /** * A BridgeStartTest @@ -44,13 +47,31 @@ import org.junit.Test; * <p/> * Created 14 Jan 2009 14:05:01 */ +@RunWith(value = Parameterized.class) public class BridgeStartTest extends ServiceTestBase { + + @Parameterized.Parameters(name = "isNetty={0}") + public static Collection getParameters() + { + return Arrays.asList(new Object[][]{ + {true}, + {false} + }); + } + + public BridgeStartTest(boolean netty) + { + this.netty = netty; + } + + private final boolean netty; + private static final IntegrationTestLogger log = IntegrationTestLogger.LOGGER; protected boolean isNetty() { - return false; + return netty; } private String getConnector() @@ -98,37 +119,30 @@ public class BridgeStartTest extends ServiceTestBase final String bridgeName = "bridge1"; - BridgeConfiguration bridgeConfiguration = new BridgeConfiguration(bridgeName, - queueName0, - forwardAddress, - null, - null, - HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - HornetQClient.DEFAULT_CONNECTION_TTL, - 1000, - HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, - 1d, - -1, - 0, - 0, - true, - 1024, - staticConnectors, - false, - HornetQDefaultConfiguration.getDefaultClusterUser(), - HornetQDefaultConfiguration.getDefaultClusterPassword()); + BridgeConfiguration bridgeConfiguration = new BridgeConfiguration() + .setName(bridgeName) + .setQueueName(queueName0) + .setForwardingAddress(forwardAddress) + .setRetryInterval(1000) + .setReconnectAttempts(0) + .setReconnectAttemptsOnSameNode(0) + .setConfirmationWindowSize(1024) + .setStaticConnectors(staticConnectors); List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); - CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration(testAddress, queueName0, null, true); + CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration() + .setAddress(testAddress) + .setName(queueName0); List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); - CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration(forwardAddress, queueName1, null, true); + CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration() + .setAddress(forwardAddress) + .setName(queueName1); List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); @@ -272,37 +286,30 @@ public class BridgeStartTest extends ServiceTestBase final String bridgeName = "bridge1"; - BridgeConfiguration bridgeConfiguration = new BridgeConfiguration(bridgeName, - queueName0, - forwardAddress, - null, - null, - HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - HornetQClient.DEFAULT_CONNECTION_TTL, - 500, - HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, - 1d, - -1, - -1, - 0, - true, - 1024, - staticConnectors, - false, - HornetQDefaultConfiguration.getDefaultClusterUser(), - HornetQDefaultConfiguration.getDefaultClusterPassword()); + BridgeConfiguration bridgeConfiguration = new BridgeConfiguration() + .setName(bridgeName) + .setQueueName(queueName0) + .setForwardingAddress(forwardAddress) + .setRetryInterval(500) + .setReconnectAttempts(-1) + .setReconnectAttemptsOnSameNode(0) + .setConfirmationWindowSize(1024) + .setStaticConnectors(staticConnectors); List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); - CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration(testAddress, queueName0, null, true); + CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration() + .setAddress(testAddress) + .setName(queueName0); List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); - CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration(forwardAddress, queueName1, null, true); + CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration() + .setAddress(forwardAddress) + .setName(queueName1); List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); @@ -492,37 +499,31 @@ public class BridgeStartTest extends ServiceTestBase final String bridgeName = "bridge1"; - BridgeConfiguration bridgeConfiguration = new BridgeConfiguration(bridgeName, - queueName0, - forwardAddress, - null, - null, - HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - HornetQClient.DEFAULT_CONNECTION_TTL, - 1000, - HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, - 1d, - -1, - 0, - 0, - false, - 1024, - staticConnectors, - false, - HornetQDefaultConfiguration.getDefaultClusterUser(), - HornetQDefaultConfiguration.getDefaultClusterPassword()); + BridgeConfiguration bridgeConfiguration = new BridgeConfiguration() + .setName(bridgeName) + .setQueueName(queueName0) + .setForwardingAddress(forwardAddress) + .setRetryInterval(1000) + .setReconnectAttempts(0) + .setReconnectAttemptsOnSameNode(0) + .setUseDuplicateDetection(false) + .setConfirmationWindowSize(1024) + .setStaticConnectors(staticConnectors); List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); - CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration(testAddress, queueName0, null, true); + CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration() + .setAddress(testAddress) + .setName(queueName0); List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); - CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration(forwardAddress, queueName1, null, true); + CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration() + .setAddress(forwardAddress) + .setName(queueName1); List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); @@ -652,37 +653,30 @@ public class BridgeStartTest extends ServiceTestBase final String bridgeName = "bridge1"; - BridgeConfiguration bridgeConfiguration = new BridgeConfiguration(bridgeName, - queueName0, - forwardAddress, - null, - null, - HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - HornetQClient.DEFAULT_CONNECTION_TTL, - 1000, - HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, - 1d, - -1, - 1, - 0, - true, - 1024, - staticConnectors, - false, - HornetQDefaultConfiguration.getDefaultClusterUser(), - HornetQDefaultConfiguration.getDefaultClusterPassword()); + BridgeConfiguration bridgeConfiguration = new BridgeConfiguration() + .setName(bridgeName) + .setQueueName(queueName0) + .setForwardingAddress(forwardAddress) + .setRetryInterval(1000) + .setReconnectAttempts(1) + .setReconnectAttemptsOnSameNode(0) + .setConfirmationWindowSize(1024) + .setStaticConnectors(staticConnectors); List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); - CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration(testAddress, queueName0, null, true); + CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration() + .setAddress(testAddress) + .setName(queueName0); List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); - CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration(forwardAddress, queueName1, null, true); + CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration() + .setAddress(forwardAddress) + .setName(queueName1); List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1);
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/177e6820/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java index b6da77a..f2f0966 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java +++ b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java @@ -13,6 +13,8 @@ package org.hornetq.tests.integration.cluster.bridge; import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -21,7 +23,6 @@ import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.config.HornetQDefaultConfiguration; import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Interceptor; @@ -40,6 +41,7 @@ import org.hornetq.core.postoffice.DuplicateIDCache; import org.hornetq.core.postoffice.impl.PostOfficeImpl; import org.hornetq.core.protocol.core.Packet; import org.hornetq.core.protocol.core.impl.wireformat.SessionSendContinuationMessage; +import org.hornetq.core.protocol.core.impl.wireformat.SessionSendLargeMessage; import org.hornetq.core.protocol.core.impl.wireformat.SessionSendMessage; import org.hornetq.core.remoting.impl.invm.TransportConstants; import org.hornetq.core.server.HornetQServer; @@ -56,6 +58,8 @@ import org.hornetq.utils.ReusableLatch; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; /** * A JMSBridgeTest @@ -65,6 +69,7 @@ import org.junit.Test; * <p/> * Created 14 Jan 2009 14:05:01 */ +@RunWith(value = Parameterized.class) public class BridgeTest extends ServiceTestBase { @@ -72,9 +77,26 @@ public class BridgeTest extends ServiceTestBase private HornetQServer server1; private ServerLocator locator; + private final boolean netty; + + + @Parameterized.Parameters(name = "isNetty={0}") + public static Collection getParameters() + { + return Arrays.asList(new Object[][]{ + {true}, + {false} + }); + } + + public BridgeTest(boolean isNetty) + { + this.netty = isNetty; + } + protected boolean isNetty() { - return false; + return netty; } @@ -152,39 +174,30 @@ public class BridgeTest extends ServiceTestBase ArrayList<String> connectorConfig = new ArrayList<String>(); connectorConfig.add(server1tc.getName()); - BridgeConfiguration bridgeConfiguration = new BridgeConfiguration("bridge1", - queueName0, - forwardAddress, - null, - null, - HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - HornetQClient.DEFAULT_CONNECTION_TTL, - 1000, - HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, - 1d, - -1, - -1, - -1, - false, - // Choose confirmation size to make sure acks - // are sent - numMessages * messageSize / 2, - connectorConfig, - false, - HornetQDefaultConfiguration.getDefaultClusterUser(), - HornetQDefaultConfiguration.getDefaultClusterPassword()); + BridgeConfiguration bridgeConfiguration = new BridgeConfiguration() + .setName("bridge1") + .setQueueName(queueName0) + .setForwardingAddress(forwardAddress) + .setRetryInterval(1000) + .setReconnectAttemptsOnSameNode(-1) + .setUseDuplicateDetection(false) + .setConfirmationWindowSize(numMessages * messageSize / 2) + .setStaticConnectors(connectorConfig); List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); - CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration(testAddress, queueName0, null, true); + CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration() + .setAddress(testAddress) + .setName(queueName0); List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); - CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration(forwardAddress, queueName1, null, true); + CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration() + .setAddress(forwardAddress) + .setName(queueName1); List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); @@ -228,7 +241,7 @@ public class BridgeTest extends ServiceTestBase for (int i = 0; i < numMessages; i++) { - ClientMessage message = consumer1.receive(200); + ClientMessage message = consumer1.receive(5000); Assert.assertNotNull(message); @@ -290,6 +303,7 @@ public class BridgeTest extends ServiceTestBase public boolean intercept(Packet packet, RemotingConnection connection) throws HornetQException { if (ignoreSends && packet instanceof SessionSendMessage || + ignoreSends && packet instanceof SessionSendLargeMessage || ignoreSends && packet instanceof SessionSendContinuationMessage && !((SessionSendContinuationMessage) packet).isContinues()) { System.out.println("Ignored"); @@ -298,6 +312,7 @@ public class BridgeTest extends ServiceTestBase } else { + System.out.println(packet); return true; } } @@ -331,28 +346,16 @@ public class BridgeTest extends ServiceTestBase ArrayList<String> connectorConfig = new ArrayList<String>(); connectorConfig.add(server1tc.getName()); - BridgeConfiguration bridgeConfiguration = new BridgeConfiguration("bridge1", - queueName0, - forwardAddress, - null, - null, - HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - HornetQClient.DEFAULT_CONNECTION_TTL, - 1000, - HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, - 1d, - -1, - -1, - -1, - false, - // Choose confirmation size to make sure acks - // are sent - numMessages * messageSize / 2, - connectorConfig, - false, - HornetQDefaultConfiguration.getDefaultClusterUser(), - HornetQDefaultConfiguration.getDefaultClusterPassword()); + BridgeConfiguration bridgeConfiguration = new BridgeConfiguration() + .setName("bridge1") + .setQueueName(queueName0) + .setForwardingAddress(forwardAddress) + .setRetryInterval(1000) + .setReconnectAttempts(-1) + .setReconnectAttemptsOnSameNode(-1) + .setUseDuplicateDetection(false) + .setConfirmationWindowSize(numMessages * messageSize / 2) + .setStaticConnectors(connectorConfig); bridgeConfiguration.setCallTimeout(500); @@ -360,12 +363,16 @@ public class BridgeTest extends ServiceTestBase bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); - CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration(testAddress, queueName0, null, true); + CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration() + .setAddress(testAddress) + .setName(queueName0); List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); - CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration(forwardAddress, queueName1, null, true); + CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration() + .setAddress(forwardAddress) + .setName(queueName1); List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); @@ -522,37 +529,31 @@ public class BridgeTest extends ServiceTestBase ArrayList<String> staticConnectors = new ArrayList<String>(); staticConnectors.add(server1tc.getName()); - BridgeConfiguration bridgeConfiguration = new BridgeConfiguration("bridge1", - queueName0, - forwardAddress, - filterString, - null, - HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - HornetQClient.DEFAULT_CONNECTION_TTL, - 1000, - HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, - 1d, - -1, - -1, - -1, - false, - 0, - staticConnectors, - false, - HornetQDefaultConfiguration.getDefaultClusterUser(), - HornetQDefaultConfiguration.getDefaultClusterPassword()); + BridgeConfiguration bridgeConfiguration = new BridgeConfiguration() + .setName("bridge1") + .setQueueName(queueName0) + .setForwardingAddress(forwardAddress) + .setFilterString(filterString) + .setRetryInterval(1000) + .setReconnectAttemptsOnSameNode(-1) + .setUseDuplicateDetection(false) + .setConfirmationWindowSize(0) + .setStaticConnectors(staticConnectors); List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); - CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration(testAddress, queueName0, null, true); + CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration() + .setAddress(testAddress) + .setName(queueName0); List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); - CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration(forwardAddress, queueName1, null, true); + CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration() + .setAddress(forwardAddress) + .setName(queueName1); List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); @@ -684,32 +685,23 @@ public class BridgeTest extends ServiceTestBase ArrayList<String> staticConnectors = new ArrayList<String>(); staticConnectors.add(server1tc.getName()); - BridgeConfiguration bridgeConfiguration = new BridgeConfiguration("bridge1", - queueName0, - forwardAddress, - null, - null, - HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - HornetQClient.DEFAULT_CONNECTION_TTL, - 100, - HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, - 1d, - -1, - -1, - -1, - false, - 1024, - staticConnectors, - false, - HornetQDefaultConfiguration.getDefaultClusterUser(), - HornetQDefaultConfiguration.getDefaultClusterPassword()); + BridgeConfiguration bridgeConfiguration = new BridgeConfiguration() + .setName("bridge1") + .setQueueName(queueName0) + .setForwardingAddress(forwardAddress) + .setRetryInterval(100) + .setReconnectAttemptsOnSameNode(-1) + .setUseDuplicateDetection(false) + .setConfirmationWindowSize(1024) + .setStaticConnectors(staticConnectors); List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); - CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration(testAddress, queueName0, null, true); + CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration() + .setAddress(testAddress) + .setName(queueName0); List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); @@ -817,32 +809,22 @@ public class BridgeTest extends ServiceTestBase ArrayList<String> staticConnectors = new ArrayList<String>(); staticConnectors.add(server1tc.getName()); - BridgeConfiguration bridgeConfiguration = new BridgeConfiguration("bridge1", - queueName0, - forwardAddress, - null, - null, - HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - HornetQClient.DEFAULT_CONNECTION_TTL, - 100, - HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, - 1d, - -1, - -1, - -1, - true, - 0, - staticConnectors, - false, - HornetQDefaultConfiguration.getDefaultClusterUser(), - HornetQDefaultConfiguration.getDefaultClusterPassword()); + BridgeConfiguration bridgeConfiguration = new BridgeConfiguration() + .setName("bridge1") + .setQueueName(queueName0) + .setForwardingAddress(forwardAddress) + .setRetryInterval(100) + .setReconnectAttemptsOnSameNode(-1) + .setConfirmationWindowSize(0) + .setStaticConnectors(staticConnectors); List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); - CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration(testAddress, queueName0, null, true); + CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration() + .setAddress(testAddress) + .setName(queueName0); List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); @@ -998,37 +980,32 @@ public class BridgeTest extends ServiceTestBase ArrayList<String> staticConnectors = new ArrayList<String>(); staticConnectors.add(server1tc.getName()); - BridgeConfiguration bridgeConfiguration = new BridgeConfiguration("bridge1", - queueName0, - forwardAddress, - null, - SimpleTransformer.class.getName(), - HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - HornetQClient.DEFAULT_CONNECTION_TTL, - 1000, - HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, - 1d, - -1, - -1, - -1, - false, - 1024, - staticConnectors, - false, - HornetQDefaultConfiguration.getDefaultClusterUser(), - HornetQDefaultConfiguration.getDefaultClusterPassword()); + BridgeConfiguration bridgeConfiguration = new BridgeConfiguration() + .setName("bridge1") + .setQueueName(queueName0) + .setForwardingAddress(forwardAddress) + .setTransformerClassName(SimpleTransformer.class.getName()) + .setRetryInterval(1000) + .setReconnectAttemptsOnSameNode(-1) + .setUseDuplicateDetection(false) + .setConfirmationWindowSize(1024) + .setStaticConnectors(staticConnectors); + List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); - CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration(testAddress, queueName0, null, true); + CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration() + .setAddress(testAddress) + .setName(queueName0); List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); - CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration(forwardAddress, queueName1, null, true); + CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration() + .setAddress(forwardAddress) + .setName(queueName1); List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); @@ -1126,37 +1103,30 @@ public class BridgeTest extends ServiceTestBase ArrayList<String> staticConnectors = new ArrayList<String>(); staticConnectors.add(server1tc.getName()); - BridgeConfiguration bridgeConfiguration = new BridgeConfiguration("bridge1", - queueName0, - forwardAddress, - null, - null, - HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - HornetQClient.DEFAULT_CONNECTION_TTL, - 1000, - HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, - 1d, - -1, - -1, - -1, - false, - 0, - staticConnectors, - false, - HornetQDefaultConfiguration.getDefaultClusterUser(), - HornetQDefaultConfiguration.getDefaultClusterPassword()); + BridgeConfiguration bridgeConfiguration = new BridgeConfiguration() + .setName("bridge1") + .setQueueName(queueName0) + .setForwardingAddress(forwardAddress) + .setRetryInterval(1000) + .setReconnectAttemptsOnSameNode(-1) + .setUseDuplicateDetection(false) + .setConfirmationWindowSize(0) + .setStaticConnectors(staticConnectors); List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); - CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration(testAddress, queueName0, null, true); + CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration() + .setAddress(testAddress) + .setName(queueName0); List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); - CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration(forwardAddress, queueName1, null, true); + CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration() + .setAddress(forwardAddress) + .setName(queueName1); List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); @@ -1380,26 +1350,15 @@ public class BridgeTest extends ServiceTestBase ArrayList<String> staticConnectors = new ArrayList<String>(); staticConnectors.add(server1tc.getName()); - BridgeConfiguration bridgeConfiguration = new BridgeConfiguration("bridge1", - queueName0, - forwardAddress, - null, - null, - HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - HornetQClient.DEFAULT_CONNECTION_TTL, - 1, - HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, - 1d, - -1, - -1, - -1, - false, - 1, - staticConnectors, - false, - HornetQDefaultConfiguration.getDefaultClusterUser(), - HornetQDefaultConfiguration.getDefaultClusterPassword()); + BridgeConfiguration bridgeConfiguration = new BridgeConfiguration() + .setName("bridge1") + .setQueueName(queueName0) + .setForwardingAddress(forwardAddress) + .setRetryInterval(1) + .setReconnectAttemptsOnSameNode(-1) + .setUseDuplicateDetection(false) + .setConfirmationWindowSize(1) + .setStaticConnectors(staticConnectors); bridgeConfiguration.setCallTimeout(1000); @@ -1409,12 +1368,16 @@ public class BridgeTest extends ServiceTestBase bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); - CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration(testAddress, queueName0, null, true); + CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration() + .setAddress(testAddress) + .setName(queueName0); List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); - CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration(forwardAddress, queueName1, null, true); + CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration() + .setAddress(forwardAddress) + .setName(queueName1); List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); @@ -1671,37 +1634,30 @@ public class BridgeTest extends ServiceTestBase ArrayList<String> staticConnectors = new ArrayList<String>(); staticConnectors.add(server1tc.getName()); - BridgeConfiguration bridgeConfiguration = new BridgeConfiguration("bridge1", - queueName0, - forwardAddress, - null, - null, - HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - HornetQClient.DEFAULT_CONNECTION_TTL, - 1000, - HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, - 1d, - -1, - -1, - -1, - false, - 1024, - staticConnectors, - false, - HornetQDefaultConfiguration.getDefaultClusterUser(), - HornetQDefaultConfiguration.getDefaultClusterPassword()); + BridgeConfiguration bridgeConfiguration = new BridgeConfiguration() + .setName("bridge1") + .setQueueName(queueName0) + .setForwardingAddress(forwardAddress) + .setRetryInterval(1000) + .setReconnectAttemptsOnSameNode(-1) + .setUseDuplicateDetection(false) + .setConfirmationWindowSize(1024) + .setStaticConnectors(staticConnectors); List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); - CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration(testAddress, queueName0, null, true); + CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration() + .setAddress(testAddress) + .setName(queueName0); List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); - CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration(forwardAddress, queueName1, null, true); + CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration() + .setAddress(forwardAddress) + .setName(queueName1); List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); @@ -1827,43 +1783,31 @@ public class BridgeTest extends ServiceTestBase ArrayList<String> staticConnectors = new ArrayList<String>(); staticConnectors.add(server1tc.getName()); - BridgeConfiguration bridgeConfiguration = new BridgeConfiguration("bridge1", queueName0, null, // pass a null - // forwarding - // address to - // use messages' - // original - // address - null, - null, - HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - HornetQClient.DEFAULT_CONNECTION_TTL, - 1000, - HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, - 1d, - -1, - -1, - -1, - false, - // Choose confirmation size to make sure acks - // are sent - numMessages * messageSize / 2, - staticConnectors, - false, - HornetQDefaultConfiguration.getDefaultClusterUser(), - HornetQDefaultConfiguration.getDefaultClusterPassword()); + // do not set forwarding address (defaults to null) to use messages' original address + BridgeConfiguration bridgeConfiguration = new BridgeConfiguration() + .setName("bridge1") + .setQueueName(queueName0) + .setRetryInterval(1000) + .setReconnectAttemptsOnSameNode(-1) + .setUseDuplicateDetection(false) + .setConfirmationWindowSize(numMessages * messageSize / 2) + .setStaticConnectors(staticConnectors); List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); - CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration(testAddress, queueName0, null, true); + CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration() + .setAddress(testAddress) + .setName(queueName0); List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); // on server #1, we bind queueName1 to same address testAddress - CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration(testAddress, queueName1, null, true); + CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration() + .setAddress(testAddress) + .setName(queueName1); List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/177e6820/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeTestBase.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeTestBase.java b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeTestBase.java index 12518fe..316e98e 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeTestBase.java +++ b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeTestBase.java @@ -17,11 +17,12 @@ import java.util.concurrent.TimeUnit; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.ha.SharedStoreMasterPolicyConfiguration; +import org.hornetq.core.config.ha.SharedStoreSlavePolicyConfiguration; import org.hornetq.core.remoting.impl.invm.InVMConnector; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; import org.hornetq.core.server.NodeManager; -import org.hornetq.core.server.cluster.ha.HAPolicy; import org.hornetq.tests.util.InVMNodeManagerServer; import org.hornetq.tests.util.UnitTestCase; import org.junit.After; @@ -60,30 +61,32 @@ public abstract class BridgeTestBase extends UnitTestCase final boolean netty, final NodeManager nodeManager) throws Exception { - Configuration serviceConf = createBasicConfig(); - serviceConf.setSecurityEnabled(false); - serviceConf.getHAPolicy().setPolicyType(HAPolicy.POLICY_TYPE.SHARED_STORE); - serviceConf.setJournalType(getDefaultJournalType()); - serviceConf.setBindingsDirectory(getBindingsDir(id, false)); - serviceConf.setJournalMinFiles(2); - serviceConf.setJournalDirectory(getJournalDir(id, false)); - serviceConf.setPagingDirectory(getPageDir(id, false)); - serviceConf.setLargeMessagesDirectory(getLargeMessagesDir(id, false)); - // these tests don't need any big storage so limiting the size of the journal files to speed up the test - serviceConf.setJournalFileSize(100 * 1024); + TransportConfiguration tc = new TransportConfiguration(); if (netty) { params.put(org.hornetq.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, org.hornetq.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + id); - serviceConf.getAcceptorConfigurations().add(new TransportConfiguration(NETTY_ACCEPTOR_FACTORY, params)); + tc = new TransportConfiguration(NETTY_ACCEPTOR_FACTORY, params); } else { params.put(org.hornetq.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, id); - serviceConf.getAcceptorConfigurations().add(new TransportConfiguration(INVM_ACCEPTOR_FACTORY, params)); + tc = new TransportConfiguration(INVM_ACCEPTOR_FACTORY, params); } + Configuration serviceConf = createBasicConfig() + .setJournalType(getDefaultJournalType()) + .setBindingsDirectory(getBindingsDir(id, false)) + .setJournalMinFiles(2) + .setJournalDirectory(getJournalDir(id, false)) + .setPagingDirectory(getPageDir(id, false)) + .setLargeMessagesDirectory(getLargeMessagesDir(id, false)) + // these tests don't need any big storage so limiting the size of the journal files to speed up the test + .setJournalFileSize(100 * 1024) + .addAcceptorConfiguration(tc) + .setHAPolicyConfiguration(new SharedStoreMasterPolicyConfiguration()); + HornetQServer service; if (nodeManager == null) { @@ -93,6 +96,7 @@ public abstract class BridgeTestBase extends UnitTestCase { service = new InVMNodeManagerServer(serviceConf, nodeManager); } + return addServer(service); } @@ -102,30 +106,33 @@ public abstract class BridgeTestBase extends UnitTestCase final int liveId, final NodeManager nodeManager) throws Exception { - Configuration serviceConf = createBasicConfig(); - serviceConf.setSecurityEnabled(false); - serviceConf.getHAPolicy().setPolicyType(HAPolicy.POLICY_TYPE.BACKUP_SHARED_STORE); - serviceConf.setJournalType(getDefaultJournalType()); - serviceConf.setBindingsDirectory(getBindingsDir(liveId, false)); - serviceConf.setJournalMinFiles(2); - serviceConf.setJournalDirectory(getJournalDir(liveId, false)); - serviceConf.setPagingDirectory(getPageDir(liveId, false)); - serviceConf.setLargeMessagesDirectory(getLargeMessagesDir(liveId, false)); - // these tests don't need any big storage so limiting the size of the journal files to speed up the test - serviceConf.setJournalFileSize(100 * 1024); + TransportConfiguration tc = new TransportConfiguration(); if (netty) { params.put(org.hornetq.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, org.hornetq.core.remoting.impl.netty.TransportConstants.DEFAULT_PORT + id); - serviceConf.getAcceptorConfigurations().add(new TransportConfiguration(NETTY_ACCEPTOR_FACTORY, params)); + tc = new TransportConfiguration(NETTY_ACCEPTOR_FACTORY, params); } else { params.put(org.hornetq.core.remoting.impl.invm.TransportConstants.SERVER_ID_PROP_NAME, id); - serviceConf.getAcceptorConfigurations().add(new TransportConfiguration(INVM_ACCEPTOR_FACTORY, params)); + tc = new TransportConfiguration(INVM_ACCEPTOR_FACTORY, params); } + + Configuration serviceConf = createBasicConfig() + .setJournalType(getDefaultJournalType()) + .setBindingsDirectory(getBindingsDir(liveId, false)) + .setJournalMinFiles(2) + .setJournalDirectory(getJournalDir(liveId, false)) + .setPagingDirectory(getPageDir(liveId, false)) + .setLargeMessagesDirectory(getLargeMessagesDir(liveId, false)) + // these tests don't need any big storage so limiting the size of the journal files to speed up the test + .setJournalFileSize(100 * 1024) + .addAcceptorConfiguration(tc) + .setHAPolicyConfiguration(new SharedStoreSlavePolicyConfiguration()); + HornetQServer service; if (nodeManager == null) { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/177e6820/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java index 1fa4feb..c904484 100644 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java +++ b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java @@ -13,11 +13,12 @@ package org.hornetq.tests.integration.cluster.bridge; import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.hornetq.api.config.HornetQDefaultConfiguration; import org.hornetq.api.core.BroadcastGroupConfiguration; import org.hornetq.api.core.DiscoveryGroupConfiguration; import org.hornetq.api.core.SimpleString; @@ -40,20 +41,42 @@ import org.hornetq.core.server.cluster.Bridge; import org.hornetq.tests.util.ServiceTestBase; import org.junit.Assert; import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; /** * A BridgeWithDiscoveryGroupStartTest * * @author <a href="mailto:[email protected]";>Jeff Mesnil</a> */ +@RunWith(value = Parameterized.class) public class BridgeWithDiscoveryGroupStartTest extends ServiceTestBase { + @Parameterized.Parameters(name = "isNetty={0}") + public static Collection getParameters() + { + return Arrays.asList(new Object[][]{ + {true}, + {false} + }); + } + + public BridgeWithDiscoveryGroupStartTest(boolean netty) + { + this.netty = netty; + } + + + private final boolean netty; + + + private static final int TIMEOUT = 2000; protected boolean isNetty() { - return false; + return netty; } @Test @@ -94,16 +117,21 @@ public class BridgeWithDiscoveryGroupStartTest extends ServiceTestBase ArrayList<String> list = new ArrayList<String>(); list.add(server1tc.getName()); - UDPBroadcastGroupConfiguration endpoint = new UDPBroadcastGroupConfiguration(groupAddress, port, null, -1); + UDPBroadcastGroupConfiguration endpoint = new UDPBroadcastGroupConfiguration().setGroupAddress(groupAddress).setGroupPort(port); - BroadcastGroupConfiguration bcConfig = new BroadcastGroupConfiguration("bg1", - 250, - list, - endpoint); + BroadcastGroupConfiguration bcConfig = new BroadcastGroupConfiguration() + .setName("bg1") + .setBroadcastPeriod(250) + .setConnectorInfos(list) + .setEndpointFactoryConfiguration(endpoint); server0.getConfiguration().getBroadcastGroupConfigurations().add(bcConfig); - DiscoveryGroupConfiguration dcConfig = new DiscoveryGroupConfiguration("dg1", 5000, 5000, endpoint); + DiscoveryGroupConfiguration dcConfig = new DiscoveryGroupConfiguration() + .setName("dg1") + .setRefreshTimeout(5000) + .setDiscoveryInitialWaitTimeout(5000) + .setBroadcastEndpointFactoryConfiguration(endpoint); server0.getConfiguration().getDiscoveryGroupConfigurations().put(dcConfig.getName(), dcConfig); @@ -111,37 +139,30 @@ public class BridgeWithDiscoveryGroupStartTest extends ServiceTestBase ArrayList<String> staticConnectors = new ArrayList<String>(); staticConnectors.add(server1tc.getName()); - BridgeConfiguration bridgeConfiguration = new BridgeConfiguration(bridgeName, - queueName0, - forwardAddress, - null, - null, - HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - HornetQClient.DEFAULT_CONNECTION_TTL, - 1000, - HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, - 1d, - -1, - 0, - 0, - true, - 1024, - staticConnectors, - false, - HornetQDefaultConfiguration.getDefaultClusterUser(), - HornetQDefaultConfiguration.getDefaultClusterPassword()); + BridgeConfiguration bridgeConfiguration = new BridgeConfiguration() + .setName(bridgeName) + .setQueueName(queueName0) + .setForwardingAddress(forwardAddress) + .setRetryInterval(1000) + .setReconnectAttempts(0) + .setReconnectAttemptsOnSameNode(0) + .setConfirmationWindowSize(1024) + .setStaticConnectors(staticConnectors); List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); bridgeConfigs.add(bridgeConfiguration); server0.getConfiguration().setBridgeConfigurations(bridgeConfigs); - CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration(testAddress, queueName0, null, true); + CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration() + .setAddress(testAddress) + .setName(queueName0); List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>(); queueConfigs0.add(queueConfig0); server0.getConfiguration().setQueueConfigurations(queueConfigs0); - CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration(forwardAddress, queueName1, null, true); + CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration() + .setAddress(forwardAddress) + .setName(queueName1); List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>(); queueConfigs1.add(queueConfig1); server1.getConfiguration().setQueueConfigurations(queueConfigs1); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/177e6820/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/NettyBridgeReconnectTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/NettyBridgeReconnectTest.java b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/NettyBridgeReconnectTest.java deleted file mode 100644 index 35504cb..0000000 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/NettyBridgeReconnectTest.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat 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.hornetq.tests.integration.cluster.bridge; - -/** - * A NettyBridgeReconnectTest - * - * @author <mailto:[email protected]";>Clebert Suconic</a> - */ -public class NettyBridgeReconnectTest extends BridgeReconnectTest -{ - - @Override - protected boolean isNetty() - { - return true; - } -} http://git-wip-us.apache.org/repos/asf/activemq-6/blob/177e6820/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/NettyBridgeStartTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/NettyBridgeStartTest.java b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/NettyBridgeStartTest.java deleted file mode 100644 index 1356da0..0000000 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/NettyBridgeStartTest.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat 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.hornetq.tests.integration.cluster.bridge; - -/** - * A NettyBridgeStartTest - * - * @author <mailto:[email protected]";>Clebert Suconic</a> - * - * - */ -public class NettyBridgeStartTest extends BridgeStartTest -{ - - @Override - protected boolean isNetty() - { - return true; - } - -} http://git-wip-us.apache.org/repos/asf/activemq-6/blob/177e6820/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/NettyBridgeTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/NettyBridgeTest.java b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/NettyBridgeTest.java deleted file mode 100644 index 73b56c9..0000000 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/NettyBridgeTest.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat 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.hornetq.tests.integration.cluster.bridge; - -/** - * A NettyBridgeTest - * - * @author <mailto:[email protected]";>Clebert Suconic</a> - * - * - */ -public class NettyBridgeTest extends BridgeTest -{ - @Override - protected boolean isNetty() - { - return true; - } - -} http://git-wip-us.apache.org/repos/asf/activemq-6/blob/177e6820/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/NettyBridgeWithDiscoveryGroupStartTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/NettyBridgeWithDiscoveryGroupStartTest.java b/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/NettyBridgeWithDiscoveryGroupStartTest.java deleted file mode 100644 index 5b37eb0..0000000 --- a/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/NettyBridgeWithDiscoveryGroupStartTest.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat 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.hornetq.tests.integration.cluster.bridge; - -/** - * A NettyBridgeWithDiscoveryGroupStartTest - * - * @author <mailto:[email protected]";>Clebert Suconic</a> - * - * - */ -public class NettyBridgeWithDiscoveryGroupStartTest extends BridgeWithDiscoveryGroupStartTest -{ - @Override - protected boolean isNetty() - { - return true; - } -}
