[hornetq-commits] JBoss hornetq SVN: r11589 - in trunk: tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge and 1 other directory.

[do-not-reply at jboss.org]

Author: borges
Date: 2011-10-25 08:32:12 -0400 (Tue, 25 Oct 2011)
New Revision: 11589

Modified:
   trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/MessageServiceManager.java
   trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java
Log:
warnings

Modified: trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/MessageServiceManager.java
===================================================================
--- trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/MessageServiceManager.java	2011-10-25 12:31:51 UTC (rev 11588)
+++ trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/MessageServiceManager.java	2011-10-25 12:32:12 UTC (rev 11589)
@@ -1,11 +1,18 @@
 package org.hornetq.rest;
 
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import javax.xml.bind.JAXBContext;
+
 import org.hornetq.api.core.TransportConfiguration;
 import org.hornetq.api.core.client.ClientSessionFactory;
 import org.hornetq.api.core.client.ServerLocator;
-import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
 import org.hornetq.core.client.impl.ServerLocatorImpl;
-import org.hornetq.core.registry.JndiBindingRegistry;
 import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory;
 import org.hornetq.core.remoting.impl.invm.TransportConstants;
 import org.hornetq.rest.queue.DestinationSettings;
@@ -17,14 +24,6 @@
 import org.hornetq.rest.util.TimeoutTask;
 import org.hornetq.spi.core.naming.BindingRegistry;
 
-import javax.xml.bind.JAXBContext;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
 /**
  * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
  * @version $Revision: 1 $
@@ -142,17 +141,17 @@
 
       HashMap<String, Object> transportConfig = new HashMap<String, Object>();
       transportConfig.put(TransportConstants.SERVER_ID_PROP_NAME, configuration.getInVmId());
-      
-      
+
+
       ServerLocator consumerLocator = new ServerLocatorImpl(false, new TransportConfiguration(InVMConnectorFactory.class.getName(), transportConfig));
-      
+
       if (configuration.getConsumerWindowSize() != -1)
       {
     	  consumerLocator.setConsumerWindowSize(configuration.getConsumerWindowSize());
       }
 
       ClientSessionFactory consumerSessionFactory = consumerLocator.createSessionFactory();
-      
+
       ServerLocator defaultLocator =  new ServerLocatorImpl(false, new TransportConfiguration(InVMConnectorFactory.class.getName(), transportConfig));
 
       ClientSessionFactory sessionFactory = defaultLocator.createSessionFactory();

Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java	2011-10-25 12:31:51 UTC (rev 11588)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java	2011-10-25 12:32:12 UTC (rev 11589)
@@ -235,8 +235,6 @@
       Map<String, Object> server2Params = new HashMap<String, Object>();
       HornetQServer service2 = createBackupHornetQServer(2, server2Params, isNetty(), 0, nodeManager);
 
-      TransportConfiguration server0tc = new TransportConfiguration(getConnector(), server0Params, "server0tc");
-
       Map<String, TransportConfiguration> connectors = new HashMap<String, TransportConfiguration>();
 
       TransportConfiguration server1tc = new TransportConfiguration(getConnector(), server1Params, "server1tc");