http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/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 deleted file mode 100644 index 9dbb233..0000000 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/HornetQClientMessageBundle.java +++ /dev/null @@ -1,247 +0,0 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package org.apache.activemq.core.client; - - -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; -import org.jboss.logging.annotations.Message; -import org.jboss.logging.annotations.MessageBundle; -import org.jboss.logging.Messages; -import org.w3c.dom.Node; - -/** - * @author <a href="mailto:andy.tay...@jboss.org";>Andy Taylor</a> - * 3/12/12 - * - * Logger Code 11 - * - * each message id must be 6 digits long starting with 10, the 3rd digit should be 9 - * - * so 119000 to 119999 - */ -@MessageBundle(projectCode = "HQ") -public interface HornetQClientMessageBundle -{ - HornetQClientMessageBundle BUNDLE = Messages.getBundle(HornetQClientMessageBundle.class); - - @Message(id = 119000, value = "ClientSession closed while creating session", format = Message.Format.MESSAGE_FORMAT) - ActiveMQInternalErrorException clientSessionClosed(); - - @Message(id = 119001, value = "Failed to create session", format = Message.Format.MESSAGE_FORMAT) - 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) - ActiveMQInternalErrorException clietSessionInternal(); - - @Message(id = 119003, value = "Queue can not be both durable and temporary", format = Message.Format.MESSAGE_FORMAT) - ActiveMQInternalErrorException queueMisConfigured(); - - @Message(id = 119004, value = "Failed to initialise session factory", format = Message.Format.MESSAGE_FORMAT) - ActiveMQInternalErrorException failedToInitialiseSessionFactory(@Cause Exception e); - - @Message(id = 119005, value = "Exception in Netty transport", format = Message.Format.MESSAGE_FORMAT) - ActiveMQInternalErrorException nettyError(); - - @Message(id = 119006, value = "Channel disconnected", format = Message.Format.MESSAGE_FORMAT) - ActiveMQNotConnectedException channelDisconnected(); - - @Message(id = 119007, value = "Cannot connect to server(s). Tried with all available servers.", format = Message.Format.MESSAGE_FORMAT) - ActiveMQNotConnectedException cannotConnectToServers(); - - @Message(id = 119008, value = "Failed to connect to any static connectors", format = Message.Format.MESSAGE_FORMAT) - ActiveMQNotConnectedException cannotConnectToStaticConnectors(@Cause Exception e); - - @Message(id = 119009, value = "Failed to connect to any static connectors", format = Message.Format.MESSAGE_FORMAT) - ActiveMQNotConnectedException cannotConnectToStaticConnectors2(); - - @Message(id = 119010, value = "Connection is destroyed", format = Message.Format.MESSAGE_FORMAT) - ActiveMQNotConnectedException connectionDestroyed(); - - @Message(id = 119011, value = "Did not receive data from server for {0}", format = Message.Format.MESSAGE_FORMAT) - ActiveMQConnectionTimedOutException connectionTimedOut(Connection transportConnection); - - @Message(id = 119012, value = "Timed out waiting to receive initial broadcast from cluster", format = Message.Format.MESSAGE_FORMAT) - ActiveMQConnectionTimedOutException connectionTimedOutInInitialBroadcast(); - - @Message(id = 119013, value = "Timed out waiting to receive cluster topology. Group:{0}", format = Message.Format.MESSAGE_FORMAT) - ActiveMQConnectionTimedOutException connectionTimedOutOnReceiveTopology(DiscoveryGroup discoveryGroup); - - @Message(id = 119014, value = "Timed out waiting for response when sending packet {0}", format = Message.Format.MESSAGE_FORMAT) - ActiveMQConnectionTimedOutException timedOutSendingPacket(Byte type); - - @Message(id = 119015, value = "The connection was disconnected because of server shutdown", format = Message.Format.MESSAGE_FORMAT) - 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) - ActiveMQUnBlockedException unblockingACall(@Cause Throwable t); - - @Message(id = 119017, value = "Consumer is closed", format = Message.Format.MESSAGE_FORMAT) - ActiveMQObjectClosedException consumerClosed(); - - @Message(id = 119018, value = "Producer is closed", format = Message.Format.MESSAGE_FORMAT) - ActiveMQObjectClosedException producerClosed(); - - @Message(id = 119019, value = "Session is closed", format = Message.Format.MESSAGE_FORMAT) - ActiveMQObjectClosedException sessionClosed(); - - @Message(id = 119020, value = "Cannot call receive(...) - a MessageHandler is set", format = Message.Format.MESSAGE_FORMAT) - ActiveMQIllegalStateException messageHandlerSet(); - - @Message(id = 119021, value = "Cannot set MessageHandler - consumer is in receive(...)", format = Message.Format.MESSAGE_FORMAT) - 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) - 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) - ActiveMQIllegalStateException largeMessageLostSession(); - - @Message(id = 119024, value = "Could not select a TransportConfiguration to create SessionFactory", format = Message.Format.MESSAGE_FORMAT) - ActiveMQIllegalStateException noTCForSessionFactory(); - - @Message(id = 119025, value = "Error saving the message body", format = Message.Format.MESSAGE_FORMAT) - ActiveMQLargeMessageException errorSavingBody(@Cause Exception e); - - @Message(id = 119026, value = "Error reading the LargeMessageBody", format = Message.Format.MESSAGE_FORMAT) - ActiveMQLargeMessageException errorReadingBody(@Cause Exception e); - - @Message(id = 119027, value = "Error closing stream from LargeMessageBody", format = Message.Format.MESSAGE_FORMAT) - ActiveMQLargeMessageException errorClosingLargeMessage(@Cause Exception e); - - @Message(id = 119028, value = "Timeout waiting for LargeMessage Body", format = Message.Format.MESSAGE_FORMAT) - ActiveMQLargeMessageException timeoutOnLargeMessage(); - - @Message(id = 119029, value = "Error writing body of message", format = Message.Format.MESSAGE_FORMAT) - 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) - ActiveMQTransactionRolledBackException txRolledBack(); - - @Message(id = 119031, value = "The transaction was rolled back on failover however commit may have been successful" + - "", format = Message.Format.MESSAGE_FORMAT) - ActiveMQTransactionOutcomeUnknownException txOutcomeUnknown(); - - @Message(id = 119032, value = "Invalid type: {0}", format = Message.Format.MESSAGE_FORMAT) - IllegalArgumentException invalidType(Object type); - - @Message(id = 119033, value = "Invalid type: {0}", format = Message.Format.MESSAGE_FORMAT) - IllegalArgumentException invalidEncodeType(Object type); - - @Message(id = 119034, value = "Params for management operations must be of the following type: int long double String boolean Map or array thereof but found {0}", - format = Message.Format.MESSAGE_FORMAT) - IllegalArgumentException invalidManagementParam(Object type); - - @Message(id = 119035, value = "Invalid window size {0}", format = Message.Format.MESSAGE_FORMAT) - IllegalArgumentException invalidWindowSize(Integer size); - - @Message(id = 119036, value = "No operation mapped to int {0}", format = Message.Format.MESSAGE_FORMAT) - IllegalArgumentException noOperationMapped(Integer operation); - - @Message(id = 119037, value = "Invalid last Received Command ID: {0}", format = Message.Format.MESSAGE_FORMAT) - IllegalArgumentException invalidCommandID(Integer lastReceivedCommandID); - - @Message(id = 119038, value = "Cannot find channel with id {0} to close", format = Message.Format.MESSAGE_FORMAT) - IllegalArgumentException noChannelToClose(Long id); - - @Message(id = 119039, value = "Close Listener cannot be null", format = Message.Format.MESSAGE_FORMAT) - IllegalArgumentException closeListenerCannotBeNull(); - - @Message(id = 119040, value = "Fail Listener cannot be null", format = Message.Format.MESSAGE_FORMAT) - IllegalArgumentException failListenerCannotBeNull(); - - @Message(id = 119041, value = "Connection already exists with id {0}", format = Message.Format.MESSAGE_FORMAT) - IllegalArgumentException connectionExists(Object id); - - @Message(id = 119042, value = "Invalid argument null listener", format = Message.Format.MESSAGE_FORMAT) - IllegalArgumentException nullListener(); - - @Message(id = 119043, value = "Invalid argument null handler", format = Message.Format.MESSAGE_FORMAT) - IllegalArgumentException nullHandler(); - - @Message(id = 119044, value = "No available codec to decode password!", format = Message.Format.MESSAGE_FORMAT) - IllegalArgumentException noCodec(); - - @Message(id = 119045, value = "the first node to be compared is null", format = Message.Format.MESSAGE_FORMAT) - IllegalArgumentException firstNodeNull(); - - @Message(id = 119046, value = "the second node to be compared is null", format = Message.Format.MESSAGE_FORMAT) - IllegalArgumentException secondNodeNull(); - - @Message(id = 119047, value = "nodes have different node names", format = Message.Format.MESSAGE_FORMAT) - IllegalArgumentException nodeHaveDifferentNames(); - - @Message(id = 119048, value = "nodes hava a different number of attributes", format = Message.Format.MESSAGE_FORMAT) - IllegalArgumentException nodeHaveDifferentAttNumber(); - - @Message(id = 119049, value = "attribute {0}={1} does not match", format = Message.Format.MESSAGE_FORMAT) - IllegalArgumentException attsDontMatch(String name, String value); - - @Message(id = 119050, value = "one node has children and the other does not" , format = Message.Format.MESSAGE_FORMAT) - IllegalArgumentException oneNodeHasChildren(); - - @Message(id = 119051, value = "nodes hava a different number of children" , format = Message.Format.MESSAGE_FORMAT) - IllegalArgumentException nodeHasDifferentChildNumber(); - - @Message(id = 119052, value = "Element {0} requires a valid Boolean value, but ''{1}'' cannot be parsed as a Boolean" , format = Message.Format.MESSAGE_FORMAT) - IllegalArgumentException mustBeBoolean(Node elem, String value); - - @Message(id = 119053, value = "Element {0} requires a valid Double value, but ''{1}'' cannot be parsed as a Double" , format = Message.Format.MESSAGE_FORMAT) - IllegalArgumentException mustBeDouble(Node elem, String value); - - @Message(id = 119054, value = "Element {0} requires a valid Integer value, but ''{1}'' cannot be parsed as a Integer" , format = Message.Format.MESSAGE_FORMAT) - IllegalArgumentException mustBeInteger(Node elem, String value); - - @Message(id = 119055, value = "Element {0} requires a valid Long value, but ''{1}'' cannot be parsed as a Long" , format = Message.Format.MESSAGE_FORMAT) - IllegalArgumentException mustBeLong(Node elem, String value); - - @Message(id = 119056, value = "Failed to get decoder" , format = Message.Format.MESSAGE_FORMAT) - IllegalArgumentException failedToGetDecoder(@Cause Exception e); - - @Message(id = 119057, value = "Error decoding password" , format = Message.Format.MESSAGE_FORMAT) - IllegalArgumentException errordecodingPassword(@Cause Exception e); - - @Message(id = 119058, value = "Address \"{0}\" is full. Message encode size = {1}B", format = Message.Format.MESSAGE_FORMAT) - 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) - ActiveMQInterceptorRejectedPacketException interceptorRejectedPacket(String interceptionResult); - - @Message(id = 119060, value = "Large Message Transmission interrupted on consumer shutdown." - , format = Message.Format.MESSAGE_FORMAT) - 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/034adfbf/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ActiveMQXAResource.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ActiveMQXAResource.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ActiveMQXAResource.java new file mode 100644 index 0000000..ceff93a --- /dev/null +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ActiveMQXAResource.java @@ -0,0 +1,20 @@ +/* + * Copyright 2005-2014 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ +package org.apache.activemq.core.client.impl; + +import javax.transaction.xa.XAResource; + +public interface ActiveMQXAResource extends XAResource +{ + XAResource getResource(); +} http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/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 c145186..6295a74 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 @@ -30,8 +30,8 @@ import org.apache.activemq.api.core.client.ClientSession; import org.apache.activemq.api.core.client.ClientSessionFactory; import org.apache.activemq.api.core.client.MessageHandler; import org.apache.activemq.api.core.client.ServerLocator; -import org.apache.activemq.core.client.HornetQClientLogger; -import org.apache.activemq.core.client.HornetQClientMessageBundle; +import org.apache.activemq.core.client.ActiveMQClientLogger; +import org.apache.activemq.core.client.ActiveMQClientMessageBundle; import org.apache.activemq.spi.core.remoting.ConsumerContext; import org.apache.activemq.spi.core.remoting.SessionContext; import org.apache.activemq.utils.FutureLatch; @@ -53,7 +53,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal // Constants // ------------------------------------------------------------------------------------ - private static final boolean isTrace = HornetQClientLogger.LOGGER.isTraceEnabled(); + private static final boolean isTrace = ActiveMQClientLogger.LOGGER.isTraceEnabled(); private static final long CLOSE_TIMEOUT_MILLISECONDS = 10000; @@ -204,7 +204,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal if (handler != null) { - throw HornetQClientMessageBundle.BUNDLE.messageHandlerSet(); + throw ActiveMQClientMessageBundle.BUNDLE.messageHandlerSet(); } if (clientWindowSize == 0) @@ -295,7 +295,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal { if (isTrace) { - HornetQClientLogger.LOGGER.trace("Forcing delivery"); + ActiveMQClientLogger.LOGGER.trace("Forcing delivery"); } // JBPAPP-6030 - Calling forceDelivery outside of the lock to avoid distributed dead locks sessionContext.forceDelivery(this, forceDeliveryCount++); @@ -321,7 +321,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal if (isTrace) { - HornetQClientLogger.LOGGER.trace("There was nothing on the queue, leaving it now:: returning null"); + ActiveMQClientLogger.LOGGER.trace("There was nothing on the queue, leaving it now:: returning null"); } return null; @@ -330,7 +330,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal { if (isTrace) { - HornetQClientLogger.LOGGER.trace("Ignored force delivery answer as it belonged to another call"); + ActiveMQClientLogger.LOGGER.trace("Ignored force delivery answer as it belonged to another call"); } // Ignore the message continue; @@ -369,7 +369,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal if (isTrace) { - HornetQClientLogger.LOGGER.trace("Returning " + m); + ActiveMQClientLogger.LOGGER.trace("Returning " + m); } return m; @@ -378,7 +378,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal { if (isTrace) { - HornetQClientLogger.LOGGER.trace("Returning null"); + ActiveMQClientLogger.LOGGER.trace("Returning null"); } resetIfSlowConsumer(); return null; @@ -428,7 +428,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal if (receiverThread != null) { - throw HornetQClientMessageBundle.BUNDLE.inReceive(); + throw ActiveMQClientMessageBundle.BUNDLE.inReceive(); } boolean noPreviousHandler = handler == null; @@ -492,7 +492,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal } catch (ActiveMQException e) { - HornetQClientLogger.LOGGER.warn("problem cleaning up: " + this); + ActiveMQClientLogger.LOGGER.warn("problem cleaning up: " + this); } } @@ -717,7 +717,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal { if (isTrace) { - HornetQClientLogger.LOGGER.trace("Sending back credits for largeController = null " + flowControlSize); + ActiveMQClientLogger.LOGGER.trace("Sending back credits for largeController = null " + flowControlSize); } flowControl(flowControlSize, false); } @@ -751,7 +751,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal } catch (Exception e) { - HornetQClientLogger.LOGGER.errorClearingMessages(e); + ActiveMQClientLogger.LOGGER.errorClearingMessages(e); } } @@ -764,7 +764,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal catch (Throwable e) { // nothing that could be done here - HornetQClientLogger.LOGGER.errorClearingMessages(e); + ActiveMQClientLogger.LOGGER.errorClearingMessages(e); } } @@ -853,7 +853,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal { if (isTrace) { - HornetQClientLogger.LOGGER.trace("FlowControl::Sending " + creditsToSend + " -1, for slow consumer"); + ActiveMQClientLogger.LOGGER.trace("FlowControl::Sending " + creditsToSend + " -1, for slow consumer"); } // sending the credits - 1 initially send to fire the slow consumer, or the slow consumer would be @@ -869,9 +869,9 @@ public final class ClientConsumerImpl implements ClientConsumerInternal } else { - if (HornetQClientLogger.LOGGER.isDebugEnabled()) + if (ActiveMQClientLogger.LOGGER.isDebugEnabled()) { - HornetQClientLogger.LOGGER.debug("Sending " + messageBytes + " from flow-control"); + ActiveMQClientLogger.LOGGER.debug("Sending " + messageBytes + " from flow-control"); } final int credits = creditsToSend; @@ -906,7 +906,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal { if (isTrace) { - HornetQClientLogger.LOGGER.trace("Sending 1 credit to start delivering of one message to slow consumer"); + ActiveMQClientLogger.LOGGER.trace("Sending 1 credit to start delivering of one message to slow consumer"); } sendCredits(1); try @@ -962,7 +962,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal { if (isTrace) { - HornetQClientLogger.LOGGER.trace("Adding Runner on Executor for delivery"); + ActiveMQClientLogger.LOGGER.trace("Adding Runner on Executor for delivery"); } sessionExecutor.execute(runner); @@ -1011,7 +1011,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal if (!ok) { - HornetQClientLogger.LOGGER.timeOutWaitingForProcessing(); + ActiveMQClientLogger.LOGGER.timeOutWaitingForProcessing(); } } @@ -1019,7 +1019,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal { if (closed) { - throw HornetQClientMessageBundle.BUNDLE.consumerClosed(); + throw ActiveMQClientMessageBundle.BUNDLE.consumerClosed(); } } @@ -1073,7 +1073,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal { if (isTrace) { - HornetQClientLogger.LOGGER.trace("Calling handler.onMessage"); + ActiveMQClientLogger.LOGGER.trace("Calling handler.onMessage"); } final ClassLoader originalLoader = AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() { @@ -1107,7 +1107,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal } catch (Exception e) { - HornetQClientLogger.LOGGER.warn(e.getMessage(), e); + ActiveMQClientLogger.LOGGER.warn(e.getMessage(), e); } onMessageThread = null; @@ -1115,7 +1115,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal if (isTrace) { - HornetQClientLogger.LOGGER.trace("Handler.onMessage done"); + ActiveMQClientLogger.LOGGER.trace("Handler.onMessage done"); } if (message.isLargeMessage()) @@ -1229,7 +1229,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal } catch (Exception e) { - HornetQClientLogger.LOGGER.onMessageError(e); + ActiveMQClientLogger.LOGGER.onMessageError(e); lastException = e; } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/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 b6fa16b..5a795fe 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 @@ -18,7 +18,7 @@ import java.io.OutputStream; 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.core.buffers.impl.ResetLimitWrappedActiveMQBuffer; import org.apache.activemq.utils.DataConstants; /** @@ -183,19 +183,19 @@ public final class ClientLargeMessageImpl extends ClientMessageImpl implements C } createBody((int)bodySize); - bodyBuffer = new ResetLimitWrappedHornetQBuffer(BODY_OFFSET, buffer, this); + bodyBuffer = new ResetLimitWrappedActiveMQBuffer(BODY_OFFSET, buffer, this); - largeMessageController.saveBuffer(new HornetQOutputStream(bodyBuffer)); + largeMessageController.saveBuffer(new ActiveMQOutputStream(bodyBuffer)); } } // Inner classes ------------------------------------------------- - private static class HornetQOutputStream extends OutputStream + private static class ActiveMQOutputStream extends OutputStream { private final ActiveMQBuffer bufferOut; - HornetQOutputStream(ActiveMQBuffer out) + ActiveMQOutputStream(ActiveMQBuffer out) { this.bufferOut = out; } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/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 715837a..000bddd 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 @@ -23,7 +23,7 @@ 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; +import org.apache.activemq.core.client.ActiveMQClientMessageBundle; import org.apache.activemq.core.message.BodyEncoder; import org.apache.activemq.core.message.impl.MessageImpl; import org.apache.activemq.reader.MessageUtil; @@ -173,7 +173,7 @@ public class ClientMessageImpl extends MessageImpl implements ClientMessageInter } catch (IOException e) { - throw HornetQClientMessageBundle.BUNDLE.errorSavingBody(e); + throw ActiveMQClientMessageBundle.BUNDLE.errorSavingBody(e); } } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/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 e037136..590ce68 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 @@ -14,8 +14,8 @@ package org.apache.activemq.core.client.impl; 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; +import org.apache.activemq.core.client.ActiveMQClientLogger; +import org.apache.activemq.core.client.ActiveMQClientMessageBundle; import org.apache.activemq.spi.core.remoting.SessionContext; import java.util.concurrent.Semaphore; @@ -99,7 +99,7 @@ public class ClientProducerCreditsImpl implements ClientProducerCredits { // I'm using string concatenation here in case address is null // better getting a "null" string than a NPE - HornetQClientLogger.LOGGER.outOfCreditOnFlowControl("" + address); + ActiveMQClientLogger.LOGGER.outOfCreditOnFlowControl("" + address); } } finally @@ -127,7 +127,7 @@ public class ClientProducerCreditsImpl implements ClientProducerCredits pendingCredits = 0; arriving = 0; - throw HornetQClientMessageBundle.BUNDLE.addressIsFull(address.toString(), credits); + throw ActiveMQClientMessageBundle.BUNDLE.addressIsFull(address.toString(), credits); } } } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/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 1c99da1..45cac1b 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 @@ -23,13 +23,13 @@ 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; -import org.apache.activemq.core.client.HornetQClientMessageBundle; +import org.apache.activemq.core.client.ActiveMQClientMessageBundle; import org.apache.activemq.core.message.BodyEncoder; import org.apache.activemq.core.message.impl.MessageInternal; import org.apache.activemq.core.protocol.core.impl.wireformat.SessionSendContinuationMessage; import org.apache.activemq.spi.core.remoting.SessionContext; import org.apache.activemq.utils.DeflaterReader; -import org.apache.activemq.utils.HornetQBufferInputStream; +import org.apache.activemq.utils.ActiveMQBufferInputStream; import org.apache.activemq.utils.TokenBucketLimiter; import org.apache.activemq.utils.UUIDGenerator; @@ -333,7 +333,7 @@ public class ClientProducerImpl implements ClientProducerInternal { if (closed) { - throw HornetQClientMessageBundle.BUNDLE.producerClosed(); + throw ActiveMQClientMessageBundle.BUNDLE.producerClosed(); } } @@ -351,7 +351,7 @@ public class ClientProducerImpl implements ClientProducerInternal if (msgI.getHeadersAndPropertiesEncodeSize() >= minLargeMessageSize) { - throw HornetQClientMessageBundle.BUNDLE.headerSizeTooBig(headerSize); + throw ActiveMQClientMessageBundle.BUNDLE.headerSizeTooBig(headerSize); } // msg.getBody() could be Null on LargeServerMessage @@ -459,7 +459,7 @@ public class ClientProducerImpl implements ClientProducerInternal final ClientProducerCredits credits, SendAcknowledgementHandler handler) throws ActiveMQException { msgI.getBodyBuffer().readerIndex(0); - largeMessageSendStreamed(sendBlocking, msgI, new HornetQBufferInputStream(msgI.getBodyBuffer()), credits, + largeMessageSendStreamed(sendBlocking, msgI, new ActiveMQBufferInputStream(msgI.getBodyBuffer()), credits, handler); } @@ -513,7 +513,7 @@ public class ClientProducerImpl implements ClientProducerInternal } catch (IOException e) { - throw HornetQClientMessageBundle.BUNDLE.errorReadingBody(e); + throw ActiveMQClientMessageBundle.BUNDLE.errorReadingBody(e); } if (numberOfBytesRead == -1) @@ -601,7 +601,7 @@ public class ClientProducerImpl implements ClientProducerInternal } catch (IOException e) { - throw HornetQClientMessageBundle.BUNDLE.errorClosingLargeMessage(e); + throw ActiveMQClientMessageBundle.BUNDLE.errorClosingLargeMessage(e); } } } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionFactoryImpl.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionFactoryImpl.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionFactoryImpl.java index 432234f..4b75160 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionFactoryImpl.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionFactoryImpl.java @@ -38,14 +38,14 @@ import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.api.core.client.ClientSession; import org.apache.activemq.api.core.client.FailoverEventListener; import org.apache.activemq.api.core.client.FailoverEventType; -import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.api.core.client.ActiveMQClient; import org.apache.activemq.api.core.client.ServerLocator; import org.apache.activemq.api.core.client.SessionFailureListener; -import org.apache.activemq.core.client.HornetQClientLogger; -import org.apache.activemq.core.client.HornetQClientMessageBundle; +import org.apache.activemq.core.client.ActiveMQClientLogger; +import org.apache.activemq.core.client.ActiveMQClientMessageBundle; import org.apache.activemq.core.protocol.core.CoreRemotingConnection; import org.apache.activemq.core.remoting.FailureListener; -import org.apache.activemq.core.server.HornetQComponent; +import org.apache.activemq.core.server.ActiveMQComponent; import org.apache.activemq.spi.core.protocol.RemotingConnection; import org.apache.activemq.spi.core.remoting.BufferHandler; import org.apache.activemq.spi.core.remoting.ClientProtocolManager; @@ -74,9 +74,9 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C // Constants // ------------------------------------------------------------------------------------ - private static final boolean isTrace = HornetQClientLogger.LOGGER.isTraceEnabled(); + private static final boolean isTrace = ActiveMQClientLogger.LOGGER.isTraceEnabled(); - private static final boolean isDebug = HornetQClientLogger.LOGGER.isDebugEnabled(); + private static final boolean isDebug = ActiveMQClientLogger.LOGGER.isDebugEnabled(); // Attributes // ----------------------------------------------------------------------------------- @@ -189,11 +189,11 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C // HORNETQ-1314 - if this in an in-vm connection then disable connection monitoring if (connectorFactory.isReliable() && - clientFailureCheckPeriod == HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD && - connectionTTL == HornetQClient.DEFAULT_CONNECTION_TTL) + clientFailureCheckPeriod == ActiveMQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD && + connectionTTL == ActiveMQClient.DEFAULT_CONNECTION_TTL) { - this.clientFailureCheckPeriod = HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD_INVM; - this.connectionTTL = HornetQClient.DEFAULT_CONNECTION_TTL_INVM; + this.clientFailureCheckPeriod = ActiveMQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD_INVM; + this.connectionTTL = ActiveMQClient.DEFAULT_CONNECTION_TTL_INVM; } else { @@ -282,7 +282,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C { if (ClientSessionFactoryImpl.isDebug) { - HornetQClientLogger.LOGGER.debug("Setting up backup config = " + backUp + " for live = " + live); + ActiveMQClientLogger.LOGGER.debug("Setting up backup config = " + backUp + " for live = " + live); } backupConfig = backUp; } @@ -290,7 +290,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C { if (ClientSessionFactoryImpl.isDebug) { - HornetQClientLogger.LOGGER.debug("ClientSessionFactoryImpl received backup update for live/backup pair = " + live + + ActiveMQClientLogger.LOGGER.debug("ClientSessionFactoryImpl received backup update for live/backup pair = " + live + " / " + backUp + " but it didn't belong to " + @@ -405,7 +405,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C // ConnectionLifeCycleListener implementation -------------------------------------------------- - public void connectionCreated(final HornetQComponent component, final Connection connection, final String protocol) + public void connectionCreated(final ActiveMQComponent component, final Connection connection, final String protocol) { } @@ -413,7 +413,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C { // The exception has to be created in the same thread where it's being called // as to avoid a different stack trace cause - final ActiveMQException ex = HornetQClientMessageBundle.BUNDLE.channelDisconnected(); + final ActiveMQException ex = ActiveMQClientMessageBundle.BUNDLE.channelDisconnected(); // It has to use the same executor as the disconnect message is being sent through @@ -516,7 +516,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C } catch (Exception e1) { - HornetQClientLogger.LOGGER.unableToCloseSession(e1); + ActiveMQClientLogger.LOGGER.unableToCloseSession(e1); } } checkCloseConnection(); @@ -573,12 +573,12 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C catch (ActiveMQInterruptedException e1) { // this is just a debug, since an interrupt is an expected event (in case of a shutdown) - HornetQClientLogger.LOGGER.debug(e1.getMessage(), e1); + ActiveMQClientLogger.LOGGER.debug(e1.getMessage(), e1); } } /** - * TODO: Maybe this belongs to HornetQClientProtocolManager + * TODO: Maybe this belongs to ActiveMQClientProtocolManager * @param connectionID * @param me */ @@ -602,7 +602,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C if (ClientSessionFactoryImpl.isTrace) { - HornetQClientLogger.LOGGER.trace("Client Connection failed, calling failure listeners and trying to reconnect, reconnectAttempts=" + reconnectAttempts); + ActiveMQClientLogger.LOGGER.trace("Client Connection failed, calling failure listeners and trying to reconnect, reconnectAttempts=" + reconnectAttempts); } callFailoverListeners(FailoverEventType.FAILURE_DETECTED); @@ -728,7 +728,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C } catch (Exception cause) { - HornetQClientLogger.LOGGER.failedToCleanupSession(cause); + ActiveMQClientLogger.LOGGER.failedToCleanupSession(cause); } } } @@ -824,7 +824,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C // Failure of one listener to execute shouldn't prevent others // from // executing - HornetQClientLogger.LOGGER.failedToExecuteListener(t); + ActiveMQClientLogger.LOGGER.failedToExecuteListener(t); } } } @@ -844,7 +844,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C // Failure of one listener to execute shouldn't prevent others // from // executing - HornetQClientLogger.LOGGER.failedToExecuteListener(t); + ActiveMQClientLogger.LOGGER.failedToExecuteListener(t); } } } @@ -870,7 +870,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C if (connection == null) { if (!clientProtocolManager.isAlive()) - HornetQClientLogger.LOGGER.failedToConnectToServer(); + ActiveMQClientLogger.LOGGER.failedToConnectToServer(); return; } @@ -907,9 +907,9 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C { if (!clientProtocolManager.isAlive()) return; - if (HornetQClientLogger.LOGGER.isTraceEnabled()) + if (ActiveMQClientLogger.LOGGER.isTraceEnabled()) { - HornetQClientLogger.LOGGER.trace("getConnectionWithRetry::" + reconnectAttempts + + ActiveMQClientLogger.LOGGER.trace("getConnectionWithRetry::" + reconnectAttempts + " with retryInterval = " + retryInterval + " multiplier = " + @@ -924,14 +924,14 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C { if (ClientSessionFactoryImpl.isDebug) { - HornetQClientLogger.LOGGER.debug("Trying reconnection attempt " + count + "/" + reconnectAttempts); + ActiveMQClientLogger.LOGGER.debug("Trying reconnection attempt " + count + "/" + reconnectAttempts); } if (getConnection() != null) { - if (HornetQClientLogger.LOGGER.isDebugEnabled()) + if (ActiveMQClientLogger.LOGGER.isDebugEnabled()) { - HornetQClientLogger.LOGGER.debug("Reconnection successful"); + ActiveMQClientLogger.LOGGER.debug("Reconnection successful"); } return; } @@ -947,7 +947,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C { if (reconnectAttempts != 1) { - HornetQClientLogger.LOGGER.failedToConnectToServer(reconnectAttempts); + ActiveMQClientLogger.LOGGER.failedToConnectToServer(reconnectAttempts); } return; @@ -955,7 +955,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C if (ClientSessionFactoryImpl.isTrace) { - HornetQClientLogger.LOGGER.waitingForRetry(interval, retryInterval, retryIntervalMultiplier); + ActiveMQClientLogger.LOGGER.waitingForRetry(interval, retryInterval, retryIntervalMultiplier); } try @@ -982,7 +982,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C } else { - HornetQClientLogger.LOGGER.debug("Could not connect to any server. Didn't have reconnection configured on the ClientSessionFactory"); + ActiveMQClientLogger.LOGGER.debug("Could not connect to any server. Didn't have reconnection configured on the ClientSessionFactory"); return; } } @@ -1086,14 +1086,14 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C { if (ClientSessionFactoryImpl.isTrace) { - HornetQClientLogger.LOGGER.trace(this + "::Subscribing Topology"); + ActiveMQClientLogger.LOGGER.trace(this + "::Subscribing Topology"); } clientProtocolManager.sendSubscribeTopology(serverLocator.isClusterConnection()); } } else { - HornetQClientLogger.LOGGER.debug("serverLocator@" + System.identityHashCode(serverLocator + " had no topology")); + ActiveMQClientLogger.LOGGER.debug("serverLocator@" + System.identityHashCode(serverLocator + " had no topology")); } return connection; @@ -1133,7 +1133,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C { if (!closed && finalizeCheck) { - HornetQClientLogger.LOGGER.factoryLeftOpen(createTrace, System.identityHashCode(this)); + ActiveMQClientLogger.LOGGER.factoryLeftOpen(createTrace, System.identityHashCode(this)); close(); } @@ -1184,11 +1184,11 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C CLOSE_RUNNABLES.add(this); if (scaleDownTargetNodeID == null) { - conn.fail(HornetQClientMessageBundle.BUNDLE.disconnected()); + conn.fail(ActiveMQClientMessageBundle.BUNDLE.disconnected()); } else { - conn.fail(HornetQClientMessageBundle.BUNDLE.disconnected(), scaleDownTargetNodeID); + conn.fail(ActiveMQClientMessageBundle.BUNDLE.disconnected(), scaleDownTargetNodeID); } } finally @@ -1234,7 +1234,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C { if (ClientSessionFactoryImpl.isDebug) { - HornetQClientLogger.LOGGER.debug("Connector towards " + connector + " failed"); + ActiveMQClientLogger.LOGGER.debug("Connector towards " + connector + " failed"); } try @@ -1291,7 +1291,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C { if (ClientSessionFactoryImpl.isDebug) { - HornetQClientLogger.LOGGER.debug("Trying to connect with connector = " + connectorFactory + + ActiveMQClientLogger.LOGGER.debug("Trying to connect with connector = " + connectorFactory + ", parameters = " + connectorConfig.getParams() + " connector = " + @@ -1310,7 +1310,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C { if (ClientSessionFactoryImpl.isDebug) { - HornetQClientLogger.LOGGER.debug("Trying backup config = " + backupConfig); + ActiveMQClientLogger.LOGGER.debug("Trying backup config = " + backupConfig); } ConnectorFactory backupConnectorFactory = instantiateConnectorFactory(backupConfig.getFactoryClassName()); @@ -1325,7 +1325,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C if (ClientSessionFactoryImpl.isDebug) { - HornetQClientLogger.LOGGER.debug("Connected to the backup at " + backupConfig); + ActiveMQClientLogger.LOGGER.debug("Connected to the backup at " + backupConfig); } // Switching backup as live @@ -1338,7 +1338,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C { if (ClientSessionFactoryImpl.isDebug) { - HornetQClientLogger.LOGGER.debug("Backup is not active yet"); + ActiveMQClientLogger.LOGGER.debug("Backup is not active yet"); } } @@ -1348,7 +1348,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C { // Sanity catch for badly behaved remoting plugins - HornetQClientLogger.LOGGER.createConnectorException(cause); + ActiveMQClientLogger.LOGGER.createConnectorException(cause); if (transportConnection != null) { @@ -1392,7 +1392,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C } else { - HornetQClientLogger.LOGGER.debug("TheConn == null on ClientSessionFactoryImpl::DelegatingBufferHandler, ignoring packet"); + ActiveMQClientLogger.LOGGER.debug("TheConn == null on ClientSessionFactoryImpl::DelegatingBufferHandler, ignoring packet"); } } } @@ -1473,7 +1473,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C // We use a different thread to send the fail // but the exception has to be created here to preserve the stack trace - final ActiveMQException me = HornetQClientMessageBundle.BUNDLE.connectionTimedOut(connection.getTransportConnection()); + final ActiveMQException me = ActiveMQClientMessageBundle.BUNDLE.connectionTimedOut(connection.getTransportConnection()); cancelled = true; @@ -1521,7 +1521,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C { if (ClientSessionFactoryImpl.isTrace) { - HornetQClientLogger.LOGGER.trace("Neither backup or live were active, will just give up now"); + ActiveMQClientLogger.LOGGER.trace("Neither backup or live were active, will just give up now"); } return null; } @@ -1535,9 +1535,9 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C schedulePing(); - if (HornetQClientLogger.LOGGER.isTraceEnabled()) + if (ActiveMQClientLogger.LOGGER.isTraceEnabled()) { - HornetQClientLogger.LOGGER.trace("returning " + connection); + ActiveMQClientLogger.LOGGER.trace("returning " + connection); } return newConnection; @@ -1573,9 +1573,9 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C public void nodeDisconnected(RemotingConnection conn, String nodeID, String scaleDownTargetNodeID) { - if (HornetQClientLogger.LOGGER.isTraceEnabled()) + if (ActiveMQClientLogger.LOGGER.isTraceEnabled()) { - HornetQClientLogger.LOGGER.trace("Disconnect being called on client:" + + ActiveMQClientLogger.LOGGER.trace("Disconnect being called on client:" + " server locator = " + serverLocator + " notifying node " + http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionImpl.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionImpl.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionImpl.java index 8b95874..65c5eaf 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionImpl.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientSessionImpl.java @@ -36,8 +36,8 @@ import org.apache.activemq.api.core.client.ClientSessionFactory; import org.apache.activemq.api.core.client.FailoverEventListener; import org.apache.activemq.api.core.client.SendAcknowledgementHandler; import org.apache.activemq.api.core.client.SessionFailureListener; -import org.apache.activemq.core.client.HornetQClientLogger; -import org.apache.activemq.core.client.HornetQClientMessageBundle; +import org.apache.activemq.core.client.ActiveMQClientLogger; +import org.apache.activemq.core.client.ActiveMQClientMessageBundle; import org.apache.activemq.core.remoting.FailureListener; import org.apache.activemq.spi.core.protocol.RemotingConnection; import org.apache.activemq.spi.core.remoting.ConsumerContext; @@ -492,19 +492,19 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi if (outcomeKnown) { - throw HornetQClientMessageBundle.BUNDLE.txRolledBack(); + throw ActiveMQClientMessageBundle.BUNDLE.txRolledBack(); } - throw HornetQClientMessageBundle.BUNDLE.txOutcomeUnknown(); + throw ActiveMQClientMessageBundle.BUNDLE.txOutcomeUnknown(); } public void commit() throws ActiveMQException { checkClosed(); - if (HornetQClientLogger.LOGGER.isTraceEnabled()) + if (ActiveMQClientLogger.LOGGER.isTraceEnabled()) { - HornetQClientLogger.LOGGER.trace("Sending commit"); + ActiveMQClientLogger.LOGGER.trace("Sending commit"); } /* @@ -565,9 +565,9 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi public void rollback(final boolean isLastMessageAsDelivered) throws ActiveMQException { - if (HornetQClientLogger.LOGGER.isTraceEnabled()) + if (ActiveMQClientLogger.LOGGER.isTraceEnabled()) { - HornetQClientLogger.LOGGER.trace("calling rollback(isLastMessageAsDelivered=" + isLastMessageAsDelivered + ")"); + ActiveMQClientLogger.LOGGER.trace("calling rollback(isLastMessageAsDelivered=" + isLastMessageAsDelivered + ")"); } checkClosed(); @@ -651,7 +651,7 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi { if (rollbackOnly) { - HornetQClientLogger.LOGGER.resettingSessionAfterFailure(); + ActiveMQClientLogger.LOGGER.resettingSessionAfterFailure(); rollback(false); } } @@ -771,9 +771,9 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi } checkClosed(); - if (HornetQClientLogger.LOGGER.isDebugEnabled()) + if (ActiveMQClientLogger.LOGGER.isDebugEnabled()) { - HornetQClientLogger.LOGGER.debug("client ack messageID = " + message.getMessageID()); + ActiveMQClientLogger.LOGGER.debug("client ack messageID = " + message.getMessageID()); } startCall(); @@ -900,7 +900,7 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi } catch (ActiveMQException e) { - HornetQClientLogger.LOGGER.unableToCloseConsumer(e); + ActiveMQClientLogger.LOGGER.unableToCloseConsumer(e); } } }); @@ -911,13 +911,13 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi { if (closed) { - HornetQClientLogger.LOGGER.debug("Session was already closed, giving up now, this=" + this); + ActiveMQClientLogger.LOGGER.debug("Session was already closed, giving up now, this=" + this); return; } - if (HornetQClientLogger.LOGGER.isDebugEnabled()) + if (ActiveMQClientLogger.LOGGER.isDebugEnabled()) { - HornetQClientLogger.LOGGER.debug("Calling close on session " + this); + ActiveMQClientLogger.LOGGER.debug("Calling close on session " + this); } try @@ -936,7 +936,7 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi // Session close should always return without exception // Note - we only log at trace - HornetQClientLogger.LOGGER.trace("Failed to close session", e); + ActiveMQClientLogger.LOGGER.trace("Failed to close session", e); } doCleanup(false); @@ -993,9 +993,9 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi if (!reattached) { - if (HornetQClientLogger.LOGGER.isDebugEnabled()) + if (ActiveMQClientLogger.LOGGER.isDebugEnabled()) { - HornetQClientLogger.LOGGER.debug("ClientSession couldn't be reattached, creating a new session"); + ActiveMQClientLogger.LOGGER.debug("ClientSession couldn't be reattached, creating a new session"); } for (ClientConsumerInternal consumer : cloneConsumers()) @@ -1061,7 +1061,7 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi } catch (Throwable t) { - HornetQClientLogger.LOGGER.failedToHandleFailover(t); + ActiveMQClientLogger.LOGGER.failedToHandleFailover(t); } finally { @@ -1179,7 +1179,7 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi { if (concurrentCall.incrementAndGet() > 1) { - HornetQClientLogger.LOGGER.invalidConcurrentSessionUsage(new Exception("trace")); + ActiveMQClientLogger.LOGGER.invalidConcurrentSessionUsage(new Exception("trace")); } } @@ -1197,16 +1197,16 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi public void commit(final Xid xid, final boolean onePhase) throws XAException { - if (HornetQClientLogger.LOGGER.isTraceEnabled()) + if (ActiveMQClientLogger.LOGGER.isTraceEnabled()) { - HornetQClientLogger.LOGGER.trace("call commit(xid=" + convert(xid)); + ActiveMQClientLogger.LOGGER.trace("call commit(xid=" + convert(xid)); } checkXA(); // we should never throw rollback if we have already prepared if (rollbackOnly) { - HornetQClientLogger.LOGGER.commitAfterFailover(); + ActiveMQClientLogger.LOGGER.commitAfterFailover(); } // Note - don't need to flush acks since the previous end would have @@ -1224,7 +1224,7 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi } catch (Throwable t) { - HornetQClientLogger.LOGGER.failoverDuringCommit(); + ActiveMQClientLogger.LOGGER.failoverDuringCommit(); // Any error on commit -> RETRY // We can't rollback a Prepared TX for definition @@ -1240,9 +1240,9 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi public void end(final Xid xid, final int flags) throws XAException { - if (HornetQClientLogger.LOGGER.isTraceEnabled()) + if (ActiveMQClientLogger.LOGGER.isTraceEnabled()) { - HornetQClientLogger.LOGGER.trace("Calling end:: " + convert(xid) + ", flags=" + convertTXFlag(flags)); + ActiveMQClientLogger.LOGGER.trace("Calling end:: " + convert(xid) + ", flags=" + convertTXFlag(flags)); } checkXA(); @@ -1257,7 +1257,7 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi } catch (Throwable ignored) { - HornetQClientLogger.LOGGER.debug("Error on rollback during end call!", ignored); + ActiveMQClientLogger.LOGGER.debug("Error on rollback during end call!", ignored); } throw new XAException(XAException.XA_RBOTHER); } @@ -1282,7 +1282,7 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi } catch (Throwable t) { - HornetQClientLogger.LOGGER.errorCallingEnd(t); + ActiveMQClientLogger.LOGGER.errorCallingEnd(t); // This could occur if the TM interrupts the thread XAException xaException = new XAException(XAException.XAER_RMERR); xaException.initCause(t); @@ -1392,9 +1392,9 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi { return (ClientSessionInternal) xares; } - else if (xares instanceof HornetQXAResource) + else if (xares instanceof ActiveMQXAResource) { - return getSessionInternalFromXAResource(((HornetQXAResource)xares).getResource()); + return getSessionInternalFromXAResource(((ActiveMQXAResource)xares).getResource()); } return null; } @@ -1402,9 +1402,9 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi public int prepare(final Xid xid) throws XAException { checkXA(); - if (HornetQClientLogger.LOGGER.isTraceEnabled()) + if (ActiveMQClientLogger.LOGGER.isTraceEnabled()) { - HornetQClientLogger.LOGGER.trace("Calling prepare:: " + convert(xid)); + ActiveMQClientLogger.LOGGER.trace("Calling prepare:: " + convert(xid)); } @@ -1439,7 +1439,7 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi { // ignore and rollback } - HornetQClientLogger.LOGGER.failoverDuringPrepareRollingBack(); + ActiveMQClientLogger.LOGGER.failoverDuringPrepareRollingBack(); try { rollback(false); @@ -1452,12 +1452,12 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi throw xaException; } - HornetQClientLogger.LOGGER.errorDuringPrepare(e); + ActiveMQClientLogger.LOGGER.errorDuringPrepare(e); throw new XAException(XAException.XA_RBOTHER); } - HornetQClientLogger.LOGGER.errorDuringPrepare(e); + ActiveMQClientLogger.LOGGER.errorDuringPrepare(e); // This should never occur XAException xaException = new XAException(XAException.XAER_RMERR); @@ -1466,7 +1466,7 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi } catch (Throwable t) { - HornetQClientLogger.LOGGER.errorDuringPrepare(t); + ActiveMQClientLogger.LOGGER.errorDuringPrepare(t); // This could occur if the TM interrupts the thread XAException xaException = new XAException(XAException.XAER_RMERR); @@ -1505,9 +1505,9 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi { checkXA(); - if (HornetQClientLogger.LOGGER.isTraceEnabled()) + if (ActiveMQClientLogger.LOGGER.isTraceEnabled()) { - HornetQClientLogger.LOGGER.trace("Calling rollback:: " + convert(xid)); + ActiveMQClientLogger.LOGGER.trace("Calling rollback:: " + convert(xid)); } try @@ -1569,9 +1569,9 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi public void start(final Xid xid, final int flags) throws XAException { - if (HornetQClientLogger.LOGGER.isTraceEnabled()) + if (ActiveMQClientLogger.LOGGER.isTraceEnabled()) { - HornetQClientLogger.LOGGER.trace("Calling start:: " + convert(xid) + " clientXID=" + xid + " flags = " + convertTXFlag(flags)); + ActiveMQClientLogger.LOGGER.trace("Calling start:: " + convert(xid) + " clientXID=" + xid + " flags = " + convertTXFlag(flags)); } checkXA(); @@ -1632,7 +1632,7 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi } catch (Exception e) { - HornetQClientLogger.LOGGER.failedToCleanupSession(e); + ActiveMQClientLogger.LOGGER.failedToCleanupSession(e); } } @@ -1742,7 +1742,7 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi if (durable && temp) { - throw HornetQClientMessageBundle.BUNDLE.queueMisConfigured(); + throw ActiveMQClientMessageBundle.BUNDLE.queueMisConfigured(); } startCall(); @@ -1760,7 +1760,7 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi { if (!xa) { - HornetQClientLogger.LOGGER.sessionNotXA(); + ActiveMQClientLogger.LOGGER.sessionNotXA(); throw new XAException(XAException.XAER_RMERR); } } @@ -1769,7 +1769,7 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi { if (closed || inClose) { - throw HornetQClientMessageBundle.BUNDLE.sessionClosed(); + throw ActiveMQClientMessageBundle.BUNDLE.sessionClosed(); } } @@ -1784,9 +1784,9 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi private void doCleanup(boolean failingOver) { - if (HornetQClientLogger.LOGGER.isDebugEnabled()) + if (ActiveMQClientLogger.LOGGER.isDebugEnabled()) { - HornetQClientLogger.LOGGER.debug("calling cleanup on " + this); + ActiveMQClientLogger.LOGGER.debug("calling cleanup on " + this); } synchronized (this) @@ -1936,7 +1936,7 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi { if (!confirmationWindowWarning.warningIssued.get()) { - HornetQClientLogger.LOGGER.confirmationWindowDisabledWarning(); + ActiveMQClientLogger.LOGGER.confirmationWindowDisabledWarning(); confirmationWindowWarning.warningIssued.set(true); } return false; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/CompressedLargeMessageControllerImpl.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/CompressedLargeMessageControllerImpl.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/CompressedLargeMessageControllerImpl.java index acadf1a..023f69d 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/CompressedLargeMessageControllerImpl.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/CompressedLargeMessageControllerImpl.java @@ -22,9 +22,9 @@ 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.SimpleString; -import org.apache.activemq.core.client.HornetQClientLogger; +import org.apache.activemq.core.client.ActiveMQClientLogger; import org.apache.activemq.utils.DataConstants; -import org.apache.activemq.utils.HornetQBufferInputStream; +import org.apache.activemq.utils.ActiveMQBufferInputStream; import org.apache.activemq.utils.InflaterReader; import org.apache.activemq.utils.InflaterWriter; import org.apache.activemq.utils.UTF8Util; @@ -102,7 +102,7 @@ final class CompressedLargeMessageControllerImpl implements LargeMessageControll { try { - InputStream input = new HornetQBufferInputStream(bufferDelegate); + InputStream input = new ActiveMQBufferInputStream(bufferDelegate); dataInput = new DataInputStream(new InflaterReader(input)); } @@ -432,7 +432,7 @@ final class CompressedLargeMessageControllerImpl implements LargeMessageControll int nReadBytes = getStream().read(dst, dstIndex, length); if (nReadBytes < length) { - HornetQClientLogger.LOGGER.compressedLargeMessageError(length, nReadBytes); + ActiveMQClientLogger.LOGGER.compressedLargeMessageError(length, nReadBytes); } } catch (Exception e) http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/DelegatingSession.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/DelegatingSession.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/DelegatingSession.java index f13de61..9a034cf 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/DelegatingSession.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/DelegatingSession.java @@ -27,7 +27,7 @@ import org.apache.activemq.api.core.client.ClientSessionFactory; import org.apache.activemq.api.core.client.FailoverEventListener; import org.apache.activemq.api.core.client.SendAcknowledgementHandler; import org.apache.activemq.api.core.client.SessionFailureListener; -import org.apache.activemq.core.client.HornetQClientLogger; +import org.apache.activemq.core.client.ActiveMQClientLogger; import org.apache.activemq.spi.core.protocol.RemotingConnection; import org.apache.activemq.spi.core.remoting.ConsumerContext; import org.apache.activemq.utils.ConcurrentHashSet; @@ -55,11 +55,11 @@ public class DelegatingSession implements ClientSessionInternal public static void dumpSessionCreationStacks() { - HornetQClientLogger.LOGGER.dumpingSessionStacks(); + ActiveMQClientLogger.LOGGER.dumpingSessionStacks(); for (DelegatingSession session : DelegatingSession.sessions) { - HornetQClientLogger.LOGGER.dumpingSessionStack(session.creationStack); + ActiveMQClientLogger.LOGGER.dumpingSessionStack(session.creationStack); } } @@ -76,7 +76,7 @@ public class DelegatingSession implements ClientSessionInternal // if (!closed && !session.isClosed()) { - HornetQClientLogger.LOGGER.clientSessionNotClosed(creationStack, System.identityHashCode(this)); + ActiveMQClientLogger.LOGGER.clientSessionNotClosed(creationStack, System.identityHashCode(this)); close(); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/HornetQXAResource.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/HornetQXAResource.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/HornetQXAResource.java deleted file mode 100644 index 31ff43d..0000000 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/HornetQXAResource.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ -package org.apache.activemq.core.client.impl; - -import javax.transaction.xa.XAResource; - -public interface HornetQXAResource extends XAResource -{ - XAResource getResource(); -} http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/LargeMessageControllerImpl.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/LargeMessageControllerImpl.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/LargeMessageControllerImpl.java index ff14363..06ce5ec 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/LargeMessageControllerImpl.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/LargeMessageControllerImpl.java @@ -32,8 +32,8 @@ import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.ActiveMQExceptionType; import org.apache.activemq.api.core.ActiveMQInterruptedException; import org.apache.activemq.api.core.SimpleString; -import org.apache.activemq.core.client.HornetQClientLogger; -import org.apache.activemq.core.client.HornetQClientMessageBundle; +import org.apache.activemq.core.client.ActiveMQClientLogger; +import org.apache.activemq.core.client.ActiveMQClientMessageBundle; import org.apache.activemq.utils.DataConstants; import org.apache.activemq.utils.UTF8Util; @@ -191,7 +191,7 @@ public class LargeMessageControllerImpl implements LargeMessageController } catch (Exception e) { - HornetQClientLogger.LOGGER.errorAddingPacket(e); + ActiveMQClientLogger.LOGGER.errorAddingPacket(e); handledException = e; } } @@ -205,7 +205,7 @@ public class LargeMessageControllerImpl implements LargeMessageController } catch (Exception e) { - HornetQClientLogger.LOGGER.errorAddingPacket(e); + ActiveMQClientLogger.LOGGER.errorAddingPacket(e); handledException = e; } } @@ -223,7 +223,7 @@ public class LargeMessageControllerImpl implements LargeMessageController } catch (Exception e) { - HornetQClientLogger.LOGGER.errorAddingPacket(e); + ActiveMQClientLogger.LOGGER.errorAddingPacket(e); handledException = e; } } @@ -231,7 +231,7 @@ public class LargeMessageControllerImpl implements LargeMessageController public void cancel() { - this.handledException = HornetQClientMessageBundle.BUNDLE.largeMessageInterrupted(); + this.handledException = ActiveMQClientMessageBundle.BUNDLE.largeMessageInterrupted(); synchronized (this) { @@ -249,7 +249,7 @@ public class LargeMessageControllerImpl implements LargeMessageController catch (Exception ignored) { // what else can we do here? - HornetQClientLogger.LOGGER.errorCallingCancel(ignored); + ActiveMQClientLogger.LOGGER.errorCallingCancel(ignored); } largeMessageData.offer(new LargeData()); @@ -308,7 +308,7 @@ public class LargeMessageControllerImpl implements LargeMessageController { if (streamClosed) { - throw HornetQClientMessageBundle.BUNDLE.largeMessageLostSession(); + throw ActiveMQClientMessageBundle.BUNDLE.largeMessageLostSession(); } setOutputStream(output); waitCompletion(0); @@ -354,11 +354,11 @@ public class LargeMessageControllerImpl implements LargeMessageController { if (timeWait != 0 && System.currentTimeMillis() > timeOut) { - throw HornetQClientMessageBundle.BUNDLE.timeoutOnLargeMessage(); + throw ActiveMQClientMessageBundle.BUNDLE.timeoutOnLargeMessage(); } else if (System.currentTimeMillis() > timeOut && !packetAdded) { - throw HornetQClientMessageBundle.BUNDLE.timeoutOnLargeMessage(); + throw ActiveMQClientMessageBundle.BUNDLE.timeoutOnLargeMessage(); } } } @@ -613,7 +613,7 @@ public class LargeMessageControllerImpl implements LargeMessageController } catch (Exception e) { - HornetQClientLogger.LOGGER.errorReadingIndex(e); + ActiveMQClientLogger.LOGGER.errorReadingIndex(e); throw new RuntimeException(e.getMessage(), e); } this.readerIndex = readerIndex; @@ -642,7 +642,7 @@ public class LargeMessageControllerImpl implements LargeMessageController } catch (Exception e) { - HornetQClientLogger.LOGGER.errorSettingIndex(e); + ActiveMQClientLogger.LOGGER.errorSettingIndex(e); throw new RuntimeException(e.getMessage(), e); } this.readerIndex = readerIndex; @@ -694,7 +694,7 @@ public class LargeMessageControllerImpl implements LargeMessageController } catch (Exception e) { - HornetQClientLogger.LOGGER.errorReSettingIndex(e); + ActiveMQClientLogger.LOGGER.errorReSettingIndex(e); throw new RuntimeException(e.getMessage(), e); } } @@ -1199,7 +1199,7 @@ public class LargeMessageControllerImpl implements LargeMessageController } catch (IOException e) { - throw HornetQClientMessageBundle.BUNDLE.errorWritingLargeMessage(e); + throw ActiveMQClientMessageBundle.BUNDLE.errorWritingLargeMessage(e); } } @@ -1327,7 +1327,7 @@ public class LargeMessageControllerImpl implements LargeMessageController } catch (Exception e) { - HornetQClientLogger.LOGGER.errorReadingCache(e); + ActiveMQClientLogger.LOGGER.errorReadingCache(e); throw new RuntimeException(e.getMessage(), e); } finally @@ -1377,7 +1377,7 @@ public class LargeMessageControllerImpl implements LargeMessageController } catch (Exception e) { - HornetQClientLogger.LOGGER.errorClosingCache(e); + ActiveMQClientLogger.LOGGER.errorClosingCache(e); } cachedChannel = null; } @@ -1390,7 +1390,7 @@ public class LargeMessageControllerImpl implements LargeMessageController } catch (Exception e) { - HornetQClientLogger.LOGGER.errorClosingCache(e); + ActiveMQClientLogger.LOGGER.errorClosingCache(e); } cachedRAFile = null; } @@ -1409,7 +1409,7 @@ public class LargeMessageControllerImpl implements LargeMessageController } catch (Exception e) { - HornetQClientLogger.LOGGER.errorFinalisingCache(e); + ActiveMQClientLogger.LOGGER.errorFinalisingCache(e); } } }
