Author: jmesnil Date: 2010-07-19 11:42:17 -0400 (Mon, 19 Jul 2010) New Revision: 9421 Modified: branches/2_2_0_HA_Improvements/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java branches/2_2_0_HA_Improvements/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java branches/2_2_0_HA_Improvements/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java Log: HA refactoring * fix JMS tests compilation Modified: branches/2_2_0_HA_Improvements/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java =================================================================== --- branches/2_2_0_HA_Improvements/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java 2010-07-19 14:28:26 UTC (rev 9420) +++ branches/2_2_0_HA_Improvements/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java 2010-07-19 15:42:17 UTC (rev 9421) @@ -21,9 +21,9 @@ import javax.jms.MessageProducer; import javax.jms.Session; -import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; +import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; import org.hornetq.jms.client.HornetQConnectionFactory; /** @@ -58,13 +58,11 @@ List<String> bindings = new ArrayList<String>(); bindings.add("StrictTCKConnectionFactory"); - List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs = new ArrayList<Pair<TransportConfiguration, TransportConfiguration>>(); + List<TransportConfiguration> connectorConfigs = new ArrayList<TransportConfiguration>(); + connectorConfigs.add(new TransportConfiguration(NettyConnectorFactory.class.getName())); - connectorConfigs.add(new Pair<TransportConfiguration, TransportConfiguration>(new TransportConfiguration("org.hornetq.core.remoting.impl.netty.NettyConnectorFactory"), - null)); - - getJmsServerManager().createConnectionFactory("StrictTCKConnectionFactory", + false, connectorConfigs, null, HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, Modified: branches/2_2_0_HA_Improvements/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java =================================================================== --- branches/2_2_0_HA_Improvements/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java 2010-07-19 14:28:26 UTC (rev 9420) +++ branches/2_2_0_HA_Improvements/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java 2010-07-19 15:42:17 UTC (rev 9421) @@ -18,9 +18,9 @@ import javax.naming.InitialContext; -import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; +import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; import org.hornetq.jms.client.HornetQConnectionFactory; /** @@ -54,13 +54,12 @@ // All jms tests should use a specific cg which has blockOnAcknowledge = true and // both np and p messages are sent synchronously - List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs = new ArrayList<Pair<TransportConfiguration, TransportConfiguration>>(); + List<TransportConfiguration> connectorConfigs = new ArrayList<TransportConfiguration>(); + connectorConfigs.add(new TransportConfiguration(NettyConnectorFactory.class.getName())); - connectorConfigs.add(new Pair<TransportConfiguration, TransportConfiguration>(new TransportConfiguration("org.hornetq.core.remoting.impl.netty.NettyConnectorFactory"), - null)); - getJmsServerManager().createConnectionFactory("testsuitecf", + false, connectorConfigs, null, HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, Modified: branches/2_2_0_HA_Improvements/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java =================================================================== --- branches/2_2_0_HA_Improvements/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java 2010-07-19 14:28:26 UTC (rev 9420) +++ branches/2_2_0_HA_Improvements/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java 2010-07-19 15:42:17 UTC (rev 9421) @@ -26,7 +26,6 @@ import javax.management.ObjectName; import javax.naming.InitialContext; -import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.management.ObjectNameBuilder; @@ -34,6 +33,7 @@ import org.hornetq.api.jms.management.JMSQueueControl; import org.hornetq.api.jms.management.TopicControl; import org.hornetq.core.logging.Logger; +import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; import org.hornetq.core.security.Role; import org.hornetq.core.server.HornetQServer; import org.hornetq.integration.bootstrap.HornetQBootstrapServer; @@ -285,12 +285,11 @@ final boolean blockOnAcknowledge, final String ... jndiBindings) throws Exception { - List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs = new ArrayList<Pair<TransportConfiguration, TransportConfiguration>>(); + List<TransportConfiguration> connectorConfigs = new ArrayList<TransportConfiguration>(); + connectorConfigs.add(new TransportConfiguration(NettyConnectorFactory.class.getName())); - connectorConfigs.add(new Pair<TransportConfiguration, TransportConfiguration>(new TransportConfiguration("org.hornetq.core.remoting.impl.netty.NettyConnectorFactory"), - null)); - getJMSServerManager().createConnectionFactory(objectName, + false, connectorConfigs, clientId, HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD,