http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingOrderTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingOrderTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingOrderTest.java index 009b55f..2d0c0d6 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingOrderTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingOrderTest.java @@ -23,7 +23,7 @@ import java.nio.ByteBuffer; import java.util.HashMap; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.api.core.client.ClientConsumer; @@ -134,7 +134,7 @@ public class PagingOrderTest extends ServiceTestBase { ClientMessage message = session.createMessage(persistentMessages); - HornetQBuffer bodyLocal = message.getBodyBuffer(); + ActiveMQBuffer bodyLocal = message.getBodyBuffer(); bodyLocal.writeBytes(body); @@ -283,7 +283,7 @@ public class PagingOrderTest extends ServiceTestBase { ClientMessage message = session.createMessage(persistentMessages); - HornetQBuffer bodyLocal = message.getBodyBuffer(); + ActiveMQBuffer bodyLocal = message.getBodyBuffer(); bodyLocal.writeBytes(body); @@ -432,7 +432,7 @@ public class PagingOrderTest extends ServiceTestBase { ClientMessage message = session.createMessage(persistentMessages); - HornetQBuffer bodyLocal = message.getBodyBuffer(); + ActiveMQBuffer bodyLocal = message.getBodyBuffer(); bodyLocal.writeBytes(body); @@ -511,7 +511,7 @@ public class PagingOrderTest extends ServiceTestBase { ClientMessage message = session.createMessage(persistentMessages); - HornetQBuffer bodyLocal = message.getBodyBuffer(); + ActiveMQBuffer bodyLocal = message.getBodyBuffer(); bodyLocal.writeBytes(body); @@ -611,7 +611,7 @@ public class PagingOrderTest extends ServiceTestBase { ClientMessage message = session.createMessage(persistentMessages); - HornetQBuffer bodyLocal = message.getBodyBuffer(); + ActiveMQBuffer bodyLocal = message.getBodyBuffer(); bodyLocal.writeBytes(body);
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingSyncTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingSyncTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingSyncTest.java index 2e9f0c4..75d6c87 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingSyncTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingSyncTest.java @@ -15,7 +15,7 @@ package org.apache.activemq.tests.integration.client; import java.nio.ByteBuffer; import java.util.HashMap; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientMessage; import org.apache.activemq.api.core.client.ClientProducer; @@ -96,7 +96,7 @@ public class PagingSyncTest extends ServiceTestBase { ClientMessage message = session.createMessage(persistentMessages); - HornetQBuffer bodyLocal = message.getBodyBuffer(); + ActiveMQBuffer bodyLocal = message.getBodyBuffer(); bodyLocal.writeBytes(body); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingTest.java index 5f1a745..90d55ec 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/PagingTest.java @@ -29,9 +29,9 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq.api.core.HornetQBuffer; -import org.apache.activemq.api.core.HornetQException; -import org.apache.activemq.api.core.HornetQExceptionType; +import org.apache.activemq.api.core.ActiveMQBuffer; +import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.api.core.ActiveMQExceptionType; import org.apache.activemq.api.core.Message; import org.apache.activemq.api.core.Pair; import org.apache.activemq.api.core.SimpleString; @@ -155,7 +155,7 @@ public class PagingTest extends ServiceTestBase { message = session.createMessage(true); - HornetQBuffer bodyLocal = message.getBodyBuffer(); + ActiveMQBuffer bodyLocal = message.getBodyBuffer(); bodyLocal.writeBytes(body); @@ -183,7 +183,7 @@ public class PagingTest extends ServiceTestBase { message = session.createMessage(true); - HornetQBuffer bodyLocal = message.getBodyBuffer(); + ActiveMQBuffer bodyLocal = message.getBodyBuffer(); bodyLocal.writeBytes(body); @@ -296,7 +296,7 @@ public class PagingTest extends ServiceTestBase { message = session.createMessage(true); - HornetQBuffer bodyLocal = message.getBodyBuffer(); + ActiveMQBuffer bodyLocal = message.getBodyBuffer(); bodyLocal.writeBytes(body); @@ -422,7 +422,7 @@ public class PagingTest extends ServiceTestBase message.putIntProperty("count", i); - HornetQBuffer bodyLocal = message.getBodyBuffer(); + ActiveMQBuffer bodyLocal = message.getBodyBuffer(); bodyLocal.writeBytes(body); @@ -512,7 +512,7 @@ public class PagingTest extends ServiceTestBase message.putIntProperty("count", i); - HornetQBuffer bodyLocal = message.getBodyBuffer(); + ActiveMQBuffer bodyLocal = message.getBodyBuffer(); bodyLocal.writeBytes(body); @@ -659,7 +659,7 @@ public class PagingTest extends ServiceTestBase message.putIntProperty("tst-count", i); - HornetQBuffer bodyLocal = message.getBodyBuffer(); + ActiveMQBuffer bodyLocal = message.getBodyBuffer(); bodyLocal.writeBytes(body); @@ -785,7 +785,7 @@ public class PagingTest extends ServiceTestBase { message = session.createMessage(true); - HornetQBuffer bodyLocal = message.getBodyBuffer(); + ActiveMQBuffer bodyLocal = message.getBodyBuffer(); bodyLocal.writeBytes(body); @@ -961,7 +961,7 @@ public class PagingTest extends ServiceTestBase { message = session.createMessage(true); - HornetQBuffer bodyLocal = message.getBodyBuffer(); + ActiveMQBuffer bodyLocal = message.getBodyBuffer(); bodyLocal.writeBytes(body); @@ -1169,7 +1169,7 @@ public class PagingTest extends ServiceTestBase { message = session.createMessage(true); - HornetQBuffer bodyLocal = message.getBodyBuffer(); + ActiveMQBuffer bodyLocal = message.getBodyBuffer(); bodyLocal.writeBytes(body); @@ -1251,7 +1251,7 @@ public class PagingTest extends ServiceTestBase { message = session.createMessage(true); - HornetQBuffer bodyLocal = message.getBodyBuffer(); + ActiveMQBuffer bodyLocal = message.getBodyBuffer(); bodyLocal.writeBytes(body); @@ -1382,7 +1382,7 @@ public class PagingTest extends ServiceTestBase { message = session.createMessage(true); - HornetQBuffer bodyLocal = message.getBodyBuffer(); + ActiveMQBuffer bodyLocal = message.getBodyBuffer(); bodyLocal.writeBytes(body); @@ -1490,7 +1490,7 @@ public class PagingTest extends ServiceTestBase { message = session.createMessage(true); - HornetQBuffer bodyLocal = message.getBodyBuffer(); + ActiveMQBuffer bodyLocal = message.getBodyBuffer(); bodyLocal.writeBytes(body); @@ -1606,7 +1606,7 @@ public class PagingTest extends ServiceTestBase { message = session.createMessage(true); - HornetQBuffer bodyLocal = message.getBodyBuffer(); + ActiveMQBuffer bodyLocal = message.getBodyBuffer(); bodyLocal.writeBytes(body); @@ -1793,7 +1793,7 @@ public class PagingTest extends ServiceTestBase { message = session.createMessage(true); - HornetQBuffer bodyLocal = message.getBodyBuffer(); + ActiveMQBuffer bodyLocal = message.getBodyBuffer(); bodyLocal.writeBytes(body); @@ -1939,7 +1939,7 @@ public class PagingTest extends ServiceTestBase { message = session.createMessage(persistentMessages); - HornetQBuffer bodyLocal = message.getBodyBuffer(); + ActiveMQBuffer bodyLocal = message.getBodyBuffer(); bodyLocal.writeBytes(body); @@ -2136,7 +2136,7 @@ public class PagingTest extends ServiceTestBase } message = session.createMessage(true); - HornetQBuffer bodyLocal = message.getBodyBuffer(); + ActiveMQBuffer bodyLocal = message.getBodyBuffer(); bodyLocal.writeBytes(body); @@ -2363,7 +2363,7 @@ public class PagingTest extends ServiceTestBase } message = session.createMessage(true); - HornetQBuffer bodyLocal = message.getBodyBuffer(); + ActiveMQBuffer bodyLocal = message.getBodyBuffer(); bodyLocal.writeBytes(body); @@ -2527,7 +2527,7 @@ public class PagingTest extends ServiceTestBase { message = session.createMessage(persistentMessages); - HornetQBuffer bodyLocal = message.getBodyBuffer(); + ActiveMQBuffer bodyLocal = message.getBodyBuffer(); bodyLocal.writeBytes(body); @@ -2596,7 +2596,7 @@ public class PagingTest extends ServiceTestBase session.close(); } - private void assertBodiesEqual(final byte[] body, final HornetQBuffer buffer) + private void assertBodiesEqual(final byte[] body, final ActiveMQBuffer buffer) { byte[] other = new byte[body.length]; @@ -3367,7 +3367,7 @@ public class PagingTest extends ServiceTestBase { message = session.createMessage(true); - HornetQBuffer bodyLocal = message.getBodyBuffer(); + ActiveMQBuffer bodyLocal = message.getBodyBuffer(); for (int j = 1; j <= numberOfIntegers; j++) { @@ -3426,7 +3426,7 @@ public class PagingTest extends ServiceTestBase { message = session.createMessage(true); - HornetQBuffer bodyLocal = message.getBodyBuffer(); + ActiveMQBuffer bodyLocal = message.getBodyBuffer(); for (int j = 1; j <= numberOfIntegers; j++) { @@ -3512,7 +3512,7 @@ public class PagingTest extends ServiceTestBase { message = session.createMessage(true); - HornetQBuffer bodyLocal = message.getBodyBuffer(); + ActiveMQBuffer bodyLocal = message.getBodyBuffer(); bodyLocal.writeBytes(new byte[1024]); @@ -4275,7 +4275,7 @@ public class PagingTest extends ServiceTestBase { sessionConsumer.close(); } - catch (HornetQException e) + catch (ActiveMQException e) { e.printStackTrace(); errors.incrementAndGet(); @@ -4295,7 +4295,7 @@ public class PagingTest extends ServiceTestBase { message = session.createMessage(persistentMessages); - HornetQBuffer bodyLocal = message.getBodyBuffer(); + ActiveMQBuffer bodyLocal = message.getBodyBuffer(); bodyLocal.writeBytes(body); @@ -4379,7 +4379,7 @@ public class PagingTest extends ServiceTestBase { message = session.createMessage(persistentMessages); - HornetQBuffer bodyLocal = message.getBodyBuffer(); + ActiveMQBuffer bodyLocal = message.getBodyBuffer(); bodyLocal.writeBytes(body); @@ -4481,7 +4481,7 @@ public class PagingTest extends ServiceTestBase { message = session.createMessage(persistentMessages); - HornetQBuffer bodyLocal = message.getBodyBuffer(); + ActiveMQBuffer bodyLocal = message.getBodyBuffer(); bodyLocal.writeBytes(body); @@ -4602,7 +4602,7 @@ public class PagingTest extends ServiceTestBase ClientMessage message = session.createMessage(persistentMessages); - HornetQBuffer bodyLocal = message.getBodyBuffer(); + ActiveMQBuffer bodyLocal = message.getBodyBuffer(); bodyLocal.writeBytes(new byte[1024]); @@ -4699,7 +4699,7 @@ public class PagingTest extends ServiceTestBase { message = session.createMessage(persistentMessages); - HornetQBuffer bodyLocal = message.getBodyBuffer(); + ActiveMQBuffer bodyLocal = message.getBodyBuffer(); bodyLocal.writeBytes(body); @@ -5451,20 +5451,20 @@ public class PagingTest extends ServiceTestBase */ private void validateExceptionOnSending(ClientProducer producer, ClientMessage message) { - HornetQException expected = null; + ActiveMQException expected = null; try { // after the address is full this send should fail (since the address full policy is FAIL) producer.send(message); } - catch (HornetQException e) + catch (ActiveMQException e) { expected = e; } assertNotNull(expected); - assertEquals(HornetQExceptionType.ADDRESS_FULL, expected.getType()); + assertEquals(ActiveMQExceptionType.ADDRESS_FULL, expected.getType()); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ProducerCloseTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ProducerCloseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ProducerCloseTest.java index a63ba53..d4074f0 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ProducerCloseTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ProducerCloseTest.java @@ -11,14 +11,14 @@ * permissions and limitations under the License. */ package org.apache.activemq.tests.integration.client; +import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.api.core.ActiveMQExceptionType; import org.junit.Before; import org.junit.Test; import org.junit.Assert; -import org.apache.activemq.api.core.HornetQException; -import org.apache.activemq.api.core.HornetQExceptionType; import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.api.core.client.ClientProducer; import org.apache.activemq.api.core.client.ClientSession; @@ -54,9 +54,9 @@ public class ProducerCloseTest extends ServiceTestBase Assert.assertTrue(producer.isClosed()); - UnitTestCase.expectHornetQException(HornetQExceptionType.OBJECT_CLOSED, new HornetQAction() + UnitTestCase.expectHornetQException(ActiveMQExceptionType.OBJECT_CLOSED, new HornetQAction() { - public void run() throws HornetQException + public void run() throws ActiveMQException { producer.send(session.createMessage(false)); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ProducerFlowControlTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ProducerFlowControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ProducerFlowControlTest.java index 131b6e4..ff6d15b 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ProducerFlowControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ProducerFlowControlTest.java @@ -19,7 +19,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.activemq.api.core.HornetQObjectClosedException; +import org.apache.activemq.api.core.ActiveMQObjectClosedException; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientConsumer; import org.apache.activemq.api.core.client.ClientMessage; @@ -428,7 +428,7 @@ public class ProducerFlowControlTest extends ServiceTestBase producer.send(message); } } - catch (HornetQObjectClosedException expected) + catch (ActiveMQObjectClosedException expected) { } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ProducerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ProducerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ProducerTest.java index 20906f4..2976127 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ProducerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ProducerTest.java @@ -15,7 +15,7 @@ package org.apache.activemq.tests.integration.client; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.Interceptor; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientConsumer; @@ -61,7 +61,7 @@ public class ProducerTest extends ServiceTestBase final CountDownLatch latch = new CountDownLatch(1); server.getRemotingService().addIncomingInterceptor(new Interceptor() { - public boolean intercept(final Packet packet, final RemotingConnection connection) throws HornetQException + public boolean intercept(final Packet packet, final RemotingConnection connection) throws ActiveMQException { if (packet.getType() == PacketImpl.SESS_SEND) { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ReceiveTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ReceiveTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ReceiveTest.java index e8fc3ba..60716eb 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ReceiveTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ReceiveTest.java @@ -12,9 +12,9 @@ */ package org.apache.activemq.tests.integration.client; -import org.apache.activemq.api.core.HornetQException; -import org.apache.activemq.api.core.HornetQIllegalStateException; -import org.apache.activemq.api.core.HornetQObjectClosedException; +import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.api.core.ActiveMQIllegalStateException; +import org.apache.activemq.api.core.ActiveMQObjectClosedException; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientConsumer; import org.apache.activemq.api.core.client.ClientMessage; @@ -99,11 +99,11 @@ public class ReceiveTest extends ServiceTestBase cc.receive(); Assert.fail("should throw exception"); } - catch (HornetQObjectClosedException oce) + catch (ActiveMQObjectClosedException oce) { //ok } - catch (HornetQException e) + catch (ActiveMQException e) { fail("Invalid Exception type:" + e.getType()); } @@ -130,11 +130,11 @@ public class ReceiveTest extends ServiceTestBase cc.receive(); Assert.fail("should throw exception"); } - catch (HornetQIllegalStateException ise) + catch (ActiveMQIllegalStateException ise) { //ok } - catch (HornetQException e) + catch (ActiveMQException e) { fail("Invalid Exception type:" + e.getType()); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/RedeliveryConsumerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/RedeliveryConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/RedeliveryConsumerTest.java index c17095b..537b704 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/RedeliveryConsumerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/RedeliveryConsumerTest.java @@ -15,7 +15,7 @@ package org.apache.activemq.tests.integration.client; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientConsumer; import org.apache.activemq.api.core.client.ClientMessage; @@ -368,7 +368,7 @@ public class RedeliveryConsumerTest extends ServiceTestBase { session.createQueue(ADDRESS, ADDRESS, true); } - catch (HornetQException expected) + catch (ActiveMQException expected) { // in case of restart } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/RequestorTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/RequestorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/RequestorTest.java index 17847c7..75dcda4 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/RequestorTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/RequestorTest.java @@ -12,8 +12,8 @@ */ package org.apache.activemq.tests.integration.client; -import org.apache.activemq.api.core.HornetQException; -import org.apache.activemq.api.core.HornetQExceptionType; +import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.api.core.ActiveMQExceptionType; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientConsumer; import org.apache.activemq.api.core.client.ClientMessage; @@ -216,7 +216,7 @@ public class RequestorTest extends ServiceTestBase }; UnitTestCase.expectHornetQException("ClientRequestor's session must not be closed", - HornetQExceptionType.OBJECT_CLOSED, + ActiveMQExceptionType.OBJECT_CLOSED, hornetQAction); } @@ -260,7 +260,7 @@ public class RequestorTest extends ServiceTestBase }; UnitTestCase.expectHornetQException("can not send a request on a closed ClientRequestor", - HornetQExceptionType.OBJECT_CLOSED, hornetQAction); + ActiveMQExceptionType.OBJECT_CLOSED, hornetQAction); } @Override @@ -316,7 +316,7 @@ public class RequestorTest extends ServiceTestBase replyProducer.send(reply); request.acknowledge(); } - catch (HornetQException e) + catch (ActiveMQException e) { e.printStackTrace(); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SelfExpandingBufferTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SelfExpandingBufferTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SelfExpandingBufferTest.java index 8b4e10c..0ee579d 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SelfExpandingBufferTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SelfExpandingBufferTest.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.tests.integration.client; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientConsumer; import org.apache.activemq.api.core.client.ClientMessage; @@ -85,7 +85,7 @@ public class SelfExpandingBufferTest extends ServiceTestBase ClientMessage msg = session.createMessage(true); - HornetQBuffer buffer = msg.getBodyBuffer(); + ActiveMQBuffer buffer = msg.getBodyBuffer(); SelfExpandingBufferTest.log.info("buffer is " + buffer); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ServerLocatorConnectTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ServerLocatorConnectTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ServerLocatorConnectTest.java index 4e0bdbb..b6e0951 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ServerLocatorConnectTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ServerLocatorConnectTest.java @@ -15,8 +15,8 @@ package org.apache.activemq.tests.integration.client; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.apache.activemq.api.core.HornetQException; -import org.apache.activemq.api.core.HornetQNotConnectedException; +import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.api.core.ActiveMQNotConnectedException; import org.apache.activemq.api.core.client.ClientSessionFactory; import org.apache.activemq.api.core.client.HornetQClient; import org.apache.activemq.api.core.client.ServerLocator; @@ -115,14 +115,14 @@ public class ServerLocatorConnectTest extends ServiceTestBase { csf = locator.connect(); } - catch (HornetQNotConnectedException nce) + catch (ActiveMQNotConnectedException nce) { //ok } catch (Exception e) { - assertTrue(e instanceof HornetQException); - fail("Invalid Exception type:" + ((HornetQException) e).getType()); + assertTrue(e instanceof ActiveMQException); + fail("Invalid Exception type:" + ((ActiveMQException) e).getType()); } assertNull(csf); locator.close(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCloseTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCloseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCloseTest.java index 4f93bc4..ea8d4cd 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCloseTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCloseTest.java @@ -11,6 +11,8 @@ * permissions and limitations under the License. */ package org.apache.activemq.tests.integration.client; +import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.api.core.ActiveMQExceptionType; import org.junit.Before; import org.junit.After; @@ -21,8 +23,6 @@ import javax.transaction.xa.XAResource; import org.junit.Assert; -import org.apache.activemq.api.core.HornetQException; -import org.apache.activemq.api.core.HornetQExceptionType; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.api.core.client.ClientConsumer; @@ -72,25 +72,25 @@ public class SessionCloseTest extends UnitTestCase Assert.assertTrue(session.isClosed()); - UnitTestCase.expectHornetQException(HornetQExceptionType.OBJECT_CLOSED, new HornetQAction() + UnitTestCase.expectHornetQException(ActiveMQExceptionType.OBJECT_CLOSED, new HornetQAction() { - public void run() throws HornetQException + public void run() throws ActiveMQException { session.createProducer(); } }); - UnitTestCase.expectHornetQException(HornetQExceptionType.OBJECT_CLOSED, new HornetQAction() + UnitTestCase.expectHornetQException(ActiveMQExceptionType.OBJECT_CLOSED, new HornetQAction() { - public void run() throws HornetQException + public void run() throws ActiveMQException { session.createConsumer(RandomUtil.randomSimpleString()); } }); - UnitTestCase.expectHornetQException(HornetQExceptionType.OBJECT_CLOSED, new HornetQAction() + UnitTestCase.expectHornetQException(ActiveMQExceptionType.OBJECT_CLOSED, new HornetQAction() { - public void run() throws HornetQException + public void run() throws ActiveMQException { session.createQueue(RandomUtil.randomSimpleString(), RandomUtil.randomSimpleString(), @@ -98,57 +98,57 @@ public class SessionCloseTest extends UnitTestCase } }); - UnitTestCase.expectHornetQException(HornetQExceptionType.OBJECT_CLOSED, new HornetQAction() + UnitTestCase.expectHornetQException(ActiveMQExceptionType.OBJECT_CLOSED, new HornetQAction() { - public void run() throws HornetQException + public void run() throws ActiveMQException { session.createTemporaryQueue(RandomUtil.randomSimpleString(), RandomUtil.randomSimpleString()); } }); - UnitTestCase.expectHornetQException(HornetQExceptionType.OBJECT_CLOSED, new HornetQAction() + UnitTestCase.expectHornetQException(ActiveMQExceptionType.OBJECT_CLOSED, new HornetQAction() { - public void run() throws HornetQException + public void run() throws ActiveMQException { session.start(); } }); - UnitTestCase.expectHornetQException(HornetQExceptionType.OBJECT_CLOSED, new HornetQAction() + UnitTestCase.expectHornetQException(ActiveMQExceptionType.OBJECT_CLOSED, new HornetQAction() { - public void run() throws HornetQException + public void run() throws ActiveMQException { session.stop(); } }); - UnitTestCase.expectHornetQException(HornetQExceptionType.OBJECT_CLOSED, new HornetQAction() + UnitTestCase.expectHornetQException(ActiveMQExceptionType.OBJECT_CLOSED, new HornetQAction() { - public void run() throws HornetQException + public void run() throws ActiveMQException { session.commit(); } }); - UnitTestCase.expectHornetQException(HornetQExceptionType.OBJECT_CLOSED, new HornetQAction() + UnitTestCase.expectHornetQException(ActiveMQExceptionType.OBJECT_CLOSED, new HornetQAction() { - public void run() throws HornetQException + public void run() throws ActiveMQException { session.rollback(); } }); - UnitTestCase.expectHornetQException(HornetQExceptionType.OBJECT_CLOSED, new HornetQAction() + UnitTestCase.expectHornetQException(ActiveMQExceptionType.OBJECT_CLOSED, new HornetQAction() { - public void run() throws HornetQException + public void run() throws ActiveMQException { session.queueQuery(RandomUtil.randomSimpleString()); } }); - UnitTestCase.expectHornetQException(HornetQExceptionType.OBJECT_CLOSED, new HornetQAction() + UnitTestCase.expectHornetQException(ActiveMQExceptionType.OBJECT_CLOSED, new HornetQAction() { - public void run() throws HornetQException + public void run() throws ActiveMQException { session.addressQuery(RandomUtil.randomSimpleString()); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java index abcc827..49d4c58 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java @@ -12,9 +12,9 @@ */ package org.apache.activemq.tests.integration.client; -import org.apache.activemq.api.core.HornetQException; -import org.apache.activemq.api.core.HornetQNotConnectedException; -import org.apache.activemq.api.core.HornetQObjectClosedException; +import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.api.core.ActiveMQNotConnectedException; +import org.apache.activemq.api.core.ActiveMQObjectClosedException; import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.api.core.client.ClientConsumer; import org.apache.activemq.api.core.client.ClientProducer; @@ -62,7 +62,7 @@ public class SessionClosedOnRemotingConnectionFailureTest extends ServiceTestBas RemotingConnection connection = ((ClientSessionInternal) session).getConnection(); - connection.fail(new HornetQNotConnectedException()); + connection.fail(new ActiveMQNotConnectedException()); Assert.assertTrue(session.isClosed()); @@ -78,11 +78,11 @@ public class SessionClosedOnRemotingConnectionFailureTest extends ServiceTestBas Assert.fail("Should throw exception"); } - catch (HornetQObjectClosedException oce) + catch (ActiveMQObjectClosedException oce) { //ok } - catch (HornetQException e) + catch (ActiveMQException e) { fail("Invalid Exception type:" + e.getType()); } @@ -93,11 +93,11 @@ public class SessionClosedOnRemotingConnectionFailureTest extends ServiceTestBas Assert.fail("Should throw exception"); } - catch (HornetQObjectClosedException oce) + catch (ActiveMQObjectClosedException oce) { //ok } - catch (HornetQException e) + catch (ActiveMQException e) { fail("Invalid Exception type:" + e.getType()); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCreateAndDeleteQueueTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCreateAndDeleteQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCreateAndDeleteQueueTest.java index f25d134..4387f54 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCreateAndDeleteQueueTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCreateAndDeleteQueueTest.java @@ -12,8 +12,8 @@ */ package org.apache.activemq.tests.integration.client; -import org.apache.activemq.api.core.HornetQException; -import org.apache.activemq.api.core.HornetQNonExistentQueueException; +import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.api.core.ActiveMQNonExistentQueueException; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientSession; import org.apache.activemq.api.core.client.ServerLocator; @@ -139,11 +139,11 @@ public class SessionCreateAndDeleteQueueTest extends ServiceTestBase session.deleteQueue(queueName); Assert.fail("should throw exception"); } - catch (HornetQNonExistentQueueException neqe) + catch (ActiveMQNonExistentQueueException neqe) { //ok } - catch (HornetQException e) + catch (ActiveMQException e) { fail("Invalid Exception type:" + e.getType()); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCreateConsumerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCreateConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCreateConsumerTest.java index d46f69b..76773f6 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCreateConsumerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCreateConsumerTest.java @@ -12,9 +12,9 @@ */ package org.apache.activemq.tests.integration.client; -import org.apache.activemq.api.core.HornetQException; -import org.apache.activemq.api.core.HornetQInvalidFilterExpressionException; -import org.apache.activemq.api.core.HornetQNonExistentQueueException; +import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.api.core.ActiveMQInvalidFilterExpressionException; +import org.apache.activemq.api.core.ActiveMQNonExistentQueueException; import org.apache.activemq.api.core.client.ClientConsumer; import org.apache.activemq.api.core.client.ClientSessionFactory; import org.apache.activemq.api.core.client.ServerLocator; @@ -69,11 +69,11 @@ public class SessionCreateConsumerTest extends ServiceTestBase clientSession.createConsumer(queueName); Assert.fail("should throw exception"); } - catch (HornetQNonExistentQueueException neqe) + catch (ActiveMQNonExistentQueueException neqe) { //ok } - catch (HornetQException e) + catch (ActiveMQException e) { fail("Invalid Exception type:" + e.getType()); } @@ -96,11 +96,11 @@ public class SessionCreateConsumerTest extends ServiceTestBase clientSession.createConsumer(queueName, "this is not valid filter"); Assert.fail("should throw exception"); } - catch (HornetQInvalidFilterExpressionException ifee) + catch (ActiveMQInvalidFilterExpressionException ifee) { //ok } - catch (HornetQException e) + catch (ActiveMQException e) { fail("Invalid Exception type:" + e.getType()); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCreateProducerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCreateProducerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCreateProducerTest.java index 6b7956d..1d0d7ec 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCreateProducerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionCreateProducerTest.java @@ -12,8 +12,8 @@ */ package org.apache.activemq.tests.integration.client; -import org.apache.activemq.api.core.HornetQException; -import org.apache.activemq.api.core.HornetQObjectClosedException; +import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.api.core.ActiveMQObjectClosedException; import org.apache.activemq.api.core.client.ClientProducer; import org.apache.activemq.api.core.client.ClientSessionFactory; import org.apache.activemq.api.core.client.ServerLocator; @@ -79,11 +79,11 @@ public class SessionCreateProducerTest extends ServiceTestBase clientSession.createProducer(); Assert.fail("should throw exception"); } - catch (HornetQObjectClosedException oce) + catch (ActiveMQObjectClosedException oce) { //ok } - catch (HornetQException e) + catch (ActiveMQException e) { fail("Invalid Exception type:" + e.getType()); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionTest.java index 285f13a..0a68b28 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SessionTest.java @@ -15,8 +15,8 @@ package org.apache.activemq.tests.integration.client; import java.util.List; import java.util.concurrent.TimeUnit; -import org.apache.activemq.api.core.HornetQException; -import org.apache.activemq.api.core.HornetQInternalErrorException; +import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.api.core.ActiveMQInternalErrorException; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientConsumer; import org.apache.activemq.api.core.client.ClientMessage; @@ -88,18 +88,18 @@ public class SessionTest extends ServiceTestBase boolean called = false; @Override - public void connectionFailed(final HornetQException me, boolean failedOver) + public void connectionFailed(final ActiveMQException me, boolean failedOver) { called = true; } @Override - public void connectionFailed(final HornetQException me, boolean failedOver, String scaleDownTargetNodeID) + public void connectionFailed(final ActiveMQException me, boolean failedOver, String scaleDownTargetNodeID) { connectionFailed(me, failedOver); } - public void beforeReconnect(final HornetQException me) + public void beforeReconnect(final ActiveMQException me) { } } @@ -142,7 +142,7 @@ public class SessionTest extends ServiceTestBase RemotingConnection rc = clientSession.getConnection(); - rc.fail(new HornetQInternalErrorException()); + rc.fail(new ActiveMQInternalErrorException()); clientSession.close(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SlowConsumerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SlowConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SlowConsumerTest.java index d7499a9..bfcdad1 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SlowConsumerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SlowConsumerTest.java @@ -19,9 +19,9 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; import org.apache.activemq.api.config.HornetQDefaultConfiguration; -import org.apache.activemq.api.core.HornetQException; -import org.apache.activemq.api.core.HornetQExceptionType; -import org.apache.activemq.api.core.HornetQObjectClosedException; +import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.api.core.ActiveMQExceptionType; +import org.apache.activemq.api.core.ActiveMQObjectClosedException; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientConsumer; import org.apache.activemq.api.core.client.ClientMessage; @@ -120,9 +120,9 @@ public class SlowConsumerTest extends ServiceTestBase consumer.receiveImmediate(); fail(); } - catch (HornetQObjectClosedException e) + catch (ActiveMQObjectClosedException e) { - assertEquals(e.getType(), HornetQExceptionType.OBJECT_CLOSED); + assertEquals(e.getType(), ActiveMQExceptionType.OBJECT_CLOSED); } } @@ -184,7 +184,7 @@ public class SlowConsumerTest extends ServiceTestBase { message.acknowledge(); } - catch (HornetQException e) + catch (ActiveMQException e) { e.printStackTrace(); } @@ -260,7 +260,7 @@ public class SlowConsumerTest extends ServiceTestBase producer.send(m); messagesProduced.incrementAndGet(); } - catch (HornetQException e) + catch (ActiveMQException e) { e.printStackTrace(); return; @@ -353,9 +353,9 @@ public class SlowConsumerTest extends ServiceTestBase consumer.receiveImmediate(); fail(); } - catch (HornetQObjectClosedException e) + catch (ActiveMQObjectClosedException e) { - assertEquals(e.getType(), HornetQExceptionType.OBJECT_CLOSED); + assertEquals(e.getType(), ActiveMQExceptionType.OBJECT_CLOSED); } } } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TemporaryQueueTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TemporaryQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TemporaryQueueTest.java index ad52394..dd344ee 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TemporaryQueueTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TemporaryQueueTest.java @@ -17,12 +17,12 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq.api.core.HornetQDisconnectedException; -import org.apache.activemq.api.core.HornetQException; -import org.apache.activemq.api.core.HornetQExceptionType; -import org.apache.activemq.api.core.HornetQIOErrorException; -import org.apache.activemq.api.core.HornetQInternalErrorException; -import org.apache.activemq.api.core.HornetQNonExistentQueueException; +import org.apache.activemq.api.core.ActiveMQDisconnectedException; +import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.api.core.ActiveMQExceptionType; +import org.apache.activemq.api.core.ActiveMQIOErrorException; +import org.apache.activemq.api.core.ActiveMQInternalErrorException; +import org.apache.activemq.api.core.ActiveMQNonExistentQueueException; import org.apache.activemq.api.core.Interceptor; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientConsumer; @@ -219,11 +219,11 @@ public class TemporaryQueueTest extends SingleServerTestBase session.createConsumer(queue); Assert.fail("temp queue must not exist after the remoting connection is closed"); } - catch (HornetQNonExistentQueueException neqe) + catch (ActiveMQNonExistentQueueException neqe) { //ol } - catch (HornetQException e) + catch (ActiveMQException e) { fail("Invalid Exception type:" + e.getType()); } @@ -367,7 +367,7 @@ public class TemporaryQueueTest extends SingleServerTestBase RemotingConnectionImpl conn = (RemotingConnectionImpl) ((ClientSessionInternal) session).getConnection(); - conn.fail(new HornetQIOErrorException()); + conn.fail(new ActiveMQIOErrorException()); prod.send(session.createMessage(false)); session.commit(); @@ -513,7 +513,7 @@ public class TemporaryQueueTest extends SingleServerTestBase server.getRemotingService().addIncomingInterceptor(new Interceptor() { - public boolean intercept(final Packet packet, final RemotingConnection connection) throws HornetQException + public boolean intercept(final Packet packet, final RemotingConnection connection) throws ActiveMQException { if (packet.getType() == PacketImpl.PING) { @@ -544,7 +544,7 @@ public class TemporaryQueueTest extends SingleServerTestBase } }); - ((ClientSessionInternal) session).getConnection().fail(new HornetQInternalErrorException("simulate a client failure")); + ((ClientSessionInternal) session).getConnection().fail(new ActiveMQInternalErrorException("simulate a client failure")); // let some time for the server to clean the connections Assert.assertTrue("server has not closed the connection", @@ -571,14 +571,14 @@ public class TemporaryQueueTest extends SingleServerTestBase HornetQAction hornetQAction = new HornetQAction() { - public void run() throws HornetQException + public void run() throws ActiveMQException { session.createConsumer(queue); } }; UnitTestCase.expectHornetQException("temp queue must not exist after the server detected the client crash", - HornetQExceptionType.QUEUE_DOES_NOT_EXIST, hornetQAction); + ActiveMQExceptionType.QUEUE_DOES_NOT_EXIST, hornetQAction); session.close(); @@ -663,7 +663,7 @@ public class TemporaryQueueTest extends SingleServerTestBase { System.out.println("Failing session"); ServerSessionImpl impl = (ServerSessionImpl) sessionIterator; - impl.getRemotingConnection().fail(new HornetQDisconnectedException("failure e")); + impl.getRemotingConnection().fail(new ActiveMQDisconnectedException("failure e")); } } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TransientQueueTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TransientQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TransientQueueTest.java index 99dda29..852496b 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TransientQueueTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/TransientQueueTest.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.tests.integration.client; -import org.apache.activemq.api.core.HornetQInvalidTransientQueueUseException; +import org.apache.activemq.api.core.ActiveMQInvalidTransientQueueUseException; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientConsumer; import org.apache.activemq.api.core.client.ClientMessage; @@ -169,7 +169,7 @@ public class TransientQueueTest extends SingleServerTestBase // There's already a queue with that name, we are supposed to throw an exception session2.createSharedQueue(address2, queue, false); } - catch (HornetQInvalidTransientQueueUseException e) + catch (ActiveMQInvalidTransientQueueUseException e) { exHappened = true; } @@ -184,7 +184,7 @@ public class TransientQueueTest extends SingleServerTestBase // There's already a queue with that name, we are supposed to throw an exception session2.createSharedQueue(address, queue, SimpleString.toSimpleString("a=1"), false); } - catch (HornetQInvalidTransientQueueUseException e) + catch (ActiveMQInvalidTransientQueueUseException e) { exHappened = true; } @@ -206,7 +206,7 @@ public class TransientQueueTest extends SingleServerTestBase // There's already a queue with that name, we are supposed to throw an exception session2.createSharedQueue(address, queue, SimpleString.toSimpleString("q=2"), false); } - catch (HornetQInvalidTransientQueueUseException e) + catch (ActiveMQInvalidTransientQueueUseException e) { exHappened = true; } @@ -220,7 +220,7 @@ public class TransientQueueTest extends SingleServerTestBase // There's already a queue with that name, we are supposed to throw an exception session2.createSharedQueue(address, queue, false); } - catch (HornetQInvalidTransientQueueUseException e) + catch (ActiveMQInvalidTransientQueueUseException e) { exHappened = true; } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/WildCardRoutingTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/WildCardRoutingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/WildCardRoutingTest.java index 750be82..85fcbec 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/WildCardRoutingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/WildCardRoutingTest.java @@ -11,6 +11,7 @@ * permissions and limitations under the License. */ package org.apache.activemq.tests.integration.client; +import org.apache.activemq.api.core.ActiveMQException; import org.junit.Before; import org.junit.After; @@ -18,7 +19,6 @@ import org.junit.Test; import org.junit.Assert; -import org.apache.activemq.api.core.HornetQException; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.api.core.client.ClientConsumer; @@ -811,7 +811,7 @@ public class WildCardRoutingTest extends UnitTestCase { clientSession.close(); } - catch (HornetQException e1) + catch (ActiveMQException e1) { // } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/DummyInterceptor.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/DummyInterceptor.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/DummyInterceptor.java index c4e07ca..595f246 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/DummyInterceptor.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/DummyInterceptor.java @@ -14,9 +14,9 @@ package org.apache.activemq.tests.integration.clientcrash; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.api.core.ActiveMQInternalErrorException; import org.apache.activemq.api.core.Interceptor; -import org.apache.activemq.api.core.HornetQInternalErrorException; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.core.protocol.core.Packet; import org.apache.activemq.core.protocol.core.impl.wireformat.SessionReceiveMessage; @@ -46,13 +46,13 @@ public class DummyInterceptor implements Interceptor syncCounter.set(0); } - public boolean intercept(final Packet packet, final RemotingConnection conn) throws HornetQException + public boolean intercept(final Packet packet, final RemotingConnection conn) throws ActiveMQException { log.debug("DummyFilter packet = " + packet.getClass().getName()); syncCounter.addAndGet(1); if (sendException) { - throw new HornetQInternalErrorException(); + throw new ActiveMQInternalErrorException(); } if (changeMessage) { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/DummyInterceptorB.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/DummyInterceptorB.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/DummyInterceptorB.java index 45d722b..9f59a4a 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/DummyInterceptorB.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/clientcrash/DummyInterceptorB.java @@ -14,7 +14,7 @@ package org.apache.activemq.tests.integration.clientcrash; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.Interceptor; import org.apache.activemq.core.protocol.core.Packet; import org.apache.activemq.spi.core.protocol.RemotingConnection; @@ -42,7 +42,7 @@ public class DummyInterceptorB implements Interceptor DummyInterceptorB.syncCounter.set(0); } - public boolean intercept(final Packet packet, final RemotingConnection conn) throws HornetQException + public boolean intercept(final Packet packet, final RemotingConnection conn) throws ActiveMQException { DummyInterceptorB.syncCounter.addAndGet(1); log.debug("DummyFilter packet = " + packet); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/ClusterControllerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/ClusterControllerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/ClusterControllerTest.java index b11567c..1b0434f 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/ClusterControllerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/ClusterControllerTest.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.tests.integration.cluster; -import org.apache.activemq.api.core.HornetQClusterSecurityException; +import org.apache.activemq.api.core.ActiveMQClusterSecurityException; import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.api.core.client.HornetQClient; import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal; @@ -90,7 +90,7 @@ public class ClusterControllerTest extends ClusterTestBase } catch (Exception e) { - assertTrue("should throw HornetQClusterSecurityException", e instanceof HornetQClusterSecurityException); + assertTrue("should throw HornetQClusterSecurityException", e instanceof ActiveMQClusterSecurityException); } } } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeReconnectTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeReconnectTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeReconnectTest.java index f3fcc11..70ea277 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeReconnectTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeReconnectTest.java @@ -17,9 +17,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.activemq.api.core.HornetQException; -import org.apache.activemq.api.core.HornetQExceptionType; -import org.apache.activemq.api.core.HornetQNotConnectedException; +import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.api.core.ActiveMQExceptionType; +import org.apache.activemq.api.core.ActiveMQNotConnectedException; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.api.core.client.ClientConsumer; @@ -420,10 +420,10 @@ public class BridgeReconnectTest extends BridgeTestBase RemotingConnection forwardingConnection = getForwardingConnection(bridge); InVMConnector.failOnCreateConnection = true; InVMConnector.numberOfFailures = reconnectAttempts - 1; - forwardingConnection.fail(new HornetQNotConnectedException()); + forwardingConnection.fail(new ActiveMQNotConnectedException()); forwardingConnection = getForwardingConnection(bridge); - forwardingConnection.fail(new HornetQNotConnectedException()); + forwardingConnection.fail(new ActiveMQNotConnectedException()); final ManagementService managementService = server0.getManagementService(); QueueControl coreQueueControl = (QueueControl) managementService.getResource(ResourceNames.CORE_QUEUE + queueName); @@ -642,7 +642,7 @@ public class BridgeReconnectTest extends BridgeTestBase RemotingConnection forwardingConnection = getForwardingConnection(bridge); InVMConnector.failOnCreateConnection = true; InVMConnector.numberOfFailures = reconnectAttempts - 1; - forwardingConnection.fail(new HornetQNotConnectedException()); + forwardingConnection.fail(new ActiveMQNotConnectedException()); final int numMessages = NUM_MESSAGES; @@ -680,7 +680,7 @@ public class BridgeReconnectTest extends BridgeTestBase forwardingConnection = ((BridgeImpl) bridge).getForwardingConnection(); InVMConnector.failOnCreateConnection = true; InVMConnector.numberOfFailures = reconnectAttempts - 1; - forwardingConnection.fail(new HornetQException(HornetQExceptionType.UNBLOCKED)); + forwardingConnection.fail(new ActiveMQException(ActiveMQExceptionType.UNBLOCKED)); for (int i = 0; i < numMessages; i++) { @@ -776,7 +776,7 @@ public class BridgeReconnectTest extends BridgeTestBase if (i == 50) { - forwardingConnection.fail(new HornetQException(HornetQExceptionType.UNBLOCKED)); + forwardingConnection.fail(new ActiveMQException(ActiveMQExceptionType.UNBLOCKED)); } } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeTest.java index d491493..88e82dc 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/BridgeTest.java @@ -23,8 +23,8 @@ import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq.api.core.HornetQBuffer; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQBuffer; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.Interceptor; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.TransportConfiguration; @@ -300,7 +300,7 @@ public class BridgeTest extends ServiceTestBase latch = new CountDownLatch(numberOfIgnores); } - public boolean intercept(Packet packet, RemotingConnection connection) throws HornetQException + public boolean intercept(Packet packet, RemotingConnection connection) throws ActiveMQException { if (ignoreSends && packet instanceof SessionSendMessage || ignoreSends && packet instanceof SessionSendLargeMessage || @@ -1553,7 +1553,7 @@ public class BridgeTest extends ServiceTestBase static int count = 0; @Override - public synchronized boolean intercept(Packet packet, RemotingConnection connection) throws HornetQException + public synchronized boolean intercept(Packet packet, RemotingConnection connection) throws ActiveMQException { if (packet instanceof SessionSendMessage && count == 1000) @@ -1705,7 +1705,7 @@ public class BridgeTest extends ServiceTestBase Assert.assertEquals(i, message.getObjectProperty(propKey)); - HornetQBuffer buff = message.getBodyBuffer(); + ActiveMQBuffer buff = message.getBodyBuffer(); for (int posMsg = 0; posMsg < LARGE_MESSAGE_SIZE; posMsg++) { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/SimpleTransformer.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/SimpleTransformer.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/SimpleTransformer.java index d8ea441..efb63fe 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/SimpleTransformer.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/bridge/SimpleTransformer.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.tests.integration.cluster.bridge; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.core.server.ServerMessage; import org.apache.activemq.core.server.cluster.Transformer; @@ -41,7 +41,7 @@ public class SimpleTransformer implements Transformer message.putStringProperty(new SimpleString("wibble"), new SimpleString("bong")); // Change the body - HornetQBuffer buffer = message.getBodyBuffer(); + ActiveMQBuffer buffer = message.getBodyBuffer(); buffer.readerIndex(0); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterTestBase.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterTestBase.java index a33582d..cb2f243 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterTestBase.java @@ -28,9 +28,9 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.BroadcastGroupConfiguration; import org.apache.activemq.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq.api.core.HornetQException; import org.apache.activemq.api.core.Message; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.TransportConfiguration; @@ -242,7 +242,7 @@ public abstract class ClusterTestBase extends ServiceTestBase { consumer.close(); } - catch (HornetQException e) + catch (ActiveMQException e) { // ignore } @@ -253,7 +253,7 @@ public abstract class ClusterTestBase extends ServiceTestBase { session.close(); } - catch (HornetQException e) + catch (ActiveMQException e) { // ignore } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusteredGroupingTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusteredGroupingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusteredGroupingTest.java index 92fec81..96f1a79 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusteredGroupingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusteredGroupingTest.java @@ -21,7 +21,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.Message; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientConsumer; @@ -654,7 +654,7 @@ public class ClusteredGroupingTest extends ClusterTestBase totalMessageProduced.incrementAndGet(); messageCount++; } - catch (HornetQException e) + catch (ActiveMQException e) { IntegrationTestLogger.LOGGER.warn("Producer thread threw exception while sending messages to " + targetServer + ": " + e.getMessage()); // in case of a failure we change the group to make possible errors more likely @@ -777,7 +777,7 @@ public class ClusteredGroupingTest extends ClusterTestBase m.acknowledge(); IntegrationTestLogger.LOGGER.trace("Consumed message " + m.getStringProperty(Message.HDR_DUPLICATE_DETECTION_ID) + " from server " + targetServer + ". Total consumed: " + totalMessagesConsumed.incrementAndGet()); } - catch (HornetQException e) + catch (ActiveMQException e) { errors.incrementAndGet(); IntegrationTestLogger.LOGGER.warn("Consumer thread threw exception while receiving messages from server " + targetServer + ".: " + e.getMessage()); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AsynchronousFailoverTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AsynchronousFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AsynchronousFailoverTest.java index b214c4e..17a2c55 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AsynchronousFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AsynchronousFailoverTest.java @@ -15,11 +15,11 @@ package org.apache.activemq.tests.integration.cluster.failover; import java.util.ArrayList; import java.util.List; -import org.apache.activemq.api.core.HornetQDuplicateIdException; -import org.apache.activemq.api.core.HornetQException; -import org.apache.activemq.api.core.HornetQTransactionOutcomeUnknownException; -import org.apache.activemq.api.core.HornetQTransactionRolledBackException; -import org.apache.activemq.api.core.HornetQUnBlockedException; +import org.apache.activemq.api.core.ActiveMQDuplicateIdException; +import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.api.core.ActiveMQTransactionOutcomeUnknownException; +import org.apache.activemq.api.core.ActiveMQTransactionRolledBackException; +import org.apache.activemq.api.core.ActiveMQUnBlockedException; import org.apache.activemq.api.core.Message; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.TransportConfiguration; @@ -286,7 +286,7 @@ public class AsynchronousFailoverTest extends FailoverTestBase retry = false; } - catch (HornetQUnBlockedException ube) + catch (ActiveMQUnBlockedException ube) { AsynchronousFailoverTest.log.info("exception when sending message with counter " + i); @@ -295,7 +295,7 @@ public class AsynchronousFailoverTest extends FailoverTestBase retry = true; } - catch (HornetQException e) + catch (ActiveMQException e) { fail("Invalid Exception type:" + e.getType()); } @@ -314,14 +314,14 @@ public class AsynchronousFailoverTest extends FailoverTestBase retry = false; } - catch (HornetQUnBlockedException ube) + catch (ActiveMQUnBlockedException ube) { AsynchronousFailoverTest.log.info("exception when creating consumer"); retry = true; } - catch (HornetQException e) + catch (ActiveMQException e) { fail("Invalid Exception type:" + e.getType()); } @@ -432,30 +432,30 @@ public class AsynchronousFailoverTest extends FailoverTestBase retry = false; } - catch (HornetQDuplicateIdException die) + catch (ActiveMQDuplicateIdException die) { logAndSystemOut("#test duplicate id rejected on sending"); break; } - catch (HornetQTransactionRolledBackException trbe) + catch (ActiveMQTransactionRolledBackException trbe) { log.info("#test transaction rollback retrying on sending"); // OK retry = true; } - catch (HornetQUnBlockedException ube) + catch (ActiveMQUnBlockedException ube) { log.info("#test transaction rollback retrying on sending"); // OK retry = true; } - catch (HornetQTransactionOutcomeUnknownException toue) + catch (ActiveMQTransactionOutcomeUnknownException toue) { log.info("#test transaction rollback retrying on sending"); // OK retry = true; } - catch (HornetQException e) + catch (ActiveMQException e) { log.info("#test Exception " + e, e); throw e; @@ -515,13 +515,13 @@ public class AsynchronousFailoverTest extends FailoverTestBase { session.commit(); } - catch (HornetQTransactionRolledBackException trbe) + catch (ActiveMQTransactionRolledBackException trbe) { //we know the tx has been rolled back so we just consume again retry = true; continue; } - catch (HornetQException e) + catch (ActiveMQException e) { // This could eventually happen // We will get rid of this when we implement 2 phase commit on failover @@ -561,7 +561,7 @@ public class AsynchronousFailoverTest extends FailoverTestBase retry = false; blocked = false; } - catch (HornetQTransactionRolledBackException trbe) + catch (ActiveMQTransactionRolledBackException trbe) { logAndSystemOut("Transaction rolled back with " + msgs.size(), trbe); // TODO: https://jira.jboss.org/jira/browse/HORNETQ-369 @@ -570,7 +570,7 @@ public class AsynchronousFailoverTest extends FailoverTestBase blocked = true; retry = true; } - catch (HornetQTransactionOutcomeUnknownException tou) + catch (ActiveMQTransactionOutcomeUnknownException tou) { logAndSystemOut("Transaction rolled back with " + msgs.size(), tou); // TODO: https://jira.jboss.org/jira/browse/HORNETQ-369 @@ -579,7 +579,7 @@ public class AsynchronousFailoverTest extends FailoverTestBase blocked = true; retry = true; } - catch (HornetQUnBlockedException ube) + catch (ActiveMQUnBlockedException ube) { logAndSystemOut("Unblocked with " + msgs.size(), ube); // TODO: https://jira.jboss.org/jira/browse/HORNETQ-369 @@ -587,7 +587,7 @@ public class AsynchronousFailoverTest extends FailoverTestBase blocked = true; retry = true; } - catch (HornetQException e) + catch (ActiveMQException e) { logAndSystemOut(e.getMessage(), e); throw e; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupAuthenticationTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupAuthenticationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupAuthenticationTest.java index ffa8cd9..4cf92ab 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupAuthenticationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupAuthenticationTest.java @@ -14,6 +14,7 @@ * */ package org.apache.activemq.tests.integration.cluster.failover; +import org.apache.activemq.api.core.ActiveMQException; import org.junit.Before; import org.junit.Test; @@ -22,7 +23,6 @@ import java.util.Arrays; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.apache.activemq.api.core.HornetQException; import org.apache.activemq.api.core.Interceptor; import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.core.protocol.core.Packet; @@ -85,7 +85,7 @@ public class BackupAuthenticationTest extends FailoverTestBase { @Override - public boolean intercept(Packet packet, RemotingConnection connection) throws HornetQException + public boolean intercept(Packet packet, RemotingConnection connection) throws ActiveMQException { if (packet.getType() == PacketImpl.BACKUP_REGISTRATION) { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupSyncJournalTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupSyncJournalTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupSyncJournalTest.java index 2904c9a..a899db7 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupSyncJournalTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupSyncJournalTest.java @@ -20,7 +20,7 @@ import java.util.HashSet; import java.util.Set; import java.util.concurrent.TimeUnit; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.Pair; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.TransportConfiguration; @@ -194,7 +194,7 @@ public class BackupSyncJournalTest extends FailoverTestBase assertNoMoreMessages(); } - protected void assertNoMoreMessages() throws HornetQException + protected void assertNoMoreMessages() throws ActiveMQException { session.start(); ClientConsumer consumer = session.createConsumer(FailoverTestBase.ADDRESS); @@ -370,7 +370,7 @@ public class BackupSyncJournalTest extends FailoverTestBase backupServer.getServer().waitForActivation(5, TimeUnit.SECONDS); } - protected void createProducerSendSomeMessages() throws HornetQException + protected void createProducerSendSomeMessages() throws ActiveMQException { session = addClientSession(sessionFactory.createSession(true, true)); session.createQueue(FailoverTestBase.ADDRESS, FailoverTestBase.ADDRESS, null, true); @@ -381,7 +381,7 @@ public class BackupSyncJournalTest extends FailoverTestBase session.commit(); } - protected void receiveMsgsInRange(int start, int end) throws HornetQException + protected void receiveMsgsInRange(int start, int end) throws ActiveMQException { session.start(); ClientConsumer consumer = addClientConsumer(session.createConsumer(FailoverTestBase.ADDRESS)); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupSyncLargeMessageTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupSyncLargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupSyncLargeMessageTest.java index 903ec51..21efc75 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupSyncLargeMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/BackupSyncLargeMessageTest.java @@ -12,6 +12,8 @@ */ package org.apache.activemq.tests.integration.cluster.failover; +import org.apache.activemq.api.core.ActiveMQBuffer; +import org.apache.activemq.api.core.ActiveMQException; import org.junit.Test; import java.io.File; @@ -24,8 +26,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.junit.Assert; -import org.apache.activemq.api.core.HornetQBuffer; -import org.apache.activemq.api.core.HornetQException; import org.apache.activemq.api.core.client.ClientConsumer; import org.apache.activemq.api.core.client.ClientMessage; import org.apache.activemq.api.core.client.ClientProducer; @@ -144,7 +144,7 @@ public class BackupSyncLargeMessageTest extends BackupSyncJournalTest sendMessages(session, producer, 20); session.commit(); } - catch (HornetQException e) + catch (ActiveMQException e) { e.printStackTrace(); caughtException.set(true); @@ -165,7 +165,7 @@ public class BackupSyncLargeMessageTest extends BackupSyncJournalTest session.start(); ClientConsumer consumer = session.createConsumer(FailoverTestBase.ADDRESS); ClientMessage msg = consumer.receive(2000); - HornetQBuffer buffer = msg.getBodyBuffer(); + ActiveMQBuffer buffer = msg.getBodyBuffer(); for (int j = 0; j < largeMessageSize; j++) {
