[hornetq-commits] JBoss hornetq SVN: r9424 - branches/2_2_0_HA_Improvements/tests/joram-tests/src/org/hornetq/jms.

Author: jmesnil Date: 2010-07-19 11:55:37 -0400 (Mon, 19 Jul 2010) New Revision: 9424 Modified: branches/2_2_0_HA_Improvements/tests/joram-tests/src/org/hornetq/jms/HornetQAdmin.java Log: HA refactoring * fix JORAM tests compilation Modified: branches/2_2_0_HA_Improvements/tests/joram-tests/src/org/hornetq/jms/HornetQAdmin.java =================================================================== --- branches/2_2_0_HA_Improvements/tests/joram-tests/src/org/hornetq/jms/HornetQAdmin.java 2010-07-19 15:47:34 UTC (rev 9423) +++ branches/2_2_0_HA_Improvements/tests/joram-tests/src/org/hornetq/jms/HornetQAdmin.java 2010-07-19 15:55:37 UTC (rev 9424) @@ -29,10 +29,11 @@ import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientRequestor; import org.hornetq.api.core.client.ClientSession; +import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.HornetQClient; +import org.hornetq.api.core.client.ServerLocator; import org.hornetq.api.core.management.ManagementHelper; import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.core.client.impl.ClientSessionFactoryImpl; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; import org.hornetq.tests.util.SpawnedVMSupport; @@ -55,6 +56,8 @@ private Process serverProcess; + private ClientSessionFactory sf; + public HornetQAdmin() { try @@ -73,7 +76,8 @@ public void start() throws Exception { - ClientSessionFactoryImpl sf = (ClientSessionFactoryImpl) HornetQClient.createClientSessionFactory(new TransportConfiguration(NettyConnectorFactory.class.getName())); + ServerLocator serverLocator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(NettyConnectorFactory.class.getName())); + sf = serverLocator.createSessionFactory(); clientSession = sf.createSession(ConfigurationImpl.DEFAULT_CLUSTER_USER, ConfigurationImpl.DEFAULT_CLUSTER_PASSWORD, false, @@ -88,6 +92,11 @@ public void stop() throws Exception { requestor.close(); + + if (sf != null) + { + sf.close(); + } } public void createConnectionFactory(final String name)