http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-ra/src/main/java/org/apache/activemq/ra/inflow/HornetQActivation.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/inflow/HornetQActivation.java b/activemq-ra/src/main/java/org/apache/activemq/ra/inflow/HornetQActivation.java index 5cf31eb..8bf12b6 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/inflow/HornetQActivation.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/inflow/HornetQActivation.java @@ -29,10 +29,10 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.activemq.api.core.HornetQException; -import org.apache.activemq.api.core.HornetQExceptionType; -import org.apache.activemq.api.core.HornetQNonExistentQueueException; -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.ActiveMQNonExistentQueueException; +import org.apache.activemq.api.core.ActiveMQNotConnectedException; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientSession; import org.apache.activemq.api.core.client.ClientSessionFactory; @@ -723,11 +723,11 @@ public class HornetQActivation */ public void handleFailure(Throwable failure) { - if (failure instanceof HornetQException && ((HornetQException) failure).getType() == HornetQExceptionType.QUEUE_DOES_NOT_EXIST) + if (failure instanceof ActiveMQException && ((ActiveMQException) failure).getType() == ActiveMQExceptionType.QUEUE_DOES_NOT_EXIST) { HornetQRALogger.LOGGER.awaitingTopicQueueCreation(getActivationSpec().getDestination()); } - else if (failure instanceof HornetQException && ((HornetQException) failure).getType() == HornetQExceptionType.NOT_CONNECTED) + else if (failure instanceof ActiveMQException && ((ActiveMQException) failure).getType() == ActiveMQExceptionType.NOT_CONNECTED) { HornetQRALogger.LOGGER.awaitingJMSServerCreation(); } @@ -771,17 +771,17 @@ public class HornetQActivation } catch (Throwable t) { - if (failure instanceof HornetQException && ((HornetQException) failure).getType() == HornetQExceptionType.QUEUE_DOES_NOT_EXIST) + if (failure instanceof ActiveMQException && ((ActiveMQException) failure).getType() == ActiveMQExceptionType.QUEUE_DOES_NOT_EXIST) { - if (lastException == null || !(t instanceof HornetQNonExistentQueueException)) + if (lastException == null || !(t instanceof ActiveMQNonExistentQueueException)) { lastException = t; HornetQRALogger.LOGGER.awaitingTopicQueueCreation(getActivationSpec().getDestination()); } } - else if (failure instanceof HornetQException && ((HornetQException) failure).getType() == HornetQExceptionType.NOT_CONNECTED) + else if (failure instanceof ActiveMQException && ((ActiveMQException) failure).getType() == ActiveMQExceptionType.NOT_CONNECTED) { - if (lastException == null || !(t instanceof HornetQNotConnectedException)) + if (lastException == null || !(t instanceof ActiveMQNotConnectedException)) { lastException = t; HornetQRALogger.LOGGER.awaitingJMSServerCreation();
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-ra/src/main/java/org/apache/activemq/ra/inflow/HornetQMessageHandler.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/inflow/HornetQMessageHandler.java b/activemq-ra/src/main/java/org/apache/activemq/ra/inflow/HornetQMessageHandler.java index dc8efa0..45933fc 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/inflow/HornetQMessageHandler.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/inflow/HornetQMessageHandler.java @@ -21,7 +21,7 @@ import javax.transaction.TransactionManager; import javax.transaction.xa.XAResource; import java.util.UUID; -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.ClientSession.QueueQuery; @@ -375,7 +375,7 @@ public class HornetQMessageHandler implements MessageHandler { session.rollback(); } - catch (HornetQException e2) + catch (ActiveMQException e2) { HornetQRALogger.LOGGER.warn("Unable to rollback", e2); return; @@ -403,7 +403,7 @@ public class HornetQMessageHandler implements MessageHandler { session.rollback(true); } - catch (HornetQException e1) + catch (ActiveMQException e1) { HornetQRALogger.LOGGER.unableToRollbackTX(); } @@ -415,7 +415,7 @@ public class HornetQMessageHandler implements MessageHandler { session.resetIfNeeded(); } - catch (HornetQException e) + catch (ActiveMQException e) { HornetQRALogger.LOGGER.unableToResetSession(); } @@ -423,7 +423,7 @@ public class HornetQMessageHandler implements MessageHandler } - public void start() throws HornetQException + public void start() throws ActiveMQException { session.start(); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-rest/src/main/java/org/apache/activemq/rest/HornetQRestLogger.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/HornetQRestLogger.java b/activemq-rest/src/main/java/org/apache/activemq/rest/HornetQRestLogger.java index 49f8db0..c706deb 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/HornetQRestLogger.java +++ b/activemq-rest/src/main/java/org/apache/activemq/rest/HornetQRestLogger.java @@ -13,7 +13,7 @@ package org.apache.activemq.rest; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.rest.queue.push.xml.XmlLink; import org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; @@ -81,5 +81,5 @@ public interface HornetQRestLogger extends BasicLogger @LogMessage(level = Logger.Level.ERROR) @Message(id = 184003, value = "Error deleting Subscriber queue", format = Message.Format.MESSAGE_FORMAT) - void errorDeletingSubscriberQueue(@Cause HornetQException e); + void errorDeletingSubscriberQueue(@Cause ActiveMQException e); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-rest/src/main/java/org/apache/activemq/rest/queue/AcknowledgedQueueConsumer.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/AcknowledgedQueueConsumer.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/AcknowledgedQueueConsumer.java index d7a0712..c3cefd5 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/AcknowledgedQueueConsumer.java +++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/AcknowledgedQueueConsumer.java @@ -25,7 +25,7 @@ import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.UriInfo; import java.net.URI; -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.ClientSession; @@ -44,7 +44,7 @@ public class AcknowledgedQueueConsumer extends QueueConsumer protected String startup = Long.toString(System.currentTimeMillis()); protected volatile Acknowledgement ack; - public AcknowledgedQueueConsumer(ClientSessionFactory factory, String destination, String id, DestinationServiceManager serviceManager, String selector) throws HornetQException + public AcknowledgedQueueConsumer(ClientSessionFactory factory, String destination, String id, DestinationServiceManager serviceManager, String selector) throws ActiveMQException { super(factory, destination, id, serviceManager, selector); autoAck = false; @@ -153,7 +153,7 @@ public class AcknowledgedQueueConsumer extends QueueConsumer //System.out.println("Acknowledge message: " + ack.getMessage()); ack.getMessage().acknowledge(); } - catch (HornetQException e) + catch (ActiveMQException e) { throw new RuntimeException(e); } @@ -217,14 +217,14 @@ public class AcknowledgedQueueConsumer extends QueueConsumer { old.close(); } - catch (HornetQException e) + catch (ActiveMQException e) { } try { oldSession.close(); } - catch (HornetQException e) + catch (ActiveMQException e) { } } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-rest/src/main/java/org/apache/activemq/rest/queue/ConsumersResource.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/ConsumersResource.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/ConsumersResource.java index 775285d..9ad4546 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/ConsumersResource.java +++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/ConsumersResource.java @@ -28,7 +28,7 @@ import javax.ws.rs.core.UriInfo; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicLong; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.client.ClientSessionFactory; import org.apache.activemq.rest.HornetQRestLogger; import org.apache.activemq.rest.util.TimeoutTask; @@ -177,7 +177,7 @@ public class ConsumersResource implements TimeoutTask.Callback return builder.build(); } - catch (HornetQException e) + catch (ActiveMQException e) { throw new RuntimeException(e); } @@ -192,7 +192,7 @@ public class ConsumersResource implements TimeoutTask.Callback serviceManager.getTimeoutTask().add(this, consumer.getId()); } - public QueueConsumer createConsumer(String selector) throws HornetQException + public QueueConsumer createConsumer(String selector) throws ActiveMQException { String genId = sessionCounter.getAndIncrement() + "-queue-" + destination + "-" + startup; QueueConsumer consumer = new QueueConsumer(sessionFactory, destination, genId, serviceManager, selector); @@ -200,7 +200,7 @@ public class ConsumersResource implements TimeoutTask.Callback return consumer; } - public QueueConsumer createAcknowledgedConsumer(String selector) throws HornetQException + public QueueConsumer createAcknowledgedConsumer(String selector) throws ActiveMQException { String genId = sessionCounter.getAndIncrement() + "-queue-" + destination + "-" + startup; QueueConsumer consumer = new AcknowledgedQueueConsumer(sessionFactory, destination, genId, serviceManager, selector); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessage.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessage.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessage.java index 3d6de80..45e8eff 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessage.java +++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessage.java @@ -28,7 +28,7 @@ import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; -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.client.ClientMessage; import org.apache.activemq.api.core.client.ClientProducer; @@ -94,7 +94,7 @@ public class PostMessage { pooled.session.close(); } - catch (HornetQException e) + catch (ActiveMQException e) { } addPooled(); @@ -227,7 +227,7 @@ public class PostMessage } } - protected void addPooled() throws HornetQException + protected void addPooled() throws ActiveMQException { ClientSession session = sessionFactory.createSession(); ClientProducer producer = session.createProducer(destination); @@ -253,7 +253,7 @@ public class PostMessage { pooled.session.close(); } - catch (HornetQException e) + catch (ActiveMQException e) { throw new RuntimeException(e); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessageDupsOk.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessageDupsOk.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessageDupsOk.java index dc61f08..60fa2b7 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessageDupsOk.java +++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessageDupsOk.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.rest.queue; -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.rest.HornetQRestLogger; @@ -56,7 +56,7 @@ public class PostMessageDupsOk extends PostMessage { pooled.session.close(); } - catch (HornetQException e) + catch (ActiveMQException e) { } addPooled(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueConsumer.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueConsumer.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueConsumer.java index 5949289..618c574 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueConsumer.java +++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueConsumer.java @@ -24,7 +24,7 @@ import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.UriInfo; import java.net.URI; -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.ClientSession; @@ -84,7 +84,7 @@ public class QueueConsumer lastPing = System.currentTimeMillis() + (offsetSecs * 1000); } - public QueueConsumer(ClientSessionFactory factory, String destination, String id, DestinationServiceManager serviceManager, String selector) throws HornetQException + public QueueConsumer(ClientSessionFactory factory, String destination, String id, DestinationServiceManager serviceManager, String selector) throws ActiveMQException { this.factory = factory; this.destination = destination; @@ -210,7 +210,7 @@ public class QueueConsumer } } - protected void createSession() throws HornetQException + protected void createSession() throws ActiveMQException { session = factory.createSession(true, true, 0); HornetQRestLogger.LOGGER.debug("Created session: " + session); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueDestinationsResource.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueDestinationsResource.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueDestinationsResource.java index 1d4c6f9..7de0945 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueDestinationsResource.java +++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueDestinationsResource.java @@ -25,7 +25,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -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.ClientSession; import org.apache.activemq.jms.client.HornetQDestination; @@ -145,7 +145,7 @@ public class QueueDestinationsResource { session.close(); } - catch (HornetQException e) + catch (ActiveMQException e) { } } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumer.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumer.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumer.java index 6adf0c0..b8671a4 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumer.java +++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumer.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.rest.queue.push; -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.ClientSession; import org.apache.activemq.api.core.client.ClientSessionFactory; @@ -124,7 +124,7 @@ public class PushConsumer session.close(); } } - catch (HornetQException e) + catch (ActiveMQException e) { } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumerMessageHandler.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumerMessageHandler.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumerMessageHandler.java index da19085..04961ec 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumerMessageHandler.java +++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumerMessageHandler.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.rest.queue.push; -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.ClientSession; import org.apache.activemq.api.core.client.MessageHandler; @@ -39,7 +39,7 @@ public class PushConsumerMessageHandler implements MessageHandler clientMessage.acknowledge(); HornetQRestLogger.LOGGER.debug(this + ": acknowledged " + clientMessage); } - catch (HornetQException e) + catch (ActiveMQException e) { throw new RuntimeException(e.getMessage(), e); } @@ -55,7 +55,7 @@ public class PushConsumerMessageHandler implements MessageHandler session.commit(); return; } - catch (HornetQException e) + catch (ActiveMQException e) { throw new RuntimeException(e); } @@ -66,7 +66,7 @@ public class PushConsumerMessageHandler implements MessageHandler { session.rollback(); } - catch (HornetQException e) + catch (ActiveMQException e) { throw new RuntimeException(e.getMessage(), e); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-rest/src/main/java/org/apache/activemq/rest/topic/AcknowledgedSubscriptionResource.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/AcknowledgedSubscriptionResource.java b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/AcknowledgedSubscriptionResource.java index 3a80a25..e8b8fc4 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/AcknowledgedSubscriptionResource.java +++ b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/AcknowledgedSubscriptionResource.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.rest.topic; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.client.ClientSessionFactory; import org.apache.activemq.rest.queue.AcknowledgedQueueConsumer; import org.apache.activemq.rest.queue.DestinationServiceManager; @@ -27,7 +27,7 @@ public class AcknowledgedSubscriptionResource extends AcknowledgedQueueConsumer private long timeout; private boolean deleteWhenIdle; - public AcknowledgedSubscriptionResource(ClientSessionFactory factory, String destination, String id, DestinationServiceManager serviceManager, String selector, boolean durable, Long timeout) throws HornetQException + public AcknowledgedSubscriptionResource(ClientSessionFactory factory, String destination, String id, DestinationServiceManager serviceManager, String selector, boolean durable, Long timeout) throws ActiveMQException { super(factory, destination, id, serviceManager, selector); this.timeout = timeout; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushSubscription.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushSubscription.java b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushSubscription.java index 4787c01..82c17e2 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushSubscription.java +++ b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushSubscription.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.rest.topic; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.client.ClientSession; import org.apache.activemq.api.core.client.ClientSessionFactory; import org.apache.activemq.rest.HornetQRestLogger; @@ -48,7 +48,7 @@ public class PushSubscription extends PushConsumer session.deleteQueue(subscriptionName); } - catch (HornetQException e) + catch (ActiveMQException e) { HornetQRestLogger.LOGGER.errorDeletingSubscriberQueue(e); } @@ -59,7 +59,7 @@ public class PushSubscription extends PushConsumer if (session != null) session.close(); } - catch (HornetQException e) + catch (ActiveMQException e) { } } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushSubscriptionsResource.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushSubscriptionsResource.java b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushSubscriptionsResource.java index 7015e65..d97e010 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushSubscriptionsResource.java +++ b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushSubscriptionsResource.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.rest.topic; -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.ClientSession; import org.apache.activemq.api.core.client.ClientSessionFactory; @@ -86,7 +86,7 @@ public class PushSubscriptionsResource } return session; } - catch (HornetQException e) + catch (ActiveMQException e) { throw new RuntimeException(e); } @@ -131,7 +131,7 @@ public class PushSubscriptionsResource { createSession.close(); } - catch (HornetQException e) + catch (ActiveMQException e) { } } @@ -246,7 +246,7 @@ public class PushSubscriptionsResource session.deleteQueue(subscriptionName); } - catch (HornetQException e) + catch (ActiveMQException e) { } finally http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-rest/src/main/java/org/apache/activemq/rest/topic/SubscriptionResource.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/SubscriptionResource.java b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/SubscriptionResource.java index 7051057..5ecb410 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/SubscriptionResource.java +++ b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/SubscriptionResource.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.rest.topic; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.client.ClientSessionFactory; import org.apache.activemq.rest.queue.DestinationServiceManager; import org.apache.activemq.rest.queue.QueueConsumer; @@ -27,7 +27,7 @@ public class SubscriptionResource extends QueueConsumer implements Subscription protected long timeout; private boolean deleteWhenIdle; - public SubscriptionResource(ClientSessionFactory factory, String destination, String id, DestinationServiceManager serviceManager, String selector, boolean durable, long timeout) throws HornetQException + public SubscriptionResource(ClientSessionFactory factory, String destination, String id, DestinationServiceManager serviceManager, String selector, boolean durable, long timeout) throws ActiveMQException { super(factory, destination, id, serviceManager, selector); this.durable = durable; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-rest/src/main/java/org/apache/activemq/rest/topic/SubscriptionsResource.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/SubscriptionsResource.java b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/SubscriptionsResource.java index 7f85fbc..a501e29 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/SubscriptionsResource.java +++ b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/SubscriptionsResource.java @@ -28,7 +28,7 @@ import javax.ws.rs.core.UriInfo; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicLong; -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.ClientSession; import org.apache.activemq.api.core.client.ClientSessionFactory; @@ -245,7 +245,7 @@ public class SubscriptionsResource implements TimeoutTask.Callback return builder.build(); } - catch (HornetQException e) + catch (ActiveMQException e) { throw new RuntimeException(e); } @@ -257,14 +257,14 @@ public class SubscriptionsResource implements TimeoutTask.Callback { session.close(); } - catch (HornetQException e) + catch (ActiveMQException e) { } } } } - protected QueueConsumer createConsumer(boolean durable, boolean autoAck, String subscriptionName, String selector, long timeout, boolean deleteWhenIdle) throws HornetQException + protected QueueConsumer createConsumer(boolean durable, boolean autoAck, String subscriptionName, String selector, long timeout, boolean deleteWhenIdle) throws ActiveMQException { QueueConsumer consumer; if (autoAck) @@ -403,7 +403,7 @@ public class SubscriptionsResource implements TimeoutTask.Callback ClientSession.QueueQuery query = session.queueQuery(new SimpleString(subscriptionId)); return query.isExists(); } - catch (HornetQException e) + catch (ActiveMQException e) { throw new RuntimeException(e); } @@ -415,7 +415,7 @@ public class SubscriptionsResource implements TimeoutTask.Callback { session.close(); } - catch (HornetQException e) + catch (ActiveMQException e) { } } @@ -432,7 +432,7 @@ public class SubscriptionsResource implements TimeoutTask.Callback { tmp = createConsumer(true, autoAck, subscriptionId, null, consumerTimeoutSeconds * 1000, false); } - catch (HornetQException e) + catch (ActiveMQException e) { throw new RuntimeException(e); } @@ -499,7 +499,7 @@ public class SubscriptionsResource implements TimeoutTask.Callback session.deleteQueue(subscriptionName); } - catch (HornetQException e) + catch (ActiveMQException e) { } finally @@ -510,7 +510,7 @@ public class SubscriptionsResource implements TimeoutTask.Callback { session.close(); } - catch (HornetQException e) + catch (ActiveMQException e) { } } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicDestinationsResource.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicDestinationsResource.java b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicDestinationsResource.java index ed769dc..8a0168a 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicDestinationsResource.java +++ b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicDestinationsResource.java @@ -25,7 +25,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -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.ClientSession; import org.apache.activemq.jms.client.HornetQDestination; @@ -135,7 +135,7 @@ public class TopicDestinationsResource { session.close(); } - catch (HornetQException e) + catch (ActiveMQException e) { } } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/config/ConfigurationUtils.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/ConfigurationUtils.java b/activemq-server/src/main/java/org/apache/activemq/core/config/ConfigurationUtils.java index 10eeedf..056211d 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/config/ConfigurationUtils.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/config/ConfigurationUtils.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.core.config; -import org.apache.activemq.api.core.HornetQIllegalStateException; +import org.apache.activemq.api.core.ActiveMQIllegalStateException; import org.apache.activemq.core.config.ha.ColocatedPolicyConfiguration; import org.apache.activemq.core.config.ha.LiveOnlyPolicyConfiguration; import org.apache.activemq.core.config.ha.ReplicaPolicyConfiguration; @@ -38,7 +38,7 @@ public final class ConfigurationUtils // Utility class } - public static ClusterConnectionConfiguration getReplicationClusterConfiguration(Configuration conf, String replicationCluster) throws HornetQIllegalStateException + public static ClusterConnectionConfiguration getReplicationClusterConfiguration(Configuration conf, String replicationCluster) throws ActiveMQIllegalStateException { if (replicationCluster == null || replicationCluster.isEmpty()) return conf.getClusterConfigurations().get(0); @@ -47,10 +47,10 @@ public final class ConfigurationUtils if (replicationCluster.equals(clusterConf.getName())) return clusterConf; } - throw new HornetQIllegalStateException("Missing cluster-configuration for replication-clustername '" + replicationCluster + "'."); + throw new ActiveMQIllegalStateException("Missing cluster-configuration for replication-clustername '" + replicationCluster + "'."); } - public static HAPolicy getHAPolicy(HAPolicyConfiguration conf) throws HornetQIllegalStateException + public static HAPolicy getHAPolicy(HAPolicyConfiguration conf) throws ActiveMQIllegalStateException { if (conf == null) { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/XmlDeployer.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/XmlDeployer.java b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/XmlDeployer.java index a05dcca..87c4724 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/XmlDeployer.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/XmlDeployer.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.core.deployers.Deployer; import org.apache.activemq.core.deployers.DeploymentManager; import org.apache.activemq.core.server.HornetQServerLogger; @@ -298,7 +298,7 @@ public abstract class XmlDeployer implements Deployer return !newTextContent.equals(origTextContent); } - private String getName(Node node) throws HornetQException + private String getName(Node node) throws ActiveMQException { String name; @@ -315,7 +315,7 @@ public abstract class XmlDeployer implements Deployer } catch (NullPointerException e) { - throw new HornetQException("Could not find " + getKeyAttribute() + " in " + XMLUtil.elementToString(node)); + throw new ActiveMQException("Could not find " + getKeyAttribute() + " in " + XMLUtil.elementToString(node)); } } else http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/filter/impl/FilterImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/filter/impl/FilterImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/filter/impl/FilterImpl.java index cf14c7b..ac2df63 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/filter/impl/FilterImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/filter/impl/FilterImpl.java @@ -12,12 +12,12 @@ */ package org.apache.activemq.core.filter.impl; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.selector.filter.BooleanExpression; import org.apache.activemq.selector.filter.FilterException; import org.apache.activemq.selector.filter.Filterable; import org.apache.activemq.selector.SelectorParser; import org.apache.activemq.api.core.FilterConstants; -import org.apache.activemq.api.core.HornetQException; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.core.filter.Filter; import org.apache.activemq.core.server.HornetQMessageBundle; @@ -68,18 +68,18 @@ public class FilterImpl implements Filter /** * @return null if <code>filterStr</code> is null or an empty String and a valid filter else - * @throws HornetQException if the string does not correspond to a valid filter + * @throws org.apache.activemq.api.core.ActiveMQException if the string does not correspond to a valid filter */ - public static Filter createFilter(final String filterStr) throws HornetQException + public static Filter createFilter(final String filterStr) throws ActiveMQException { return FilterImpl.createFilter(SimpleString.toSimpleString(filterStr == null ? null : filterStr.trim())); } /** * @return null if <code>filterStr</code> is null or an empty String and a valid filter else - * @throws HornetQException if the string does not correspond to a valid filter + * @throws org.apache.activemq.api.core.ActiveMQException if the string does not correspond to a valid filter */ - public static Filter createFilter(final SimpleString filterStr) throws HornetQException + public static Filter createFilter(final SimpleString filterStr) throws ActiveMQException { if (filterStr == null || filterStr.length() == 0) { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/management/impl/QueueControlImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/management/impl/QueueControlImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/management/impl/QueueControlImpl.java index ec8f38b..d021712 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/management/impl/QueueControlImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/management/impl/QueueControlImpl.java @@ -19,7 +19,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.Message; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.management.MessageCounterInfo; @@ -506,7 +506,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl iterator.close(); } } - catch (HornetQException e) + catch (ActiveMQException e) { throw new IllegalStateException(e.getMessage()); } @@ -613,7 +613,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { return queue.deleteReference(messageID); } - catch (HornetQException e) + catch (ActiveMQException e) { throw new IllegalStateException(e.getMessage()); } @@ -670,7 +670,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl Filter filter = FilterImpl.createFilter(filterStr); return queue.expireReferences(filter); } - catch (HornetQException e) + catch (ActiveMQException e) { throw new IllegalStateException(e.getMessage()); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/Page.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/Page.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/Page.java index 4f0dd1c..883ef3b 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/Page.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/Page.java @@ -18,8 +18,8 @@ import java.util.List; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; -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.SimpleString; import org.apache.activemq.core.journal.SequentialFile; import org.apache.activemq.core.journal.SequentialFileFactory; @@ -116,7 +116,7 @@ public final class Page implements Comparable<Page> size.set((int) file.size()); // Using direct buffer, as described on https://jira.jboss.org/browse/HORNETQ-467 ByteBuffer directBuffer = storage.allocateDirectBuffer((int) file.size()); - HornetQBuffer fileBuffer = null; + ActiveMQBuffer fileBuffer = null; try { @@ -125,7 +125,7 @@ public final class Page implements Comparable<Page> directBuffer.rewind(); - fileBuffer = HornetQBuffers.wrappedBuffer(directBuffer); + fileBuffer = ActiveMQBuffers.wrappedBuffer(directBuffer); fileBuffer.writerIndex(fileBuffer.capacity()); while (fileBuffer.readable()) @@ -198,7 +198,7 @@ public final class Page implements Comparable<Page> ByteBuffer buffer = fileFactory.newBuffer(message.getEncodeSize() + Page.SIZE_RECORD); - HornetQBuffer wrap = HornetQBuffers.wrappedBuffer(buffer); + ActiveMQBuffer wrap = ActiveMQBuffers.wrappedBuffer(buffer); wrap.clear(); wrap.writeByte(Page.START_BYTE); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PageSyncTimer.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PageSyncTimer.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PageSyncTimer.java index e6e8d1e..e1d3eea 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PageSyncTimer.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PageSyncTimer.java @@ -17,7 +17,7 @@ import java.util.List; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import org.apache.activemq.api.core.HornetQExceptionType; +import org.apache.activemq.api.core.ActiveMQExceptionType; import org.apache.activemq.core.paging.PagingStore; import org.apache.activemq.core.persistence.OperationContext; @@ -97,7 +97,7 @@ final class PageSyncTimer { for (OperationContext ctx : pendingSyncsArray) { - ctx.onError(HornetQExceptionType.IO_ERROR.getCode(), e.getMessage()); + ctx.onError(ActiveMQExceptionType.IO_ERROR.getCode(), e.getMessage()); } } finally http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PageTransactionInfoImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PageTransactionInfoImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PageTransactionInfoImpl.java index 172d919..dd172db 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PageTransactionInfoImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PageTransactionInfoImpl.java @@ -18,7 +18,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.api.core.Pair; import org.apache.activemq.core.paging.PageTransactionInfo; import org.apache.activemq.core.paging.PagingManager; @@ -118,7 +118,7 @@ public final class PageTransactionInfoImpl implements PageTransactionInfo // EncodingSupport implementation - public synchronized void decode(final HornetQBuffer buffer) + public synchronized void decode(final ActiveMQBuffer buffer) { transactionID = buffer.readLong(); numberOfMessages.set(buffer.readInt()); @@ -126,7 +126,7 @@ public final class PageTransactionInfoImpl implements PageTransactionInfo committed = true; } - public synchronized void encode(final HornetQBuffer buffer) + public synchronized void encode(final ActiveMQBuffer buffer) { buffer.writeLong(transactionID); buffer.writeInt(numberOfPersistentMessages.get()); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagedMessageImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagedMessageImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagedMessageImpl.java index a7c8b3f..803a301 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagedMessageImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/paging/impl/PagedMessageImpl.java @@ -14,8 +14,8 @@ package org.apache.activemq.core.paging.impl; import java.util.Arrays; -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.core.paging.PagedMessage; import org.apache.activemq.core.persistence.StorageManager; import org.apache.activemq.core.server.LargeServerMessage; @@ -69,7 +69,7 @@ public class PagedMessageImpl implements PagedMessage if (largeMessageLazyData != null) { LargeServerMessage lgMessage = storage.createLargeMessage(); - HornetQBuffer buffer = HornetQBuffers.dynamicBuffer(largeMessageLazyData); + ActiveMQBuffer buffer = ActiveMQBuffers.dynamicBuffer(largeMessageLazyData); lgMessage.decodeHeadersAndProperties(buffer); lgMessage.incrementDelayDeletionCount(); lgMessage.setPaged(); @@ -90,7 +90,7 @@ public class PagedMessageImpl implements PagedMessage // EncodingSupport implementation -------------------------------- - public void decode(final HornetQBuffer buffer) + public void decode(final ActiveMQBuffer buffer) { transactionID = buffer.readLong(); @@ -123,7 +123,7 @@ public class PagedMessageImpl implements PagedMessage } } - public void encode(final HornetQBuffer buffer) + public void encode(final ActiveMQBuffer buffer) { buffer.writeLong(transactionID); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/persistence/config/PersistedAddressSetting.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/persistence/config/PersistedAddressSetting.java b/activemq-server/src/main/java/org/apache/activemq/core/persistence/config/PersistedAddressSetting.java index 374cbef..60dbb11 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/persistence/config/PersistedAddressSetting.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/persistence/config/PersistedAddressSetting.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.core.persistence.config; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.core.journal.EncodingSupport; import org.apache.activemq.core.settings.impl.AddressSettings; @@ -97,7 +97,7 @@ public class PersistedAddressSetting implements EncodingSupport } @Override - public void decode(HornetQBuffer buffer) + public void decode(ActiveMQBuffer buffer) { addressMatch = buffer.readSimpleString(); @@ -106,7 +106,7 @@ public class PersistedAddressSetting implements EncodingSupport } @Override - public void encode(HornetQBuffer buffer) + public void encode(ActiveMQBuffer buffer) { buffer.writeSimpleString(addressMatch); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/persistence/config/PersistedRoles.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/persistence/config/PersistedRoles.java b/activemq-server/src/main/java/org/apache/activemq/core/persistence/config/PersistedRoles.java index 302b031..63aa578 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/persistence/config/PersistedRoles.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/persistence/config/PersistedRoles.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.core.persistence.config; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.core.journal.EncodingSupport; @@ -164,7 +164,7 @@ public class PersistedRoles implements EncodingSupport } @Override - public void encode(final HornetQBuffer buffer) + public void encode(final ActiveMQBuffer buffer) { buffer.writeSimpleString(addressMatch); buffer.writeNullableSimpleString(sendRoles); @@ -190,7 +190,7 @@ public class PersistedRoles implements EncodingSupport } @Override - public void decode(final HornetQBuffer buffer) + public void decode(final ActiveMQBuffer buffer) { addressMatch = buffer.readSimpleString(); sendRoles = buffer.readNullableSimpleString(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/BatchingIDGenerator.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/BatchingIDGenerator.java b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/BatchingIDGenerator.java index c3859a6..07d6121 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/BatchingIDGenerator.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/BatchingIDGenerator.java @@ -14,7 +14,7 @@ package org.apache.activemq.core.persistence.impl.journal; 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.persistence.StorageManager; import org.apache.activemq.core.server.HornetQServerLogger; @@ -56,7 +56,7 @@ public final class BatchingIDGenerator implements IDGenerator storeID(recordID, recordID); } - public void loadState(final long journalID, final HornetQBuffer buffer) + public void loadState(final long journalID, final ActiveMQBuffer buffer) { IDCounterEncoding encoding = new IDCounterEncoding(); @@ -131,12 +131,12 @@ public final class BatchingIDGenerator implements IDGenerator { } - public void decode(final HornetQBuffer buffer) + public void decode(final ActiveMQBuffer buffer) { id = buffer.readLong(); } - public void encode(final HornetQBuffer buffer) + public void encode(final ActiveMQBuffer buffer) { buffer.writeLong(id); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/DescribeJournal.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/DescribeJournal.java b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/DescribeJournal.java index df660ae..836b2be 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/DescribeJournal.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/DescribeJournal.java @@ -19,8 +19,8 @@ import java.util.LinkedList; 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.Message; import org.apache.activemq.core.config.impl.ConfigurationImpl; import org.apache.activemq.core.journal.EncodingSupport; @@ -455,7 +455,7 @@ public final class DescribeJournal { try { - return XidCodecSupport.decodeXid(HornetQBuffers.wrappedBuffer(data)); + return XidCodecSupport.decodeXid(ActiveMQBuffers.wrappedBuffer(data)); } catch (Exception e) { @@ -470,7 +470,7 @@ public final class DescribeJournal public static Object newObjectEncoding(RecordInfo info, JournalStorageManager storageManager) { - HornetQBuffer buffer = HornetQBuffers.wrappedBuffer(info.data); + ActiveMQBuffer buffer = ActiveMQBuffers.wrappedBuffer(info.data); long id = info.id; int rec = info.getUserRecordType(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/JournalStorageManager.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/JournalStorageManager.java b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/JournalStorageManager.java index a170934..039eca2 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/JournalStorageManager.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/JournalStorageManager.java @@ -41,11 +41,11 @@ import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReentrantReadWriteLock; -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.HornetQIllegalStateException; -import org.apache.activemq.api.core.HornetQInternalErrorException; +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.ActiveMQIllegalStateException; +import org.apache.activemq.api.core.ActiveMQInternalErrorException; import org.apache.activemq.api.core.Message; import org.apache.activemq.api.core.Pair; import org.apache.activemq.api.core.SimpleString; @@ -356,7 +356,7 @@ public class JournalStorageManager implements StorageManager * * @param replicationManager * @param pagingManager - * @throws HornetQException + * @throws org.apache.activemq.api.core.ActiveMQException */ @Override public void startReplication(ReplicationManager replicationManager, PagingManager pagingManager, String nodeID, @@ -393,7 +393,7 @@ public class JournalStorageManager implements StorageManager try { if (isReplicated()) - throw new HornetQIllegalStateException("already replicating"); + throw new ActiveMQIllegalStateException("already replicating"); replicator = replicationManager; // Establishes lock @@ -1562,7 +1562,7 @@ public class JournalStorageManager implements StorageManager RecordInfo record = records.get(reccount); byte[] data = record.data; - HornetQBuffer buff = HornetQBuffers.wrappedBuffer(data); + ActiveMQBuffer buff = ActiveMQBuffers.wrappedBuffer(data); byte recordType = record.getUserRecordType(); @@ -2160,7 +2160,7 @@ public class JournalStorageManager implements StorageManager { long id = record.id; - HornetQBuffer buffer = HornetQBuffers.wrappedBuffer(record.data); + ActiveMQBuffer buffer = ActiveMQBuffers.wrappedBuffer(record.data); byte rec = record.getUserRecordType(); @@ -2398,7 +2398,7 @@ public class JournalStorageManager implements StorageManager } // This should be accessed from this package only - void deleteLargeMessageFile(final LargeServerMessage largeServerMessage) throws HornetQException + void deleteLargeMessageFile(final LargeServerMessage largeServerMessage) throws ActiveMQException { if (largeServerMessage.getPendingRecordID() < 0) { @@ -2412,7 +2412,7 @@ public class JournalStorageManager implements StorageManager } catch (Exception e) { - throw new HornetQInternalErrorException(e.getMessage(), e); + throw new ActiveMQInternalErrorException(e.getMessage(), e); } } final SequentialFile file = largeServerMessage.getFile(); @@ -2529,7 +2529,7 @@ public class JournalStorageManager implements StorageManager * @return * @throws Exception */ - private LargeServerMessage parseLargeMessage(final Map<Long, ServerMessage> messages, final HornetQBuffer buff) throws Exception + private LargeServerMessage parseLargeMessage(final Map<Long, ServerMessage> messages, final ActiveMQBuffer buff) throws Exception { LargeServerMessage largeMessage = createLargeMessage(); @@ -2590,7 +2590,7 @@ public class JournalStorageManager implements StorageManager { byte[] data = record.data; - HornetQBuffer buff = HornetQBuffers.wrappedBuffer(data); + ActiveMQBuffer buff = ActiveMQBuffers.wrappedBuffer(data); byte recordType = record.getUserRecordType(); @@ -2756,7 +2756,7 @@ public class JournalStorageManager implements StorageManager if (data.length > 0) { - HornetQBuffer buff = HornetQBuffers.wrappedBuffer(data); + ActiveMQBuffer buff = ActiveMQBuffers.wrappedBuffer(data); byte b = buff.readByte(); switch (b) @@ -2891,15 +2891,15 @@ public class JournalStorageManager implements StorageManager XidEncoding(final byte[] data) { - xid = XidCodecSupport.decodeXid(HornetQBuffers.wrappedBuffer(data)); + xid = XidCodecSupport.decodeXid(ActiveMQBuffers.wrappedBuffer(data)); } - public void decode(final HornetQBuffer buffer) + public void decode(final ActiveMQBuffer buffer) { throw new IllegalStateException("Non Supported Operation"); } - public void encode(final HornetQBuffer buffer) + public void encode(final ActiveMQBuffer buffer) { XidCodecSupport.encodeXid(xid, buffer); } @@ -2932,13 +2932,13 @@ public class JournalStorageManager implements StorageManager { } - public void decode(final HornetQBuffer buffer) + public void decode(final ActiveMQBuffer buffer) { xid = XidCodecSupport.decodeXid(buffer); isCommit = buffer.readBoolean(); } - public void encode(final HornetQBuffer buffer) + public void encode(final ActiveMQBuffer buffer) { XidCodecSupport.encodeXid(xid, buffer); buffer.writeBoolean(isCommit); @@ -2974,13 +2974,13 @@ public class JournalStorageManager implements StorageManager return SimpleString.sizeofString(groupId) + SimpleString.sizeofString(clusterName); } - public void encode(final HornetQBuffer buffer) + public void encode(final ActiveMQBuffer buffer) { buffer.writeSimpleString(groupId); buffer.writeSimpleString(clusterName); } - public void decode(final HornetQBuffer buffer) + public void decode(final ActiveMQBuffer buffer) { groupId = buffer.readSimpleString(); clusterName = buffer.readSimpleString(); @@ -3079,14 +3079,14 @@ public class JournalStorageManager implements StorageManager return name; } - public void decode(final HornetQBuffer buffer) + public void decode(final ActiveMQBuffer buffer) { name = buffer.readSimpleString(); address = buffer.readSimpleString(); filterString = buffer.readNullableSimpleString(); } - public void encode(final HornetQBuffer buffer) + public void encode(final ActiveMQBuffer buffer) { buffer.writeSimpleString(name); buffer.writeSimpleString(address); @@ -3112,7 +3112,7 @@ public class JournalStorageManager implements StorageManager /* (non-Javadoc) * @see org.apache.activemq.core.journal.EncodingSupport#decode(org.apache.activemq.spi.core.remoting.HornetQBuffer) */ - public void decode(final HornetQBuffer buffer) + public void decode(final ActiveMQBuffer buffer) { message.decodeHeadersAndProperties(buffer); } @@ -3120,7 +3120,7 @@ public class JournalStorageManager implements StorageManager /* (non-Javadoc) * @see org.apache.activemq.core.journal.EncodingSupport#encode(org.apache.activemq.spi.core.remoting.HornetQBuffer) */ - public void encode(final HornetQBuffer buffer) + public void encode(final ActiveMQBuffer buffer) { message.encode(buffer); } @@ -3151,7 +3151,7 @@ public class JournalStorageManager implements StorageManager /* (non-Javadoc) * @see org.apache.activemq.core.journal.EncodingSupport#decode(org.apache.activemq.spi.core.remoting.HornetQBuffer) */ - public void decode(final HornetQBuffer buffer) + public void decode(final ActiveMQBuffer buffer) { largeMessageID = buffer.readLong(); } @@ -3159,7 +3159,7 @@ public class JournalStorageManager implements StorageManager /* (non-Javadoc) * @see org.apache.activemq.core.journal.EncodingSupport#encode(org.apache.activemq.spi.core.remoting.HornetQBuffer) */ - public void encode(final HornetQBuffer buffer) + public void encode(final ActiveMQBuffer buffer) { buffer.writeLong(largeMessageID); } @@ -3198,13 +3198,13 @@ public class JournalStorageManager implements StorageManager this.count = count; } - public void decode(final HornetQBuffer buffer) + public void decode(final ActiveMQBuffer buffer) { queueID = buffer.readLong(); count = buffer.readInt(); } - public void encode(final HornetQBuffer buffer) + public void encode(final ActiveMQBuffer buffer) { buffer.writeLong(queueID); buffer.writeInt(count); @@ -3238,12 +3238,12 @@ public class JournalStorageManager implements StorageManager super(); } - public void decode(final HornetQBuffer buffer) + public void decode(final ActiveMQBuffer buffer) { queueID = buffer.readLong(); } - public void encode(final HornetQBuffer buffer) + public void encode(final ActiveMQBuffer buffer) { buffer.writeLong(queueID); } @@ -3286,7 +3286,7 @@ public class JournalStorageManager implements StorageManager * @see org.apache.activemq.core.journal.EncodingSupport#encode(org.apache.activemq.api.core.HornetQBuffer) */ @Override - public void encode(HornetQBuffer buffer) + public void encode(ActiveMQBuffer buffer) { buffer.writeByte(recordType); buffer.writeLong(id); @@ -3296,7 +3296,7 @@ public class JournalStorageManager implements StorageManager * @see org.apache.activemq.core.journal.EncodingSupport#decode(org.apache.activemq.api.core.HornetQBuffer) */ @Override - public void decode(HornetQBuffer buffer) + public void decode(ActiveMQBuffer buffer) { recordType = buffer.readByte(); id = buffer.readLong(); @@ -3339,14 +3339,14 @@ public class JournalStorageManager implements StorageManager this.recods = records; } - public void decode(HornetQBuffer buffer) + public void decode(ActiveMQBuffer buffer) { this.pageTX = buffer.readLong(); this.recods = buffer.readInt(); } @Override - public void encode(HornetQBuffer buffer) + public void encode(ActiveMQBuffer buffer) { buffer.writeLong(pageTX); buffer.writeInt(recods); @@ -3391,14 +3391,14 @@ public class JournalStorageManager implements StorageManager } @Override - public void encode(final HornetQBuffer buffer) + public void encode(final ActiveMQBuffer buffer) { super.encode(buffer); buffer.writeLong(scheduledDeliveryTime); } @Override - public void decode(final HornetQBuffer buffer) + public void decode(final ActiveMQBuffer buffer) { super.decode(buffer); scheduledDeliveryTime = buffer.readLong(); @@ -3422,7 +3422,7 @@ public class JournalStorageManager implements StorageManager { } - public void decode(final HornetQBuffer buffer) + public void decode(final ActiveMQBuffer buffer) { address = buffer.readSimpleString(); @@ -3433,7 +3433,7 @@ public class JournalStorageManager implements StorageManager buffer.readBytes(duplID); } - public void encode(final HornetQBuffer buffer) + public void encode(final ActiveMQBuffer buffer) { buffer.writeSimpleString(address); @@ -3530,14 +3530,14 @@ public class JournalStorageManager implements StorageManager } @Override - public void encode(HornetQBuffer buffer) + public void encode(ActiveMQBuffer buffer) { buffer.writeLong(queueID); buffer.writeLong(value); } @Override - public void decode(HornetQBuffer buffer) + public void decode(ActiveMQBuffer buffer) { queueID = buffer.readLong(); value = buffer.readLong(); @@ -3599,14 +3599,14 @@ public class JournalStorageManager implements StorageManager } @Override - public void encode(HornetQBuffer buffer) + public void encode(ActiveMQBuffer buffer) { buffer.writeLong(queueID); buffer.writeLong(pageID); } @Override - public void decode(HornetQBuffer buffer) + public void decode(ActiveMQBuffer buffer) { queueID = buffer.readLong(); pageID = buffer.readLong(); @@ -3643,13 +3643,13 @@ public class JournalStorageManager implements StorageManager return DataConstants.SIZE_LONG + DataConstants.SIZE_INT; } - public void encode(HornetQBuffer buffer) + public void encode(ActiveMQBuffer buffer) { buffer.writeLong(queueID); buffer.writeInt(value); } - public void decode(HornetQBuffer buffer) + public void decode(ActiveMQBuffer buffer) { queueID = buffer.readLong(); value = buffer.readInt(); @@ -3685,14 +3685,14 @@ public class JournalStorageManager implements StorageManager return DataConstants.SIZE_LONG + DataConstants.SIZE_LONG + DataConstants.SIZE_INT; } - public void encode(HornetQBuffer buffer) + public void encode(ActiveMQBuffer buffer) { buffer.writeLong(queueID); buffer.writeLong(position.getPageNr()); buffer.writeInt(position.getMessageNr()); } - public void decode(HornetQBuffer buffer) + public void decode(ActiveMQBuffer buffer) { queueID = buffer.readLong(); long pageNR = buffer.readLong(); @@ -3721,7 +3721,7 @@ public class JournalStorageManager implements StorageManager { byte[] data = record.data; - HornetQBuffer buff = HornetQBuffers.wrappedBuffer(data); + ActiveMQBuffer buff = ActiveMQBuffers.wrappedBuffer(data); try { @@ -3761,7 +3761,7 @@ public class JournalStorageManager implements StorageManager * @param buffer * @return */ - protected static PersistedRoles newSecurityRecord(long id, HornetQBuffer buffer) + protected static PersistedRoles newSecurityRecord(long id, ActiveMQBuffer buffer) { PersistedRoles roles = new PersistedRoles(); roles.decode(buffer); @@ -3774,7 +3774,7 @@ public class JournalStorageManager implements StorageManager * @param buffer * @return */ - static PersistedAddressSetting newAddressEncoding(long id, HornetQBuffer buffer) + static PersistedAddressSetting newAddressEncoding(long id, ActiveMQBuffer buffer) { PersistedAddressSetting setting = new PersistedAddressSetting(); setting.decode(buffer); @@ -3787,7 +3787,7 @@ public class JournalStorageManager implements StorageManager * @param buffer * @return */ - static GroupingEncoding newGroupEncoding(long id, HornetQBuffer buffer) + static GroupingEncoding newGroupEncoding(long id, ActiveMQBuffer buffer) { GroupingEncoding encoding = new GroupingEncoding(); encoding.decode(buffer); @@ -3800,7 +3800,7 @@ public class JournalStorageManager implements StorageManager * @param buffer * @return */ - protected static PersistentQueueBindingEncoding newBindingEncoding(long id, HornetQBuffer buffer) + protected static PersistentQueueBindingEncoding newBindingEncoding(long id, ActiveMQBuffer buffer) { PersistentQueueBindingEncoding bindingEncoding = new PersistentQueueBindingEncoding(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/LargeServerMessageImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/LargeServerMessageImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/LargeServerMessageImpl.java index ca0f5c4..5781e65 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/LargeServerMessageImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/LargeServerMessageImpl.java @@ -15,10 +15,10 @@ package org.apache.activemq.core.persistence.impl.journal; import java.nio.ByteBuffer; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq.api.core.HornetQBuffer; -import org.apache.activemq.api.core.HornetQException; -import org.apache.activemq.api.core.HornetQExceptionType; -import org.apache.activemq.api.core.HornetQInternalErrorException; +import org.apache.activemq.api.core.ActiveMQBuffer; +import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.api.core.ActiveMQExceptionType; +import org.apache.activemq.api.core.ActiveMQInternalErrorException; import org.apache.activemq.api.core.Message; import org.apache.activemq.core.journal.SequentialFile; import org.apache.activemq.core.message.BodyEncoder; @@ -119,7 +119,7 @@ public final class LargeServerMessageImpl extends ServerMessageImpl implements L bodySize += bytes.length; } - public void encodeBody(final HornetQBuffer bufferOut, final BodyEncoder context, final int size) + public void encodeBody(final ActiveMQBuffer bufferOut, final BodyEncoder context, final int size) { try { @@ -149,13 +149,13 @@ public final class LargeServerMessageImpl extends ServerMessageImpl implements L } @Override - public void encode(final HornetQBuffer buffer1) + public void encode(final ActiveMQBuffer buffer1) { super.encodeHeadersAndProperties(buffer1); } @Override - public void decode(final HornetQBuffer buffer1) + public void decode(final ActiveMQBuffer buffer1) { file = null; @@ -188,7 +188,7 @@ public final class LargeServerMessageImpl extends ServerMessageImpl implements L } @Override - public BodyEncoder getBodyEncoder() throws HornetQException + public BodyEncoder getBodyEncoder() throws ActiveMQException { validateFile(); return new DecodingContext(); @@ -361,7 +361,7 @@ public final class LargeServerMessageImpl extends ServerMessageImpl implements L } } - public SequentialFile getFile() throws HornetQException + public SequentialFile getFile() throws ActiveMQException { validateFile(); return file; @@ -389,7 +389,7 @@ public final class LargeServerMessageImpl extends ServerMessageImpl implements L // Private ------------------------------------------------------- - private synchronized void validateFile() throws HornetQException + private synchronized void validateFile() throws ActiveMQException { try { @@ -410,7 +410,7 @@ public final class LargeServerMessageImpl extends ServerMessageImpl implements L catch (Exception e) { // TODO: There is an IO_ERROR on trunk now, this should be used here instead - throw new HornetQInternalErrorException(e.getMessage(), e); + throw new ActiveMQInternalErrorException(e.getMessage(), e); } } @@ -448,7 +448,7 @@ public final class LargeServerMessageImpl extends ServerMessageImpl implements L { private SequentialFile cFile; - public void open() throws HornetQException + public void open() throws ActiveMQException { try { @@ -461,11 +461,11 @@ public final class LargeServerMessageImpl extends ServerMessageImpl implements L } catch (Exception e) { - throw new HornetQException(HornetQExceptionType.INTERNAL_ERROR, e.getMessage(), e); + throw new ActiveMQException(ActiveMQExceptionType.INTERNAL_ERROR, e.getMessage(), e); } } - public void close() throws HornetQException + public void close() throws ActiveMQException { try { @@ -476,11 +476,11 @@ public final class LargeServerMessageImpl extends ServerMessageImpl implements L } catch (Exception e) { - throw new HornetQInternalErrorException(e.getMessage(), e); + throw new ActiveMQInternalErrorException(e.getMessage(), e); } } - public int encode(final ByteBuffer bufferRead) throws HornetQException + public int encode(final ByteBuffer bufferRead) throws ActiveMQException { try { @@ -488,11 +488,11 @@ public final class LargeServerMessageImpl extends ServerMessageImpl implements L } catch (Exception e) { - throw new HornetQInternalErrorException(e.getMessage(), e); + throw new ActiveMQInternalErrorException(e.getMessage(), e); } } - public int encode(final HornetQBuffer bufferOut, final int size) throws HornetQException + public int encode(final ActiveMQBuffer bufferOut, final int size) throws ActiveMQException { // This could maybe be optimized (maybe reading directly into bufferOut) ByteBuffer bufferRead = ByteBuffer.allocate(size); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/LargeServerMessageInSync.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/LargeServerMessageInSync.java b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/LargeServerMessageInSync.java index 0204230..25461f3 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/LargeServerMessageInSync.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/LargeServerMessageInSync.java @@ -17,7 +17,7 @@ package org.apache.activemq.core.persistence.impl.journal; import java.nio.ByteBuffer; -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.core.journal.SequentialFile; import org.apache.activemq.core.persistence.StorageManager; @@ -72,7 +72,7 @@ public final class LargeServerMessageInSync implements ReplicatedLargeMessage syncDone = true; } - public SequentialFile getSyncFile() throws HornetQException + public SequentialFile getSyncFile() throws ActiveMQException { return mainLM.getFile(); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/OperationContextImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/OperationContextImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/OperationContextImpl.java index ce79381..8bdb709 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/OperationContextImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/journal/OperationContextImpl.java @@ -19,8 +19,8 @@ import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import org.apache.activemq.api.core.HornetQException; -import org.apache.activemq.api.core.HornetQExceptionType; +import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.api.core.ActiveMQExceptionType; import org.apache.activemq.core.journal.IOAsyncTask; import org.apache.activemq.core.journal.impl.SimpleWaitIOCallback; import org.apache.activemq.core.persistence.OperationContext; @@ -243,7 +243,7 @@ public class OperationContextImpl implements OperationContext { HornetQServerLogger.LOGGER.errorExecutingIOAsyncTask(e); executorsPending.decrementAndGet(); - task.onError(HornetQExceptionType.INTERNAL_ERROR.getCode(), + task.onError(ActiveMQExceptionType.INTERNAL_ERROR.getCode(), "It wasn't possible to complete IO operation - " + e.getMessage()); } } @@ -312,7 +312,7 @@ public class OperationContextImpl implements OperationContext } @Override - public boolean waitCompletion(final long timeout) throws InterruptedException, HornetQException + public boolean waitCompletion(final long timeout) throws InterruptedException, ActiveMQException { SimpleWaitIOCallback waitCallback = new SimpleWaitIOCallback(); executeOnCompletion(waitCallback); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java index 0c46c26..72ac31a 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.core.persistence.impl.nullpm; -import org.apache.activemq.api.core.HornetQBuffers; +import org.apache.activemq.api.core.ActiveMQBuffers; import org.apache.activemq.core.journal.SequentialFile; import org.apache.activemq.core.server.LargeServerMessage; import org.apache.activemq.core.server.impl.ServerMessageImpl; @@ -39,7 +39,7 @@ class NullStorageLargeServerMessage extends ServerMessageImpl implements LargeSe { if (buffer == null) { - buffer = HornetQBuffers.dynamicBuffer(bytes.length); + buffer = ActiveMQBuffers.dynamicBuffer(bytes.length); } // expand the buffer http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/PostOfficeImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/PostOfficeImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/PostOfficeImpl.java index 440cafb..59d5133 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/PostOfficeImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/postoffice/impl/PostOfficeImpl.java @@ -27,10 +27,10 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.activemq.api.core.HornetQAddressFullException; -import org.apache.activemq.api.core.HornetQDuplicateIdException; -import org.apache.activemq.api.core.HornetQInterruptedException; -import org.apache.activemq.api.core.HornetQNonExistentQueueException; +import org.apache.activemq.api.core.ActiveMQAddressFullException; +import org.apache.activemq.api.core.ActiveMQDuplicateIdException; +import org.apache.activemq.api.core.ActiveMQInterruptedException; +import org.apache.activemq.api.core.ActiveMQNonExistentQueueException; import org.apache.activemq.api.core.Message; import org.apache.activemq.api.core.Pair; import org.apache.activemq.api.core.SimpleString; @@ -498,7 +498,7 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding if (binding == null) { - throw new HornetQNonExistentQueueException(); + throw new ActiveMQNonExistentQueueException(); } if (addressManager.getBindingsForRoutingAddress(binding.getAddress()) == null) @@ -733,7 +733,7 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding { processRoute(message, context, direct); } - catch (HornetQAddressFullException e) + catch (ActiveMQAddressFullException e) { if (startedTX.get()) { @@ -1268,7 +1268,7 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding if (context.getTransaction() != null) { - context.getTransaction().markAsRollbackOnly(new HornetQDuplicateIdException()); + context.getTransaction().markAsRollbackOnly(new ActiveMQDuplicateIdException()); } message.decrementRefCount(); @@ -1313,7 +1313,7 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding if (context.getTransaction() != null) { - context.getTransaction().markAsRollbackOnly(new HornetQDuplicateIdException(warnMessage)); + context.getTransaction().markAsRollbackOnly(new ActiveMQDuplicateIdException(warnMessage)); } message.decrementRefCount(); @@ -1406,7 +1406,7 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding } catch (InterruptedException e1) { - throw new HornetQInterruptedException(e1); + throw new ActiveMQInterruptedException(e1); } if (!isStarted()) return; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/protocol/ServerPacketDecoder.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/ServerPacketDecoder.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/ServerPacketDecoder.java index 366aa3c..1632711 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/ServerPacketDecoder.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/ServerPacketDecoder.java @@ -36,7 +36,7 @@ import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_SEND; import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_SEND_LARGE; import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SCALEDOWN_ANNOUNCEMENT; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.core.protocol.core.Packet; import org.apache.activemq.core.protocol.core.impl.PacketImpl; import org.apache.activemq.core.protocol.core.impl.wireformat.BackupRegistrationMessage; @@ -78,7 +78,7 @@ public class ServerPacketDecoder extends ClientPacketDecoder public static final ServerPacketDecoder INSTANCE = new ServerPacketDecoder(); @Override - public Packet decode(final HornetQBuffer in) + public Packet decode(final ActiveMQBuffer in) { final byte packetType = in.readByte();
