[hornetq-commits] JBoss hornetq SVN: r11702 - in trunk: hornetq-ra/hornetq-ra-jar/src/main/java/org/hornetq/ra and 2 other directories.

Author: borges Date: 2011-11-18 05:45:26 -0500 (Fri, 18 Nov 2011) New Revision: 11702 Modified: trunk/hornetq-jms/src/main/java/org/hornetq/jms/server/recovery/HornetQXAResourceWrapper.java trunk/hornetq-ra/hornetq-ra-jar/src/main/java/org/hornetq/ra/HornetQRAManagedConnectionFactory.java trunk/hornetq-rest/hornetq-rest/src/test/java/org/hornetq/rest/test/JMSTest.java trunk/hornetq-rest/hornetq-rest/src/test/java/org/hornetq/rest/test/SelectorTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/MultipleBackupsFailoverTestBase.java Log: Remove unused imports. Modified: trunk/hornetq-jms/src/main/java/org/hornetq/jms/server/recovery/HornetQXAResourceWrapper.java =================================================================== --- trunk/hornetq-jms/src/main/java/org/hornetq/jms/server/recovery/HornetQXAResourceWrapper.java 2011-11-18 10:44:52 UTC (rev 11701) +++ trunk/hornetq-jms/src/main/java/org/hornetq/jms/server/recovery/HornetQXAResourceWrapper.java 2011-11-18 10:45:26 UTC (rev 11702) @@ -13,17 +13,13 @@ package org.hornetq.jms.server.recovery; -import java.util.Map; - import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.TransportConfiguration; 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.client.SessionFailureListener; import org.hornetq.core.logging.Logger; @@ -58,7 +54,7 @@ private XAResource delegate; - private XARecoveryConfig[] xaRecoveryConfigs; + private final XARecoveryConfig[] xaRecoveryConfigs; //private TransportConfiguration currentConnection; Modified: trunk/hornetq-ra/hornetq-ra-jar/src/main/java/org/hornetq/ra/HornetQRAManagedConnectionFactory.java =================================================================== --- trunk/hornetq-ra/hornetq-ra-jar/src/main/java/org/hornetq/ra/HornetQRAManagedConnectionFactory.java 2011-11-18 10:44:52 UTC (rev 11701) +++ trunk/hornetq-ra/hornetq-ra-jar/src/main/java/org/hornetq/ra/HornetQRAManagedConnectionFactory.java 2011-11-18 10:45:26 UTC (rev 11702) @@ -15,7 +15,6 @@ import java.io.PrintWriter; import java.util.Iterator; -import java.util.List; import java.util.Set; import javax.jms.ConnectionMetaData; Modified: trunk/hornetq-rest/hornetq-rest/src/test/java/org/hornetq/rest/test/JMSTest.java =================================================================== --- trunk/hornetq-rest/hornetq-rest/src/test/java/org/hornetq/rest/test/JMSTest.java 2011-11-18 10:44:52 UTC (rev 11701) +++ trunk/hornetq-rest/hornetq-rest/src/test/java/org/hornetq/rest/test/JMSTest.java 2011-11-18 10:45:26 UTC (rev 11702) @@ -1,18 +1,11 @@ package org.hornetq.rest.test; -import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.client.HornetQDestination; -import org.hornetq.jms.client.HornetQJMSConnectionFactory; -import org.hornetq.rest.HttpHeaderProperty; -import org.hornetq.rest.Jms; -import org.hornetq.rest.queue.QueueDeployment; -import org.jboss.resteasy.client.ClientRequest; -import org.jboss.resteasy.client.ClientResponse; -import org.jboss.resteasy.spi.Link; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; +import static org.jboss.resteasy.test.TestPortProvider.generateURL; +import java.io.Serializable; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; + import javax.jms.Connection; import javax.jms.ConnectionFactory; import javax.jms.Destination; @@ -23,11 +16,18 @@ import javax.jms.ObjectMessage; import javax.jms.Session; import javax.xml.bind.annotation.XmlRootElement; -import java.io.Serializable; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; -import static org.jboss.resteasy.test.TestPortProvider.*; +import org.hornetq.jms.client.HornetQDestination; +import org.hornetq.jms.client.HornetQJMSConnectionFactory; +import org.hornetq.rest.HttpHeaderProperty; +import org.hornetq.rest.Jms; +import org.hornetq.rest.queue.QueueDeployment; +import org.jboss.resteasy.client.ClientRequest; +import org.jboss.resteasy.client.ClientResponse; +import org.jboss.resteasy.spi.Link; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; /** * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a> @@ -46,6 +46,7 @@ @XmlRootElement public static class Order implements Serializable { + private static final long serialVersionUID = 1397854679589606480L; private String name; private String amount; Modified: trunk/hornetq-rest/hornetq-rest/src/test/java/org/hornetq/rest/test/SelectorTest.java =================================================================== --- trunk/hornetq-rest/hornetq-rest/src/test/java/org/hornetq/rest/test/SelectorTest.java 2011-11-18 10:44:52 UTC (rev 11701) +++ trunk/hornetq-rest/hornetq-rest/src/test/java/org/hornetq/rest/test/SelectorTest.java 2011-11-18 10:45:26 UTC (rev 11702) @@ -1,6 +1,19 @@ package org.hornetq.rest.test; -import org.hornetq.jms.client.HornetQConnectionFactory; +import static org.jboss.resteasy.test.TestPortProvider.generateURL; + +import java.io.Serializable; + +import javax.jms.Connection; +import javax.jms.ConnectionFactory; +import javax.jms.Destination; +import javax.jms.MessageProducer; +import javax.jms.ObjectMessage; +import javax.jms.Session; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.xml.bind.annotation.XmlRootElement; + import org.hornetq.jms.client.HornetQDestination; import org.hornetq.jms.client.HornetQJMSConnectionFactory; import org.hornetq.rest.HttpHeaderProperty; @@ -14,19 +27,6 @@ import org.junit.BeforeClass; import org.junit.Test; -import javax.jms.Connection; -import javax.jms.ConnectionFactory; -import javax.jms.Destination; -import javax.jms.MessageProducer; -import javax.jms.ObjectMessage; -import javax.jms.Session; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.xml.bind.annotation.XmlRootElement; -import java.io.Serializable; - -import static org.jboss.resteasy.test.TestPortProvider.*; - /** * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a> * @version $Revision: 1 $ @@ -157,7 +157,7 @@ @Path("two") public void two(Order order) { - twoOrder = order; + twoOrder = order; } Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/MultipleBackupsFailoverTestBase.java =================================================================== --- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/MultipleBackupsFailoverTestBase.java 2011-11-18 10:44:52 UTC (rev 11701) +++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/MultipleBackupsFailoverTestBase.java 2011-11-18 10:45:26 UTC (rev 11702) @@ -20,6 +20,7 @@ import java.util.concurrent.TimeUnit; import junit.framework.Assert; + import org.hornetq.api.core.Pair; import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; @@ -32,7 +33,6 @@ import org.hornetq.api.core.client.ServerLocator; import org.hornetq.core.client.impl.ClientSessionFactoryInternal; import org.hornetq.core.client.impl.ServerLocatorImpl; -import org.hornetq.core.client.impl.ServerLocatorInternal; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; import org.hornetq.jms.client.HornetQTextMessage;