http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/HornetQMessageHandlerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/HornetQMessageHandlerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/HornetQMessageHandlerTest.java index 219a6f2..ef8fd35 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/HornetQMessageHandlerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ra/HornetQMessageHandlerTest.java @@ -20,7 +20,7 @@ import java.util.concurrent.CountDownLatch; 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.SimpleString; import org.apache.activemq.api.core.client.ClientMessage; import org.apache.activemq.api.core.client.ClientProducer; @@ -217,18 +217,18 @@ public class HornetQMessageHandlerTest extends HornetQRATestBase { @Override - public void connectionFailed(HornetQException exception, boolean failedOver) + public void connectionFailed(ActiveMQException exception, boolean failedOver) { } @Override - public void connectionFailed(HornetQException exception, boolean failedOver, String scaleDownTargetNodeID) + public void connectionFailed(ActiveMQException exception, boolean failedOver, String scaleDownTargetNodeID) { connectionFailed(exception, failedOver); } @Override - public void beforeReconnect(HornetQException exception) + public void beforeReconnect(ActiveMQException exception) { failedLatch.countDown(); }
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/PingTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/PingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/PingTest.java index 1da57bf..b038748 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/PingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/PingTest.java @@ -12,6 +12,7 @@ */ package org.apache.activemq.tests.integration.remoting; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.core.protocol.core.impl.wireformat.Ping; import org.junit.Before; @@ -23,7 +24,6 @@ import java.util.concurrent.TimeUnit; import org.junit.Assert; -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.api.core.client.ClientSession; @@ -78,26 +78,26 @@ public class PingTest extends ServiceTestBase class Listener implements SessionFailureListener { - volatile HornetQException me; + volatile ActiveMQException me; @Override - public void connectionFailed(final HornetQException me, boolean failedOver) + public void connectionFailed(final ActiveMQException me, boolean failedOver) { this.me = me; } @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 HornetQException getException() + public ActiveMQException getException() { return me; } - public void beforeReconnect(final HornetQException exception) + public void beforeReconnect(final ActiveMQException exception) { } } @@ -235,7 +235,7 @@ public class PingTest extends ServiceTestBase final CountDownLatch unwantedPings = new CountDownLatch(2); 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) { @@ -358,7 +358,7 @@ public class PingTest extends ServiceTestBase 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) { @@ -383,18 +383,18 @@ public class PingTest extends ServiceTestBase SessionFailureListener clientListener = new SessionFailureListener() { @Override - public void connectionFailed(final HornetQException me, boolean failedOver) + public void connectionFailed(final ActiveMQException me, boolean failedOver) { clientLatch.countDown(); } @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 exception) + public void beforeReconnect(final ActiveMQException exception) { } }; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/ReconnectTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/ReconnectTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/ReconnectTest.java index de6fba0..959d05e 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/ReconnectTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/remoting/ReconnectTest.java @@ -12,6 +12,7 @@ */ package org.apache.activemq.tests.integration.remoting; +import org.apache.activemq.api.core.ActiveMQException; import org.junit.Test; import java.util.ArrayList; @@ -21,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.junit.Assert; -import org.apache.activemq.api.core.HornetQException; import org.apache.activemq.api.core.client.ClientSessionFactory; import org.apache.activemq.api.core.client.ServerLocator; import org.apache.activemq.api.core.client.SessionFailureListener; @@ -82,19 +82,19 @@ public class ReconnectTest extends ServiceTestBase session.addFailureListener(new SessionFailureListener() { @Override - public void connectionFailed(final HornetQException me, boolean failedOver) + public void connectionFailed(final ActiveMQException me, boolean failedOver) { count.incrementAndGet(); latch.countDown(); } @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 exception) + public void beforeReconnect(final ActiveMQException exception) { } @@ -181,18 +181,18 @@ public class ReconnectTest extends ServiceTestBase { @Override - public void connectionFailed(HornetQException exception, boolean failedOver) + public void connectionFailed(ActiveMQException exception, boolean failedOver) { } @Override - public void connectionFailed(final HornetQException me, boolean failedOver, String scaleDownTargetNodeID) + public void connectionFailed(final ActiveMQException me, boolean failedOver, String scaleDownTargetNodeID) { connectionFailed(me, failedOver); } @Override - public void beforeReconnect(HornetQException exception) + public void beforeReconnect(ActiveMQException exception) { latchCommit.countDown(); threadToBeInterrupted.add(Thread.currentThread()); @@ -210,19 +210,19 @@ public class ReconnectTest extends ServiceTestBase session.addFailureListener(new SessionFailureListener() { - public void connectionFailed(final HornetQException me, boolean failedOver) + public void connectionFailed(final ActiveMQException me, boolean failedOver) { count.incrementAndGet(); latch.countDown(); } @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 exception) + public void beforeReconnect(final ActiveMQException exception) { } @@ -239,7 +239,7 @@ public class ReconnectTest extends ServiceTestBase { session.commit(); } - 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/replication/ReplicationTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/replication/ReplicationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/replication/ReplicationTest.java index 98ce133..fa54304 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/replication/ReplicationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/replication/ReplicationTest.java @@ -27,11 +27,11 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import org.apache.activemq.api.config.HornetQDefaultConfiguration; -import org.apache.activemq.api.core.HornetQBuffer; -import org.apache.activemq.api.core.HornetQBuffers; -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.ActiveMQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffers; +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.Interceptor; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.TransportConfiguration; @@ -185,11 +185,11 @@ public final class ReplicationTest extends ServiceTestBase manager.start(); Assert.fail("Exception was expected"); } - catch (HornetQNotConnectedException nce) + catch (ActiveMQNotConnectedException nce) { // ok } - catch (HornetQException expected) + catch (ActiveMQException expected) { fail("Invalid Exception type:" + expected.getType()); } @@ -261,7 +261,7 @@ public final class ReplicationTest extends ServiceTestBase serverMsg.setMessageID(500); serverMsg.setAddress(new SimpleString("tttt")); - HornetQBuffer buffer = HornetQBuffers.dynamicBuffer(100); + ActiveMQBuffer buffer = ActiveMQBuffers.dynamicBuffer(100); serverMsg.encodeHeadersAndProperties(buffer); manager.largeMessageBegin(500); @@ -336,7 +336,7 @@ public final class ReplicationTest extends ServiceTestBase String msg = "I'm an exception"; - ctx.onError(HornetQExceptionType.UNBLOCKED.getCode(), msg); + ctx.onError(ActiveMQExceptionType.UNBLOCKED.getCode(), msg); final AtomicInteger lastError = new AtomicInteger(0); @@ -527,11 +527,11 @@ public final class ReplicationTest extends ServiceTestBase class FakeData implements EncodingSupport { - public void decode(final HornetQBuffer buffer) + public void decode(final ActiveMQBuffer buffer) { } - public void encode(final HornetQBuffer buffer) + public void encode(final ActiveMQBuffer buffer) { buffer.writeBytes(new byte[5]); } @@ -605,7 +605,7 @@ public final class ReplicationTest extends ServiceTestBase { static AtomicBoolean value = new AtomicBoolean(true); - public boolean intercept(final Packet packet, final RemotingConnection connection) throws HornetQException + public boolean intercept(final Packet packet, final RemotingConnection connection) throws ActiveMQException { return TestInterceptor.value.get(); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/security/SecurityTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/security/SecurityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/security/SecurityTest.java index 1c21b75..f3d6265 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/security/SecurityTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/security/SecurityTest.java @@ -28,8 +28,8 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.apache.activemq.api.core.HornetQException; -import org.apache.activemq.api.core.HornetQSecurityException; +import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.api.core.ActiveMQSecurityException; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientConsumer; import org.apache.activemq.api.core.client.ClientMessage; @@ -93,7 +93,7 @@ public class SecurityTest extends ServiceTestBase session.close(); } - catch (HornetQException e) + catch (ActiveMQException e) { Assert.fail("should not throw exception"); } @@ -122,11 +122,11 @@ public class SecurityTest extends ServiceTestBase cf.createSession(false, true, true); Assert.fail("should throw exception"); } - catch (HornetQSecurityException se) + catch (ActiveMQSecurityException se) { //ok } - catch (HornetQException e) + catch (ActiveMQException e) { fail("Invalid Exception type:" + e.getType()); } @@ -146,11 +146,11 @@ public class SecurityTest extends ServiceTestBase cf.createSession("newuser", "awrongpass", false, true, true, false, -1); Assert.fail("should not throw exception"); } - catch (HornetQSecurityException se) + catch (ActiveMQSecurityException se) { //ok } - catch (HornetQException e) + catch (ActiveMQException e) { fail("Invalid Exception type:" + e.getType()); } @@ -171,7 +171,7 @@ public class SecurityTest extends ServiceTestBase session.close(); } - catch (HornetQException e) + catch (ActiveMQException e) { Assert.fail("should not throw exception"); } @@ -217,11 +217,11 @@ public class SecurityTest extends ServiceTestBase session.createQueue(SecurityTest.addressA, SecurityTest.queueA, true); Assert.fail("should throw exception"); } - catch (HornetQSecurityException se) + catch (ActiveMQSecurityException se) { //ok } - catch (HornetQException e) + catch (ActiveMQException e) { fail("Invalid Exception type:" + e.getType()); } @@ -269,11 +269,11 @@ public class SecurityTest extends ServiceTestBase session.deleteQueue(SecurityTest.queueA); Assert.fail("should throw exception"); } - catch (HornetQSecurityException se) + catch (ActiveMQSecurityException se) { //ok } - catch (HornetQException e) + catch (ActiveMQException e) { fail("Invalid Exception type:" + e.getType()); } @@ -321,11 +321,11 @@ public class SecurityTest extends ServiceTestBase session.createQueue(SecurityTest.addressA, SecurityTest.queueA, false); Assert.fail("should throw exception"); } - catch (HornetQSecurityException se) + catch (ActiveMQSecurityException se) { //ok } - catch (HornetQException e) + catch (ActiveMQException e) { fail("Invalid Exception type:" + e.getType()); } @@ -373,11 +373,11 @@ public class SecurityTest extends ServiceTestBase session.deleteQueue(SecurityTest.queueA); Assert.fail("should throw exception"); } - catch (HornetQSecurityException se) + catch (ActiveMQSecurityException se) { //ok } - catch (HornetQException e) + catch (ActiveMQException e) { fail("Invalid Exception type:" + e.getType()); } @@ -442,7 +442,7 @@ public class SecurityTest extends ServiceTestBase { cp.send(session.createMessage(true)); } - catch (HornetQException e) + catch (ActiveMQException e) { failed = true; } @@ -474,11 +474,11 @@ public class SecurityTest extends ServiceTestBase { cp.send(session.createMessage(false)); } - catch (HornetQSecurityException se) + catch (ActiveMQSecurityException se) { //ok } - catch (HornetQException e) + catch (ActiveMQException e) { fail("Invalid Exception type:" + e.getType()); } @@ -567,11 +567,11 @@ public class SecurityTest extends ServiceTestBase { session.createConsumer(SecurityTest.queueA); } - catch (HornetQSecurityException se) + catch (ActiveMQSecurityException se) { //ok } - catch (HornetQException e) + catch (ActiveMQException e) { fail("Invalid Exception type:" + e.getType()); } @@ -612,11 +612,11 @@ public class SecurityTest extends ServiceTestBase { session.createConsumer(SecurityTest.queueA); } - catch (HornetQSecurityException se) + catch (ActiveMQSecurityException se) { //ok } - catch (HornetQException e) + catch (ActiveMQException e) { fail("Invalid Exception type:" + e.getType()); } @@ -669,11 +669,11 @@ public class SecurityTest extends ServiceTestBase { session.createConsumer(SecurityTest.queueA); } - catch (HornetQSecurityException se) + catch (ActiveMQSecurityException se) { //ok } - catch (HornetQException e) + catch (ActiveMQException e) { fail("Invalid Exception type:" + e.getType()); } @@ -691,11 +691,11 @@ public class SecurityTest extends ServiceTestBase { session.createConsumer(SecurityTest.queueA); } - catch (HornetQSecurityException se) + catch (ActiveMQSecurityException se) { //ok } - catch (HornetQException e) + catch (ActiveMQException e) { fail("Invalid Exception type:" + e.getType()); } @@ -742,11 +742,11 @@ public class SecurityTest extends ServiceTestBase { session.createConsumer(SecurityTest.queueA); } - catch (HornetQSecurityException se) + catch (ActiveMQSecurityException se) { //ok } - catch (HornetQException e) + catch (ActiveMQException e) { fail("Invalid Exception type:" + e.getType()); } @@ -769,7 +769,7 @@ public class SecurityTest extends ServiceTestBase sendingSession.commit(); Assert.fail("Expected exception"); } - catch (HornetQException e) + catch (ActiveMQException e) { // I would expect the commit to fail, since there were failures registered } @@ -852,11 +852,11 @@ public class SecurityTest extends ServiceTestBase { cp.send(session.createMessage(false)); } - catch (HornetQSecurityException se) + catch (ActiveMQSecurityException se) { //ok } - catch (HornetQException e) + catch (ActiveMQException e) { fail("Invalid Exception type:" + e.getType()); } @@ -923,7 +923,7 @@ public class SecurityTest extends ServiceTestBase session.close(); } - catch (HornetQException e) + catch (ActiveMQException e) { Assert.fail("should not throw exception"); } @@ -958,11 +958,11 @@ public class SecurityTest extends ServiceTestBase cf.createSession(false, true, true); Assert.fail("should not throw exception"); } - catch (HornetQSecurityException se) + catch (ActiveMQSecurityException se) { //ok } - catch (HornetQException e) + catch (ActiveMQException e) { fail("Invalid Exception type:" + e.getType()); } @@ -1028,11 +1028,11 @@ public class SecurityTest extends ServiceTestBase factory.createSession(false, true, true); Assert.fail("should throw exception"); } - catch (HornetQSecurityException se) + catch (ActiveMQSecurityException se) { //ok } - catch (HornetQException e) + catch (ActiveMQException e) { fail("Invalid Exception type:" + e.getType()); } @@ -1043,11 +1043,11 @@ public class SecurityTest extends ServiceTestBase billConnection = factory.createSession("bill", "hornetq1", false, true, true, false, -1); Assert.fail("should throw exception"); } - catch (HornetQSecurityException se) + catch (ActiveMQSecurityException se) { //ok } - catch (HornetQException e) + catch (ActiveMQException e) { fail("Invalid Exception type:" + e.getType()); } @@ -1167,11 +1167,11 @@ public class SecurityTest extends ServiceTestBase factory.createSession(false, true, true); Assert.fail("should throw exception"); } - catch (HornetQSecurityException se) + catch (ActiveMQSecurityException se) { //ok } - catch (HornetQException e) + catch (ActiveMQException e) { fail("Invalid Exception type:" + e.getType()); } @@ -1182,11 +1182,11 @@ public class SecurityTest extends ServiceTestBase billConnection = factory.createSession("bill", "hornetq1", false, true, true, false, -1); Assert.fail("should throw exception"); } - catch (HornetQSecurityException se) + catch (ActiveMQSecurityException se) { //ok } - catch (HornetQException e) + catch (ActiveMQException e) { fail("Invalid Exception type:" + e.getType()); } @@ -1272,7 +1272,7 @@ public class SecurityTest extends ServiceTestBase prod.send(m); Assert.fail("should throw exception"); } - catch (HornetQException e) + catch (ActiveMQException e) { // pass } @@ -1303,7 +1303,7 @@ public class SecurityTest extends ServiceTestBase prod.send(m); Assert.fail("should throw exception"); } - catch (HornetQException e) + catch (ActiveMQException e) { // pass } @@ -1316,7 +1316,7 @@ public class SecurityTest extends ServiceTestBase connection.createConsumer(queue); Assert.fail("should throw exception"); } - catch (HornetQException e) + catch (ActiveMQException e) { // pass } @@ -1339,11 +1339,11 @@ public class SecurityTest extends ServiceTestBase connection.createConsumer(queue); Assert.fail("should throw exception"); } - catch (HornetQSecurityException se) + catch (ActiveMQSecurityException se) { //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/server/AddressFullLoggingTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/AddressFullLoggingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/AddressFullLoggingTest.java index 4f3c9ce..4a4d26a 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/AddressFullLoggingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/AddressFullLoggingTest.java @@ -19,7 +19,7 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.client.ClientConsumer; import org.apache.activemq.api.core.client.ClientMessage; import org.apache.activemq.api.core.client.ClientProducer; @@ -83,7 +83,7 @@ public class AddressFullLoggingTest extends ServiceTestBase ExecutorService executor = Executors.newFixedThreadPool(1); Callable<Object> sendMessageTask = new Callable<Object>() { - public Object call() throws HornetQException + public Object call() throws ActiveMQException { producer.send(message); return null; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/ExpiryRunnerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/ExpiryRunnerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/ExpiryRunnerTest.java index 24b79cc..b8c47a0 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/ExpiryRunnerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/ExpiryRunnerTest.java @@ -11,6 +11,7 @@ * permissions and limitations under the License. */ package org.apache.activemq.tests.integration.server; +import org.apache.activemq.api.core.ActiveMQException; import org.junit.Before; import org.junit.After; @@ -23,7 +24,6 @@ import java.util.concurrent.TimeUnit; 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; @@ -294,7 +294,7 @@ public class ExpiryRunnerTest 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/server/LVQRecoveryTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/LVQRecoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/LVQRecoveryTest.java index 808e31d..e25ca46 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/LVQRecoveryTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/LVQRecoveryTest.java @@ -15,7 +15,7 @@ package org.apache.activemq.tests.integration.server; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -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.TransportConfiguration; @@ -177,7 +177,7 @@ public class LVQRecoveryTest extends ServiceTestBase { clientSession.close(); } - catch (HornetQException e1) + catch (ActiveMQException e1) { // } @@ -188,7 +188,7 @@ public class LVQRecoveryTest extends ServiceTestBase { clientSessionXa.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/server/LVQTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/LVQTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/LVQTest.java index 70427f9..ba08b15 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/LVQTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/LVQTest.java @@ -11,6 +11,7 @@ * permissions and limitations under the License. */ package org.apache.activemq.tests.integration.server; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.core.server.Queue; import org.junit.Before; import org.junit.After; @@ -19,7 +20,6 @@ import org.junit.Test; import org.junit.Assert; -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; @@ -621,7 +621,7 @@ public class LVQTest extends UnitTestCase { clientSession.close(); } - catch (HornetQException e1) + catch (ActiveMQException e1) { // } @@ -633,7 +633,7 @@ public class LVQTest extends UnitTestCase { clientSessionTxReceives.close(); } - catch (HornetQException e1) + catch (ActiveMQException e1) { // } @@ -645,7 +645,7 @@ public class LVQTest extends UnitTestCase { clientSessionTxSends.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/server/PredefinedQueueTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/PredefinedQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/PredefinedQueueTest.java index d6392cc..74fc5fb 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/PredefinedQueueTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/PredefinedQueueTest.java @@ -15,8 +15,8 @@ package org.apache.activemq.tests.integration.server; import java.util.ArrayList; import java.util.List; -import org.apache.activemq.api.core.HornetQException; -import org.apache.activemq.api.core.HornetQQueueExistsException; +import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.api.core.ActiveMQQueueExistsException; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.api.core.client.ClientConsumer; @@ -96,11 +96,11 @@ public class PredefinedQueueTest extends ServiceTestBase Assert.fail("Should throw exception"); } - catch (HornetQQueueExistsException se) + catch (ActiveMQQueueExistsException se) { //ok } - catch (HornetQException e) + catch (ActiveMQException e) { fail("Invalid Exception type:" + e.getType()); } @@ -110,11 +110,11 @@ public class PredefinedQueueTest extends ServiceTestBase Assert.fail("Should throw exception"); } - catch (HornetQQueueExistsException se) + catch (ActiveMQQueueExistsException se) { //ok } - catch (HornetQException e) + catch (ActiveMQException e) { fail("Invalid Exception type:" + e.getType()); } @@ -124,11 +124,11 @@ public class PredefinedQueueTest extends ServiceTestBase Assert.fail("Should throw exception"); } - catch (HornetQQueueExistsException se) + catch (ActiveMQQueueExistsException se) { //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/ssl/CoreClientOverOneWaySSLTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ssl/CoreClientOverOneWaySSLTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ssl/CoreClientOverOneWaySSLTest.java index 7a7e903..8a631e8 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ssl/CoreClientOverOneWaySSLTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ssl/CoreClientOverOneWaySSLTest.java @@ -19,9 +19,9 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.apache.activemq.api.core.HornetQConnectionTimedOutException; -import org.apache.activemq.api.core.HornetQException; -import org.apache.activemq.api.core.HornetQNotConnectedException; +import org.apache.activemq.api.core.ActiveMQConnectionTimedOutException; +import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.api.core.ActiveMQNotConnectedException; import org.apache.activemq.api.core.Message; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.TransportConfiguration; @@ -135,7 +135,7 @@ public class CoreClientOverOneWaySSLTest extends ServiceTestBase createSessionFactory(locator); Assert.fail(); } - catch (HornetQNotConnectedException e) + catch (ActiveMQNotConnectedException e) { Assert.assertTrue(true); } @@ -156,7 +156,7 @@ public class CoreClientOverOneWaySSLTest extends ServiceTestBase createSessionFactory(locator); Assert.fail(); } - catch (HornetQNotConnectedException e) + catch (ActiveMQNotConnectedException e) { Assert.assertTrue(true); } @@ -179,7 +179,7 @@ public class CoreClientOverOneWaySSLTest extends ServiceTestBase createSessionFactory(locator); Assert.fail(); } - catch (HornetQNotConnectedException e) + catch (ActiveMQNotConnectedException e) { Assert.assertTrue(true); } @@ -201,7 +201,7 @@ public class CoreClientOverOneWaySSLTest extends ServiceTestBase createSessionFactory(locator); Assert.fail(); } - catch (HornetQNotConnectedException e) + catch (ActiveMQNotConnectedException e) { Assert.assertTrue(true); } @@ -222,7 +222,7 @@ public class CoreClientOverOneWaySSLTest extends ServiceTestBase createSessionFactory(locator); Assert.fail(); } - catch (HornetQNotConnectedException e) + catch (ActiveMQNotConnectedException e) { Assert.assertTrue(true); } @@ -244,7 +244,7 @@ public class CoreClientOverOneWaySSLTest extends ServiceTestBase createSessionFactory(locator); Assert.fail(); } - catch (HornetQNotConnectedException e) + catch (ActiveMQNotConnectedException e) { Assert.assertTrue(true); } @@ -267,7 +267,7 @@ public class CoreClientOverOneWaySSLTest extends ServiceTestBase createSessionFactory(locator); Assert.fail(); } - catch (HornetQNotConnectedException e) + catch (ActiveMQNotConnectedException e) { Assert.assertTrue(true); } @@ -292,7 +292,7 @@ public class CoreClientOverOneWaySSLTest extends ServiceTestBase { sf = createSessionFactory(locator); } - catch (HornetQNotConnectedException e) + catch (ActiveMQNotConnectedException e) { Assert.fail(); } @@ -330,7 +330,7 @@ public class CoreClientOverOneWaySSLTest extends ServiceTestBase { sf = createSessionFactory(locator); } - catch (HornetQNotConnectedException e) + catch (ActiveMQNotConnectedException e) { Assert.fail(); } @@ -369,7 +369,7 @@ public class CoreClientOverOneWaySSLTest extends ServiceTestBase sf = createSessionFactory(locator); Assert.assertTrue(true); } - catch (HornetQNotConnectedException e) + catch (ActiveMQNotConnectedException e) { Assert.fail(); } @@ -407,7 +407,7 @@ public class CoreClientOverOneWaySSLTest extends ServiceTestBase sf = createSessionFactory(locator); Assert.assertTrue(true); } - catch (HornetQNotConnectedException e) + catch (ActiveMQNotConnectedException e) { Assert.fail(); } @@ -479,11 +479,11 @@ public class CoreClientOverOneWaySSLTest extends ServiceTestBase createSessionFactory(locator); Assert.fail(); } - catch (HornetQNotConnectedException se) + catch (ActiveMQNotConnectedException se) { //ok } - catch (HornetQException e) + catch (ActiveMQException e) { fail("Invalid Exception type:" + e.getType()); } @@ -504,11 +504,11 @@ public class CoreClientOverOneWaySSLTest extends ServiceTestBase ClientSessionFactory sf = createSessionFactory(locator); Assert.fail(); } - catch (HornetQNotConnectedException se) + catch (ActiveMQNotConnectedException se) { //ok } - catch (HornetQException e) + catch (ActiveMQException e) { fail("Invalid Exception type:" + e.getType()); } @@ -528,11 +528,11 @@ public class CoreClientOverOneWaySSLTest extends ServiceTestBase ClientSessionFactory sf = createSessionFactory(locator); Assert.fail(); } - catch (HornetQNotConnectedException se) + catch (ActiveMQNotConnectedException se) { //ok } - catch (HornetQException e) + catch (ActiveMQException e) { fail("Invalid Exception type:" + e.getType()); } @@ -552,15 +552,15 @@ public class CoreClientOverOneWaySSLTest extends ServiceTestBase createSessionFactory(locator); fail("expecting exception"); } - catch (HornetQNotConnectedException se) + catch (ActiveMQNotConnectedException se) { //ok } - catch (HornetQConnectionTimedOutException ctoe) + catch (ActiveMQConnectionTimedOutException ctoe) { //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/ssl/CoreClientOverTwoWaySSLTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ssl/CoreClientOverTwoWaySSLTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ssl/CoreClientOverTwoWaySSLTest.java index 58c8c05..3d6211b 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ssl/CoreClientOverTwoWaySSLTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/ssl/CoreClientOverTwoWaySSLTest.java @@ -19,8 +19,8 @@ import java.util.HashMap; import java.util.Map; import io.netty.handler.ssl.SslHandler; -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.Interceptor; import org.apache.activemq.api.core.Message; import org.apache.activemq.api.core.SimpleString; @@ -100,7 +100,7 @@ public class CoreClientOverTwoWaySSLTest extends ServiceTestBase private class MyInterceptor implements 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) { @@ -171,11 +171,11 @@ public class CoreClientOverTwoWaySSLTest extends ServiceTestBase createSessionFactory(locator); Assert.fail(); } - catch (HornetQNotConnectedException se) + catch (ActiveMQNotConnectedException se) { //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/transports/netty/NettyConnectorWithHTTPUpgradeTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java index d41d241..702d712 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java @@ -29,9 +29,9 @@ import io.netty.handler.codec.http.FullHttpResponse; import io.netty.handler.codec.http.HttpRequest; import io.netty.handler.codec.http.HttpRequestDecoder; import io.netty.handler.codec.http.HttpResponseEncoder; -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; @@ -184,8 +184,8 @@ public class NettyConnectorWithHTTPUpgradeTest extends UnitTestCase // make sure we failed *before* the HTTP hand-shake timeout elapsed (which is hard-coded to 30 seconds, see org.apache.activemq.core.remoting.impl.netty.NettyConnector.HttpUpgradeHandler.awaitHandshake()) assertTrue((System.currentTimeMillis() - start) < 30000); assertNotNull(e); - assertTrue(e instanceof HornetQNotConnectedException); - assertTrue(((HornetQException) e).getType() == HornetQExceptionType.NOT_CONNECTED); + assertTrue(e instanceof ActiveMQNotConnectedException); + assertTrue(((ActiveMQException) e).getType() == ActiveMQExceptionType.NOT_CONNECTED); } private void startWebServer(int port) throws InterruptedException http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/vertx/HornetQVertxUnitTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/vertx/HornetQVertxUnitTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/vertx/HornetQVertxUnitTest.java index 7cfb975..8ff284d 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/vertx/HornetQVertxUnitTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/vertx/HornetQVertxUnitTest.java @@ -14,7 +14,7 @@ package org.apache.activemq.tests.integration.vertx; import java.util.HashMap; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.api.core.client.ClientConsumer; import org.apache.activemq.api.core.client.ClientMessage; @@ -201,7 +201,7 @@ public class HornetQVertxUnitTest extends ServiceTestBase vertxType = msg.getIntProperty(VertxConstants.VERTX_MESSAGE_TYPE); assertEquals(VertxConstants.TYPE_BUFFER, vertxType); - HornetQBuffer hqBuf = msg.getBodyBuffer(); + ActiveMQBuffer hqBuf = msg.getBodyBuffer(); int len = hqBuf.readInt(); System.out.println("==== len is: " + len); assertEquals(content.length, len); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/xa/BasicXaRecoveryTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/xa/BasicXaRecoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/xa/BasicXaRecoveryTest.java index d39ba47..ce7ca0a 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/xa/BasicXaRecoveryTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/xa/BasicXaRecoveryTest.java @@ -20,7 +20,7 @@ import javax.management.MBeanServerFactory; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -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; @@ -111,7 +111,7 @@ public class BasicXaRecoveryTest extends ServiceTestBase { 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/xa/BasicXaTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/xa/BasicXaTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/xa/BasicXaTest.java index dfb863b..9ab3c8e 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/xa/BasicXaTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/xa/BasicXaTest.java @@ -20,7 +20,7 @@ import java.util.Map; 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.SimpleString; import org.apache.activemq.api.core.client.ClientConsumer; import org.apache.activemq.api.core.client.ClientMessage; @@ -665,7 +665,7 @@ public class BasicXaTest extends ServiceTestBase } /** - * @throws HornetQException + * @throws org.apache.activemq.api.core.ActiveMQException * @throws XAException */ protected void multipleQueuesInternalTest(final boolean createQueues, @@ -956,7 +956,7 @@ public class BasicXaTest extends ServiceTestBase { message.acknowledge(); } - catch (HornetQException e) + catch (ActiveMQException e) { BasicXaTest.log.error("Failed to process message", e); } @@ -973,7 +973,7 @@ public class BasicXaTest extends ServiceTestBase { session.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/xa/XaTimeoutTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/xa/XaTimeoutTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/xa/XaTimeoutTest.java index 89e03b6..53012a5 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/xa/XaTimeoutTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/xa/XaTimeoutTest.java @@ -22,7 +22,7 @@ import java.util.concurrent.CountDownLatch; 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.Interceptor; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.TransportConfiguration; @@ -110,7 +110,7 @@ public class XaTimeoutTest extends UnitTestCase { clientSession.close(); } - catch (HornetQException e1) + catch (ActiveMQException e1) { // } @@ -714,7 +714,7 @@ public class XaTimeoutTest extends UnitTestCase * @see org.apache.activemq.api.core.Interceptor#intercept(org.apache.activemq.core.protocol.core.Packet, org.apache.activemq.spi.core.protocol.RemotingConnection) */ @Override - public boolean intercept(Packet packet, RemotingConnection connection) throws HornetQException + public boolean intercept(Packet packet, RemotingConnection connection) throws ActiveMQException { if (packet instanceof SessionXAStartMessage) { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/largemessage/LargeMessageTestBase.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/largemessage/LargeMessageTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/largemessage/LargeMessageTestBase.java index 6f37356..77f0a12 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/largemessage/LargeMessageTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/largemessage/LargeMessageTestBase.java @@ -21,9 +21,9 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import org.apache.activemq.api.core.HornetQBuffer; -import org.apache.activemq.api.core.HornetQBuffers; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffers; +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; @@ -354,7 +354,7 @@ public abstract class LargeMessageTestBase extends ServiceTestBase else { - HornetQBuffer buffer = message.getBodyBuffer(); + ActiveMQBuffer buffer = message.getBodyBuffer(); buffer.resetReaderIndex(); for (long b = 0; b < numberOfBytes; b++) { @@ -476,7 +476,7 @@ public abstract class LargeMessageTestBase extends ServiceTestBase } else { - HornetQBuffer buffer = message.getBodyBuffer(); + ActiveMQBuffer buffer = message.getBodyBuffer(); buffer.resetReaderIndex(); for (long b = 0; b < numberOfBytes; b++) @@ -553,7 +553,7 @@ public abstract class LargeMessageTestBase extends ServiceTestBase * @param producer * @throws FileNotFoundException * @throws IOException - * @throws HornetQException + * @throws org.apache.activemq.api.core.ActiveMQException */ private void sendMessages(final int numberOfMessages, final long numberOfBytes, @@ -599,9 +599,9 @@ public abstract class LargeMessageTestBase extends ServiceTestBase } } - protected HornetQBuffer createLargeBuffer(final int numberOfIntegers) + protected ActiveMQBuffer createLargeBuffer(final int numberOfIntegers) { - HornetQBuffer body = HornetQBuffers.fixedBuffer(DataConstants.SIZE_INT * numberOfIntegers); + ActiveMQBuffer body = ActiveMQBuffers.fixedBuffer(DataConstants.SIZE_INT * numberOfIntegers); for (int i = 0; i < numberOfIntegers; i++) { @@ -640,11 +640,11 @@ public abstract class LargeMessageTestBase extends ServiceTestBase * @param session * @param queueToRead * @param numberOfBytes - * @throws HornetQException + * @throws org.apache.activemq.api.core.ActiveMQException * @throws FileNotFoundException * @throws IOException */ - protected void readMessage(final ClientSession session, final SimpleString queueToRead, final int numberOfBytes) throws HornetQException, + protected void readMessage(final ClientSession session, final SimpleString queueToRead, final int numberOfBytes) throws ActiveMQException, IOException { session.start(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/jms-tests/pom.xml ---------------------------------------------------------------------- diff --git a/tests/jms-tests/pom.xml b/tests/jms-tests/pom.xml index 9c4401e..6be5488 100644 --- a/tests/jms-tests/pom.xml +++ b/tests/jms-tests/pom.xml @@ -151,7 +151,7 @@ <exclude>org.apache.activemq/jms/tests/stress/*.java</exclude> <exclude>org.apache.activemq/jms/tests/manual/**</exclude> </excludes> - <argLine>${hornetq-surefire-argline}</argLine> + <argLine>${activemq-surefire-argline}</argLine> </configuration> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/MessageHeaderTest.java ---------------------------------------------------------------------- diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/MessageHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/MessageHeaderTest.java index af5e4ad..47194cb 100644 --- a/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/MessageHeaderTest.java +++ b/tests/jms-tests/src/test/java/org/apache/activemq/jms/tests/message/MessageHeaderTest.java @@ -34,8 +34,8 @@ import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -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.SimpleString; import org.apache.activemq.api.core.client.ClientConsumer; import org.apache.activemq.api.core.client.ClientMessage; @@ -977,20 +977,20 @@ public class MessageHeaderTest extends MessageHeaderTestBase class FakeSession implements ClientSession { - public ClientConsumer createConsumer(final SimpleString queueName, final boolean browseOnly) throws HornetQException + public ClientConsumer createConsumer(final SimpleString queueName, final boolean browseOnly) throws ActiveMQException { // TODO Auto-generated method stub return null; } - public ClientConsumer createConsumer(final String queueName, final boolean browseOnly) throws HornetQException + public ClientConsumer createConsumer(final String queueName, final boolean browseOnly) throws ActiveMQException { // TODO Auto-generated method stub return null; } - public void createQueue(final String address, final String queueName) throws HornetQException + public void createQueue(final String address, final String queueName) throws ActiveMQException { // TODO Auto-generated method stub @@ -1006,88 +1006,88 @@ public class MessageHeaderTest extends MessageHeaderTestBase public void createQueue(final SimpleString address, final SimpleString queueName, final SimpleString filterString, - final boolean durable) throws HornetQException + final boolean durable) throws ActiveMQException { } - public void createQueue(final SimpleString address, final SimpleString queueName, final boolean durable) throws HornetQException + public void createQueue(final SimpleString address, final SimpleString queueName, final boolean durable) throws ActiveMQException { } @Override - public void createSharedQueue(SimpleString address, SimpleString queueName, boolean durable) throws HornetQException + public void createSharedQueue(SimpleString address, SimpleString queueName, boolean durable) throws ActiveMQException { } @Override - public void createSharedQueue(SimpleString address, SimpleString queueName, SimpleString filter, boolean durable) throws HornetQException + public void createSharedQueue(SimpleString address, SimpleString queueName, SimpleString filter, boolean durable) throws ActiveMQException { } - public void createQueue(final String address, final String queueName, final boolean durable) throws HornetQException + public void createQueue(final String address, final String queueName, final boolean durable) throws ActiveMQException { } public void createQueue(final SimpleString address, final SimpleString queueName, final boolean durable, - final boolean temporary) throws HornetQException + final boolean temporary) throws ActiveMQException { } public void createQueue(final String address, final String queueName, final boolean durable, - final boolean temporary) throws HornetQException + final boolean temporary) throws ActiveMQException { } public void createQueue(final String address, final String queueName, final String filterString, - final boolean durable) throws HornetQException + final boolean durable) throws ActiveMQException { } - public void createTemporaryQueue(final SimpleString address, final SimpleString queueName) throws HornetQException + public void createTemporaryQueue(final SimpleString address, final SimpleString queueName) throws ActiveMQException { } - public void createTemporaryQueue(final String address, final String queueName) throws HornetQException + public void createTemporaryQueue(final String address, final String queueName) throws ActiveMQException { } public void createTemporaryQueue(final SimpleString address, final SimpleString queueName, - final SimpleString filter) throws HornetQException + final SimpleString filter) throws ActiveMQException { } - public void createTemporaryQueue(final String address, final String queueName, final String filter) throws HornetQException + public void createTemporaryQueue(final String address, final String queueName, final String filter) throws ActiveMQException { } - public void deleteQueue(final SimpleString queueName) throws HornetQException + public void deleteQueue(final SimpleString queueName) throws ActiveMQException { } - public void deleteQueue(final String queueName) throws HornetQException + public void deleteQueue(final String queueName) throws ActiveMQException { } - public ClientConsumer createConsumer(final SimpleString queueName) throws HornetQException + public ClientConsumer createConsumer(final SimpleString queueName) throws ActiveMQException { return null; } - public ClientConsumer createConsumer(final SimpleString queueName, final SimpleString filterString) throws HornetQException + public ClientConsumer createConsumer(final SimpleString queueName, final SimpleString filterString) throws ActiveMQException { return null; } public ClientConsumer createConsumer(final SimpleString queueName, final SimpleString filterString, - final boolean browseOnly) throws HornetQException + final boolean browseOnly) throws ActiveMQException { return null; } @@ -1096,22 +1096,22 @@ public class MessageHeaderTest extends MessageHeaderTestBase final SimpleString filterString, final int windowSize, final int maxRate, - final boolean browseOnly) throws HornetQException + final boolean browseOnly) throws ActiveMQException { return null; } - public ClientConsumer createConsumer(final String queueName) throws HornetQException + public ClientConsumer createConsumer(final String queueName) throws ActiveMQException { return null; } - public ClientConsumer createConsumer(final String queueName, final String filterString) throws HornetQException + public ClientConsumer createConsumer(final String queueName, final String filterString) throws ActiveMQException { return null; } - public ClientConsumer createConsumer(final String queueName, final String filterString, final boolean browseOnly) throws HornetQException + public ClientConsumer createConsumer(final String queueName, final String filterString, final boolean browseOnly) throws ActiveMQException { return null; } @@ -1120,19 +1120,19 @@ public class MessageHeaderTest extends MessageHeaderTestBase final String filterString, final int windowSize, final int maxRate, - final boolean browseOnly) throws HornetQException + final boolean browseOnly) throws ActiveMQException { return null; } - public ClientConsumer createFileConsumer(final File directory, final SimpleString queueName) throws HornetQException + public ClientConsumer createFileConsumer(final File directory, final SimpleString queueName) throws ActiveMQException { return null; } public ClientConsumer createFileConsumer(final File directory, final SimpleString queueName, - final SimpleString filterString) throws HornetQException + final SimpleString filterString) throws ActiveMQException { return null; } @@ -1140,7 +1140,7 @@ public class MessageHeaderTest extends MessageHeaderTestBase public ClientConsumer createFileConsumer(final File directory, final SimpleString queueName, final SimpleString filterString, - final boolean browseOnly) throws HornetQException + final boolean browseOnly) throws ActiveMQException { return null; } @@ -1150,17 +1150,17 @@ public class MessageHeaderTest extends MessageHeaderTestBase final SimpleString filterString, final int windowSize, final int maxRate, - final boolean browseOnly) throws HornetQException + final boolean browseOnly) throws ActiveMQException { return null; } - public ClientConsumer createFileConsumer(final File directory, final String queueName) throws HornetQException + public ClientConsumer createFileConsumer(final File directory, final String queueName) throws ActiveMQException { return null; } - public ClientConsumer createFileConsumer(final File directory, final String queueName, final String filterString) throws HornetQException + public ClientConsumer createFileConsumer(final File directory, final String queueName, final String filterString) throws ActiveMQException { return null; } @@ -1168,7 +1168,7 @@ public class MessageHeaderTest extends MessageHeaderTestBase public ClientConsumer createFileConsumer(final File directory, final String queueName, final String filterString, - final boolean browseOnly) throws HornetQException + final boolean browseOnly) throws ActiveMQException { return null; } @@ -1178,22 +1178,22 @@ public class MessageHeaderTest extends MessageHeaderTestBase final String filterString, final int windowSize, final int maxRate, - final boolean browseOnly) throws HornetQException + final boolean browseOnly) throws ActiveMQException { return null; } - public ClientProducer createProducer() throws HornetQException + public ClientProducer createProducer() throws ActiveMQException { return null; } - public ClientProducer createProducer(final SimpleString address) throws HornetQException + public ClientProducer createProducer(final SimpleString address) throws ActiveMQException { return null; } - public ClientProducer createProducer(final SimpleString address, final int rate) throws HornetQException + public ClientProducer createProducer(final SimpleString address, final int rate) throws ActiveMQException { return null; } @@ -1201,17 +1201,17 @@ public class MessageHeaderTest extends MessageHeaderTestBase public ClientProducer createProducer(final SimpleString address, final int maxRate, final boolean blockOnNonDurableSend, - final boolean blockOnDurableSend) throws HornetQException + final boolean blockOnDurableSend) throws ActiveMQException { return null; } - public ClientProducer createProducer(final String address) throws HornetQException + public ClientProducer createProducer(final String address) throws ActiveMQException { return null; } - public ClientProducer createProducer(final String address, final int rate) throws HornetQException + public ClientProducer createProducer(final String address, final int rate) throws ActiveMQException { return null; } @@ -1219,17 +1219,17 @@ public class MessageHeaderTest extends MessageHeaderTestBase public ClientProducer createProducer(final String address, final int maxRate, final boolean blockOnNonDurableSend, - final boolean blockOnDurableSend) throws HornetQException + final boolean blockOnDurableSend) throws ActiveMQException { return null; } - public QueueQuery queueQuery(final SimpleString queueName) throws HornetQException + public QueueQuery queueQuery(final SimpleString queueName) throws ActiveMQException { return null; } - public AddressQuery addressQuery(final SimpleString address) throws HornetQException + public AddressQuery addressQuery(final SimpleString address) throws ActiveMQException { return null; } @@ -1239,7 +1239,7 @@ public class MessageHeaderTest extends MessageHeaderTestBase return null; } - public void commit() throws HornetQException + public void commit() throws ActiveMQException { } @@ -1249,15 +1249,15 @@ public class MessageHeaderTest extends MessageHeaderTestBase return false; } - public void rollback() throws HornetQException + public void rollback() throws ActiveMQException { } - public void rollback(final boolean considerLastMessageAsDelivered) throws HornetQException + public void rollback(final boolean considerLastMessageAsDelivered) throws ActiveMQException { } - public void close() throws HornetQException + public void close() throws ActiveMQException { } @@ -1305,12 +1305,12 @@ public class MessageHeaderTest extends MessageHeaderTestBase return message; } - public FakeSession start() throws HornetQException + public FakeSession start() throws ActiveMQException { return this; } - public void stop() throws HornetQException + public void stop() throws ActiveMQException { } @@ -1390,7 +1390,7 @@ public class MessageHeaderTest extends MessageHeaderTestBase /* (non-Javadoc) * @see org.apache.activemq.api.core.client.ClientSession#createBuffer(byte[]) */ - public HornetQBuffer createBuffer(final byte[] bytes) + public ActiveMQBuffer createBuffer(final byte[] bytes) { // TODO Auto-generated method stub return null; @@ -1399,7 +1399,7 @@ public class MessageHeaderTest extends MessageHeaderTestBase /* (non-Javadoc) * @see org.apache.activemq.api.core.client.ClientSession#createBuffer(int) */ - public HornetQBuffer createBuffer(final int size) + public ActiveMQBuffer createBuffer(final int size) { // TODO Auto-generated method stub return null; @@ -1421,7 +1421,7 @@ public class MessageHeaderTest extends MessageHeaderTestBase /* (non-Javadoc) * @see org.apache.activemq.api.core.client.ClientSession#createQueue(org.apache.activemq.utils.SimpleString, org.apache.activemq.utils.SimpleString) */ - public void createQueue(SimpleString address, SimpleString queueName) throws HornetQException + public void createQueue(SimpleString address, SimpleString queueName) throws ActiveMQException { // TODO Auto-generated method stub @@ -1439,7 +1439,7 @@ public class MessageHeaderTest extends MessageHeaderTestBase /* (non-Javadoc) * @see org.apache.activemq.api.core.client.ClientSession#addMetaData(java.lang.String, java.lang.String) */ - public void addMetaData(String key, String data) throws HornetQException + public void addMetaData(String key, String data) throws ActiveMQException { // TODO Auto-generated method stub @@ -1448,7 +1448,7 @@ public class MessageHeaderTest extends MessageHeaderTestBase /* (non-Javadoc) * @see org.apache.activemq.api.core.client.ClientSession#addUniqueMetaData(java.lang.String, java.lang.String) */ - public void addUniqueMetaData(String key, String data) throws HornetQException + public void addUniqueMetaData(String key, String data) throws ActiveMQException { // TODO Auto-generated method stub http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/joram-tests/pom.xml ---------------------------------------------------------------------- diff --git a/tests/joram-tests/pom.xml b/tests/joram-tests/pom.xml index fee5078..8636ffe 100644 --- a/tests/joram-tests/pom.xml +++ b/tests/joram-tests/pom.xml @@ -111,7 +111,7 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <skipTests>${skipJoramTests}</skipTests> - <argLine>${hornetq-surefire-argline}</argLine> + <argLine>${activemq-surefire-argline}</argLine> <excludes> <exclude>org/objectweb/**</exclude> </excludes> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/performance-tests/pom.xml ---------------------------------------------------------------------- diff --git a/tests/performance-tests/pom.xml b/tests/performance-tests/pom.xml index e96fe42..5c66b12 100644 --- a/tests/performance-tests/pom.xml +++ b/tests/performance-tests/pom.xml @@ -117,7 +117,7 @@ <includes> <include>**/*Test.java</include> </includes> - <argLine>${hornetq-surefire-argline}</argLine> + <argLine>${activemq-surefire-argline}</argLine> </configuration> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/performance-tests/src/test/java/org/apache/activemq/tests/performance/paging/MeasurePagingMultiThreadTest.java ---------------------------------------------------------------------- diff --git a/tests/performance-tests/src/test/java/org/apache/activemq/tests/performance/paging/MeasurePagingMultiThreadTest.java b/tests/performance-tests/src/test/java/org/apache/activemq/tests/performance/paging/MeasurePagingMultiThreadTest.java index befd1ad..d17c4a0 100644 --- a/tests/performance-tests/src/test/java/org/apache/activemq/tests/performance/paging/MeasurePagingMultiThreadTest.java +++ b/tests/performance-tests/src/test/java/org/apache/activemq/tests/performance/paging/MeasurePagingMultiThreadTest.java @@ -14,7 +14,7 @@ package org.apache.activemq.tests.performance.paging; import java.util.HashMap; import java.util.concurrent.CountDownLatch; -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.ClientMessage; import org.apache.activemq.api.core.client.ClientProducer; @@ -181,12 +181,12 @@ public class MeasurePagingMultiThreadTest extends ServiceTestBase * @param nMessages * @param messageSize * @param factory - * @throws HornetQException + * @throws org.apache.activemq.api.core.ActiveMQException */ private void sendInitialBatch(final SimpleString adr, final int nMessages, final int messageSize, - final ClientSessionFactory factory) throws HornetQException + final ClientSessionFactory factory) throws ActiveMQException { ClientSession session = factory.createSession(false, true, true); ClientProducer producer = session.createProducer(adr); @@ -201,9 +201,9 @@ public class MeasurePagingMultiThreadTest extends ServiceTestBase * @param nMessages * @param producer * @param msg - * @throws HornetQException + * @throws org.apache.activemq.api.core.ActiveMQException */ - private void sendMessages(final int nMessages, final ClientProducer producer, final ClientMessage msg) throws HornetQException + private void sendMessages(final int nMessages, final ClientProducer producer, final ClientMessage msg) throws ActiveMQException { for (int i = 0; i < nMessages; i++) { @@ -214,9 +214,9 @@ public class MeasurePagingMultiThreadTest extends ServiceTestBase /** * @param factory * @param adr - * @throws HornetQException + * @throws org.apache.activemq.api.core.ActiveMQException */ - private void createDestination(final ClientSessionFactory factory, final SimpleString adr) throws HornetQException + private void createDestination(final ClientSessionFactory factory, final SimpleString adr) throws ActiveMQException { { ClientSession session = factory.createSession(false, false, false); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/pom.xml ---------------------------------------------------------------------- diff --git a/tests/pom.xml b/tests/pom.xml index 7cbb8d2..598bbc5 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -30,7 +30,7 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <skipTests>${skipUnitTests}</skipTests> - <argLine>${hornetq-surefire-argline}</argLine> + <argLine>${activemq-surefire-argline}</argLine> <excludes> <!--todo this test is dependent on the jar so needs to be run post package as an integration test--> <exclude>**/ManifestTest.java</exclude> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/soak-tests/pom.xml ---------------------------------------------------------------------- diff --git a/tests/soak-tests/pom.xml b/tests/soak-tests/pom.xml index 937366b..9742f88 100644 --- a/tests/soak-tests/pom.xml +++ b/tests/soak-tests/pom.xml @@ -136,7 +136,7 @@ <includes> <include>**/*Test.java</include> </includes> - <argLine>${hornetq-surefire-argline}</argLine> + <argLine>${activemq-surefire-argline}</argLine> </configuration> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/stress-tests/pom.xml ---------------------------------------------------------------------- diff --git a/tests/stress-tests/pom.xml b/tests/stress-tests/pom.xml index 9690f17..d9b896f 100644 --- a/tests/stress-tests/pom.xml +++ b/tests/stress-tests/pom.xml @@ -136,7 +136,7 @@ <includes> <include>**/*Test.java</include> </includes> - <argLine>${hornetq-surefire-argline}</argLine> + <argLine>${activemq-surefire-argline}</argLine> </configuration> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/JournalRestartStressTest.java ---------------------------------------------------------------------- diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/JournalRestartStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/JournalRestartStressTest.java index 979b431..18e4411 100644 --- a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/JournalRestartStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/JournalRestartStressTest.java @@ -104,7 +104,7 @@ public class JournalRestartStressTest extends ServiceTestBase /** * @param sf * @param NMSGS - * @throws HornetQException + * @throws ActiveMQException * @throws InterruptedException * @throws Throwable */ http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java ---------------------------------------------------------------------- diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java index 43dfce3..d1adb29 100644 --- a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.concurrent.CountDownLatch; import org.apache.activemq.api.config.HornetQDefaultConfiguration; -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; @@ -146,7 +146,7 @@ public class NIOMultiThreadCompactorStressTest extends ServiceTestBase /** * @param xid - * @throws HornetQException + * @throws org.apache.activemq.api.core.ActiveMQException */ private void addEmptyTransaction(final Xid xid) throws Exception { @@ -264,9 +264,9 @@ public class NIOMultiThreadCompactorStressTest extends ServiceTestBase /** * @param numberOfMessagesExpected * @param queue - * @throws HornetQException + * @throws org.apache.activemq.api.core.ActiveMQException */ - private void drainQueue(final int numberOfMessagesExpected, final SimpleString queue) throws HornetQException + private void drainQueue(final int numberOfMessagesExpected, final SimpleString queue) throws ActiveMQException { ClientSession sess = sf.createSession(true, true); @@ -292,9 +292,9 @@ public class NIOMultiThreadCompactorStressTest extends ServiceTestBase } /** - * @throws HornetQException + * @throws org.apache.activemq.api.core.ActiveMQException */ - private void addBogusData(final int nmessages, final String queue) throws HornetQException + private void addBogusData(final int nmessages, final String queue) throws ActiveMQException { ClientSession session = sf.createSession(false, false); try
