http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientSession.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientSession.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientSession.java index 5c9ac02..d9c7e08 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientSession.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientSession.java @@ -15,7 +15,7 @@ package org.apache.activemq.api.core.client; import javax.transaction.xa.XAResource; import java.util.List; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.SimpleString; /** @@ -111,24 +111,24 @@ public interface ClientSession extends XAResource, AutoCloseable * Starts the session. * The session must be started before ClientConsumers created by the session can consume messages from the queue. * - * @throws HornetQException if an exception occurs while starting the session + * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while starting the session */ - ClientSession start() throws HornetQException; + ClientSession start() throws ActiveMQException; /** * Stops the session. * ClientConsumers created by the session can not consume messages when the session is stopped. * - * @throws HornetQException if an exception occurs while stopping the session + * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while stopping the session */ - void stop() throws HornetQException; + void stop() throws ActiveMQException; /** * Closes the session. * - * @throws HornetQException if an exception occurs while closing the session + * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while closing the session */ - void close() throws HornetQException; + void close() throws ActiveMQException; /** * Returns whether the session is closed or not. @@ -183,9 +183,9 @@ public interface ClientSession extends XAResource, AutoCloseable * @param address the queue will be bound to this address * @param queueName the name of the queue * @param durable whether the queue is durable or not - * @throws HornetQException in an exception occurs while creating the queue + * @throws org.apache.activemq.api.core.ActiveMQException in an exception occurs while creating the queue */ - void createQueue(SimpleString address, SimpleString queueName, boolean durable) throws HornetQException; + void createQueue(SimpleString address, SimpleString queueName, boolean durable) throws ActiveMQException; /** * Creates a transient queue. A queue that will exist as long as there are consumers. When the last consumer is closed the queue will be deleted @@ -195,9 +195,9 @@ public interface ClientSession extends XAResource, AutoCloseable * @param address the queue will be bound to this address * @param queueName the name of the queue * @param durable if the queue is durable - * @throws HornetQException in an exception occurs while creating the queue + * @throws org.apache.activemq.api.core.ActiveMQException in an exception occurs while creating the queue */ - void createSharedQueue(SimpleString address, SimpleString queueName, boolean durable) throws HornetQException; + void createSharedQueue(SimpleString address, SimpleString queueName, boolean durable) throws ActiveMQException; /** * Creates a transient queue. A queue that will exist as long as there are consumers. When the last consumer is closed the queue will be deleted @@ -208,9 +208,9 @@ public interface ClientSession extends XAResource, AutoCloseable * @param queueName the name of the queue * @param filter whether the queue is durable or not * @param durable if the queue is durable - * @throws HornetQException in an exception occurs while creating the queue + * @throws org.apache.activemq.api.core.ActiveMQException in an exception occurs while creating the queue */ - void createSharedQueue(SimpleString address, SimpleString queueName, SimpleString filter, boolean durable) throws HornetQException; + void createSharedQueue(SimpleString address, SimpleString queueName, SimpleString filter, boolean durable) throws ActiveMQException; /** * Creates a <em>non-temporary</em> queue. @@ -218,27 +218,27 @@ public interface ClientSession extends XAResource, AutoCloseable * @param address the queue will be bound to this address * @param queueName the name of the queue * @param durable whether the queue is durable or not - * @throws HornetQException in an exception occurs while creating the queue + * @throws org.apache.activemq.api.core.ActiveMQException in an exception occurs while creating the queue */ - void createQueue(String address, String queueName, boolean durable) throws HornetQException; + void createQueue(String address, String queueName, boolean durable) throws ActiveMQException; /** * Creates a <em>non-temporary</em> queue <em>non-durable</em> queue. * * @param address the queue will be bound to this address * @param queueName the name of the queue - * @throws HornetQException in an exception occurs while creating the queue + * @throws org.apache.activemq.api.core.ActiveMQException in an exception occurs while creating the queue */ - void createQueue(String address, String queueName) throws HornetQException; + void createQueue(String address, String queueName) throws ActiveMQException; /** * Creates a <em>non-temporary</em> queue <em>non-durable</em> queue. * * @param address the queue will be bound to this address * @param queueName the name of the queue - * @throws HornetQException in an exception occurs while creating the queue + * @throws org.apache.activemq.api.core.ActiveMQException in an exception occurs while creating the queue */ - void createQueue(SimpleString address, SimpleString queueName) throws HornetQException; + void createQueue(SimpleString address, SimpleString queueName) throws ActiveMQException; /** * Creates a <em>non-temporary</em> queue. @@ -247,9 +247,9 @@ public interface ClientSession extends XAResource, AutoCloseable * @param queueName the name of the queue * @param filter only messages which match this filter will be put in the queue * @param durable whether the queue is durable or not - * @throws HornetQException in an exception occurs while creating the queue + * @throws org.apache.activemq.api.core.ActiveMQException in an exception occurs while creating the queue */ - void createQueue(SimpleString address, SimpleString queueName, SimpleString filter, boolean durable) throws HornetQException; + void createQueue(SimpleString address, SimpleString queueName, SimpleString filter, boolean durable) throws ActiveMQException; /** * Creates a <em>non-temporary</em>queue. @@ -258,27 +258,27 @@ public interface ClientSession extends XAResource, AutoCloseable * @param queueName the name of the queue * @param durable whether the queue is durable or not * @param filter only messages which match this filter will be put in the queue - * @throws HornetQException in an exception occurs while creating the queue + * @throws org.apache.activemq.api.core.ActiveMQException in an exception occurs while creating the queue */ - void createQueue(String address, String queueName, String filter, boolean durable) throws HornetQException; + void createQueue(String address, String queueName, String filter, boolean durable) throws ActiveMQException; /** * Creates a <em>temporary</em> queue. * * @param address the queue will be bound to this address * @param queueName the name of the queue - * @throws HornetQException in an exception occurs while creating the queue + * @throws org.apache.activemq.api.core.ActiveMQException in an exception occurs while creating the queue */ - void createTemporaryQueue(SimpleString address, SimpleString queueName) throws HornetQException; + void createTemporaryQueue(SimpleString address, SimpleString queueName) throws ActiveMQException; /** * Creates a <em>temporary</em> queue. * * @param address the queue will be bound to this address * @param queueName the name of the queue - * @throws HornetQException in an exception occurs while creating the queue + * @throws org.apache.activemq.api.core.ActiveMQException in an exception occurs while creating the queue */ - void createTemporaryQueue(String address, String queueName) throws HornetQException; + void createTemporaryQueue(String address, String queueName) throws ActiveMQException; /** * Creates a <em>temporary</em> queue with a filter. @@ -286,9 +286,9 @@ public interface ClientSession extends XAResource, AutoCloseable * @param address the queue will be bound to this address * @param queueName the name of the queue * @param filter only messages which match this filter will be put in the queue - * @throws HornetQException in an exception occurs while creating the queue + * @throws org.apache.activemq.api.core.ActiveMQException in an exception occurs while creating the queue */ - void createTemporaryQueue(SimpleString address, SimpleString queueName, SimpleString filter) throws HornetQException; + void createTemporaryQueue(SimpleString address, SimpleString queueName, SimpleString filter) throws ActiveMQException; /** * Creates a <em>temporary</em> queue with a filter. @@ -296,25 +296,25 @@ public interface ClientSession extends XAResource, AutoCloseable * @param address the queue will be bound to this address * @param queueName the name of the queue * @param filter only messages which match this filter will be put in the queue - * @throws HornetQException in an exception occurs while creating the queue + * @throws org.apache.activemq.api.core.ActiveMQException in an exception occurs while creating the queue */ - void createTemporaryQueue(String address, String queueName, String filter) throws HornetQException; + void createTemporaryQueue(String address, String queueName, String filter) throws ActiveMQException; /** * Deletes the queue. * * @param queueName the name of the queue to delete - * @throws HornetQException if there is no queue for the given name or if the queue has consumers + * @throws org.apache.activemq.api.core.ActiveMQException if there is no queue for the given name or if the queue has consumers */ - void deleteQueue(SimpleString queueName) throws HornetQException; + void deleteQueue(SimpleString queueName) throws ActiveMQException; /** * Deletes the queue. * * @param queueName the name of the queue to delete - * @throws HornetQException if there is no queue for the given name or if the queue has consumers + * @throws org.apache.activemq.api.core.ActiveMQException if there is no queue for the given name or if the queue has consumers */ - void deleteQueue(String queueName) throws HornetQException; + void deleteQueue(String queueName) throws ActiveMQException; // Consumer Operations ------------------------------------------- @@ -323,18 +323,18 @@ public interface ClientSession extends XAResource, AutoCloseable * * @param queueName name of the queue to consume messages from * @return a ClientConsumer - * @throws HornetQException if an exception occurs while creating the ClientConsumer + * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the ClientConsumer */ - ClientConsumer createConsumer(SimpleString queueName) throws HornetQException; + ClientConsumer createConsumer(SimpleString queueName) throws ActiveMQException; /** * Creates a ClientConsumer to consume messages from the queue with the given name. * * @param queueName name of the queue to consume messages from * @return a ClientConsumer - * @throws HornetQException if an exception occurs while creating the ClientConsumer + * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the ClientConsumer */ - ClientConsumer createConsumer(String queueName) throws HornetQException; + ClientConsumer createConsumer(String queueName) throws ActiveMQException; /** * Creates a ClientConsumer to consume messages matching the filter from the queue with the given name. @@ -342,9 +342,9 @@ public interface ClientSession extends XAResource, AutoCloseable * @param queueName name of the queue to consume messages from * @param filter only messages which match this filter will be consumed * @return a ClientConsumer - * @throws HornetQException if an exception occurs while creating the ClientConsumer + * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the ClientConsumer */ - ClientConsumer createConsumer(SimpleString queueName, SimpleString filter) throws HornetQException; + ClientConsumer createConsumer(SimpleString queueName, SimpleString filter) throws ActiveMQException; /** * Creates a ClientConsumer to consume messages matching the filter from the queue with the given name. @@ -352,9 +352,9 @@ public interface ClientSession extends XAResource, AutoCloseable * @param queueName name of the queue to consume messages from * @param filter only messages which match this filter will be consumed * @return a ClientConsumer - * @throws HornetQException if an exception occurs while creating the ClientConsumer + * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the ClientConsumer */ - ClientConsumer createConsumer(String queueName, String filter) throws HornetQException; + ClientConsumer createConsumer(String queueName, String filter) throws ActiveMQException; /** * Creates a ClientConsumer to consume or browse messages from the queue with the given name. @@ -370,9 +370,9 @@ public interface ClientSession extends XAResource, AutoCloseable * @param queueName name of the queue to consume messages from * @param browseOnly whether the ClientConsumer will only browse the queue or consume messages. * @return a ClientConsumer - * @throws HornetQException if an exception occurs while creating the ClientConsumer + * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the ClientConsumer */ - ClientConsumer createConsumer(SimpleString queueName, boolean browseOnly) throws HornetQException; + ClientConsumer createConsumer(SimpleString queueName, boolean browseOnly) throws ActiveMQException; /** * Creates a ClientConsumer to consume or browse messages from the queue with the given name. @@ -388,9 +388,9 @@ public interface ClientSession extends XAResource, AutoCloseable * @param queueName name of the queue to consume messages from * @param browseOnly whether the ClientConsumer will only browse the queue or consume messages. * @return a ClientConsumer - * @throws HornetQException if an exception occurs while creating the ClientConsumer + * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the ClientConsumer */ - ClientConsumer createConsumer(String queueName, boolean browseOnly) throws HornetQException; + ClientConsumer createConsumer(String queueName, boolean browseOnly) throws ActiveMQException; /** * Creates a ClientConsumer to consume or browse messages matching the filter from the queue with @@ -408,9 +408,9 @@ public interface ClientSession extends XAResource, AutoCloseable * @param filter only messages which match this filter will be consumed * @param browseOnly whether the ClientConsumer will only browse the queue or consume messages. * @return a ClientConsumer - * @throws HornetQException if an exception occurs while creating the ClientConsumer + * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the ClientConsumer */ - ClientConsumer createConsumer(String queueName, String filter, boolean browseOnly) throws HornetQException; + ClientConsumer createConsumer(String queueName, String filter, boolean browseOnly) throws ActiveMQException; /** * Creates a ClientConsumer to consume or browse messages matching the filter from the queue with @@ -428,9 +428,9 @@ public interface ClientSession extends XAResource, AutoCloseable * @param filter only messages which match this filter will be consumed * @param browseOnly whether the ClientConsumer will only browse the queue or consume messages. * @return a ClientConsumer - * @throws HornetQException if an exception occurs while creating the ClientConsumer + * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the ClientConsumer */ - ClientConsumer createConsumer(SimpleString queueName, SimpleString filter, boolean browseOnly) throws HornetQException; + ClientConsumer createConsumer(SimpleString queueName, SimpleString filter, boolean browseOnly) throws ActiveMQException; /** * Creates a ClientConsumer to consume or browse messages matching the filter from the queue with @@ -450,13 +450,13 @@ public interface ClientSession extends XAResource, AutoCloseable * @param maxRate the maximum rate to consume messages * @param browseOnly whether the ClientConsumer will only browse the queue or consume messages. * @return a ClientConsumer - * @throws HornetQException if an exception occurs while creating the ClientConsumer + * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the ClientConsumer */ ClientConsumer createConsumer(SimpleString queueName, SimpleString filter, int windowSize, int maxRate, - boolean browseOnly) throws HornetQException; + boolean browseOnly) throws ActiveMQException; /** * Creates a ClientConsumer to consume or browse messages matching the filter from the queue with @@ -476,9 +476,9 @@ public interface ClientSession extends XAResource, AutoCloseable * @param maxRate the maximum rate to consume messages * @param browseOnly whether the ClientConsumer will only browse the queue or consume messages. * @return a ClientConsumer - * @throws HornetQException if an exception occurs while creating the ClientConsumer + * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the ClientConsumer */ - ClientConsumer createConsumer(String queueName, String filter, int windowSize, int maxRate, boolean browseOnly) throws HornetQException; + ClientConsumer createConsumer(String queueName, String filter, int windowSize, int maxRate, boolean browseOnly) throws ActiveMQException; // Producer Operations ------------------------------------------- @@ -489,25 +489,25 @@ public interface ClientSession extends XAResource, AutoCloseable * @return a ClientProducer * @see ClientProducer#send(SimpleString, org.apache.activemq.api.core.Message) */ - ClientProducer createProducer() throws HornetQException; + ClientProducer createProducer() throws ActiveMQException; /** * Creates a producer which sends messages to the given address * * @param address the address to send messages to * @return a ClientProducer - * @throws HornetQException if an exception occurs while creating the ClientProducer + * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the ClientProducer */ - ClientProducer createProducer(SimpleString address) throws HornetQException; + ClientProducer createProducer(SimpleString address) throws ActiveMQException; /** * Creates a producer which sends messages to the given address * * @param address the address to send messages to * @return a ClientProducer - * @throws HornetQException if an exception occurs while creating the ClientProducer + * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the ClientProducer */ - ClientProducer createProducer(String address) throws HornetQException; + ClientProducer createProducer(String address) throws ActiveMQException; /** * Creates a producer which sends messages to the given address @@ -515,9 +515,9 @@ public interface ClientSession extends XAResource, AutoCloseable * @param address the address to send messages to * @param rate the producer rate * @return a ClientProducer - * @throws HornetQException if an exception occurs while creating the ClientProducer + * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the ClientProducer */ - ClientProducer createProducer(SimpleString address, int rate) throws HornetQException; + ClientProducer createProducer(SimpleString address, int rate) throws ActiveMQException; // Message operations -------------------------------------------- @@ -557,18 +557,18 @@ public interface ClientSession extends XAResource, AutoCloseable * * @param queueName the name of the queue to query * @return a QueueQuery containing information on the given queue - * @throws HornetQException if an exception occurs while querying the queue + * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while querying the queue */ - QueueQuery queueQuery(SimpleString queueName) throws HornetQException; + QueueQuery queueQuery(SimpleString queueName) throws ActiveMQException; /** * Queries information on a binding. * * @param address the address of the biding to query * @return a AddressQuery containing information on the binding attached to the given address - * @throws HornetQException if an exception occurs while querying the binding + * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while querying the binding */ - AddressQuery addressQuery(SimpleString address) throws HornetQException; + AddressQuery addressQuery(SimpleString address) throws ActiveMQException; // Transaction operations ---------------------------------------- @@ -589,24 +589,24 @@ public interface ClientSession extends XAResource, AutoCloseable /** * Commits the current transaction. * - * @throws HornetQException if an exception occurs while committing the transaction + * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while committing the transaction */ - void commit() throws HornetQException; + void commit() throws ActiveMQException; /** * Rolls back the current transaction. * - * @throws HornetQException if an exception occurs while rolling back the transaction + * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while rolling back the transaction */ - void rollback() throws HornetQException; + void rollback() throws ActiveMQException; /** * Rolls back the current transaction. * * @param considerLastMessageAsDelivered the first message on deliveringMessage Buffer is considered as delivered - * @throws HornetQException if an exception occurs while rolling back the transaction + * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while rolling back the transaction */ - void rollback(boolean considerLastMessageAsDelivered) throws HornetQException; + void rollback(boolean considerLastMessageAsDelivered) throws ActiveMQException; /** * Returns <code>true</code> if the current transaction has been flagged to rollback, <code>false</code> else. @@ -649,18 +649,18 @@ public interface ClientSession extends XAResource, AutoCloseable /** * Attach any metadata to the session. * - * @throws HornetQException + * @throws org.apache.activemq.api.core.ActiveMQException */ - void addMetaData(String key, String data) throws HornetQException; + void addMetaData(String key, String data) throws ActiveMQException; /** * Attach any metadata to the session. Throws an exception if there's already a metadata available. * You can use this metadata to ensure that there is no other session with the same meta-data you are passing as an argument. * This is useful to simulate unique client-ids, where you may want to avoid multiple instances of your client application connected. * - * @throws HornetQException + * @throws org.apache.activemq.api.core.ActiveMQException */ - void addUniqueMetaData(String key, String data) throws HornetQException; + void addUniqueMetaData(String key, String data) throws ActiveMQException; /** * Return the sessionFactory used to created this Session.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientSessionFactory.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientSessionFactory.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientSessionFactory.java index 80bcf10..f15061f 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientSessionFactory.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientSessionFactory.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.api.core.client; -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.spi.core.protocol.RemotingConnection; @@ -31,9 +31,9 @@ public interface ClientSessionFactory extends AutoCloseable * Creates a session with XA transaction semantics. * * @return a ClientSession with XA transaction semantics - * @throws HornetQException if an exception occurs while creating the session + * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the session */ - ClientSession createXASession() throws HornetQException; + ClientSession createXASession() throws ActiveMQException; /** * Creates a <em>transacted</em> session. @@ -41,10 +41,10 @@ public interface ClientSessionFactory extends AutoCloseable * It is up to the client to commit when sending and acknowledging messages. * * @return a transacted ClientSession - * @throws HornetQException if an exception occurs while creating the session + * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the session * @see ClientSession#commit() */ - ClientSession createTransactedSession() throws HornetQException; + ClientSession createTransactedSession() throws ActiveMQException; /** @@ -54,9 +54,9 @@ public interface ClientSessionFactory extends AutoCloseable * the session will automatically commit the transaction containing the acknowledgements. * * @return a non-transacted ClientSession - * @throws HornetQException if an exception occurs while creating the session + * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the session */ - ClientSession createSession() throws HornetQException; + ClientSession createSession() throws ActiveMQException; /** * Creates a session. @@ -64,9 +64,9 @@ public interface ClientSessionFactory extends AutoCloseable * @param autoCommitSends <code>true</code> to automatically commit message sends, <code>false</code> to commit manually * @param autoCommitAcks <code>true</code> to automatically commit message acknowledgement, <code>false</code> to commit manually * @return a ClientSession - * @throws HornetQException if an exception occurs while creating the session + * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the session */ - ClientSession createSession(boolean autoCommitSends, boolean autoCommitAcks) throws HornetQException; + ClientSession createSession(boolean autoCommitSends, boolean autoCommitAcks) throws ActiveMQException; /** * Creates a session. @@ -75,9 +75,9 @@ public interface ClientSessionFactory extends AutoCloseable * @param autoCommitAcks <code>true</code> to automatically commit message acknowledgement, <code>false</code> to commit manually * @param ackBatchSize the batch size of the acknowledgements * @return a ClientSession - * @throws HornetQException if an exception occurs while creating the session + * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the session */ - ClientSession createSession(boolean autoCommitSends, boolean autoCommitAcks, int ackBatchSize) throws HornetQException; + ClientSession createSession(boolean autoCommitSends, boolean autoCommitAcks, int ackBatchSize) throws ActiveMQException; /** * Creates a session. @@ -86,9 +86,9 @@ public interface ClientSessionFactory extends AutoCloseable * @param autoCommitSends <code>true</code> to automatically commit message sends, <code>false</code> to commit manually * @param autoCommitAcks <code>true</code> to automatically commit message acknowledgement, <code>false</code> to commit manually * @return a ClientSession - * @throws HornetQException if an exception occurs while creating the session + * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the session */ - ClientSession createSession(boolean xa, boolean autoCommitSends, boolean autoCommitAcks) throws HornetQException; + ClientSession createSession(boolean xa, boolean autoCommitSends, boolean autoCommitAcks) throws ActiveMQException; /** * Creates a session. @@ -102,9 +102,9 @@ public interface ClientSessionFactory extends AutoCloseable * @param autoCommitAcks <code>true</code> to automatically commit message acknowledgement, <code>false</code> to commit manually * @param preAcknowledge <code>true</code> to pre-acknowledge messages on the server, <code>false</code> to let the client acknowledge the messages * @return a ClientSession - * @throws HornetQException if an exception occurs while creating the session + * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the session */ - ClientSession createSession(boolean xa, boolean autoCommitSends, boolean autoCommitAcks, boolean preAcknowledge) throws HornetQException; + ClientSession createSession(boolean xa, boolean autoCommitSends, boolean autoCommitAcks, boolean preAcknowledge) throws ActiveMQException; /** * Creates an <em>authenticated</em> session. @@ -120,7 +120,7 @@ public interface ClientSessionFactory extends AutoCloseable * @param autoCommitAcks <code>true</code> to automatically commit message acknowledgement, <code>false</code> to commit manually * @param preAcknowledge <code>true</code> to pre-acknowledge messages on the server, <code>false</code> to let the client acknowledge the messages * @return a ClientSession - * @throws HornetQException if an exception occurs while creating the session + * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while creating the session */ ClientSession createSession(String username, String password, @@ -128,7 +128,7 @@ public interface ClientSessionFactory extends AutoCloseable boolean autoCommitSends, boolean autoCommitAcks, boolean preAcknowledge, - int ackBatchSize) throws HornetQException; + int ackBatchSize) throws ActiveMQException; /** * Closes this factory and any session created by it. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ServerLocator.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ServerLocator.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ServerLocator.java index 087b287..e4a41fc 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ServerLocator.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ServerLocator.java @@ -165,7 +165,7 @@ public interface ServerLocator extends AutoCloseable * Returns the blocking calls timeout. * <p> * If client's blocking calls to the server take more than this timeout, the call will throw a - * {@link org.apache.activemq.api.core.HornetQException} with the code {@link org.apache.activemq.api.core.HornetQExceptionType#CONNECTION_TIMEDOUT}. Value + * {@link org.apache.activemq.api.core.ActiveMQException} with the code {@link org.apache.activemq.api.core.ActiveMQExceptionType#CONNECTION_TIMEDOUT}. Value * is in milliseconds, default value is {@link HornetQClient#DEFAULT_CALL_TIMEOUT}. * * @return the blocking calls timeout http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/SessionFailureListener.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/SessionFailureListener.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/SessionFailureListener.java index 8317af2..26d2150 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/SessionFailureListener.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/SessionFailureListener.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.api.core.client; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.core.remoting.FailureListener; /** @@ -29,5 +29,5 @@ public interface SessionFailureListener extends FailureListener * * @param exception exception which has caused the connection to fail */ - void beforeReconnect(HornetQException exception); + void beforeReconnect(ActiveMQException exception); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/HornetQServerControl.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/HornetQServerControl.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/HornetQServerControl.java index 8c7e5c7..8da629c 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/HornetQServerControl.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/HornetQServerControl.java @@ -316,7 +316,7 @@ public interface HornetQServerControl /** * Create a durable queue. * <br> - * This method throws a {@link org.apache.activemq.api.core.HornetQQueueExistsException}) exception if the queue already exits. + * This method throws a {@link org.apache.activemq.api.core.ActiveMQQueueExistsException}) exception if the queue already exits. * * @param address address to bind the queue to * @param name name of the queue @@ -328,7 +328,7 @@ public interface HornetQServerControl /** * Create a queue. * <br> - * This method throws a {@link org.apache.activemq.api.core.HornetQQueueExistsException}) exception if the queue already exits. + * This method throws a {@link org.apache.activemq.api.core.ActiveMQQueueExistsException}) exception if the queue already exits. * * @param address address to bind the queue to * @param name name of the queue @@ -344,7 +344,7 @@ public interface HornetQServerControl /** * Create a queue. * <br> - * This method throws a {@link org.apache.activemq.api.core.HornetQQueueExistsException}) exception if the queue already exits. + * This method throws a {@link org.apache.activemq.api.core.ActiveMQQueueExistsException}) exception if the queue already exits. * * @param address address to bind the queue to * @param name name of the queue http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/buffers/impl/ResetLimitWrappedHornetQBuffer.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/buffers/impl/ResetLimitWrappedHornetQBuffer.java b/activemq-core-client/src/main/java/org/apache/activemq/core/buffers/impl/ResetLimitWrappedHornetQBuffer.java index 4f01f74..71ef0a4 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/buffers/impl/ResetLimitWrappedHornetQBuffer.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/buffers/impl/ResetLimitWrappedHornetQBuffer.java @@ -14,7 +14,7 @@ package org.apache.activemq.core.buffers.impl; 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.core.message.impl.MessageInternal; @@ -40,7 +40,7 @@ public final class ResetLimitWrappedHornetQBuffer extends ChannelBufferWrapper this.message = message; } - public ResetLimitWrappedHornetQBuffer(final int limit, final HornetQBuffer buffer, final MessageInternal message) + public ResetLimitWrappedHornetQBuffer(final int limit, final ActiveMQBuffer buffer, final MessageInternal message) { super(buffer.byteBuf()); @@ -64,7 +64,7 @@ public final class ResetLimitWrappedHornetQBuffer extends ChannelBufferWrapper } } - public void setBuffer(final HornetQBuffer buffer) + public void setBuffer(final ActiveMQBuffer buffer) { if (this.buffer != null) { @@ -175,7 +175,7 @@ public final class ResetLimitWrappedHornetQBuffer extends ChannelBufferWrapper } @Override - public void setBytes(final int index, final HornetQBuffer src, final int srcIndex, final int length) + public void setBytes(final int index, final ActiveMQBuffer src, final int srcIndex, final int length) { changed(); @@ -183,7 +183,7 @@ public final class ResetLimitWrappedHornetQBuffer extends ChannelBufferWrapper } @Override - public void setBytes(final int index, final HornetQBuffer src, final int length) + public void setBytes(final int index, final ActiveMQBuffer src, final int length) { changed(); @@ -191,7 +191,7 @@ public final class ResetLimitWrappedHornetQBuffer extends ChannelBufferWrapper } @Override - public void setBytes(final int index, final HornetQBuffer src) + public void setBytes(final int index, final ActiveMQBuffer src) { changed(); @@ -287,7 +287,7 @@ public final class ResetLimitWrappedHornetQBuffer extends ChannelBufferWrapper } @Override - public void writeBytes(final HornetQBuffer src, final int srcIndex, final int length) + public void writeBytes(final ActiveMQBuffer src, final int srcIndex, final int length) { changed(); @@ -295,7 +295,7 @@ public final class ResetLimitWrappedHornetQBuffer extends ChannelBufferWrapper } @Override - public void writeBytes(final HornetQBuffer src, final int length) + public void writeBytes(final ActiveMQBuffer src, final int length) { changed(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/client/HornetQClientLogger.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/HornetQClientLogger.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/HornetQClientLogger.java index 3e63af8..742bb34 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/HornetQClientLogger.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/client/HornetQClientLogger.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.core.client; -import org.apache.activemq.api.core.HornetQExceptionType; +import org.apache.activemq.api.core.ActiveMQExceptionType; import org.apache.activemq.api.core.Interceptor; import org.apache.activemq.core.protocol.core.Packet; import org.jboss.logging.BasicLogger; @@ -223,7 +223,7 @@ public interface HornetQClientLogger extends BasicLogger @LogMessage(level = Logger.Level.WARN) @Message(id = 212037, value = "Connection failure has been detected: {0} [code={1}]", format = Message.Format.MESSAGE_FORMAT) - void connectionFailureDetected(String message, HornetQExceptionType type); + void connectionFailureDetected(String message, ActiveMQExceptionType type); @LogMessage(level = Logger.Level.WARN) @Message(id = 212038, value = "Failure in calling interceptor: {0}", format = Message.Format.MESSAGE_FORMAT) http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/client/HornetQClientMessageBundle.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/HornetQClientMessageBundle.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/HornetQClientMessageBundle.java index d69b30a..9dbb233 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/HornetQClientMessageBundle.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/client/HornetQClientMessageBundle.java @@ -14,19 +14,19 @@ package org.apache.activemq.core.client; -import org.apache.activemq.api.core.HornetQAddressFullException; -import org.apache.activemq.api.core.HornetQConnectionTimedOutException; -import org.apache.activemq.api.core.HornetQDisconnectedException; -import org.apache.activemq.api.core.HornetQIllegalStateException; -import org.apache.activemq.api.core.HornetQInterceptorRejectedPacketException; -import org.apache.activemq.api.core.HornetQInternalErrorException; -import org.apache.activemq.api.core.HornetQLargeMessageException; -import org.apache.activemq.api.core.HornetQLargeMessageInterruptedException; -import org.apache.activemq.api.core.HornetQNotConnectedException; -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.HornetQUnBlockedException; +import org.apache.activemq.api.core.ActiveMQAddressFullException; +import org.apache.activemq.api.core.ActiveMQConnectionTimedOutException; +import org.apache.activemq.api.core.ActiveMQDisconnectedException; +import org.apache.activemq.api.core.ActiveMQIllegalStateException; +import org.apache.activemq.api.core.ActiveMQInterceptorRejectedPacketException; +import org.apache.activemq.api.core.ActiveMQInternalErrorException; +import org.apache.activemq.api.core.ActiveMQLargeMessageException; +import org.apache.activemq.api.core.ActiveMQLargeMessageInterruptedException; +import org.apache.activemq.api.core.ActiveMQNotConnectedException; +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.ActiveMQUnBlockedException; import org.apache.activemq.core.cluster.DiscoveryGroup; import org.apache.activemq.spi.core.remoting.Connection; import org.jboss.logging.annotations.Cause; @@ -51,105 +51,105 @@ public interface HornetQClientMessageBundle HornetQClientMessageBundle BUNDLE = Messages.getBundle(HornetQClientMessageBundle.class); @Message(id = 119000, value = "ClientSession closed while creating session", format = Message.Format.MESSAGE_FORMAT) - HornetQInternalErrorException clientSessionClosed(); + ActiveMQInternalErrorException clientSessionClosed(); @Message(id = 119001, value = "Failed to create session", format = Message.Format.MESSAGE_FORMAT) - HornetQInternalErrorException failedToCreateSession(@Cause Throwable t); + ActiveMQInternalErrorException failedToCreateSession(@Cause Throwable t); @Message(id = 119002, value = "Internal Error! ClientSessionFactoryImpl::createSessionInternal " + "just reached a condition that was not supposed to happen. " + "Please inform this condition to the HornetQ team", format = Message.Format.MESSAGE_FORMAT) - HornetQInternalErrorException clietSessionInternal(); + ActiveMQInternalErrorException clietSessionInternal(); @Message(id = 119003, value = "Queue can not be both durable and temporary", format = Message.Format.MESSAGE_FORMAT) - HornetQInternalErrorException queueMisConfigured(); + ActiveMQInternalErrorException queueMisConfigured(); @Message(id = 119004, value = "Failed to initialise session factory", format = Message.Format.MESSAGE_FORMAT) - HornetQInternalErrorException failedToInitialiseSessionFactory(@Cause Exception e); + ActiveMQInternalErrorException failedToInitialiseSessionFactory(@Cause Exception e); @Message(id = 119005, value = "Exception in Netty transport", format = Message.Format.MESSAGE_FORMAT) - HornetQInternalErrorException nettyError(); + ActiveMQInternalErrorException nettyError(); @Message(id = 119006, value = "Channel disconnected", format = Message.Format.MESSAGE_FORMAT) - HornetQNotConnectedException channelDisconnected(); + ActiveMQNotConnectedException channelDisconnected(); @Message(id = 119007, value = "Cannot connect to server(s). Tried with all available servers.", format = Message.Format.MESSAGE_FORMAT) - HornetQNotConnectedException cannotConnectToServers(); + ActiveMQNotConnectedException cannotConnectToServers(); @Message(id = 119008, value = "Failed to connect to any static connectors", format = Message.Format.MESSAGE_FORMAT) - HornetQNotConnectedException cannotConnectToStaticConnectors(@Cause Exception e); + ActiveMQNotConnectedException cannotConnectToStaticConnectors(@Cause Exception e); @Message(id = 119009, value = "Failed to connect to any static connectors", format = Message.Format.MESSAGE_FORMAT) - HornetQNotConnectedException cannotConnectToStaticConnectors2(); + ActiveMQNotConnectedException cannotConnectToStaticConnectors2(); @Message(id = 119010, value = "Connection is destroyed", format = Message.Format.MESSAGE_FORMAT) - HornetQNotConnectedException connectionDestroyed(); + ActiveMQNotConnectedException connectionDestroyed(); @Message(id = 119011, value = "Did not receive data from server for {0}", format = Message.Format.MESSAGE_FORMAT) - HornetQConnectionTimedOutException connectionTimedOut(Connection transportConnection); + ActiveMQConnectionTimedOutException connectionTimedOut(Connection transportConnection); @Message(id = 119012, value = "Timed out waiting to receive initial broadcast from cluster", format = Message.Format.MESSAGE_FORMAT) - HornetQConnectionTimedOutException connectionTimedOutInInitialBroadcast(); + ActiveMQConnectionTimedOutException connectionTimedOutInInitialBroadcast(); @Message(id = 119013, value = "Timed out waiting to receive cluster topology. Group:{0}", format = Message.Format.MESSAGE_FORMAT) - HornetQConnectionTimedOutException connectionTimedOutOnReceiveTopology(DiscoveryGroup discoveryGroup); + ActiveMQConnectionTimedOutException connectionTimedOutOnReceiveTopology(DiscoveryGroup discoveryGroup); @Message(id = 119014, value = "Timed out waiting for response when sending packet {0}", format = Message.Format.MESSAGE_FORMAT) - HornetQConnectionTimedOutException timedOutSendingPacket(Byte type); + ActiveMQConnectionTimedOutException timedOutSendingPacket(Byte type); @Message(id = 119015, value = "The connection was disconnected because of server shutdown", format = Message.Format.MESSAGE_FORMAT) - HornetQDisconnectedException disconnected(); + ActiveMQDisconnectedException disconnected(); @Message(id = 119016, value = "Connection failure detected. Unblocking a blocking call that will never get a resp" + "onse", format = Message.Format.MESSAGE_FORMAT) - HornetQUnBlockedException unblockingACall(@Cause Throwable t); + ActiveMQUnBlockedException unblockingACall(@Cause Throwable t); @Message(id = 119017, value = "Consumer is closed", format = Message.Format.MESSAGE_FORMAT) - HornetQObjectClosedException consumerClosed(); + ActiveMQObjectClosedException consumerClosed(); @Message(id = 119018, value = "Producer is closed", format = Message.Format.MESSAGE_FORMAT) - HornetQObjectClosedException producerClosed(); + ActiveMQObjectClosedException producerClosed(); @Message(id = 119019, value = "Session is closed", format = Message.Format.MESSAGE_FORMAT) - HornetQObjectClosedException sessionClosed(); + ActiveMQObjectClosedException sessionClosed(); @Message(id = 119020, value = "Cannot call receive(...) - a MessageHandler is set", format = Message.Format.MESSAGE_FORMAT) - HornetQIllegalStateException messageHandlerSet(); + ActiveMQIllegalStateException messageHandlerSet(); @Message(id = 119021, value = "Cannot set MessageHandler - consumer is in receive(...)", format = Message.Format.MESSAGE_FORMAT) - HornetQIllegalStateException inReceive(); + ActiveMQIllegalStateException inReceive(); @Message(id = 119022, value = "Header size ({0}) is too big, use the messageBody for large data, or increase minLargeMessageSize", format = Message.Format.MESSAGE_FORMAT) - HornetQIllegalStateException headerSizeTooBig(Integer headerSize); + ActiveMQIllegalStateException headerSizeTooBig(Integer headerSize); @Message(id = 119023, value = "The large message lost connection with its session, either because of a rollback or a closed session", format = Message.Format.MESSAGE_FORMAT) - HornetQIllegalStateException largeMessageLostSession(); + ActiveMQIllegalStateException largeMessageLostSession(); @Message(id = 119024, value = "Could not select a TransportConfiguration to create SessionFactory", format = Message.Format.MESSAGE_FORMAT) - HornetQIllegalStateException noTCForSessionFactory(); + ActiveMQIllegalStateException noTCForSessionFactory(); @Message(id = 119025, value = "Error saving the message body", format = Message.Format.MESSAGE_FORMAT) - HornetQLargeMessageException errorSavingBody(@Cause Exception e); + ActiveMQLargeMessageException errorSavingBody(@Cause Exception e); @Message(id = 119026, value = "Error reading the LargeMessageBody", format = Message.Format.MESSAGE_FORMAT) - HornetQLargeMessageException errorReadingBody(@Cause Exception e); + ActiveMQLargeMessageException errorReadingBody(@Cause Exception e); @Message(id = 119027, value = "Error closing stream from LargeMessageBody", format = Message.Format.MESSAGE_FORMAT) - HornetQLargeMessageException errorClosingLargeMessage(@Cause Exception e); + ActiveMQLargeMessageException errorClosingLargeMessage(@Cause Exception e); @Message(id = 119028, value = "Timeout waiting for LargeMessage Body", format = Message.Format.MESSAGE_FORMAT) - HornetQLargeMessageException timeoutOnLargeMessage(); + ActiveMQLargeMessageException timeoutOnLargeMessage(); @Message(id = 119029, value = "Error writing body of message", format = Message.Format.MESSAGE_FORMAT) - HornetQLargeMessageException errorWritingLargeMessage(@Cause Exception e); + ActiveMQLargeMessageException errorWritingLargeMessage(@Cause Exception e); @Message(id = 119030, value = "The transaction was rolled back on failover to a backup server", format = Message.Format.MESSAGE_FORMAT) - HornetQTransactionRolledBackException txRolledBack(); + ActiveMQTransactionRolledBackException txRolledBack(); @Message(id = 119031, value = "The transaction was rolled back on failover however commit may have been successful" + "", format = Message.Format.MESSAGE_FORMAT) - HornetQTransactionOutcomeUnknownException txOutcomeUnknown(); + ActiveMQTransactionOutcomeUnknownException txOutcomeUnknown(); @Message(id = 119032, value = "Invalid type: {0}", format = Message.Format.MESSAGE_FORMAT) IllegalArgumentException invalidType(Object type); @@ -231,15 +231,15 @@ public interface HornetQClientMessageBundle IllegalArgumentException errordecodingPassword(@Cause Exception e); @Message(id = 119058, value = "Address \"{0}\" is full. Message encode size = {1}B", format = Message.Format.MESSAGE_FORMAT) - HornetQAddressFullException addressIsFull(String addressName, int size); + ActiveMQAddressFullException addressIsFull(String addressName, int size); @Message(id = 119059, value = "Interceptor {0} rejected packet in a blocking call. This call will never complete." , format = Message.Format.MESSAGE_FORMAT) - HornetQInterceptorRejectedPacketException interceptorRejectedPacket(String interceptionResult); + ActiveMQInterceptorRejectedPacketException interceptorRejectedPacket(String interceptionResult); @Message(id = 119060, value = "Large Message Transmission interrupted on consumer shutdown." , format = Message.Format.MESSAGE_FORMAT) - HornetQLargeMessageInterruptedException largeMessageInterrupted(); + ActiveMQLargeMessageInterruptedException largeMessageInterrupted(); @Message(id = 119061, value = "error decoding AMQP frame", format = Message.Format.MESSAGE_FORMAT) String decodeError(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientConsumerImpl.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientConsumerImpl.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientConsumerImpl.java index e7ef46d..c145186 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientConsumerImpl.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientConsumerImpl.java @@ -20,9 +20,9 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; -import org.apache.activemq.api.core.HornetQBuffer; -import org.apache.activemq.api.core.HornetQException; -import org.apache.activemq.api.core.HornetQInterruptedException; +import org.apache.activemq.api.core.ActiveMQBuffer; +import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.api.core.ActiveMQInterruptedException; import org.apache.activemq.api.core.Message; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientMessage; @@ -186,7 +186,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal return consumerContext; } - private ClientMessage receive(final long timeout, final boolean forcingDelivery) throws HornetQException + private ClientMessage receive(final long timeout, final boolean forcingDelivery) throws ActiveMQException { checkClosed(); @@ -259,7 +259,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal } catch (InterruptedException e) { - throw new HornetQInterruptedException(e); + throw new ActiveMQInterruptedException(e); } if (m != null || closed) @@ -391,7 +391,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal } } - public ClientMessage receive(final long timeout) throws HornetQException + public ClientMessage receive(final long timeout) throws ActiveMQException { ClientMessage msg = receive(timeout, false); @@ -403,17 +403,17 @@ public final class ClientConsumerImpl implements ClientConsumerInternal return msg; } - public ClientMessage receive() throws HornetQException + public ClientMessage receive() throws ActiveMQException { return receive(0, false); } - public ClientMessage receiveImmediate() throws HornetQException + public ClientMessage receiveImmediate() throws ActiveMQException { return receive(0, true); } - public MessageHandler getMessageHandler() throws HornetQException + public MessageHandler getMessageHandler() throws ActiveMQException { checkClosed(); @@ -422,7 +422,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal // Must be synchronized since messages may be arriving while handler is being set and might otherwise end // up not queueing enough executors - so messages get stranded - public synchronized ClientConsumerImpl setMessageHandler(final MessageHandler theHandler) throws HornetQException + public synchronized ClientConsumerImpl setMessageHandler(final MessageHandler theHandler) throws ActiveMQException { checkClosed(); @@ -454,7 +454,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal return this; } - public void close() throws HornetQException + public void close() throws ActiveMQException { doCleanUp(true); } @@ -462,10 +462,10 @@ public final class ClientConsumerImpl implements ClientConsumerInternal /** * To be used by MDBs to stop any more handling of messages. * - * @throws HornetQException + * @throws org.apache.activemq.api.core.ActiveMQException * @param future the future to run once the onMessage Thread has completed */ - public Thread prepareForClose(final FutureLatch future) throws HornetQException + public Thread prepareForClose(final FutureLatch future) throws ActiveMQException { closing = true; @@ -490,7 +490,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal { doCleanUp(false); } - catch (HornetQException e) + catch (ActiveMQException e) { HornetQClientLogger.LOGGER.warn("problem cleaning up: " + this); } @@ -501,7 +501,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal return closed; } - public void stop(final boolean waitForOnMessage) throws HornetQException + public void stop(final boolean waitForOnMessage) throws ActiveMQException { waitForOnMessageToComplete(waitForOnMessage); @@ -661,7 +661,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal currentLargeMessageController.setLocal(true); //sets the packet - HornetQBuffer qbuff = clMessage.getBodyBuffer(); + ActiveMQBuffer qbuff = clMessage.getBodyBuffer(); int bytesToRead = qbuff.writerIndex() - qbuff.readerIndex(); final byte[] body = qbuff.readBytes(bytesToRead).toByteBuffer().array(); @@ -727,7 +727,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal } } - public void clear(boolean waitForOnMessage) throws HornetQException + public void clear(boolean waitForOnMessage) throws ActiveMQException { synchronized (this) { @@ -794,7 +794,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal return buffer.size(); } - public void acknowledge(final ClientMessage message) throws HornetQException + public void acknowledge(final ClientMessage message) throws ActiveMQException { ClientMessageInternal cmi = (ClientMessageInternal) message; @@ -817,7 +817,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal } } - public void individualAcknowledge(ClientMessage message) throws HornetQException + public void individualAcknowledge(ClientMessage message) throws ActiveMQException { if (lastAckedMessage != null) { @@ -827,7 +827,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal session.individualAcknowledge(this, message); } - public void flushAcks() throws HornetQException + public void flushAcks() throws ActiveMQException { if (lastAckedMessage != null) { @@ -841,7 +841,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal * * @param discountSlowConsumer When dealing with slowConsumers, we need to discount one credit that was pre-sent when the first receive was called. For largeMessage that is only done at the latest packet */ - public void flowControl(final int messageBytes, final boolean discountSlowConsumer) throws HornetQException + public void flowControl(final int messageBytes, final boolean discountSlowConsumer) throws ActiveMQException { if (clientWindowSize >= 0) { @@ -945,7 +945,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal } catch (InterruptedException e) { - throw new HornetQInterruptedException(e); + throw new ActiveMQInterruptedException(e); } } } @@ -1015,7 +1015,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal } } - private void checkClosed() throws HornetQException + private void checkClosed() throws ActiveMQException { if (closed) { @@ -1139,9 +1139,9 @@ public final class ClientConsumerImpl implements ClientConsumerInternal /** * @param message - * @throws HornetQException + * @throws org.apache.activemq.api.core.ActiveMQException */ - private void flowControlBeforeConsumption(final ClientMessageInternal message) throws HornetQException + private void flowControlBeforeConsumption(final ClientMessageInternal message) throws ActiveMQException { // Chunk messages will execute the flow control while receiving the chunks if (message.getFlowControlSize() != 0) @@ -1151,7 +1151,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal } } - private void doCleanUp(final boolean sendCloseMessage) throws HornetQException + private void doCleanUp(final boolean sendCloseMessage) throws ActiveMQException { try { @@ -1207,7 +1207,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal buffer.clear(); } - private void doAck(final ClientMessageInternal message) throws HornetQException + private void doAck(final ClientMessageInternal message) throws ActiveMQException { ackBytes = 0; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientConsumerInternal.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientConsumerInternal.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientConsumerInternal.java index 57f0ab0..e49b037 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientConsumerInternal.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientConsumerInternal.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.core.client.impl; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientConsumer; import org.apache.activemq.api.core.client.ClientMessage; @@ -38,17 +38,17 @@ public interface ClientConsumerInternal extends ClientConsumer void handleLargeMessageContinuation(byte[] chunk, int flowControlSize, boolean isContinues) throws Exception; - void flowControl(final int messageBytes, final boolean discountSlowConsumer) throws HornetQException; + void flowControl(final int messageBytes, final boolean discountSlowConsumer) throws ActiveMQException; - void clear(boolean waitForOnMessage) throws HornetQException; + void clear(boolean waitForOnMessage) throws ActiveMQException; /** * To be called by things like MDBs during shutdown of the server * - * @throws HornetQException + * @throws org.apache.activemq.api.core.ActiveMQException * @param future */ - Thread prepareForClose(FutureLatch future) throws HornetQException; + Thread prepareForClose(FutureLatch future) throws ActiveMQException; void clearAtFailover(); @@ -56,15 +56,15 @@ public interface ClientConsumerInternal extends ClientConsumer int getBufferSize(); - void cleanUp() throws HornetQException; + void cleanUp() throws ActiveMQException; - void acknowledge(ClientMessage message) throws HornetQException; + void acknowledge(ClientMessage message) throws ActiveMQException; - void individualAcknowledge(ClientMessage message) throws HornetQException; + void individualAcknowledge(ClientMessage message) throws ActiveMQException; - void flushAcks() throws HornetQException; + void flushAcks() throws ActiveMQException; - void stop(boolean waitForOnMessage) throws HornetQException; + void stop(boolean waitForOnMessage) throws ActiveMQException; void start(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientLargeMessageImpl.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientLargeMessageImpl.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientLargeMessageImpl.java index 389a9fd..b6fa16b 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientLargeMessageImpl.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientLargeMessageImpl.java @@ -15,8 +15,8 @@ package org.apache.activemq.core.client.impl; import java.io.IOException; import java.io.OutputStream; -import org.apache.activemq.api.core.HornetQBuffer; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQBuffer; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.Message; import org.apache.activemq.core.buffers.impl.ResetLimitWrappedHornetQBuffer; import org.apache.activemq.utils.DataConstants; @@ -84,20 +84,20 @@ public final class ClientLargeMessageImpl extends ClientMessageImpl implements C largeMessageController = controller; } - public void checkCompletion() throws HornetQException + public void checkCompletion() throws ActiveMQException { checkBuffer(); } @Override - public HornetQBuffer getBodyBuffer() + public ActiveMQBuffer getBodyBuffer() { try { checkBuffer(); } - catch (HornetQException e) + catch (ActiveMQException e) { throw new RuntimeException(e.getMessage(), e); } @@ -117,7 +117,7 @@ public final class ClientLargeMessageImpl extends ClientMessageImpl implements C } @Override - public void saveToOutputStream(final OutputStream out) throws HornetQException + public void saveToOutputStream(final OutputStream out) throws ActiveMQException { if (bodyBuffer != null) { @@ -131,7 +131,7 @@ public final class ClientLargeMessageImpl extends ClientMessageImpl implements C } @Override - public ClientLargeMessageImpl setOutputStream(final OutputStream out) throws HornetQException + public ClientLargeMessageImpl setOutputStream(final OutputStream out) throws ActiveMQException { if (bodyBuffer != null) { @@ -146,7 +146,7 @@ public final class ClientLargeMessageImpl extends ClientMessageImpl implements C } @Override - public boolean waitOutputStreamCompletion(final long timeMilliseconds) throws HornetQException + public boolean waitOutputStreamCompletion(final long timeMilliseconds) throws ActiveMQException { if (bodyBuffer != null) { @@ -171,7 +171,7 @@ public final class ClientLargeMessageImpl extends ClientMessageImpl implements C } } - private void checkBuffer() throws HornetQException + private void checkBuffer() throws ActiveMQException { if (bodyBuffer == null) { @@ -193,9 +193,9 @@ public final class ClientLargeMessageImpl extends ClientMessageImpl implements C private static class HornetQOutputStream extends OutputStream { - private final HornetQBuffer bufferOut; + private final ActiveMQBuffer bufferOut; - HornetQOutputStream(HornetQBuffer out) + HornetQOutputStream(ActiveMQBuffer out) { this.bufferOut = out; } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientMessageImpl.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientMessageImpl.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientMessageImpl.java index 8ef0cb6..715837a 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientMessageImpl.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientMessageImpl.java @@ -17,10 +17,10 @@ import java.io.InputStream; import java.io.OutputStream; import java.nio.ByteBuffer; -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.HornetQPropertyConversionException; +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.ActiveMQPropertyConversionException; import org.apache.activemq.api.core.Message; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.core.client.HornetQClientMessageBundle; @@ -97,7 +97,7 @@ public class ClientMessageImpl extends MessageImpl implements ClientMessageInter } @Override - public ClientMessageImpl acknowledge() throws HornetQException + public ClientMessageImpl acknowledge() throws ActiveMQException { if (consumer != null) { @@ -108,7 +108,7 @@ public class ClientMessageImpl extends MessageImpl implements ClientMessageInter } @Override - public ClientMessageImpl individualAcknowledge() throws HornetQException + public ClientMessageImpl individualAcknowledge() throws ActiveMQException { if (consumer != null) { @@ -162,7 +162,7 @@ public class ClientMessageImpl extends MessageImpl implements ClientMessageInter } @Override - public void saveToOutputStream(final OutputStream out) throws HornetQException + public void saveToOutputStream(final OutputStream out) throws ActiveMQException { try { @@ -178,14 +178,14 @@ public class ClientMessageImpl extends MessageImpl implements ClientMessageInter } @Override - public ClientMessageImpl setOutputStream(final OutputStream out) throws HornetQException + public ClientMessageImpl setOutputStream(final OutputStream out) throws ActiveMQException { saveToOutputStream(out); return this; } @Override - public boolean waitOutputStreamCompletion(final long timeMilliseconds) throws HornetQException + public boolean waitOutputStreamCompletion(final long timeMilliseconds) throws ActiveMQException { return true; } @@ -215,7 +215,7 @@ public class ClientMessageImpl extends MessageImpl implements ClientMessageInter } @Override - public BodyEncoder getBodyEncoder() throws HornetQException + public BodyEncoder getBodyEncoder() throws ActiveMQException { return new DecodingContext(); } @@ -287,13 +287,13 @@ public class ClientMessageImpl extends MessageImpl implements ClientMessageInter } @Override - public ClientMessageImpl putObjectProperty(final SimpleString key, final Object value) throws HornetQPropertyConversionException + public ClientMessageImpl putObjectProperty(final SimpleString key, final Object value) throws ActiveMQPropertyConversionException { return (ClientMessageImpl) super.putObjectProperty(key, value); } @Override - public ClientMessageImpl putObjectProperty(final String key, final Object value) throws HornetQPropertyConversionException + public ClientMessageImpl putObjectProperty(final String key, final Object value) throws ActiveMQPropertyConversionException { return (ClientMessageImpl) super.putObjectProperty(key, value); } @@ -395,14 +395,14 @@ public class ClientMessageImpl extends MessageImpl implements ClientMessageInter } @Override - public int encode(final ByteBuffer bufferRead) throws HornetQException + public int encode(final ByteBuffer bufferRead) throws ActiveMQException { - HornetQBuffer buffer1 = HornetQBuffers.wrappedBuffer(bufferRead); + ActiveMQBuffer buffer1 = ActiveMQBuffers.wrappedBuffer(bufferRead); return encode(buffer1, bufferRead.capacity()); } @Override - public int encode(final HornetQBuffer bufferOut, final int size) + public int encode(final ActiveMQBuffer bufferOut, final int size) { byte[] bytes = new byte[size]; getWholeBuffer().readBytes(bytes); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCredits.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCredits.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCredits.java index c57a50d..776fa56 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCredits.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCredits.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.core.client.impl; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.spi.core.remoting.SessionContext; /** @@ -24,7 +24,7 @@ import org.apache.activemq.spi.core.remoting.SessionContext; */ public interface ClientProducerCredits { - void acquireCredits(int credits) throws InterruptedException, HornetQException; + void acquireCredits(int credits) throws InterruptedException, ActiveMQException; void receiveCredits(int credits); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCreditsImpl.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCreditsImpl.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCreditsImpl.java index c943b3e..e037136 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCreditsImpl.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerCreditsImpl.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.core.client.impl; -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.core.client.HornetQClientLogger; import org.apache.activemq.core.client.HornetQClientMessageBundle; @@ -76,7 +76,7 @@ public class ClientProducerCreditsImpl implements ClientProducerCredits this.sessionContext.linkFlowControl(address, this); } - public void acquireCredits(final int credits) throws InterruptedException, HornetQException + public void acquireCredits(final int credits) throws InterruptedException, ActiveMQException { checkCredits(credits); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerImpl.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerImpl.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerImpl.java index 48c63a3..1c99da1 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerImpl.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientProducerImpl.java @@ -16,10 +16,10 @@ import java.io.IOException; import java.io.InputStream; 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.HornetQInterruptedException; +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.ActiveMQInterruptedException; import org.apache.activemq.api.core.Message; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.SendAcknowledgementHandler; @@ -118,27 +118,27 @@ public class ClientProducerImpl implements ClientProducerInternal return address; } - public void send(final Message msg) throws HornetQException + public void send(final Message msg) throws ActiveMQException { checkClosed(); doSend(null, msg, null, false); } - public void send(final SimpleString address1, final Message msg) throws HornetQException + public void send(final SimpleString address1, final Message msg) throws ActiveMQException { checkClosed(); doSend(address1, msg, null, false); } - public void send(final String address1, final Message message) throws HornetQException + public void send(final String address1, final Message message) throws ActiveMQException { send(SimpleString.toSimpleString(address1), message); } @Override - public void send(SimpleString address1, Message message, SendAcknowledgementHandler handler) throws HornetQException + public void send(SimpleString address1, Message message, SendAcknowledgementHandler handler) throws ActiveMQException { checkClosed(); boolean confirmationWindowEnabled = session.isConfirmationWindowEnabled(); @@ -157,12 +157,12 @@ public class ClientProducerImpl implements ClientProducerInternal } @Override - public void send(Message message, SendAcknowledgementHandler handler) throws HornetQException + public void send(Message message, SendAcknowledgementHandler handler) throws ActiveMQException { send(null, message, handler); } - public synchronized void close() throws HornetQException + public synchronized void close() throws ActiveMQException { if (closed) { @@ -222,7 +222,7 @@ public class ClientProducerImpl implements ClientProducerInternal } private void doSend(final SimpleString address1, final Message msg, final SendAcknowledgementHandler handler, - final boolean forceAsync) throws HornetQException + final boolean forceAsync) throws ActiveMQException { session.startCall(); @@ -307,7 +307,7 @@ public class ClientProducerImpl implements ClientProducerInternal } } - private void sendRegularMessage(final MessageInternal msgI, final boolean sendBlocking, final ClientProducerCredits theCredits, final SendAcknowledgementHandler handler) throws HornetQException + private void sendRegularMessage(final MessageInternal msgI, final boolean sendBlocking, final ClientProducerCredits theCredits, final SendAcknowledgementHandler handler) throws ActiveMQException { try { @@ -323,13 +323,13 @@ public class ClientProducerImpl implements ClientProducerInternal } catch (InterruptedException e) { - throw new HornetQInterruptedException(e); + throw new ActiveMQInterruptedException(e); } sessionContext.sendFullMessage(msgI, sendBlocking, handler, address); } - private void checkClosed() throws HornetQException + private void checkClosed() throws ActiveMQException { if (closed) { @@ -342,10 +342,10 @@ public class ClientProducerImpl implements ClientProducerInternal /** * @param msgI * @param handler - * @throws HornetQException + * @throws org.apache.activemq.api.core.ActiveMQException */ private void largeMessageSend(final boolean sendBlocking, final MessageInternal msgI, - final ClientProducerCredits credits, SendAcknowledgementHandler handler) throws HornetQException + final ClientProducerCredits credits, SendAcknowledgementHandler handler) throws ActiveMQException { int headerSize = msgI.getHeadersAndPropertiesEncodeSize(); @@ -376,7 +376,7 @@ public class ClientProducerImpl implements ClientProducerInternal } } - private void sendInitialLargeMessageHeader(MessageInternal msgI, ClientProducerCredits credits) throws HornetQException + private void sendInitialLargeMessageHeader(MessageInternal msgI, ClientProducerCredits credits) throws ActiveMQException { int creditsUsed = sessionContext.sendInitialChunkOnLargeMessage(msgI); @@ -389,7 +389,7 @@ public class ClientProducerImpl implements ClientProducerInternal } catch (InterruptedException e) { - throw new HornetQInterruptedException(e); + throw new ActiveMQInterruptedException(e); } } @@ -400,10 +400,10 @@ public class ClientProducerImpl implements ClientProducerInternal * @param sendBlocking * @param msgI * @param handler - * @throws HornetQException + * @throws org.apache.activemq.api.core.ActiveMQException */ private void largeMessageSendServer(final boolean sendBlocking, final MessageInternal msgI, - final ClientProducerCredits credits, SendAcknowledgementHandler handler) throws HornetQException + final ClientProducerCredits credits, SendAcknowledgementHandler handler) throws ActiveMQException { sendInitialLargeMessageHeader(msgI, credits); @@ -421,7 +421,7 @@ public class ClientProducerImpl implements ClientProducerInternal final int chunkLength = Math.min((int) (bodySize - pos), minLargeMessageSize); - final HornetQBuffer bodyBuffer = HornetQBuffers.fixedBuffer(chunkLength); + final ActiveMQBuffer bodyBuffer = ActiveMQBuffers.fixedBuffer(chunkLength); context.encode(bodyBuffer, chunkLength); @@ -438,7 +438,7 @@ public class ClientProducerImpl implements ClientProducerInternal } catch (InterruptedException e) { - throw new HornetQInterruptedException(e); + throw new ActiveMQInterruptedException(e); } } } @@ -452,11 +452,11 @@ public class ClientProducerImpl implements ClientProducerInternal * @param sendBlocking * @param msgI * @param handler - * @throws HornetQException + * @throws org.apache.activemq.api.core.ActiveMQException */ private void largeMessageSendBuffered(final boolean sendBlocking, final MessageInternal msgI, - final ClientProducerCredits credits, SendAcknowledgementHandler handler) throws HornetQException + final ClientProducerCredits credits, SendAcknowledgementHandler handler) throws ActiveMQException { msgI.getBodyBuffer().readerIndex(0); largeMessageSendStreamed(sendBlocking, msgI, new HornetQBufferInputStream(msgI.getBodyBuffer()), credits, @@ -468,11 +468,11 @@ public class ClientProducerImpl implements ClientProducerInternal * @param msgI * @param inputStreamParameter * @param credits - * @throws HornetQException + * @throws org.apache.activemq.api.core.ActiveMQException */ private void largeMessageSendStreamed(final boolean sendBlocking, final MessageInternal msgI, final InputStream inputStreamParameter, final ClientProducerCredits credits, - SendAcknowledgementHandler handler) throws HornetQException + SendAcknowledgementHandler handler) throws ActiveMQException { boolean lastPacket = false; @@ -570,7 +570,7 @@ public class ClientProducerImpl implements ClientProducerInternal } catch (InterruptedException e) { - throw new HornetQInterruptedException(e); + throw new ActiveMQInterruptedException(e); } } } @@ -590,7 +590,7 @@ public class ClientProducerImpl implements ClientProducerInternal } catch (InterruptedException e) { - throw new HornetQInterruptedException(e); + throw new ActiveMQInterruptedException(e); } } }
