Author: gaohoward Date: 2010-10-10 21:01:04 -0400 (Sun, 10 Oct 2010) New Revision: 9764 Modified: trunk/tests/jms-tests/config/hornetq-jms.xml trunk/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java trunk/tests/jms-tests/src/org/hornetq/jms/tests/ConnectionClosedTest.java trunk/tests/jms-tests/src/org/hornetq/jms/tests/ConnectionFactoryTest.java trunk/tests/jms-tests/src/org/hornetq/jms/tests/ConnectionTest.java trunk/tests/jms-tests/src/org/hornetq/jms/tests/HornetQServerTestCase.java trunk/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java trunk/tests/jms-tests/src/org/hornetq/jms/tests/ReferenceableTest.java trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/JMSXDeliveryCountTest.java trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java trunk/tests/joram-tests/src/org/hornetq/jms/HornetQAdmin.java trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java trunk/tests/src/org/hornetq/tests/integration/jms/bridge/BridgeTestBase.java trunk/tests/src/org/hornetq/tests/integration/jms/bridge/JMSBridgeReconnectionTest.java trunk/tests/src/org/hornetq/tests/integration/jms/bridge/JMSBridgeTest.java trunk/tests/src/org/hornetq/tests/integration/jms/client/AutoGroupingTest.java trunk/tests/src/org/hornetq/tests/integration/jms/client/GroupIDTest.java trunk/tests/src/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java trunk/tests/src/org/hornetq/tests/integration/jms/client/ReSendMessageTest.java trunk/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java trunk/tests/src/org/hornetq/tests/integration/jms/client/TextMessageTest.java trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSUtil.java trunk/tests/src/org/hornetq/tests/integration/stomp/StompTestBase.java trunk/tests/src/org/hornetq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java Log: HORNETQ-515 -- test changes Modified: trunk/tests/jms-tests/config/hornetq-jms.xml =================================================================== --- trunk/tests/jms-tests/config/hornetq-jms.xml 2010-10-11 00:56:51 UTC (rev 9763) +++ trunk/tests/jms-tests/config/hornetq-jms.xml 2010-10-11 01:01:04 UTC (rev 9764) @@ -15,4 +15,112 @@ </entries> </connection-factory> -</configuration> \ No newline at end of file + <connection-factory name="JMSConnectionFactory1"> + <xa>true</xa> + <connectors> + <connector-ref connector-name="netty"/> + </connectors> + <entries> + <entry name="/CF_XA_TRUE"/> + </entries> + </connection-factory> + + <connection-factory name="JMSConnectionFactory2"> + <xa>false</xa> + <connectors> + <connector-ref connector-name="netty"/> + </connectors> + <entries> + <entry name="/CF_XA_FALSE"/> + </entries> + </connection-factory> + + <connection-factory name="JMSConnectionFactory3" signature="generic"> + <connectors> + <connector-ref connector-name="netty"/> + </connectors> + <entries> + <entry name="/CF_GENERIC"/> + </entries> + </connection-factory> + + <connection-factory name="JMSConnectionFactory4" signature="generic"> + <xa>true</xa> + <connectors> + <connector-ref connector-name="netty"/> + </connectors> + <entries> + <entry name="/CF_GENERIC_XA_TRUE"/> + </entries> + </connection-factory> + + <connection-factory name="JMSConnectionFactory5" signature="generic"> + <xa>false</xa> + <connectors> + <connector-ref connector-name="netty"/> + </connectors> + <entries> + <entry name="/CF_GENERIC_XA_FALSE"/> + </entries> + </connection-factory> + + <connection-factory name="JMSConnectionFactory6" signature="queue"> + <connectors> + <connector-ref connector-name="netty"/> + </connectors> + <entries> + <entry name="/CF_QUEUE"/> + </entries> + </connection-factory> + + <connection-factory name="JMSConnectionFactory7" signature="queue"> + <xa>true</xa> + <connectors> + <connector-ref connector-name="netty"/> + </connectors> + <entries> + <entry name="/CF_QUEUE_XA_TRUE"/> + </entries> + </connection-factory> + + <connection-factory name="JMSConnectionFactory8" signature="queue"> + <xa>false</xa> + <connectors> + <connector-ref connector-name="netty"/> + </connectors> + <entries> + <entry name="/CF_QUEUE_XA_FALSE"/> + </entries> + </connection-factory> + + <connection-factory name="JMSConnectionFactory9" signature="topic"> + <connectors> + <connector-ref connector-name="netty"/> + </connectors> + <entries> + <entry name="/CF_TOPIC"/> + </entries> + </connection-factory> + + <connection-factory name="JMSConnectionFactory10" signature="topic"> + <xa>true</xa> + <connectors> + <connector-ref connector-name="netty"/> + </connectors> + <entries> + <entry name="/CF_TOPIC_XA_TRUE"/> + </entries> + </connection-factory> + + <connection-factory name="JMSConnectionFactory11" signature="topic"> + <xa>false</xa> + <connectors> + <connector-ref connector-name="netty"/> + </connectors> + <entries> + <entry name="/CF_TOPIC_XA_FALSE"/> + </entries> + </connection-factory> + +</configuration> + Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java =================================================================== --- trunk/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java 2010-10-11 00:56:51 UTC (rev 9763) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java 2010-10-11 01:01:04 UTC (rev 9764) @@ -25,6 +25,7 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; import org.hornetq.jms.client.HornetQConnectionFactory; +import org.hornetq.jms.server.impl.JMSFactoryType; /** * Safeguards for previously detected TCK failures. @@ -95,6 +96,7 @@ HornetQClient.DEFAULT_FAILOVER_ON_INITIAL_CONNECTION, HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN, null, + JMSFactoryType.CF, "/StrictTCKConnectionFactory"); CTSMiscellaneousTest.cf = (HornetQConnectionFactory)getInitialContext().lookup("/StrictTCKConnectionFactory"); Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/ConnectionClosedTest.java =================================================================== --- trunk/tests/jms-tests/src/org/hornetq/jms/tests/ConnectionClosedTest.java 2010-10-11 00:56:51 UTC (rev 9763) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/ConnectionClosedTest.java 2010-10-11 01:01:04 UTC (rev 9764) @@ -66,8 +66,8 @@ /** See TCK test: topicconntests.connNotStartedTopicTest */ public void testCannotReceiveMessageOnStoppedConnection() throws Exception { - TopicConnection conn1 = ((TopicConnectionFactory)JMSTestCase.cf).createTopicConnection(); - TopicConnection conn2 = ((TopicConnectionFactory)JMSTestCase.cf).createTopicConnection(); + TopicConnection conn1 = ((TopicConnectionFactory)JMSTestCase.topicCf).createTopicConnection(); + TopicConnection conn2 = ((TopicConnectionFactory)JMSTestCase.topicCf).createTopicConnection(); TopicSession sess1 = conn1.createTopicSession(false, Session.AUTO_ACKNOWLEDGE); TopicSession sess2 = conn2.createTopicSession(false, Session.AUTO_ACKNOWLEDGE); Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/ConnectionFactoryTest.java =================================================================== --- trunk/tests/jms-tests/src/org/hornetq/jms/tests/ConnectionFactoryTest.java 2010-10-11 00:56:51 UTC (rev 9763) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/ConnectionFactoryTest.java 2010-10-11 01:01:04 UTC (rev 9764) @@ -28,7 +28,11 @@ import javax.jms.Topic; import javax.jms.TopicConnection; import javax.jms.TopicConnectionFactory; +import javax.jms.XAConnectionFactory; +import javax.jms.XAQueueConnectionFactory; +import javax.jms.XATopicConnectionFactory; +import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.jms.tests.util.ProxyAssertSupport; /** @@ -62,7 +66,7 @@ */ public void testQueueConnectionFactory() throws Exception { - QueueConnectionFactory qcf = (QueueConnectionFactory)JMSTestCase.ic.lookup("/ConnectionFactory"); + QueueConnectionFactory qcf = (QueueConnectionFactory)JMSTestCase.ic.lookup("/CF_QUEUE_XA_FALSE"); QueueConnection qc = qcf.createQueueConnection(); qc.close(); } @@ -73,7 +77,7 @@ */ public void testTopicConnectionFactory() throws Exception { - TopicConnectionFactory qcf = (TopicConnectionFactory)JMSTestCase.ic.lookup("/ConnectionFactory"); + TopicConnectionFactory qcf = (TopicConnectionFactory)JMSTestCase.ic.lookup("/CF_TOPIC_XA_FALSE"); TopicConnection tc = qcf.createTopicConnection(); tc.close(); } @@ -107,7 +111,7 @@ // the ConnectionFactories that ship with HornetQ do not have their clientID // administratively configured. - ConnectionFactory cf = (ConnectionFactory)JMSTestCase.ic.lookup("/ConnectionFactory"); + ConnectionFactory cf = (ConnectionFactory)JMSTestCase.ic.lookup("/CF_XA_FALSE"); Connection c = cf.createConnection(); ProxyAssertSupport.assertNull(c.getClientID()); @@ -120,7 +124,7 @@ // the ConnectionFactories that ship with HornetQ do not have their clientID // administratively configured. - ConnectionFactory cf = (ConnectionFactory)JMSTestCase.ic.lookup("/ConnectionFactory"); + ConnectionFactory cf = (ConnectionFactory)JMSTestCase.ic.lookup("/CF_XA_FALSE"); Connection c = cf.createConnection(); // set the client id immediately after the connection is created @@ -320,7 +324,102 @@ } } + + public void testFactoryTypes() throws Exception + { + HornetQConnectionFactory factory = null; + + factory = (HornetQConnectionFactory)JMSTestCase.ic.lookup("/ConnectionFactory"); + + assertTrue(factory instanceof ConnectionFactory); + assertEquals(1, getTypes(factory)); + + factory = (HornetQConnectionFactory)JMSTestCase.ic.lookup("/CF_XA_TRUE"); + + assertTrue(factory instanceof XAConnectionFactory); + assertEquals(1, getTypes(factory)); + + factory = (HornetQConnectionFactory)JMSTestCase.ic.lookup("/CF_XA_FALSE"); + + assertTrue(factory instanceof ConnectionFactory); + assertEquals(1, getTypes(factory)); + + factory = (HornetQConnectionFactory)JMSTestCase.ic.lookup("/CF_GENERIC"); + + assertTrue(factory instanceof ConnectionFactory); + assertEquals(1, getTypes(factory)); + + factory = (HornetQConnectionFactory)JMSTestCase.ic.lookup("/CF_GENERIC_XA_TRUE"); + + assertTrue(factory instanceof XAConnectionFactory); + assertEquals(1, getTypes(factory)); + + factory = (HornetQConnectionFactory)JMSTestCase.ic.lookup("/CF_GENERIC_XA_FALSE"); + + assertTrue(factory instanceof ConnectionFactory); + assertEquals(1, getTypes(factory)); + + factory = (HornetQConnectionFactory)JMSTestCase.ic.lookup("/CF_QUEUE"); + + assertTrue(factory instanceof QueueConnectionFactory); + assertEquals(2, getTypes(factory)); + + factory = (HornetQConnectionFactory)JMSTestCase.ic.lookup("/CF_QUEUE_XA_TRUE"); + + assertTrue(factory instanceof XAQueueConnectionFactory); + assertEquals(4, getTypes(factory)); + + factory = (HornetQConnectionFactory)JMSTestCase.ic.lookup("/CF_QUEUE_XA_FALSE"); + + assertTrue(factory instanceof QueueConnectionFactory); + assertEquals(2, getTypes(factory)); + + factory = (HornetQConnectionFactory)JMSTestCase.ic.lookup("/CF_TOPIC"); + + assertTrue(factory instanceof TopicConnectionFactory); + assertEquals(2, getTypes(factory)); + + factory = (HornetQConnectionFactory)JMSTestCase.ic.lookup("/CF_TOPIC_XA_TRUE"); + + assertTrue(factory instanceof XATopicConnectionFactory); + assertEquals(4, getTypes(factory)); + + factory = (HornetQConnectionFactory)JMSTestCase.ic.lookup("/CF_TOPIC_XA_FALSE"); + + assertTrue(factory instanceof TopicConnectionFactory); + assertEquals(2, getTypes(factory)); + } + private int getTypes(HornetQConnectionFactory factory) + { + int num = 0; + if (factory instanceof ConnectionFactory) + { + num++; + } + if (factory instanceof XAConnectionFactory) + { + num++; + } + if (factory instanceof QueueConnectionFactory) + { + num++; + } + if (factory instanceof TopicConnectionFactory) + { + num++; + } + if (factory instanceof XAQueueConnectionFactory) + { + num++; + } + if (factory instanceof XATopicConnectionFactory) + { + num++; + } + return num; + } + // Package protected --------------------------------------------- // Protected ----------------------------------------------------- Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/ConnectionTest.java =================================================================== --- trunk/tests/jms-tests/src/org/hornetq/jms/tests/ConnectionTest.java 2010-10-11 00:56:51 UTC (rev 9763) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/ConnectionTest.java 2010-10-11 01:01:04 UTC (rev 9764) @@ -211,7 +211,7 @@ */ public void testQueueConnection1() throws Exception { - QueueConnectionFactory qcf = JMSTestCase.cf; + QueueConnectionFactory qcf = JMSTestCase.queueCf; QueueConnection qc = qcf.createQueueConnection(); @@ -225,7 +225,7 @@ */ public void testQueueConnection2() throws Exception { - TopicConnectionFactory tcf = JMSTestCase.cf; + TopicConnectionFactory tcf = JMSTestCase.topicCf; TopicConnection tc = tcf.createTopicConnection(); @@ -280,7 +280,7 @@ */ public void testDurableSubscriberOnQueueConnection() throws Exception { - QueueConnection queueConnection = ((QueueConnectionFactory)JMSTestCase.cf).createQueueConnection(); + QueueConnection queueConnection = ((QueueConnectionFactory)JMSTestCase.queueCf).createQueueConnection(); try { Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/HornetQServerTestCase.java =================================================================== --- trunk/tests/jms-tests/src/org/hornetq/jms/tests/HornetQServerTestCase.java 2010-10-11 00:56:51 UTC (rev 9763) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/HornetQServerTestCase.java 2010-10-11 01:01:04 UTC (rev 9764) @@ -318,12 +318,12 @@ public TopicConnectionFactory getTopicConnectionFactory() throws Exception { - return (TopicConnectionFactory)getInitialContext().lookup("/ConnectionFactory"); + return (TopicConnectionFactory)getInitialContext().lookup("/CF_TOPIC"); } public XAConnectionFactory getXAConnectionFactory() throws Exception { - return (XAConnectionFactory)getInitialContext().lookup("/ConnectionFactory"); + return (XAConnectionFactory)getInitialContext().lookup("/CF_XA_TRUE"); } public InitialContext getInitialContext(final int serverid) throws Exception Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java =================================================================== --- trunk/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java 2010-10-11 00:56:51 UTC (rev 9763) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java 2010-10-11 01:01:04 UTC (rev 9764) @@ -22,6 +22,10 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; import org.hornetq.jms.client.HornetQConnectionFactory; +import org.hornetq.jms.client.HornetQJMSConnectionFactory; +import org.hornetq.jms.client.HornetQQueueConnectionFactory; +import org.hornetq.jms.client.HornetQTopicConnectionFactory; +import org.hornetq.jms.server.impl.JMSFactoryType; /** * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> @@ -32,8 +36,12 @@ public class JMSTestCase extends HornetQServerTestCase { - protected static HornetQConnectionFactory cf; + protected static HornetQJMSConnectionFactory cf; + protected static HornetQQueueConnectionFactory queueCf; + + protected static HornetQTopicConnectionFactory topicCf; + protected static InitialContext ic; protected static final String defaultConf = "all"; @@ -91,10 +99,81 @@ HornetQClient.DEFAULT_FAILOVER_ON_INITIAL_CONNECTION, HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN, null, + JMSFactoryType.CF, "/testsuitecf"); - JMSTestCase.cf = (HornetQConnectionFactory)getInitialContext().lookup("/testsuitecf"); + getJmsServerManager().createConnectionFactory("testsuitecf_queue", + connectorConfigs, + null, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CALL_TIMEOUT, + HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, + true, + true, + true, + HornetQClient.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_RETRY_INTERVAL, + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, + HornetQClient.DEFAULT_RECONNECT_ATTEMPTS, + HornetQClient.DEFAULT_FAILOVER_ON_INITIAL_CONNECTION, + HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN, + null, + JMSFactoryType.QUEUE_CF, + "/testsuitecf_queue"); + getJmsServerManager().createConnectionFactory("testsuitecf_topic", + connectorConfigs, + null, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CALL_TIMEOUT, + HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, + true, + true, + true, + HornetQClient.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_RETRY_INTERVAL, + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, + HornetQClient.DEFAULT_RECONNECT_ATTEMPTS, + HornetQClient.DEFAULT_FAILOVER_ON_INITIAL_CONNECTION, + HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN, + null, + JMSFactoryType.TOPIC_CF, + "/testsuitecf_topic"); + + JMSTestCase.cf = (HornetQJMSConnectionFactory)getInitialContext().lookup("/testsuitecf"); + JMSTestCase.queueCf = (HornetQQueueConnectionFactory)getInitialContext().lookup("/testsuitecf_queue"); + JMSTestCase.topicCf = (HornetQTopicConnectionFactory)getInitialContext().lookup("/testsuitecf_topic"); + assertRemainingMessages(0); } Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/ReferenceableTest.java =================================================================== --- trunk/tests/jms-tests/src/org/hornetq/jms/tests/ReferenceableTest.java 2010-10-11 00:56:51 UTC (rev 9763) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/ReferenceableTest.java 2010-10-11 01:01:04 UTC (rev 9764) @@ -27,6 +27,7 @@ import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.jms.client.HornetQDestination; +import org.hornetq.jms.client.HornetQJMSConnectionFactory; import org.hornetq.jms.client.HornetQQueue; import org.hornetq.jms.client.HornetQTopic; import org.hornetq.jms.referenceable.ConnectionFactoryObjectFactory; @@ -88,7 +89,7 @@ ProxyAssertSupport.assertTrue(instance instanceof HornetQConnectionFactory); - HornetQConnectionFactory cf2 = (HornetQConnectionFactory)instance; + HornetQJMSConnectionFactory cf2 = (HornetQJMSConnectionFactory)instance; simpleSendReceive(cf2, HornetQServerTestCase.queue1); } Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/JMSXDeliveryCountTest.java =================================================================== --- trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/JMSXDeliveryCountTest.java 2010-10-11 00:56:51 UTC (rev 9763) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/JMSXDeliveryCountTest.java 2010-10-11 01:01:04 UTC (rev 9764) @@ -499,7 +499,7 @@ producer.send(tm); - xaConn = ((XAConnectionFactory)getConnectionFactory()).createXAConnection(); + xaConn = ((XAConnectionFactory)getXAConnectionFactory()).createXAConnection(); XASession consumerSess = xaConn.createXASession(); MessageConsumer consumer = consumerSess.createConsumer(HornetQServerTestCase.queue1); Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java =================================================================== --- trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java 2010-10-11 00:56:51 UTC (rev 9763) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java 2010-10-11 01:01:04 UTC (rev 9764) @@ -38,6 +38,7 @@ import org.hornetq.core.server.HornetQServer; import org.hornetq.integration.bootstrap.HornetQBootstrapServer; import org.hornetq.jms.server.JMSServerManager; +import org.hornetq.jms.server.impl.JMSFactoryType; import org.jboss.kernel.plugins.config.property.PropertyKernelConfig; /** @@ -321,6 +322,7 @@ HornetQClient.DEFAULT_FAILOVER_ON_INITIAL_CONNECTION, HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN, null, + JMSFactoryType.CF, jndiBindings); } Modified: trunk/tests/joram-tests/src/org/hornetq/jms/HornetQAdmin.java =================================================================== --- trunk/tests/joram-tests/src/org/hornetq/jms/HornetQAdmin.java 2010-10-11 00:56:51 UTC (rev 9763) +++ trunk/tests/joram-tests/src/org/hornetq/jms/HornetQAdmin.java 2010-10-11 01:01:04 UTC (rev 9764) @@ -129,7 +129,19 @@ public void createQueueConnectionFactory(final String name) { - createConnectionFactory(name); + try + { + invokeSyncOperation(ResourceNames.JMS_SERVER, + "createQueueConnectionFactory", + name, + NettyConnectorFactory.class.getName(), + new HashMap<String, Object>(), + new String[] { name }); + } + catch (Exception e) + { + throw new IllegalStateException(e); + } } public void createTopic(final String name) @@ -148,7 +160,19 @@ public void createTopicConnectionFactory(final String name) { - createConnectionFactory(name); + try + { + invokeSyncOperation(ResourceNames.JMS_SERVER, + "createTopicConnectionFactory", + name, + NettyConnectorFactory.class.getName(), + new HashMap<String, Object>(), + new String[] { name }); + } + catch (Exception e) + { + throw new IllegalStateException(e); + } } public void deleteConnectionFactory(final String name) Modified: trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java 2010-10-11 00:56:51 UTC (rev 9763) +++ trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java 2010-10-11 01:01:04 UTC (rev 9764) @@ -35,6 +35,7 @@ import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; +import org.hornetq.jms.server.impl.JMSFactoryType; import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.tests.unit.util.InVMContext; import org.hornetq.tests.util.UnitTestCase; @@ -159,6 +160,7 @@ HornetQClient.DEFAULT_FAILOVER_ON_INITIAL_CONNECTION, failoverOnServerShutdown, null, + JMSFactoryType.CF, "/cf"); } Modified: trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java 2010-10-11 00:56:51 UTC (rev 9763) +++ trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java 2010-10-11 01:01:04 UTC (rev 9764) @@ -28,6 +28,7 @@ import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.HornetQClient; import org.hornetq.jms.client.HornetQConnectionFactory; +import org.hornetq.jms.server.impl.JMSFactoryType; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.config.BroadcastGroupConfiguration; import org.hornetq.core.config.Configuration; @@ -172,7 +173,7 @@ public void testDiscoveryConstructor() throws Exception { - HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(groupAddress, groupPort); + HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(groupAddress, groupPort, JMSFactoryType.CF); assertFactoryParams(cf, null, groupAddress, @@ -219,7 +220,7 @@ backupTC); staticConnectors.add(pair0); - HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(staticConnectors); + HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(staticConnectors, JMSFactoryType.CF); assertFactoryParams(cf, staticConnectors, null, @@ -267,7 +268,7 @@ backupTC); staticConnectors.add(pair0); - HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(liveTC, backupTC); + HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(liveTC, backupTC, JMSFactoryType.CF); assertFactoryParams(cf, staticConnectors, null, Modified: trunk/tests/src/org/hornetq/tests/integration/jms/bridge/BridgeTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/bridge/BridgeTestBase.java 2010-10-11 00:56:51 UTC (rev 9763) +++ trunk/tests/src/org/hornetq/tests/integration/jms/bridge/BridgeTestBase.java 2010-10-11 01:01:04 UTC (rev 9764) @@ -28,6 +28,7 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.jms.Topic; +import javax.jms.XAConnectionFactory; import javax.transaction.TransactionManager; import junit.framework.Assert; @@ -50,8 +51,9 @@ import org.hornetq.jms.bridge.ConnectionFactoryFactory; import org.hornetq.jms.bridge.DestinationFactory; import org.hornetq.jms.bridge.QualityOfServiceMode; -import org.hornetq.jms.client.HornetQConnectionFactory; +import org.hornetq.jms.client.HornetQJMSConnectionFactory; import org.hornetq.jms.client.HornetQMessage; +import org.hornetq.jms.client.HornetQXAConnectionFactory; import org.hornetq.jms.server.JMSServerManager; import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.tests.unit.util.InVMContext; @@ -73,8 +75,12 @@ protected ConnectionFactoryFactory cff0, cff1; + protected ConnectionFactoryFactory cff0xa, cff1xa; + protected ConnectionFactory cf0, cf1; + protected XAConnectionFactory cf0xa, cf1xa; + protected DestinationFactory sourceQueueFactory, targetQueueFactory, localTargetQueueFactory, sourceTopicFactory; protected Queue sourceQueue, targetQueue, localTargetQueue; @@ -173,8 +179,12 @@ server0.stop(); cff0 = cff1 = null; + + cff0xa = cff1xa = null; cf0 = cf1 = null; + + cf0xa = cf1xa = null; sourceQueueFactory = targetQueueFactory = localTargetQueueFactory = sourceTopicFactory = null; @@ -203,7 +213,7 @@ { public ConnectionFactory createConnectionFactory() throws Exception { - HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); + HornetQJMSConnectionFactory cf = (HornetQJMSConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); // Note! We disable automatic reconnection on the session factory. The bridge needs to do the reconnection cf.setReconnectAttempts(0); @@ -216,14 +226,32 @@ }; - cf0 = cff0.createConnectionFactory(); + cff0xa = new ConnectionFactoryFactory() + { + public Object createConnectionFactory() throws Exception + { + HornetQXAConnectionFactory cf = HornetQJMSClient.createXAConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); + // Note! We disable automatic reconnection on the session factory. The bridge needs to do the reconnection + cf.setReconnectAttempts(0); + cf.setBlockOnNonDurableSend(true); + cf.setBlockOnDurableSend(true); + cf.setCacheLargeMessagesClient(true); + + return cf; + } + + }; + + cf0 = (ConnectionFactory)cff0.createConnectionFactory(); + cf0xa = (XAConnectionFactory)cff0xa.createConnectionFactory(); + cff1 = new ConnectionFactoryFactory() { public ConnectionFactory createConnectionFactory() throws Exception { - HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName(), + HornetQJMSConnectionFactory cf = (HornetQJMSConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName(), params1)); // Note! We disable automatic reconnection on the session factory. The bridge needs to do the reconnection @@ -236,8 +264,27 @@ } }; - cf1 = cff1.createConnectionFactory(); + cff1xa = new ConnectionFactoryFactory() + { + public XAConnectionFactory createConnectionFactory() throws Exception + { + HornetQXAConnectionFactory cf = (HornetQXAConnectionFactory) HornetQJMSClient.createXAConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName(), + params1)); + + // Note! We disable automatic reconnection on the session factory. The bridge needs to do the reconnection + cf.setReconnectAttempts(0); + cf.setBlockOnNonDurableSend(true); + cf.setBlockOnDurableSend(true); + cf.setCacheLargeMessagesClient(true); + + return cf; + } + }; + + cf1 = (ConnectionFactory)cff1.createConnectionFactory(); + cf1xa = (XAConnectionFactory)cff1xa.createConnectionFactory(); + sourceQueueFactory = new DestinationFactory() { public Destination createDestination() throws Exception Modified: trunk/tests/src/org/hornetq/tests/integration/jms/bridge/JMSBridgeReconnectionTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/bridge/JMSBridgeReconnectionTest.java 2010-10-11 00:56:51 UTC (rev 9763) +++ trunk/tests/src/org/hornetq/tests/integration/jms/bridge/JMSBridgeReconnectionTest.java 2010-10-11 01:01:04 UTC (rev 9764) @@ -18,6 +18,7 @@ import junit.framework.Assert; import org.hornetq.core.logging.Logger; +import org.hornetq.jms.bridge.ConnectionFactoryFactory; import org.hornetq.jms.bridge.QualityOfServiceMode; import org.hornetq.jms.bridge.impl.JMSBridgeImpl; @@ -196,10 +197,18 @@ { JMSBridgeImpl bridge = null; + ConnectionFactoryFactory factInUse0 = cff0; + ConnectionFactoryFactory factInUse1 = cff1; + if (qosMode.equals(QualityOfServiceMode.ONCE_AND_ONLY_ONCE)) + { + factInUse0 = cff0xa; + factInUse1 = cff1xa; + } + try { - bridge = new JMSBridgeImpl(cff0, - cff1, + bridge = new JMSBridgeImpl(factInUse0, + factInUse1, sourceQueueFactory, targetQueueFactory, null, @@ -290,8 +299,8 @@ try { - bridge = new JMSBridgeImpl(cff0, - cff1, + bridge = new JMSBridgeImpl(cff0xa, + cff1xa, sourceQueueFactory, targetQueueFactory, null, Modified: trunk/tests/src/org/hornetq/tests/integration/jms/bridge/JMSBridgeTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/bridge/JMSBridgeTest.java 2010-10-11 00:56:51 UTC (rev 9763) +++ trunk/tests/src/org/hornetq/tests/integration/jms/bridge/JMSBridgeTest.java 2010-10-11 01:01:04 UTC (rev 9764) @@ -33,6 +33,7 @@ import org.hornetq.api.jms.HornetQJMSConstants; import org.hornetq.core.logging.Logger; +import org.hornetq.jms.bridge.ConnectionFactoryFactory; import org.hornetq.jms.bridge.QualityOfServiceMode; import org.hornetq.jms.bridge.impl.JMSBridgeImpl; import org.hornetq.jms.client.HornetQMessage; @@ -1444,10 +1445,18 @@ Thread t = null; + ConnectionFactoryFactory factInUse0 = cff0; + ConnectionFactoryFactory factInUse1 = cff1; + if (qosMode.equals(QualityOfServiceMode.ONCE_AND_ONLY_ONCE)) + { + factInUse0 = cff0xa; + factInUse1 = cff1xa; + } + try { - bridge = new JMSBridgeImpl(cff0, - cff1, + bridge = new JMSBridgeImpl(factInUse0, + factInUse1, sourceQueueFactory, targetQueueFactory, null, @@ -1530,10 +1539,18 @@ Thread t = null; + ConnectionFactoryFactory factInUse0 = cff0; + ConnectionFactoryFactory factInUse1 = cff1; + if (qosMode.equals(QualityOfServiceMode.ONCE_AND_ONLY_ONCE)) + { + factInUse0 = cff0xa; + factInUse1 = cff1xa; + } + try { - bridge = new JMSBridgeImpl(cff0, - cff1, + bridge = new JMSBridgeImpl(factInUse0, + factInUse1, sourceQueueFactory, targetQueueFactory, null, @@ -1617,10 +1634,16 @@ Thread t = null; + ConnectionFactoryFactory factInUse0 = cff0; + if (qosMode.equals(QualityOfServiceMode.ONCE_AND_ONLY_ONCE)) + { + factInUse0 = cff0xa; + } + try { - bridge = new JMSBridgeImpl(cff0, - cff0, + bridge = new JMSBridgeImpl(factInUse0, + factInUse0, sourceQueueFactory, localTargetQueueFactory, null, @@ -1699,12 +1722,19 @@ { JMSBridgeImpl bridge = null; + ConnectionFactoryFactory factInUse0 = cff0; + ConnectionFactoryFactory factInUse1 = cff1; + if (qosMode.equals(QualityOfServiceMode.ONCE_AND_ONLY_ONCE)) + { + factInUse0 = cff0xa; + factInUse1 = cff1xa; + } try { final int NUM_MESSAGES = 10; - bridge = new JMSBridgeImpl(cff0, - cff1, + bridge = new JMSBridgeImpl(factInUse0, + factInUse1, sourceQueueFactory, targetQueueFactory, null, @@ -1770,12 +1800,18 @@ { JMSBridgeImpl bridge = null; + ConnectionFactoryFactory factInUse0 = cff0; + if (qosMode.equals(QualityOfServiceMode.ONCE_AND_ONLY_ONCE)) + { + factInUse0 = cff0xa; + } + try { final int NUM_MESSAGES = 10; - bridge = new JMSBridgeImpl(cff0, - cff0, + bridge = new JMSBridgeImpl(factInUse0, + factInUse0, sourceQueueFactory, localTargetQueueFactory, null, @@ -1840,14 +1876,22 @@ { JMSBridgeImpl bridge = null; + ConnectionFactoryFactory factInUse0 = cff0; + ConnectionFactoryFactory factInUse1 = cff1; + if (qosMode.equals(QualityOfServiceMode.ONCE_AND_ONLY_ONCE)) + { + factInUse0 = cff0xa; + factInUse1 = cff1xa; + } + try { final long MAX_BATCH_TIME = 3000; final int MAX_BATCH_SIZE = 100000; // something big so it won't reach it - bridge = new JMSBridgeImpl(cff0, - cff1, + bridge = new JMSBridgeImpl(factInUse0, + factInUse1, sourceQueueFactory, targetQueueFactory, null, @@ -1894,14 +1938,20 @@ { JMSBridgeImpl bridge = null; + ConnectionFactoryFactory factInUse0 = cff0; + if (qosMode.equals(QualityOfServiceMode.ONCE_AND_ONLY_ONCE)) + { + factInUse0 = cff0xa; + } + try { final long MAX_BATCH_TIME = 3000; final int MAX_BATCH_SIZE = 100000; // something big so it won't reach it - bridge = new JMSBridgeImpl(cff0, - cff0, + bridge = new JMSBridgeImpl(factInUse0, + factInUse0, sourceQueueFactory, localTargetQueueFactory, null, Modified: trunk/tests/src/org/hornetq/tests/integration/jms/client/AutoGroupingTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/client/AutoGroupingTest.java 2010-10-11 00:56:51 UTC (rev 9763) +++ trunk/tests/src/org/hornetq/tests/integration/jms/client/AutoGroupingTest.java 2010-10-11 01:01:04 UTC (rev 9764) @@ -19,7 +19,7 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; -import org.hornetq.jms.client.HornetQConnectionFactory; +import org.hornetq.jms.client.HornetQJMSConnectionFactory; /** * A AutoGroupingTest @@ -34,7 +34,7 @@ @Override protected ConnectionFactory getCF() throws Exception { - HornetQConnectionFactory cf = HornetQJMSClient.createConnectionFactory(new TransportConfiguration(NettyConnectorFactory.class.getName())); + HornetQJMSConnectionFactory cf = HornetQJMSClient.createConnectionFactory(new TransportConfiguration(NettyConnectorFactory.class.getName())); cf.setAutoGroup(true); Modified: trunk/tests/src/org/hornetq/tests/integration/jms/client/GroupIDTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/client/GroupIDTest.java 2010-10-11 00:56:51 UTC (rev 9763) +++ trunk/tests/src/org/hornetq/tests/integration/jms/client/GroupIDTest.java 2010-10-11 01:01:04 UTC (rev 9764) @@ -19,7 +19,7 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; -import org.hornetq.jms.client.HornetQConnectionFactory; +import org.hornetq.jms.client.HornetQJMSConnectionFactory; /** * A GroupIDTest @@ -34,7 +34,7 @@ @Override protected ConnectionFactory getCF() throws Exception { - HornetQConnectionFactory cf = HornetQJMSClient.createConnectionFactory(new TransportConfiguration(NettyConnectorFactory.class.getName())); + HornetQJMSConnectionFactory cf = HornetQJMSClient.createConnectionFactory(new TransportConfiguration(NettyConnectorFactory.class.getName())); cf.setGroupID("wibble"); Modified: trunk/tests/src/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java 2010-10-11 00:56:51 UTC (rev 9763) +++ trunk/tests/src/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java 2010-10-11 01:01:04 UTC (rev 9764) @@ -27,6 +27,7 @@ import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; +import org.hornetq.jms.server.impl.JMSFactoryType; import org.hornetq.tests.util.JMSTestBase; /** @@ -229,6 +230,7 @@ HornetQClient.DEFAULT_FAILOVER_ON_INITIAL_CONNECTION, failoverOnServerShutdown, null, + JMSFactoryType.CF, jndiBindings); } Modified: trunk/tests/src/org/hornetq/tests/integration/jms/client/ReSendMessageTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/client/ReSendMessageTest.java 2010-10-11 00:56:51 UTC (rev 9763) +++ trunk/tests/src/org/hornetq/tests/integration/jms/client/ReSendMessageTest.java 2010-10-11 01:01:04 UTC (rev 9764) @@ -34,6 +34,7 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.jms.HornetQJMSConstants; +import org.hornetq.jms.server.impl.JMSFactoryType; import org.hornetq.tests.util.JMSTestBase; import org.hornetq.tests.util.UnitTestCase; @@ -328,6 +329,7 @@ HornetQClient.DEFAULT_FAILOVER_ON_INITIAL_CONNECTION, failoverOnServerShutdown, null, + JMSFactoryType.CF, jndiBindings); } Modified: trunk/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java 2010-10-11 00:56:51 UTC (rev 9763) +++ trunk/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java 2010-10-11 01:01:04 UTC (rev 9764) @@ -34,6 +34,7 @@ import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; import org.hornetq.jms.client.HornetQSession; +import org.hornetq.jms.server.impl.JMSFactoryType; import org.hornetq.spi.core.protocol.RemotingConnection; import org.hornetq.tests.util.JMSTestBase; @@ -97,6 +98,7 @@ HornetQClient.DEFAULT_FAILOVER_ON_INITIAL_CONNECTION, false, null, + JMSFactoryType.CF, "/cffoo"); cf = (ConnectionFactory)context.lookup("/cffoo"); Modified: trunk/tests/src/org/hornetq/tests/integration/jms/client/TextMessageTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/client/TextMessageTest.java 2010-10-11 00:56:51 UTC (rev 9763) +++ trunk/tests/src/org/hornetq/tests/integration/jms/client/TextMessageTest.java 2010-10-11 01:01:04 UTC (rev 9764) @@ -27,6 +27,7 @@ import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; +import org.hornetq.jms.server.impl.JMSFactoryType; import org.hornetq.tests.util.JMSTestBase; import org.hornetq.tests.util.RandomUtil; @@ -264,6 +265,7 @@ HornetQClient.DEFAULT_FAILOVER_ON_INITIAL_CONNECTION, failoverOnServerShutdown, null, + JMSFactoryType.CF, jndiBindings); } Modified: trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java 2010-10-11 00:56:51 UTC (rev 9763) +++ trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java 2010-10-11 01:01:04 UTC (rev 9764) @@ -47,6 +47,7 @@ import org.hornetq.jms.client.HornetQDestination; import org.hornetq.jms.client.HornetQSession; import org.hornetq.jms.server.JMSServerManager; +import org.hornetq.jms.server.impl.JMSFactoryType; import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.spi.core.protocol.RemotingConnection; import org.hornetq.tests.unit.util.InVMContext; @@ -159,7 +160,7 @@ { HornetQConnectionFactory jbcf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"), new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory", - backupParams)); + backupParams), JMSFactoryType.CF); jbcf.setBlockOnDurableSend(true); jbcf.setBlockOnNonDurableSend(true); Modified: trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java 2010-10-11 00:56:51 UTC (rev 9763) +++ trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java 2010-10-11 01:01:04 UTC (rev 9764) @@ -30,6 +30,7 @@ import org.hornetq.api.core.client.HornetQClient; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.DivertConfiguration; +import org.hornetq.jms.server.impl.JMSFactoryType; import org.hornetq.tests.util.JMSTestBase; /** @@ -175,6 +176,7 @@ HornetQClient.DEFAULT_FAILOVER_ON_INITIAL_CONNECTION, failoverOnServerShutdown, null, + JMSFactoryType.CF, jndiBindings); } Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSUtil.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSUtil.java 2010-10-11 00:56:51 UTC (rev 9763) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSUtil.java 2010-10-11 01:01:04 UTC (rev 9764) @@ -28,6 +28,7 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.jms.client.HornetQConnectionFactory; +import org.hornetq.jms.client.HornetQJMSConnectionFactory; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.tests.util.RandomUtil; @@ -65,7 +66,7 @@ final long connectionTTL, final long clientFailureCheckPeriod) throws JMSException { - HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration(connectorFactory)); + HornetQJMSConnectionFactory cf = (HornetQJMSConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration(connectorFactory)); cf.setBlockOnNonDurableSend(true); cf.setBlockOnDurableSend(true); @@ -103,7 +104,7 @@ public static String[] sendMessages(final Destination destination, final int messagesToSend) throws Exception { - HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); + HornetQJMSConnectionFactory cf = (HornetQJMSConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); return JMSUtil.sendMessages(cf, destination, messagesToSend); } Modified: trunk/tests/src/org/hornetq/tests/integration/stomp/StompTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/stomp/StompTestBase.java 2010-10-11 00:56:51 UTC (rev 9763) +++ trunk/tests/src/org/hornetq/tests/integration/stomp/StompTestBase.java 2010-10-11 01:01:04 UTC (rev 9764) @@ -47,7 +47,7 @@ import org.hornetq.core.remoting.impl.netty.TransportConstants; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; -import org.hornetq.jms.client.HornetQConnectionFactory; +import org.hornetq.jms.client.HornetQJMSConnectionFactory; import org.hornetq.jms.server.JMSServerManager; import org.hornetq.jms.server.config.JMSConfiguration; import org.hornetq.jms.server.config.impl.JMSConfigurationImpl; @@ -161,7 +161,7 @@ protected ConnectionFactory createConnectionFactory() { - return new HornetQConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); + return new HornetQJMSConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); } protected Socket createSocket() throws IOException Modified: trunk/tests/src/org/hornetq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java 2010-10-11 00:56:51 UTC (rev 9763) +++ trunk/tests/src/org/hornetq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java 2010-10-11 01:01:04 UTC (rev 9764) @@ -53,6 +53,7 @@ import org.hornetq.jms.bridge.QualityOfServiceMode; import org.hornetq.jms.bridge.impl.JMSBridgeImpl; import org.hornetq.jms.client.HornetQConnectionFactory; +import org.hornetq.jms.client.HornetQJMSConnectionFactory; import org.hornetq.jms.server.JMSServerManager; import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.tests.unit.util.InVMContext; @@ -157,7 +158,7 @@ private static ConnectionFactory createConnectionFactory() { - HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); + HornetQJMSConnectionFactory cf = (HornetQJMSConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); // Note! We disable automatic reconnection on the session factory. The bridge needs to do the reconnection cf.setReconnectAttempts(0); cf.setBlockOnNonDurableSend(true); @@ -171,8 +172,10 @@ public void testStartWithRepeatedFailure() throws Exception { - HornetQConnectionFactory failingSourceCF = new HornetQConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())) + HornetQJMSConnectionFactory failingSourceCF = new HornetQJMSConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())) { + private static final long serialVersionUID = -2142578705002528826L; + @Override public Connection createConnection() throws JMSException { @@ -212,8 +215,9 @@ public void testStartWithFailureThenSuccess() throws Exception { - HornetQConnectionFactory failingSourceCF = new HornetQConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())) + HornetQJMSConnectionFactory failingSourceCF = new HornetQJMSConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())) { + private static final long serialVersionUID = 1274250681150776714L; boolean firstTime = true; @Override @@ -410,8 +414,10 @@ public void testExceptionOnSourceAndRetrySucceeds() throws Exception { final AtomicReference<Connection> sourceConn = new AtomicReference<Connection>(); - HornetQConnectionFactory failingSourceCF = new HornetQConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())) + HornetQJMSConnectionFactory failingSourceCF = new HornetQJMSConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())) { + private static final long serialVersionUID = -6930787952179727779L; + @Override public Connection createConnection() throws JMSException { @@ -460,8 +466,9 @@ public void testExceptionOnSourceAndRetryFails() throws Exception { final AtomicReference<Connection> sourceConn = new AtomicReference<Connection>(); - HornetQConnectionFactory failingSourceCF = new HornetQConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())) + HornetQJMSConnectionFactory failingSourceCF = new HornetQJMSConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())) { + private static final long serialVersionUID = 4163579449500727852L; boolean firstTime = true; @Override Modified: trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java 2010-10-11 00:56:51 UTC (rev 9763) +++ trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java 2010-10-11 01:01:04 UTC (rev 9764) @@ -29,6 +29,7 @@ import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; +import org.hornetq.jms.server.impl.JMSFactoryType; import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.tests.unit.util.InVMContext; @@ -213,6 +214,7 @@ HornetQClient.DEFAULT_FAILOVER_ON_INITIAL_CONNECTION, failoverOnServerShutdown, null, + JMSFactoryType.CF, jndiBindings); }