[hornetq-commits] JBoss hornetq SVN: r11106 - in branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests: integration/cluster/distribution and 3 other directories.

Author: clebert.suconic(a)jboss.com Date: 2011-08-03 17:18:53 -0400 (Wed, 03 Aug 2011) New Revision: 11106 Modified: branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/client/JMSPagingFileDeleteTest.java branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterHeadersRemovedTest.java branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/jms/client/AutoGroupingTest.java branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/jms/client/GroupIDTest.java branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/persistence/JMSDynamicConfigTest.java branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/util/JMSTestBase.java Log: Removing Netty from JMS Tests Modified: branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/client/JMSPagingFileDeleteTest.java =================================================================== --- branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/client/JMSPagingFileDeleteTest.java 2011-08-03 20:52:33 UTC (rev 11105) +++ branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/client/JMSPagingFileDeleteTest.java 2011-08-03 21:18:53 UTC (rev 11106) @@ -64,7 +64,7 @@ { clearData(); super.setUp(); - + topic1 = createTopic("topic1"); // Paging Setting @@ -77,6 +77,7 @@ @Override protected void tearDown() throws Exception { + log.info("#tearDown"); topic1 = null; super.tearDown(); } Modified: branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterHeadersRemovedTest.java =================================================================== --- branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterHeadersRemovedTest.java 2011-08-03 20:52:33 UTC (rev 11105) +++ branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterHeadersRemovedTest.java 2011-08-03 21:18:53 UTC (rev 11106) @@ -1,4 +1,4 @@ -/* + /* * Copyright 2009 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 Modified: branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/jms/client/AutoGroupingTest.java =================================================================== --- branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/jms/client/AutoGroupingTest.java 2011-08-03 20:52:33 UTC (rev 11105) +++ branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/jms/client/AutoGroupingTest.java 2011-08-03 21:18:53 UTC (rev 11106) @@ -19,7 +19,6 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; import org.hornetq.jms.client.HornetQJMSConnectionFactory; /** @@ -35,7 +34,7 @@ @Override protected ConnectionFactory getCF() throws Exception { - HornetQJMSConnectionFactory cf = (HornetQJMSConnectionFactory)HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration(NettyConnectorFactory.class.getName())); + HornetQJMSConnectionFactory cf = (HornetQJMSConnectionFactory)HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration(INVM_CONNECTOR_FACTORY)); cf.setAutoGroup(true); Modified: branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/jms/client/GroupIDTest.java =================================================================== --- branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/jms/client/GroupIDTest.java 2011-08-03 20:52:33 UTC (rev 11105) +++ branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/jms/client/GroupIDTest.java 2011-08-03 21:18:53 UTC (rev 11106) @@ -19,7 +19,6 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; import org.hornetq.jms.client.HornetQJMSConnectionFactory; /** @@ -35,7 +34,7 @@ @Override protected ConnectionFactory getCF() throws Exception { - HornetQJMSConnectionFactory cf = (HornetQJMSConnectionFactory)HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration(NettyConnectorFactory.class.getName())); + HornetQJMSConnectionFactory cf = (HornetQJMSConnectionFactory)HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration(INVM_CONNECTOR_FACTORY)); cf.setGroupID("wibble"); Modified: branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java =================================================================== --- branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java 2011-08-03 20:52:33 UTC (rev 11105) +++ branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java 2011-08-03 21:18:53 UTC (rev 11106) @@ -27,13 +27,11 @@ import junit.framework.Assert; import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; import org.hornetq.jms.client.HornetQSession; import org.hornetq.spi.core.protocol.RemotingConnection; import org.hornetq.tests.util.JMSTestBase; @@ -63,7 +61,7 @@ public void testSessionClosedOnRemotingConnectionFailure() throws Exception { List<TransportConfiguration> connectorConfigs = new ArrayList<TransportConfiguration>(); - connectorConfigs.add(new TransportConfiguration(NettyConnectorFactory.class.getName())); + connectorConfigs.add(new TransportConfiguration(INVM_CONNECTOR_FACTORY)); jmsServer.createConnectionFactory("cffoo", Modified: branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/persistence/JMSDynamicConfigTest.java =================================================================== --- branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/persistence/JMSDynamicConfigTest.java 2011-08-03 20:52:33 UTC (rev 11105) +++ branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/persistence/JMSDynamicConfigTest.java 2011-08-03 21:18:53 UTC (rev 11106) @@ -52,7 +52,7 @@ { ArrayList<String> connectors = new ArrayList<String>(); - connectors.add("netty"); + connectors.add("invm"); ConnectionFactoryConfiguration cfg = new ConnectionFactoryConfigurationImpl("tst", false, connectors, "tt"); jmsServer.createConnectionFactory(true, cfg, "tst"); Modified: branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/util/JMSTestBase.java =================================================================== --- branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/util/JMSTestBase.java 2011-08-03 20:52:33 UTC (rev 11105) +++ branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/util/JMSTestBase.java 2011-08-03 21:18:53 UTC (rev 11106) @@ -27,8 +27,6 @@ import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.core.config.Configuration; -import org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory; -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.JMSServerManagerImpl; @@ -110,8 +108,8 @@ Configuration conf = createDefaultConfig(false); - conf.getAcceptorConfigurations().add(new TransportConfiguration(NettyAcceptorFactory.class.getName())); - conf.getConnectorConfigurations().put("netty", new TransportConfiguration(NettyConnectorFactory.class.getName())); + conf.getAcceptorConfigurations().add(new TransportConfiguration(INVM_ACCEPTOR_FACTORY)); + conf.getConnectorConfigurations().put("invm", new TransportConfiguration(INVM_CONNECTOR_FACTORY)); server = HornetQServers.newHornetQServer(conf, mbeanServer, usePersistence()); @@ -181,7 +179,7 @@ protected void registerConnectionFactory() throws Exception { List<TransportConfiguration> connectorConfigs = new ArrayList<TransportConfiguration>(); - connectorConfigs.add(new TransportConfiguration(NettyConnectorFactory.class.getName())); + connectorConfigs.add(new TransportConfiguration(INVM_CONNECTOR_FACTORY)); createCF(connectorConfigs, "/cf");