You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ma...@apache.org on 2014/11/18 10:24:05 UTC
[03/20] activemq-6 git commit: ACTIVEMQ6-3 Renaming Exception classes
and fixing native compilation
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/DelayInterceptor.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/DelayInterceptor.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/DelayInterceptor.java
index 3feb721..6f8f621 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/DelayInterceptor.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/DelayInterceptor.java
@@ -12,7 +12,7 @@
*/
package org.apache.activemq.tests.integration.cluster.failover;
-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.core.protocol.core.impl.PacketImpl;
@@ -27,7 +27,7 @@ import org.apache.activemq.spi.core.protocol.RemotingConnection;
*/
public class DelayInterceptor 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)
{
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/DelayInterceptor2.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/DelayInterceptor2.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/DelayInterceptor2.java
index 3a01383..45b6012 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/DelayInterceptor2.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/DelayInterceptor2.java
@@ -15,7 +15,7 @@ package org.apache.activemq.tests.integration.cluster.failover;
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.core.protocol.core.Packet;
import org.apache.activemq.core.protocol.core.impl.PacketImpl;
@@ -34,7 +34,7 @@ public class DelayInterceptor2 implements Interceptor
private final CountDownLatch latch = new CountDownLatch(1);
- 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.NULL_RESPONSE && loseResponse)
{
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/DelayInterceptor3.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/DelayInterceptor3.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/DelayInterceptor3.java
index d2fb386..00dbcf0 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/DelayInterceptor3.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/DelayInterceptor3.java
@@ -12,7 +12,7 @@
*/
package org.apache.activemq.tests.integration.cluster.failover;
-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.core.protocol.core.impl.PacketImpl;
@@ -28,7 +28,7 @@ import org.apache.activemq.spi.core.protocol.RemotingConnection;
public class DelayInterceptor3 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_COMMIT)
{
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/FailoverOnFlowControlTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailoverOnFlowControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailoverOnFlowControlTest.java
index 20bb72b..c8fa258 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailoverOnFlowControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailoverOnFlowControlTest.java
@@ -12,12 +12,12 @@
*/
package org.apache.activemq.tests.integration.cluster.failover;
+import org.apache.activemq.api.core.ActiveMQException;
import org.junit.Test;
import java.util.ArrayList;
import java.util.concurrent.atomic.AtomicInteger;
-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.ClientMessage;
@@ -58,7 +58,7 @@ public class FailoverOnFlowControlTest extends FailoverTestBase
Interceptor interceptorClient = new Interceptor()
{
AtomicInteger count = new AtomicInteger(0);
- public boolean intercept(Packet packet, RemotingConnection connection) throws HornetQException
+ public boolean intercept(Packet packet, RemotingConnection connection) throws ActiveMQException
{
log.debug("Intercept..." + packet.getClass().getName());
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/FailoverTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailoverTest.java
index e3cbbc8..ecf982b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailoverTest.java
@@ -23,12 +23,12 @@ import java.util.Set;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import org.apache.activemq.api.core.HornetQDuplicateIdException;
-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.HornetQTransactionOutcomeUnknownException;
-import org.apache.activemq.api.core.HornetQTransactionRolledBackException;
+import org.apache.activemq.api.core.ActiveMQDuplicateIdException;
+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.ActiveMQTransactionOutcomeUnknownException;
+import org.apache.activemq.api.core.ActiveMQTransactionRolledBackException;
import org.apache.activemq.api.core.Interceptor;
import org.apache.activemq.api.core.Message;
import org.apache.activemq.api.core.SimpleString;
@@ -159,7 +159,7 @@ public class FailoverTest extends FailoverTestBase
if (!producer.isClosed())
producer.send(message);
}
- catch (HornetQException e1)
+ catch (ActiveMQException e1)
{
e1.printStackTrace();
}
@@ -238,7 +238,7 @@ public class FailoverTest extends FailoverTestBase
message.getIntProperty("counter"));
message.acknowledge();
}
- catch (HornetQException e)
+ catch (ActiveMQException e)
{
e.printStackTrace();
return;
@@ -320,7 +320,7 @@ public class FailoverTest extends FailoverTestBase
message.getIntProperty("counter"));
message.acknowledge();
}
- catch (HornetQException e)
+ catch (ActiveMQException e)
{
e.printStackTrace();
continue;
@@ -361,11 +361,11 @@ public class FailoverTest extends FailoverTestBase
}
return msg;
}
- catch (HornetQObjectClosedException oce)
+ catch (ActiveMQObjectClosedException oce)
{
throw new RuntimeException(oce);
}
- catch (HornetQException ignored)
+ catch (ActiveMQException ignored)
{
// retry
ignored.printStackTrace();
@@ -764,9 +764,9 @@ public class FailoverTest extends FailoverTestBase
/**
* @param consumer
- * @throws HornetQException
+ * @throws org.apache.activemq.api.core.ActiveMQException
*/
- private void assertNoMoreMessages(ClientConsumer consumer) throws HornetQException
+ private void assertNoMoreMessages(ClientConsumer consumer) throws ActiveMQException
{
ClientMessage msg = consumer.receiveImmediate();
assertNull("there should be no more messages to receive! " + msg, msg);
@@ -821,11 +821,11 @@ public class FailoverTest extends FailoverTestBase
session.commit();
fail("session must have rolled back on failover");
}
- catch (HornetQTransactionRolledBackException trbe)
+ catch (ActiveMQTransactionRolledBackException trbe)
{
//ok
}
- catch (HornetQException e)
+ catch (ActiveMQException e)
{
fail("Invalid Exception type:" + e.getType());
}
@@ -915,11 +915,11 @@ public class FailoverTest extends FailoverTestBase
Assert.fail("Should throw exception");
}
- catch (HornetQTransactionRolledBackException trbe)
+ catch (ActiveMQTransactionRolledBackException trbe)
{
//ok
}
- catch (HornetQException e)
+ catch (ActiveMQException e)
{
fail("Invalid Exception type:" + e.getType());
}
@@ -960,11 +960,11 @@ public class FailoverTest extends FailoverTestBase
Assert.fail("Should throw exception");
}
- catch (HornetQTransactionRolledBackException trbe)
+ catch (ActiveMQTransactionRolledBackException trbe)
{
//ok
}
- catch (HornetQException e)
+ catch (ActiveMQException e)
{
fail("Invalid Exception type:" + e.getType());
}
@@ -1096,11 +1096,11 @@ public class FailoverTest extends FailoverTestBase
Assert.fail("Should throw exception");
}
- catch (HornetQTransactionRolledBackException trbe)
+ catch (ActiveMQTransactionRolledBackException trbe)
{
//ok
}
- catch (HornetQException e)
+ catch (ActiveMQException e)
{
fail("Invalid Exception type:" + e.getType());
}
@@ -1702,7 +1702,7 @@ public class FailoverTest extends FailoverTestBase
receiveDurableMessages(consumer);
}
- protected void receiveDurableMessages(ClientConsumer consumer) throws HornetQException
+ protected void receiveDurableMessages(ClientConsumer consumer) throws ActiveMQException
{
// During failover non-persistent messages may disappear but in certain cases they may survive.
// For that reason the test is validating all the messages but being permissive with non-persistent messages
@@ -1788,7 +1788,7 @@ public class FailoverTest extends FailoverTestBase
receiveMessages(consumer, NUM_MESSAGES, NUM_MESSAGES * 2, true);
}
- protected void receiveMessages(ClientConsumer consumer) throws HornetQException
+ protected void receiveMessages(ClientConsumer consumer) throws ActiveMQException
{
receiveMessages(consumer, 0, NUM_MESSAGES, true);
}
@@ -1880,13 +1880,13 @@ public class FailoverTest extends FailoverTestBase
{
producer.send(message);
}
- catch (HornetQException e1)
+ catch (ActiveMQException e1)
{
this.e = e1;
}
}
- volatile HornetQException e;
+ volatile ActiveMQException e;
}
Sender sender = new Sender();
@@ -1901,9 +1901,9 @@ public class FailoverTest extends FailoverTestBase
Assert.assertNotNull(sender.e.getCause());
- Assert.assertEquals(sender.e.getType(), HornetQExceptionType.UNBLOCKED);
+ Assert.assertEquals(sender.e.getType(), ActiveMQExceptionType.UNBLOCKED);
- Assert.assertEquals(((HornetQException)sender.e.getCause()).getType(), HornetQExceptionType.DISCONNECTED);
+ Assert.assertEquals(((ActiveMQException)sender.e.getCause()).getType(), ActiveMQExceptionType.DISCONNECTED);
session.close();
}
@@ -1957,7 +1957,7 @@ public class FailoverTest extends FailoverTestBase
session.commit();
}
- catch (HornetQTransactionRolledBackException trbe)
+ catch (ActiveMQTransactionRolledBackException trbe)
{
// Ok - now we retry the commit after removing the interceptor
@@ -1969,12 +1969,12 @@ public class FailoverTest extends FailoverTestBase
failed = false;
}
- catch (HornetQException e2)
+ catch (ActiveMQException e2)
{
throw new RuntimeException(e2);
}
}
- catch (HornetQTransactionOutcomeUnknownException toue)
+ catch (ActiveMQTransactionOutcomeUnknownException toue)
{
// Ok - now we retry the commit after removing the interceptor
@@ -1986,12 +1986,12 @@ public class FailoverTest extends FailoverTestBase
failed = false;
}
- catch (HornetQException e2)
+ catch (ActiveMQException e2)
{
throw new RuntimeException(e2);
}
}
- catch (HornetQException e)
+ catch (ActiveMQException e)
{
//ignore
}
@@ -2047,11 +2047,11 @@ public class FailoverTest extends FailoverTestBase
session2.commit();
fail("expecting DUPLICATE_ID_REJECTED exception");
}
- catch (HornetQDuplicateIdException dide)
+ catch (ActiveMQDuplicateIdException dide)
{
//ok
}
- catch (HornetQException e)
+ catch (ActiveMQException e)
{
fail("Invalid Exception type:" + e.getType());
}
@@ -2097,7 +2097,7 @@ public class FailoverTest extends FailoverTestBase
session.commit();
}
- catch (HornetQTransactionRolledBackException trbe)
+ catch (ActiveMQTransactionRolledBackException trbe)
{
// Ok - now we retry the commit after removing the interceptor
@@ -2109,11 +2109,11 @@ public class FailoverTest extends FailoverTestBase
failed = false;
}
- catch (HornetQException e2)
+ catch (ActiveMQException e2)
{
}
}
- catch (HornetQTransactionOutcomeUnknownException toue)
+ catch (ActiveMQTransactionOutcomeUnknownException toue)
{
// Ok - now we retry the commit after removing the interceptor
@@ -2125,11 +2125,11 @@ public class FailoverTest extends FailoverTestBase
failed = false;
}
- catch (HornetQException e2)
+ catch (ActiveMQException e2)
{
}
}
- 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/failover/FailoverTestBase.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailoverTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailoverTestBase.java
index 5a69e6a..ee0e37b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailoverTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/FailoverTestBase.java
@@ -19,7 +19,7 @@ import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-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.ClientMessage;
@@ -160,7 +160,7 @@ public abstract class FailoverTestBase extends ServiceTestBase
*/
protected static void assertLargeMessageBody(final int i, final ClientMessage message)
{
- HornetQBuffer buffer = message.getBodyBuffer();
+ ActiveMQBuffer buffer = message.getBodyBuffer();
for (int j = 0; j < LARGE_MESSAGE_SIZE; j++)
{
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/NettyAsynchronousReattachTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/NettyAsynchronousReattachTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/NettyAsynchronousReattachTest.java
index 062a26f..9e56a67 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/NettyAsynchronousReattachTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/NettyAsynchronousReattachTest.java
@@ -12,7 +12,7 @@
*/
package org.apache.activemq.tests.integration.cluster.failover;
-import org.apache.activemq.api.core.HornetQNotConnectedException;
+import org.apache.activemq.api.core.ActiveMQNotConnectedException;
import org.apache.activemq.api.core.client.ClientSession;
import org.apache.activemq.core.client.impl.ClientSessionInternal;
import org.apache.activemq.tests.integration.IntegrationTestLogger;
@@ -36,7 +36,7 @@ public class NettyAsynchronousReattachTest extends NettyAsynchronousFailoverTest
{
log.debug("Crashing session " + session);
ClientSessionInternal internalSession = (ClientSessionInternal) session;
- internalSession.getConnection().fail(new HornetQNotConnectedException("oops"));
+ internalSession.getConnection().fail(new ActiveMQNotConnectedException("oops"));
}
}
}
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/ReplicatedDistributionTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedDistributionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedDistributionTest.java
index d1344c5..2b1831c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedDistributionTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/ReplicatedDistributionTest.java
@@ -15,7 +15,7 @@ package org.apache.activemq.tests.integration.cluster.failover;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import org.apache.activemq.api.core.HornetQNotConnectedException;
+import org.apache.activemq.api.core.ActiveMQNotConnectedException;
import org.apache.activemq.api.core.SimpleString;
import org.apache.activemq.api.core.client.ClientConsumer;
import org.apache.activemq.api.core.client.ClientMessage;
@@ -175,7 +175,7 @@ public class ReplicatedDistributionTest extends ClusterTestBase
RemotingConnection conn = ((ClientSessionInternal) session).getConnection();
// Simulate failure on connection
- conn.fail(new HornetQNotConnectedException());
+ conn.fail(new ActiveMQNotConnectedException());
// Wait to be informed of failure
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/remote/FailoverWithSharedStoreTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/remote/FailoverWithSharedStoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/remote/FailoverWithSharedStoreTest.java
index 6e6f15a..2cf4157 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/remote/FailoverWithSharedStoreTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/remote/FailoverWithSharedStoreTest.java
@@ -12,8 +12,8 @@
*/
package org.apache.activemq.tests.integration.cluster.failover.remote;
-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.TransportConfiguration;
import org.apache.activemq.api.core.client.HornetQClient;
import org.apache.activemq.api.core.client.ServerLocator;
@@ -38,11 +38,11 @@ public class FailoverWithSharedStoreTest extends ClusterTestBase
createSessionFactory(locator);
fail();
}
- catch (HornetQNotConnectedException nce)
+ catch (ActiveMQNotConnectedException nce)
{
//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/cluster/reattach/MultiThreadRandomReattachTestBase.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java
index 231ee66..40d3b8e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java
@@ -11,6 +11,7 @@
* permissions and limitations under the License.
*/
package org.apache.activemq.tests.integration.cluster.reattach;
+import org.apache.activemq.api.core.ActiveMQException;
import org.junit.Before;
import org.junit.After;
@@ -25,7 +26,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.client.ClientConsumer;
import org.apache.activemq.api.core.client.ClientMessage;
@@ -1436,7 +1436,7 @@ public abstract class MultiThreadRandomReattachTestBase extends MultiThreadReatt
{
message.acknowledge();
}
- catch (HornetQException me)
+ catch (ActiveMQException me)
{
log.error("Failed to process", me);
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/MultiThreadReattachSupportTestBase.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/MultiThreadReattachSupportTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/MultiThreadReattachSupportTestBase.java
index c59d5c1..a2faf13 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/MultiThreadReattachSupportTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/MultiThreadReattachSupportTestBase.java
@@ -11,6 +11,7 @@
* permissions and limitations under the License.
*/
package org.apache.activemq.tests.integration.cluster.reattach;
+import org.apache.activemq.api.core.ActiveMQNotConnectedException;
import org.junit.Before;
import org.junit.After;
@@ -21,7 +22,6 @@ import java.util.TimerTask;
import org.junit.Assert;
-import org.apache.activemq.api.core.HornetQNotConnectedException;
import org.apache.activemq.api.core.client.ClientSession;
import org.apache.activemq.api.core.client.ClientSessionFactory;
import org.apache.activemq.api.core.client.ServerLocator;
@@ -251,7 +251,7 @@ public abstract class MultiThreadReattachSupportTestBase extends ServiceTestBase
}
else
{
- conn.fail(new HornetQNotConnectedException("blah"));
+ conn.fail(new ActiveMQNotConnectedException("blah"));
}
log.info("** Fail complete");
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/OrderReattachTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/OrderReattachTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/OrderReattachTest.java
index 6d92a51..feb733b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/OrderReattachTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/OrderReattachTest.java
@@ -12,6 +12,7 @@
*/
package org.apache.activemq.tests.integration.cluster.reattach;
+import org.apache.activemq.api.core.ActiveMQNotConnectedException;
import org.junit.Test;
import java.util.HashSet;
@@ -22,7 +23,6 @@ import java.util.concurrent.TimeUnit;
import org.junit.Assert;
-import org.apache.activemq.api.core.HornetQNotConnectedException;
import org.apache.activemq.api.core.SimpleString;
import org.apache.activemq.api.core.client.ClientConsumer;
import org.apache.activemq.api.core.client.ClientMessage;
@@ -117,7 +117,7 @@ public class OrderReattachTest extends ServiceTestBase
// True means... fail session
if (poll)
{
- conn.fail(new HornetQNotConnectedException("poop"));
+ conn.fail(new ActiveMQNotConnectedException("poop"));
}
else
{
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/RandomReattachTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/RandomReattachTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/RandomReattachTest.java
index ad24339..c3b0789 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/RandomReattachTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/RandomReattachTest.java
@@ -20,8 +20,8 @@ import java.util.TimerTask;
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.SimpleString;
import org.apache.activemq.api.core.TransportConfiguration;
import org.apache.activemq.api.core.client.ClientConsumer;
@@ -352,7 +352,7 @@ public class RandomReattachTest extends UnitTestCase
{
message.acknowledge();
}
- catch (HornetQException me)
+ catch (ActiveMQException me)
{
RandomReattachTest.log.error("Failed to process", me);
}
@@ -601,7 +601,7 @@ public class RandomReattachTest extends UnitTestCase
{
message.acknowledge();
}
- catch (HornetQException e)
+ catch (ActiveMQException e)
{
e.printStackTrace();
throw new RuntimeException(e.getMessage(), e);
@@ -1529,7 +1529,7 @@ public class RandomReattachTest extends UnitTestCase
{
RandomReattachTest.log.info("** Failing connection");
- session.getConnection().fail(new HornetQNotConnectedException("oops"));
+ session.getConnection().fail(new ActiveMQNotConnectedException("oops"));
RandomReattachTest.log.info("** Fail complete");
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/ReattachTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/ReattachTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/ReattachTest.java
index c4e154f..a137d7e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/ReattachTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/reattach/ReattachTest.java
@@ -17,10 +17,10 @@ import java.util.TimerTask;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicInteger;
-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.HornetQObjectClosedException;
+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.ActiveMQObjectClosedException;
import org.apache.activemq.api.core.Interceptor;
import org.apache.activemq.api.core.SimpleString;
import org.apache.activemq.api.core.client.ClientConsumer;
@@ -106,7 +106,7 @@ public class ReattachTest extends ServiceTestBase
RemotingConnection conn = ((ClientSessionInternal) session).getConnection();
- conn.fail(new HornetQNotConnectedException());
+ conn.fail(new ActiveMQNotConnectedException());
session.start();
@@ -160,7 +160,7 @@ public class ReattachTest extends ServiceTestBase
Interceptor intercept = new Interceptor()
{
- public boolean intercept(Packet packet, RemotingConnection connection) throws HornetQException
+ public boolean intercept(Packet packet, RemotingConnection connection) throws ActiveMQException
{
System.out.println("Intercept..." + packet.getClass().getName());
@@ -172,7 +172,7 @@ public class ReattachTest extends ServiceTestBase
if (count.incrementAndGet() == 2)
{
System.out.println("Failing");
- connection.fail(new HornetQException(HornetQExceptionType.UNSUPPORTED_PACKET, "bye"));
+ connection.fail(new ActiveMQException(ActiveMQExceptionType.UNSUPPORTED_PACKET, "bye"));
return false;
}
}
@@ -273,7 +273,7 @@ public class ReattachTest extends ServiceTestBase
t.start();
- conn.fail(new HornetQNotConnectedException());
+ conn.fail(new ActiveMQNotConnectedException());
session.start();
@@ -328,18 +328,18 @@ public class ReattachTest extends ServiceTestBase
volatile boolean failed;
@Override
- public void connectionFailed(final HornetQException me, boolean failedOver)
+ public void connectionFailed(final ActiveMQException me, boolean failedOver)
{
failed = 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 exception)
+ public void beforeReconnect(final ActiveMQException exception)
{
}
}
@@ -388,13 +388,13 @@ public class ReattachTest extends ServiceTestBase
{
}
- conn2.fail(new HornetQNotConnectedException("Did not receive pong from server"));
+ conn2.fail(new ActiveMQNotConnectedException("Did not receive pong from server"));
}
};
t.start();
- conn.fail(new HornetQNotConnectedException());
+ conn.fail(new ActiveMQNotConnectedException());
Assert.assertTrue(listener.failed);
@@ -488,7 +488,7 @@ public class ReattachTest extends ServiceTestBase
t.start();
- conn.fail(new HornetQNotConnectedException());
+ conn.fail(new ActiveMQNotConnectedException());
// Should throw exception since didn't reconnect
@@ -498,11 +498,11 @@ public class ReattachTest extends ServiceTestBase
Assert.fail("Should throw exception");
}
- catch (HornetQObjectClosedException oce)
+ catch (ActiveMQObjectClosedException oce)
{
//ok
}
- catch (HornetQException e)
+ catch (ActiveMQException e)
{
fail("Invalid Exception type:" + e.getType());
}
@@ -589,7 +589,7 @@ public class ReattachTest extends ServiceTestBase
{
try
{
- connFailure.fail(new HornetQNotConnectedException());
+ connFailure.fail(new ActiveMQNotConnectedException());
}
catch (Exception e)
{
@@ -754,7 +754,7 @@ public class ReattachTest extends ServiceTestBase
InVMConnector.failOnCreateConnection = false;
- conn.fail(new HornetQNotConnectedException());
+ conn.fail(new ActiveMQNotConnectedException());
Thread t = new Thread()
{
@@ -792,9 +792,9 @@ public class ReattachTest extends ServiceTestBase
//
// fail("Should throw exception");
// }
- // catch (HornetQException e)
+ // catch (ActiveMQException e)
// {
- // assertEquals(HornetQException.OBJECT_CLOSED, e.getCode());
+ // assertEquals(ActiveMQException.OBJECT_CLOSED, e.getCode());
// }
session.close();
@@ -846,7 +846,7 @@ public class ReattachTest extends ServiceTestBase
RemotingConnection conn = ((ClientSessionInternal) session).getConnection();
- conn.fail(new HornetQNotConnectedException());
+ conn.fail(new ActiveMQNotConnectedException());
session.start();
@@ -933,7 +933,7 @@ public class ReattachTest extends ServiceTestBase
t.start();
- conn.fail(new HornetQNotConnectedException());
+ conn.fail(new ActiveMQNotConnectedException());
session.start();
@@ -1009,7 +1009,7 @@ public class ReattachTest extends ServiceTestBase
long start = System.currentTimeMillis();
- conn.fail(new HornetQNotConnectedException());
+ conn.fail(new ActiveMQNotConnectedException());
session.start();
@@ -1088,7 +1088,7 @@ public class ReattachTest extends ServiceTestBase
long start = System.currentTimeMillis();
- conn.fail(new HornetQNotConnectedException());
+ conn.fail(new ActiveMQNotConnectedException());
session.start();
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/topology/TopologyClusterTestBase.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/topology/TopologyClusterTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/topology/TopologyClusterTestBase.java
index 69ace38..2d7f706 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/topology/TopologyClusterTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/topology/TopologyClusterTestBase.java
@@ -17,10 +17,10 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.CountDownLatch;
-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.HornetQUnBlockedException;
+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.ActiveMQUnBlockedException;
import org.apache.activemq.api.core.client.ClientConsumer;
import org.apache.activemq.api.core.client.ClientProducer;
import org.apache.activemq.api.core.client.ClientSession;
@@ -175,12 +175,12 @@ public abstract class TopologyClusterTestBase extends ClusterTestBase
session.deleteQueue(rand);
return session;
}
- catch (HornetQObjectClosedException oce)
+ catch (ActiveMQObjectClosedException oce)
{
ClientSessionFactory sf = createSessionFactory(locator);
return sf.createSession();
}
- catch (HornetQUnBlockedException obe)
+ catch (ActiveMQUnBlockedException obe)
{
ClientSessionFactory sf = createSessionFactory(locator);
return sf.createSession();
@@ -378,9 +378,9 @@ public abstract class TopologyClusterTestBase extends ClusterTestBase
session = checkSessionOrReconnect(session, locator);
fail();
}
- catch (HornetQException expected)
+ catch (ActiveMQException expected)
{
- assertEquals(HornetQExceptionType.NOT_CONNECTED, expected.getType());
+ assertEquals(ActiveMQExceptionType.NOT_CONNECTED, 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/cluster/util/BackupSyncDelay.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/util/BackupSyncDelay.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/util/BackupSyncDelay.java
index cd00f34..25ee09e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/util/BackupSyncDelay.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/util/BackupSyncDelay.java
@@ -17,7 +17,7 @@ package org.apache.activemq.tests.integration.cluster.util;
import java.util.concurrent.locks.Lock;
-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.Channel;
import org.apache.activemq.core.protocol.core.ChannelHandler;
@@ -92,7 +92,7 @@ public class BackupSyncDelay implements Interceptor
}
@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)
{
@@ -252,7 +252,7 @@ public class BackupSyncDelay implements Interceptor
}
@Override
- public Packet sendBlocking(Packet packet, byte expected) throws HornetQException
+ public Packet sendBlocking(Packet packet, byte expected) throws ActiveMQException
{
throw new UnsupportedOperationException();
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/discovery/DiscoveryTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/discovery/DiscoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/discovery/DiscoveryTest.java
index 546c17a..69697f2 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/discovery/DiscoveryTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/discovery/DiscoveryTest.java
@@ -30,9 +30,9 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
+import org.apache.activemq.api.core.ActiveMQIllegalStateException;
import org.apache.activemq.api.core.BroadcastEndpoint;
import org.apache.activemq.api.core.BroadcastEndpointFactory;
-import org.apache.activemq.api.core.HornetQIllegalStateException;
import org.apache.activemq.api.core.JGroupsBroadcastGroupConfiguration;
import org.apache.activemq.api.core.SimpleString;
import org.apache.activemq.api.core.TransportConfiguration;
@@ -1396,7 +1396,7 @@ public class DiscoveryTest extends UnitTestCase
}
@Override
- public SimpleString readNodeId() throws HornetQIllegalStateException, IOException
+ public SimpleString readNodeId() throws ActiveMQIllegalStateException, IOException
{
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/jms/bridge/ClusteredBridgeTestBase.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/ClusteredBridgeTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/ClusteredBridgeTestBase.java
index 6fcaeeb..b1e832d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/ClusteredBridgeTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/ClusteredBridgeTestBase.java
@@ -23,7 +23,7 @@ import java.util.concurrent.TimeUnit;
import com.arjuna.ats.arjuna.coordinator.TransactionReaper;
import com.arjuna.ats.arjuna.coordinator.TxControl;
-import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.ActiveMQException;
import org.apache.activemq.api.core.TransportConfiguration;
import org.apache.activemq.api.core.client.ClientConsumer;
import org.apache.activemq.api.core.client.ClientMessage;
@@ -238,7 +238,7 @@ public abstract class ClusteredBridgeTestBase extends ServiceTestBase
return destFactory;
}
- public void sendMessages(String queueName, int num) throws HornetQException
+ public void sendMessages(String queueName, int num) throws ActiveMQException
{
ClientSession session = sessionFactory.createSession();
ClientProducer producer = session.createProducer("jms.queue." + queueName);
@@ -252,7 +252,7 @@ public abstract class ClusteredBridgeTestBase extends ServiceTestBase
session.close();
}
- public void receiveMessages(String queueName, int num, boolean checkDup) throws HornetQException
+ public void receiveMessages(String queueName, int num, boolean checkDup) throws ActiveMQException
{
ClientSession session = sessionFactory.createSession();
session.start();
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/JMSBridgeClusteredTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/JMSBridgeClusteredTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/JMSBridgeClusteredTest.java
index a1fa2e5..dae8c16 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/JMSBridgeClusteredTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/JMSBridgeClusteredTest.java
@@ -15,7 +15,7 @@ package org.apache.activemq.tests.integration.jms.bridge;
import javax.transaction.TransactionManager;
import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple;
-import org.apache.activemq.api.core.HornetQException;
+import org.apache.activemq.api.core.ActiveMQException;
import org.apache.activemq.jms.bridge.ConnectionFactoryFactory;
import org.apache.activemq.jms.bridge.DestinationFactory;
import org.apache.activemq.jms.bridge.QualityOfServiceMode;
@@ -233,31 +233,31 @@ public class JMSBridgeClusteredTest extends ClusteredBridgeTestBase
}
}
- private void sendMessages(ServerGroup server, String queueName, int num) throws HornetQException
+ private void sendMessages(ServerGroup server, String queueName, int num) throws ActiveMQException
{
server.sendMessages(queueName, num);
}
- private void receiveMessages(ServerGroup server, String queueName, int num, boolean checkDup) throws HornetQException
+ private void receiveMessages(ServerGroup server, String queueName, int num, boolean checkDup) throws ActiveMQException
{
try
{
server.receiveMessages(queueName, num, checkDup);
}
- catch (HornetQException e)
+ catch (ActiveMQException e)
{
e.printStackTrace();
throw e;
}
}
- private void receiveMessages(ServerGroup server, String queueName, int num) throws HornetQException
+ private void receiveMessages(ServerGroup server, String queueName, int num) throws ActiveMQException
{
try
{
server.receiveMessages(queueName, num, false);
}
- catch (HornetQException e)
+ catch (ActiveMQException e)
{
e.printStackTrace();
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/jms/client/GroupingTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/GroupingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/GroupingTest.java
index 2aca0ad..4a2a0cb 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/GroupingTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/GroupingTest.java
@@ -21,7 +21,7 @@ import javax.jms.Queue;
import javax.jms.Session;
import javax.jms.TextMessage;
-import org.apache.activemq.api.core.HornetQNotConnectedException;
+import org.apache.activemq.api.core.ActiveMQNotConnectedException;
import org.apache.activemq.api.core.SimpleString;
import org.apache.activemq.jms.client.HornetQConnectionFactory;
import org.apache.activemq.jms.client.HornetQMessage;
@@ -248,7 +248,7 @@ public class GroupingTest extends JMSTestBase
//consume all msgs from 2nd first consumer
// ClientSession hqs = ((HornetQSession) session).getCoreSession();
// ((DelegatingSession) hqs).getChannel().close();
- rc.fail(new HornetQNotConnectedException());
+ rc.fail(new ActiveMQNotConnectedException());
for (int j = 0; j < 10; j++)
{
TextMessage tm = (TextMessage)consumer2.receive(10000);
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java
index 4f41749..7602f78 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java
@@ -12,6 +12,7 @@
*/
package org.apache.activemq.tests.integration.jms.client;
+import org.apache.activemq.api.core.ActiveMQNotConnectedException;
import org.junit.Test;
import java.util.ArrayList;
@@ -27,7 +28,6 @@ import javax.jms.Session;
import org.junit.Assert;
-import org.apache.activemq.api.core.HornetQNotConnectedException;
import org.apache.activemq.api.core.TransportConfiguration;
import org.apache.activemq.api.core.client.HornetQClient;
import org.apache.activemq.api.jms.JMSFactoryType;
@@ -126,7 +126,7 @@ public class SessionClosedOnRemotingConnectionFailureTest extends JMSTestBase
RemotingConnection connection = ((ClientSessionInternal)((HornetQSession)session).getCoreSession()).getConnection();
- connection.fail(new HornetQNotConnectedException());
+ connection.fail(new ActiveMQNotConnectedException());
// Now try and use the producer
@@ -138,7 +138,7 @@ public class SessionClosedOnRemotingConnectionFailureTest extends JMSTestBase
}
catch (JMSException e)
{
- // assertEquals(HornetQException.OBJECT_CLOSED, e.getCode());
+ // assertEquals(ActiveMQException.OBJECT_CLOSED, e.getCode());
}
try
@@ -149,7 +149,7 @@ public class SessionClosedOnRemotingConnectionFailureTest extends JMSTestBase
}
catch (JMSException e)
{
- // assertEquals(HornetQException.OBJECT_CLOSED, e.getCode());
+ // assertEquals(ActiveMQException.OBJECT_CLOSED, e.getCode());
}
session.close();
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/BindingsClusterTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/BindingsClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/BindingsClusterTest.java
index d501a93..7beb44b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/BindingsClusterTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/BindingsClusterTest.java
@@ -12,8 +12,8 @@
*/
package org.apache.activemq.tests.integration.jms.cluster;
-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.TransportConfiguration;
import org.apache.activemq.api.jms.HornetQJMSClient;
import org.apache.activemq.api.jms.JMSFactoryType;
@@ -438,18 +438,18 @@ public class BindingsClusterTest extends JMSClusteredTestBase
forwardingConnection.addFailureListener(new FailureListener()
{
@Override
- public void connectionFailed(HornetQException exception, boolean failedOver)
+ public void connectionFailed(ActiveMQException exception, boolean failedOver)
{
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);
}
});
- forwardingConnection.fail(new HornetQNotConnectedException());
+ forwardingConnection.fail(new ActiveMQNotConnectedException());
assertTrue(latch.await(5000, TimeUnit.MILLISECONDS));
}
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/JMSFailoverTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/JMSFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/JMSFailoverTest.java
index 6cd456d..b220b2e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/JMSFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/JMSFailoverTest.java
@@ -28,7 +28,7 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
-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;
@@ -365,7 +365,7 @@ public class JMSFailoverTest extends ServiceTestBase
int count = 0;
@Override
- public boolean intercept(Packet packet, RemotingConnection connection) throws HornetQException
+ public boolean intercept(Packet packet, RemotingConnection connection) throws ActiveMQException
{
if (packet instanceof SessionReceiveContinuationMessage)
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/JMSReconnectTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/JMSReconnectTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/JMSReconnectTest.java
index f38bf31..f39a1e6 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/JMSReconnectTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/cluster/JMSReconnectTest.java
@@ -11,6 +11,8 @@
* permissions and limitations under the License.
*/
package org.apache.activemq.tests.integration.jms.cluster;
+import org.apache.activemq.api.core.ActiveMQException;
+import org.apache.activemq.api.core.ActiveMQNotConnectedException;
import org.junit.Before;
import org.junit.After;
@@ -31,8 +33,6 @@ import javax.jms.Topic;
import org.junit.Assert;
-import org.apache.activemq.api.core.HornetQException;
-import org.apache.activemq.api.core.HornetQNotConnectedException;
import org.apache.activemq.api.core.SimpleString;
import org.apache.activemq.api.core.TransportConfiguration;
import org.apache.activemq.api.core.client.ClientSession;
@@ -140,7 +140,7 @@ public class JMSReconnectTest extends UnitTestCase
Thread.sleep(2000);
- HornetQException me = new HornetQNotConnectedException();
+ ActiveMQException me = new ActiveMQNotConnectedException();
coreConn.fail(me);
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/CloseDestroyedConnectionTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/CloseDestroyedConnectionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/CloseDestroyedConnectionTest.java
index 9be3281..3c23a02 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/CloseDestroyedConnectionTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/CloseDestroyedConnectionTest.java
@@ -11,6 +11,9 @@
* permissions and limitations under the License.
*/
package org.apache.activemq.tests.integration.jms.connection;
+import org.apache.activemq.api.core.ActiveMQException;
+import org.apache.activemq.api.core.ActiveMQExceptionType;
+import org.apache.activemq.api.core.ActiveMQInternalErrorException;
import org.junit.Before;
import org.junit.After;
@@ -23,9 +26,6 @@ import javax.jms.Session;
import org.junit.Assert;
-import org.apache.activemq.api.core.HornetQException;
-import org.apache.activemq.api.core.HornetQExceptionType;
-import org.apache.activemq.api.core.HornetQInternalErrorException;
import org.apache.activemq.api.core.TransportConfiguration;
import org.apache.activemq.api.core.client.ClientSession;
import org.apache.activemq.api.jms.HornetQJMSClient;
@@ -78,7 +78,7 @@ public class CloseDestroyedConnectionTest extends JMSTestBase
}
@Test
- public void testClosingTemporaryTopicDeletesQueue() throws JMSException, HornetQException
+ public void testClosingTemporaryTopicDeletesQueue() throws JMSException, ActiveMQException
{
conn = cf.createConnection();
@@ -98,9 +98,9 @@ public class CloseDestroyedConnectionTest extends JMSTestBase
cs.createConsumer(address);
fail("the address from the TemporaryTopic still exists!");
}
- catch (HornetQException e)
+ catch (ActiveMQException e)
{
- assertEquals("expecting 'queue does not exist'", HornetQExceptionType.QUEUE_DOES_NOT_EXIST, e.getType());
+ assertEquals("expecting 'queue does not exist'", ActiveMQExceptionType.QUEUE_DOES_NOT_EXIST, e.getType());
}
}
@@ -142,7 +142,7 @@ public class CloseDestroyedConnectionTest extends JMSTestBase
RemotingConnection rc = sessi.getConnection();
- rc.fail(new HornetQInternalErrorException());
+ rc.fail(new ActiveMQInternalErrorException());
// Now close the connection
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/ExceptionListenerTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/ExceptionListenerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/ExceptionListenerTest.java
index 860da7d..d70f5d2 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/ExceptionListenerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/connection/ExceptionListenerTest.java
@@ -11,6 +11,7 @@
* permissions and limitations under the License.
*/
package org.apache.activemq.tests.integration.jms.connection;
+import org.apache.activemq.api.core.ActiveMQInternalErrorException;
import org.junit.Before;
import org.junit.After;
@@ -26,7 +27,6 @@ import javax.jms.Session;
import org.junit.Assert;
-import org.apache.activemq.api.core.HornetQInternalErrorException;
import org.apache.activemq.api.core.TransportConfiguration;
import org.apache.activemq.api.jms.HornetQJMSClient;
import org.apache.activemq.api.jms.JMSFactoryType;
@@ -120,7 +120,7 @@ public class ExceptionListenerTest extends UnitTestCase
ClientSessionInternal coreSession = (ClientSessionInternal)((HornetQConnection)conn).getInitialSession();
- coreSession.getConnection().fail(new HornetQInternalErrorException("blah"));
+ coreSession.getConnection().fail(new ActiveMQInternalErrorException("blah"));
latch.await(5, TimeUnit.SECONDS);
@@ -153,13 +153,13 @@ public class ExceptionListenerTest extends UnitTestCase
ClientSessionInternal coreSession3 = (ClientSessionInternal)((HornetQSession)sess3).getCoreSession();
- coreSession0.getConnection().fail(new HornetQInternalErrorException("blah"));
+ coreSession0.getConnection().fail(new ActiveMQInternalErrorException("blah"));
- coreSession1.getConnection().fail(new HornetQInternalErrorException("blah"));
+ coreSession1.getConnection().fail(new ActiveMQInternalErrorException("blah"));
- coreSession2.getConnection().fail(new HornetQInternalErrorException("blah"));
+ coreSession2.getConnection().fail(new ActiveMQInternalErrorException("blah"));
- coreSession3.getConnection().fail(new HornetQInternalErrorException("blah"));
+ coreSession3.getConnection().fail(new ActiveMQInternalErrorException("blah"));
latch.await(5, TimeUnit.SECONDS);
// Listener should only be called once even if all sessions connections die
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlTest.java
index d9ee560..2017487 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlTest.java
@@ -35,7 +35,7 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
-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.TransportConfiguration;
import org.apache.activemq.api.core.client.HornetQClient;
@@ -351,7 +351,7 @@ public class JMSServerControlTest extends ManagementTestBase
}
catch (javax.jms.IllegalStateException e)
{
- assertTrue(e.getCause() instanceof HornetQObjectClosedException);
+ assertTrue(e.getCause() instanceof ActiveMQObjectClosedException);
}
}
finally
@@ -513,7 +513,7 @@ public class JMSServerControlTest extends ManagementTestBase
}
catch (javax.jms.IllegalStateException e)
{
- assertTrue(e.getCause() instanceof HornetQObjectClosedException);
+ assertTrue(e.getCause() instanceof ActiveMQObjectClosedException);
}
}
finally
@@ -564,7 +564,7 @@ public class JMSServerControlTest extends ManagementTestBase
}
catch (javax.jms.IllegalStateException e)
{
- assertTrue(e.getCause() instanceof HornetQObjectClosedException);
+ assertTrue(e.getCause() instanceof ActiveMQObjectClosedException);
}
}
finally
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSUtil.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSUtil.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSUtil.java
index 2089e5f..b5c5bb3 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSUtil.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSUtil.java
@@ -31,8 +31,8 @@ import javax.management.NotificationListener;
import java.util.Collection;
import java.util.Set;
+import org.apache.activemq.api.core.ActiveMQException;
import org.junit.Assert;
-import org.apache.activemq.api.core.HornetQException;
import org.apache.activemq.api.core.TransportConfiguration;
import org.apache.activemq.api.core.client.ClientSession;
import org.apache.activemq.api.core.client.ServerLocator;
@@ -222,18 +222,18 @@ public class JMSUtil
class MyListener implements SessionFailureListener
{
@Override
- public void connectionFailed(final HornetQException me, boolean failedOver)
+ public void connectionFailed(final ActiveMQException me, boolean failedOver)
{
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(HornetQException exception)
+ public void beforeReconnect(ActiveMQException exception)
{
System.out.println("MyListener.beforeReconnect");
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/JournalPerfTuneTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/JournalPerfTuneTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/JournalPerfTuneTest.java
index ac1927f..0e241c8 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/JournalPerfTuneTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/journal/JournalPerfTuneTest.java
@@ -15,7 +15,7 @@ import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.activemq.api.core.HornetQBuffer;
+import org.apache.activemq.api.core.ActiveMQBuffer;
import org.apache.activemq.core.journal.EncodingSupport;
import org.apache.activemq.core.journal.IOCompletion;
import org.apache.activemq.core.journal.Journal;
@@ -214,7 +214,7 @@ public class JournalPerfTuneTest extends UnitTestCase
this.bytes = bytes;
}
- public void decode(HornetQBuffer buffer)
+ public void decode(ActiveMQBuffer buffer)
{
int length = buffer.readInt();
@@ -223,7 +223,7 @@ public class JournalPerfTuneTest extends UnitTestCase
buffer.readBytes(bytes);
}
- public void encode(HornetQBuffer buffer)
+ public void encode(ActiveMQBuffer buffer)
{
buffer.writeInt(bytes.length);
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/largemessage/LargeMessageTestBase.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/largemessage/LargeMessageTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/largemessage/LargeMessageTestBase.java
index 6f6b66c..e20dcbf 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/largemessage/LargeMessageTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/largemessage/LargeMessageTestBase.java
@@ -23,9 +23,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;
@@ -333,7 +333,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++)
{
@@ -455,7 +455,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++)
@@ -532,7 +532,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,
@@ -578,9 +578,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++)
{
@@ -619,11 +619,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/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AcceptorControlTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AcceptorControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AcceptorControlTest.java
index 2de534e..0bfecab 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AcceptorControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AcceptorControlTest.java
@@ -12,12 +12,12 @@
*/
package org.apache.activemq.tests.integration.management;
+import org.apache.activemq.api.core.ActiveMQException;
import org.junit.Test;
import java.util.HashMap;
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.ClientSession;
@@ -97,7 +97,7 @@ public class AcceptorControlTest extends ManagementTestBase
sf.createSession(false, true, true);
Assert.fail("acceptor must not accept connections when stopped accepting");
}
- catch (HornetQException e)
+ catch (ActiveMQException e)
{
}
@@ -120,7 +120,7 @@ public class AcceptorControlTest extends ManagementTestBase
sf.createSession(false, true, true);
Assert.fail("acceptor must not accept connections when stopped accepting");
}
- catch (HornetQException e)
+ catch (ActiveMQException e)
{
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementWithPagingServerTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementWithPagingServerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementWithPagingServerTest.java
index 487f34b..26a5743 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementWithPagingServerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementWithPagingServerTest.java
@@ -14,7 +14,7 @@ package org.apache.activemq.tests.integration.management;
import java.nio.ByteBuffer;
-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;
@@ -272,7 +272,7 @@ public class ManagementWithPagingServerTest extends ManagementTestBase
for (int i = 0; i < num; i++)
{
ClientMessage message = session1.createMessage(true);
- HornetQBuffer buffer = message.getBodyBuffer();
+ ActiveMQBuffer buffer = message.getBodyBuffer();
buffer.writeBytes(body);
producer.send(message);
try
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/NotificationTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/NotificationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/NotificationTest.java
index a63f693..a4ade5b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/NotificationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/NotificationTest.java
@@ -13,7 +13,7 @@
package org.apache.activemq.tests.integration.management;
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.TransportConfiguration;
import org.apache.activemq.api.core.client.ClientConsumer;
@@ -291,7 +291,7 @@ public class NotificationTest extends UnitTestCase
// Private -------------------------------------------------------
- private static void flush(final ClientConsumer notifConsumer) throws HornetQException
+ private static void flush(final ClientConsumer notifConsumer) throws ActiveMQException
{
ClientMessage message = null;
do
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/QueueControlTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/QueueControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/QueueControlTest.java
index f7a9fbf..c652d97 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/QueueControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/QueueControlTest.java
@@ -19,7 +19,7 @@ import java.util.concurrent.TimeUnit;
import javax.management.Notification;
-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;
@@ -437,7 +437,7 @@ public class QueueControlTest extends ManagementTestBase
{
message.acknowledge();
}
- catch (HornetQException e1)
+ catch (ActiveMQException e1)
{
e1.printStackTrace();
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityNotificationTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityNotificationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityNotificationTest.java
index ce020c8..f87780e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityNotificationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityNotificationTest.java
@@ -11,6 +11,7 @@
* permissions and limitations under the License.
*/
package org.apache.activemq.tests.integration.management;
+import org.apache.activemq.api.core.ActiveMQException;
import org.junit.Before;
import org.junit.After;
@@ -25,7 +26,6 @@ import java.util.Set;
import org.junit.Assert;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
-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;
@@ -197,7 +197,7 @@ public class SecurityNotificationTest extends UnitTestCase
// Private -------------------------------------------------------
- private static void flush(final ClientConsumer notifConsumer) throws HornetQException
+ private static void flush(final ClientConsumer notifConsumer) throws ActiveMQException
{
ClientMessage message = null;
do
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/DeleteQueueRestartTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/DeleteQueueRestartTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/DeleteQueueRestartTest.java
index 36a7c86..c8170ad 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/DeleteQueueRestartTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/DeleteQueueRestartTest.java
@@ -15,7 +15,7 @@ package org.apache.activemq.tests.integration.persistence;
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.client.ClientMessage;
import org.apache.activemq.api.core.client.ClientProducer;
import org.apache.activemq.api.core.client.ClientSession;
@@ -102,7 +102,7 @@ public class DeleteQueueRestartTest extends ServiceTestBase
session.close();
count.countDown();
}
- catch (HornetQException e)
+ catch (ActiveMQException e)
{
}
}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/JMSConnectionFactoryConfigurationStorageTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/JMSConnectionFactoryConfigurationStorageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/JMSConnectionFactoryConfigurationStorageTest.java
index c8bd2cf..8ac4a07 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/JMSConnectionFactoryConfigurationStorageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/JMSConnectionFactoryConfigurationStorageTest.java
@@ -17,8 +17,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.activemq.api.core.HornetQBuffer;
-import org.apache.activemq.api.core.HornetQBuffers;
+import org.apache.activemq.api.core.ActiveMQBuffer;
+import org.apache.activemq.api.core.ActiveMQBuffers;
import org.apache.activemq.api.core.Pair;
import org.apache.activemq.core.remoting.impl.netty.TransportConstants;
import org.apache.activemq.jms.persistence.config.PersistedConnectionFactory;
@@ -123,7 +123,7 @@ public class JMSConnectionFactoryConfigurationStorageTest extends StorageManager
int size = config.getEncodeSize();
- HornetQBuffer buffer = HornetQBuffers.fixedBuffer(size);
+ ActiveMQBuffer buffer = ActiveMQBuffers.fixedBuffer(size);
config.encode(buffer);
@@ -133,7 +133,7 @@ public class JMSConnectionFactoryConfigurationStorageTest extends StorageManager
size = persistedCF.getEncodeSize();
- buffer = HornetQBuffers.fixedBuffer(size);
+ buffer = ActiveMQBuffers.fixedBuffer(size);
persistedCF.encode(buffer);
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/TransportConfigurationEncodingSupportTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/TransportConfigurationEncodingSupportTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/TransportConfigurationEncodingSupportTest.java
index cc9eb8f..6d6ce82 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/TransportConfigurationEncodingSupportTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/persistence/TransportConfigurationEncodingSupportTest.java
@@ -12,6 +12,8 @@
*/
package org.apache.activemq.tests.integration.persistence;
+import org.apache.activemq.api.core.ActiveMQBuffer;
+import org.apache.activemq.api.core.ActiveMQBuffers;
import org.junit.Test;
import java.util.ArrayList;
@@ -19,8 +21,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.activemq.api.core.HornetQBuffer;
-import org.apache.activemq.api.core.HornetQBuffers;
import org.apache.activemq.api.core.TransportConfiguration;
import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory;
import org.apache.activemq.core.remoting.impl.netty.TransportConstants;
@@ -58,7 +58,7 @@ public class TransportConfigurationEncodingSupportTest extends Assert
params.put(TransportConstants.HOST_PROP_NAME, RandomUtil.randomString());
TransportConfiguration config = new TransportConfiguration(NettyConnectorFactory.class.getName(), params);
- HornetQBuffer buffer = HornetQBuffers.fixedBuffer(TransportConfigurationEncodingSupport.getEncodeSize(config));
+ ActiveMQBuffer buffer = ActiveMQBuffers.fixedBuffer(TransportConfigurationEncodingSupport.getEncodeSize(config));
TransportConfigurationEncodingSupport.encode(buffer, config);
assertEquals(buffer.capacity(), buffer.writerIndex());
@@ -93,7 +93,7 @@ public class TransportConfigurationEncodingSupportTest extends Assert
connectorConfigs.add(new Pair<TransportConfiguration, TransportConfiguration>(live1, backup1));
connectorConfigs.add(new Pair<TransportConfiguration, TransportConfiguration>(live2, null));
- HornetQBuffer buffer = HornetQBuffers.fixedBuffer(TransportConfigurationEncodingSupport.getEncodeSize(connectorConfigs));
+ ActiveMQBuffer buffer = ActiveMQBuffers.fixedBuffer(TransportConfigurationEncodingSupport.getEncodeSize(connectorConfigs));
TransportConfigurationEncodingSupport.encodeConfigs(buffer, connectorConfigs);
assertEquals(buffer.capacity(), buffer.writerIndex());