activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [44/52] [abbrv] [partial] activemq-6 git commit: ACTIVEMQ6-4 Rename HornetQ* classes to ActiveMQ*
Date Tue, 18 Nov 2014 23:38:37 GMT
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/HornetQSessionContext.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/HornetQSessionContext.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/HornetQSessionContext.java
deleted file mode 100644
index 5589402..0000000
--- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/HornetQSessionContext.java
+++ /dev/null
@@ -1,940 +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.protocol.core.impl;
-
-import javax.transaction.xa.XAException;
-import javax.transaction.xa.XAResource;
-import javax.transaction.xa.Xid;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Executor;
-
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.ActiveMQExceptionType;
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.api.core.client.ClientConsumer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.SendAcknowledgementHandler;
-import org.apache.activemq.core.client.HornetQClientLogger;
-import org.apache.activemq.core.client.HornetQClientMessageBundle;
-import org.apache.activemq.core.client.impl.AddressQueryImpl;
-import org.apache.activemq.core.client.impl.ClientConsumerImpl;
-import org.apache.activemq.core.client.impl.ClientConsumerInternal;
-import org.apache.activemq.core.client.impl.ClientLargeMessageInternal;
-import org.apache.activemq.core.client.impl.ClientMessageInternal;
-import org.apache.activemq.core.client.impl.ClientProducerCreditsImpl;
-import org.apache.activemq.core.client.impl.ClientSessionImpl;
-import org.apache.activemq.core.message.impl.MessageInternal;
-import org.apache.activemq.core.protocol.core.Channel;
-import org.apache.activemq.core.protocol.core.ChannelHandler;
-import org.apache.activemq.core.protocol.core.CommandConfirmationHandler;
-import org.apache.activemq.core.protocol.core.CoreRemotingConnection;
-import org.apache.activemq.core.protocol.core.Packet;
-import org.apache.activemq.core.protocol.core.impl.wireformat.CreateQueueMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.CreateSessionMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.CreateSharedQueueMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.DisconnectConsumerMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.HornetQExceptionMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.ReattachSessionMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.ReattachSessionResponseMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.RollbackMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionAcknowledgeMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionAddMetaDataMessageV2;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionBindingQueryMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionBindingQueryResponseMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionCloseMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionConsumerCloseMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionConsumerFlowCreditMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionCreateConsumerMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionDeleteQueueMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionExpireMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionForceConsumerDelivery;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionIndividualAcknowledgeMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionProducerCreditsFailMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionProducerCreditsMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionQueueQueryMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionQueueQueryResponseMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionReceiveContinuationMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionReceiveLargeMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionReceiveMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionRequestProducerCreditsMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionSendContinuationMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionSendLargeMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionSendMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionUniqueAddMetaDataMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAAfterFailedMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXACommitMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAEndMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAForgetMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAGetInDoubtXidsResponseMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAGetTimeoutResponseMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAJoinMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAPrepareMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAResponseMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAResumeMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXARollbackMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXASetTimeoutMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXASetTimeoutResponseMessage;
-import org.apache.activemq.core.protocol.core.impl.wireformat.SessionXAStartMessage;
-import org.apache.activemq.spi.core.protocol.RemotingConnection;
-import org.apache.activemq.spi.core.remoting.Connection;
-import org.apache.activemq.spi.core.remoting.SessionContext;
-import org.apache.activemq.utils.TokenBucketLimiterImpl;
-
-import static org.apache.activemq.core.protocol.core.impl.PacketImpl.DISCONNECT_CONSUMER;
-import static org.apache.activemq.core.protocol.core.impl.PacketImpl.EXCEPTION;
-import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_RECEIVE_CONTINUATION;
-import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_RECEIVE_LARGE_MSG;
-import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SESS_RECEIVE_MSG;
-
-/**
- * @author Clebert Suconic
- */
-
-public class HornetQSessionContext extends SessionContext
-{
-   private final Channel sessionChannel;
-   private final int serverVersion;
-   private int confirmationWindow;
-   private final String name;
-
-
-   public HornetQSessionContext(String name, RemotingConnection remotingConnection, Channel sessionChannel, int serverVersion, int confirmationWindow)
-   {
-      super(remotingConnection);
-
-      this.name = name;
-      this.sessionChannel = sessionChannel;
-      this.serverVersion = serverVersion;
-      this.confirmationWindow = confirmationWindow;
-
-      ChannelHandler handler = new ClientSessionPacketHandler();
-      sessionChannel.setHandler(handler);
-
-
-      if (confirmationWindow >= 0)
-      {
-         sessionChannel.setCommandConfirmationHandler(confirmationHandler);
-      }
-   }
-
-
-   private final CommandConfirmationHandler confirmationHandler = new CommandConfirmationHandler()
-   {
-      public void commandConfirmed(final Packet packet)
-      {
-         if (packet.getType() == PacketImpl.SESS_SEND)
-         {
-            SessionSendMessage ssm = (SessionSendMessage) packet;
-            callSendAck(ssm.getHandler(), ssm.getMessage());
-         }
-         else if (packet.getType() == PacketImpl.SESS_SEND_CONTINUATION)
-         {
-            SessionSendContinuationMessage scm = (SessionSendContinuationMessage) packet;
-            if (!scm.isContinues())
-            {
-               callSendAck(scm.getHandler(), scm.getMessage());
-            }
-         }
-      }
-
-      private void callSendAck(SendAcknowledgementHandler handler, final Message message)
-      {
-         if (handler != null)
-         {
-            handler.sendAcknowledged(message);
-         }
-         else if (sendAckHandler != null)
-         {
-            sendAckHandler.sendAcknowledged(message);
-         }
-      }
-
-   };
-
-
-   // Failover utility methods
-
-   @Override
-   public void returnBlocking(ActiveMQException cause)
-   {
-      sessionChannel.returnBlocking(cause);
-   }
-
-   @Override
-   public void lockCommunications()
-   {
-      sessionChannel.lock();
-   }
-
-   @Override
-   public void releaseCommunications()
-   {
-      sessionChannel.setTransferring(false);
-      sessionChannel.unlock();
-   }
-
-   public void cleanup()
-   {
-      sessionChannel.close();
-
-      // if the server is sending a disconnect
-      // any pending blocked operation could hang without this
-      sessionChannel.returnBlocking();
-   }
-
-   @Override
-   public void linkFlowControl(SimpleString address, ClientProducerCreditsImpl clientProducerCredits)
-   {
-      // nothing to be done here... Flow control here is done on the core side
-   }
-
-
-   public void setSendAcknowledgementHandler(final SendAcknowledgementHandler handler)
-   {
-      sessionChannel.setCommandConfirmationHandler(confirmationHandler);
-      this.sendAckHandler = handler;
-   }
-
-   public void createSharedQueue(SimpleString address,
-                                 SimpleString queueName,
-                                 SimpleString filterString,
-                                 boolean durable) throws ActiveMQException
-   {
-      sessionChannel.sendBlocking(new CreateSharedQueueMessage(address, queueName, filterString, durable, true), PacketImpl.NULL_RESPONSE);
-   }
-
-   public void deleteQueue(final SimpleString queueName) throws ActiveMQException
-   {
-      sessionChannel.sendBlocking(new SessionDeleteQueueMessage(queueName), PacketImpl.NULL_RESPONSE);
-   }
-
-   public ClientSession.QueueQuery queueQuery(final SimpleString queueName) throws ActiveMQException
-   {
-      SessionQueueQueryMessage request = new SessionQueueQueryMessage(queueName);
-      SessionQueueQueryResponseMessage response = (SessionQueueQueryResponseMessage) sessionChannel.sendBlocking(request, PacketImpl.SESS_QUEUEQUERY_RESP);
-
-      return response.toQueueQuery();
-
-   }
-
-
-   public ClientConsumerInternal createConsumer(SimpleString queueName, SimpleString filterString,
-                                                int windowSize, int maxRate, int ackBatchSize, boolean browseOnly,
-                                                Executor executor, Executor flowControlExecutor) throws ActiveMQException
-   {
-      long consumerID = idGenerator.generateID();
-
-      HornetQConsumerContext consumerContext = new HornetQConsumerContext(consumerID);
-
-      SessionCreateConsumerMessage request = new SessionCreateConsumerMessage(consumerID,
-                                                                              queueName,
-                                                                              filterString,
-                                                                              browseOnly,
-                                                                              true);
-
-      SessionQueueQueryResponseMessage queueInfo = (SessionQueueQueryResponseMessage) sessionChannel.sendBlocking(request, PacketImpl.SESS_QUEUEQUERY_RESP);
-
-      // The actual windows size that gets used is determined by the user since
-      // could be overridden on the queue settings
-      // The value we send is just a hint
-
-      return new ClientConsumerImpl(session,
-                                    consumerContext,
-                                    queueName,
-                                    filterString,
-                                    browseOnly,
-                                    calcWindowSize(windowSize),
-                                    ackBatchSize,
-                                    maxRate > 0 ? new TokenBucketLimiterImpl(maxRate,
-                                                                             false)
-                                       : null,
-                                    executor,
-                                    flowControlExecutor,
-                                    this,
-                                    queueInfo.toQueueQuery(),
-                                    lookupTCCL());
-   }
-
-
-   public int getServerVersion()
-   {
-      return serverVersion;
-   }
-
-   public ClientSession.AddressQuery addressQuery(final SimpleString address) throws ActiveMQException
-   {
-      SessionBindingQueryResponseMessage response =
-         (SessionBindingQueryResponseMessage) sessionChannel.sendBlocking(new SessionBindingQueryMessage(address), PacketImpl.SESS_BINDINGQUERY_RESP);
-
-      return new AddressQueryImpl(response.isExists(), response.getQueueNames());
-   }
-
-
-   @Override
-   public void closeConsumer(final ClientConsumer consumer) throws ActiveMQException
-   {
-      sessionChannel.sendBlocking(new SessionConsumerCloseMessage(getConsumerID(consumer)), PacketImpl.NULL_RESPONSE);
-   }
-
-   public void sendConsumerCredits(final ClientConsumer consumer, final int credits)
-   {
-      sessionChannel.send(new SessionConsumerFlowCreditMessage(getConsumerID(consumer), credits));
-   }
-
-   public void forceDelivery(final ClientConsumer consumer, final long sequence) throws ActiveMQException
-   {
-      SessionForceConsumerDelivery request = new SessionForceConsumerDelivery(getConsumerID(consumer), sequence);
-      sessionChannel.send(request);
-   }
-
-   public void simpleCommit() throws ActiveMQException
-   {
-      sessionChannel.sendBlocking(new PacketImpl(PacketImpl.SESS_COMMIT), PacketImpl.NULL_RESPONSE);
-   }
-
-   public void simpleRollback(boolean lastMessageAsDelivered) throws ActiveMQException
-   {
-      sessionChannel.sendBlocking(new RollbackMessage(lastMessageAsDelivered), PacketImpl.NULL_RESPONSE);
-   }
-
-   public void sessionStart() throws ActiveMQException
-   {
-      sessionChannel.send(new PacketImpl(PacketImpl.SESS_START));
-   }
-
-   public void sessionStop() throws ActiveMQException
-   {
-      sessionChannel.sendBlocking(new PacketImpl(PacketImpl.SESS_STOP), PacketImpl.NULL_RESPONSE);
-   }
-
-   public void addSessionMetadata(String key, String data) throws ActiveMQException
-   {
-      sessionChannel.sendBlocking(new SessionAddMetaDataMessageV2(key, data), PacketImpl.NULL_RESPONSE);
-   }
-
-
-   public void addUniqueMetaData(String key, String data) throws ActiveMQException
-   {
-      sessionChannel.sendBlocking(new SessionUniqueAddMetaDataMessage(key, data), PacketImpl.NULL_RESPONSE);
-   }
-
-   public void xaCommit(Xid xid, boolean onePhase) throws XAException, ActiveMQException
-   {
-      SessionXACommitMessage packet = new SessionXACommitMessage(xid, onePhase);
-      SessionXAResponseMessage response = (SessionXAResponseMessage) sessionChannel.sendBlocking(packet, PacketImpl.SESS_XA_RESP);
-
-      if (response.isError())
-      {
-         throw new XAException(response.getResponseCode());
-      }
-
-      if (HornetQClientLogger.LOGGER.isTraceEnabled())
-      {
-         HornetQClientLogger.LOGGER.trace("finished commit on " + ClientSessionImpl.convert(xid) + " with response = " + response);
-      }
-   }
-
-   public void xaEnd(Xid xid, int flags) throws XAException, ActiveMQException
-   {
-      Packet packet;
-      if (flags == XAResource.TMSUSPEND)
-      {
-         packet = new PacketImpl(PacketImpl.SESS_XA_SUSPEND);
-      }
-      else if (flags == XAResource.TMSUCCESS)
-      {
-         packet = new SessionXAEndMessage(xid, false);
-      }
-      else if (flags == XAResource.TMFAIL)
-      {
-         packet = new SessionXAEndMessage(xid, true);
-      }
-      else
-      {
-         throw new XAException(XAException.XAER_INVAL);
-      }
-
-      SessionXAResponseMessage response = (SessionXAResponseMessage) sessionChannel.sendBlocking(packet, PacketImpl.SESS_XA_RESP);
-
-      if (response.isError())
-      {
-         throw new XAException(response.getResponseCode());
-      }
-   }
-
-
-   public void sendProducerCreditsMessage(final int credits, final SimpleString address)
-   {
-      sessionChannel.send(new SessionRequestProducerCreditsMessage(credits, address));
-   }
-
-   /**
-    * HornetQ does support large messages
-    *
-    * @return
-    */
-   public boolean supportsLargeMessage()
-   {
-      return true;
-   }
-
-   @Override
-   public int getCreditsOnSendingFull(MessageInternal msgI)
-   {
-      return msgI.getEncodeSize();
-   }
-
-   public void sendFullMessage(MessageInternal msgI, boolean sendBlocking, SendAcknowledgementHandler handler, SimpleString defaultAddress) throws ActiveMQException
-   {
-      SessionSendMessage packet = new SessionSendMessage(msgI, sendBlocking, handler);
-
-      if (sendBlocking)
-      {
-         sessionChannel.sendBlocking(packet, PacketImpl.NULL_RESPONSE);
-      }
-      else
-      {
-         sessionChannel.sendBatched(packet);
-      }
-   }
-
-   @Override
-   public int sendInitialChunkOnLargeMessage(MessageInternal msgI) throws ActiveMQException
-   {
-      SessionSendLargeMessage initialChunk = new SessionSendLargeMessage(msgI);
-
-      sessionChannel.send(initialChunk);
-
-      return msgI.getHeadersAndPropertiesEncodeSize();
-   }
-
-   @Override
-   public int sendLargeMessageChunk(MessageInternal msgI, long messageBodySize, boolean sendBlocking, boolean lastChunk, byte[] chunk, SendAcknowledgementHandler messageHandler) throws ActiveMQException
-   {
-      final boolean requiresResponse = lastChunk && sendBlocking;
-      final SessionSendContinuationMessage chunkPacket =
-         new SessionSendContinuationMessage(msgI, chunk, !lastChunk,
-                                            requiresResponse, messageBodySize, messageHandler);
-
-      if (requiresResponse)
-      {
-         // When sending it blocking, only the last chunk will be blocking.
-         sessionChannel.sendBlocking(chunkPacket, PacketImpl.NULL_RESPONSE);
-      }
-      else
-      {
-         sessionChannel.send(chunkPacket);
-      }
-
-      return chunkPacket.getPacketSize();
-   }
-
-   public void sendACK(boolean individual, boolean block, final ClientConsumer consumer, final Message message) throws ActiveMQException
-   {
-      PacketImpl messagePacket;
-      if (individual)
-      {
-         messagePacket = new SessionIndividualAcknowledgeMessage(getConsumerID(consumer), message.getMessageID(), block);
-      }
-      else
-      {
-         messagePacket = new SessionAcknowledgeMessage(getConsumerID(consumer), message.getMessageID(), block);
-      }
-
-      if (block)
-      {
-         sessionChannel.sendBlocking(messagePacket, PacketImpl.NULL_RESPONSE);
-      }
-      else
-      {
-         sessionChannel.sendBatched(messagePacket);
-      }
-   }
-
-   public void expireMessage(final ClientConsumer consumer, Message message) throws ActiveMQException
-   {
-      SessionExpireMessage messagePacket = new SessionExpireMessage(getConsumerID(consumer), message.getMessageID());
-
-      sessionChannel.send(messagePacket);
-   }
-
-
-   public void sessionClose() throws ActiveMQException
-   {
-      sessionChannel.sendBlocking(new SessionCloseMessage(), PacketImpl.NULL_RESPONSE);
-   }
-
-   public void xaForget(Xid xid) throws XAException, ActiveMQException
-   {
-      SessionXAResponseMessage response = (SessionXAResponseMessage) sessionChannel.sendBlocking(new SessionXAForgetMessage(xid), PacketImpl.SESS_XA_RESP);
-
-      if (response.isError())
-      {
-         throw new XAException(response.getResponseCode());
-      }
-   }
-
-   public int xaPrepare(Xid xid) throws XAException, ActiveMQException
-   {
-      SessionXAPrepareMessage packet = new SessionXAPrepareMessage(xid);
-
-      SessionXAResponseMessage response = (SessionXAResponseMessage) sessionChannel.sendBlocking(packet, PacketImpl.SESS_XA_RESP);
-
-      if (response.isError())
-      {
-         throw new XAException(response.getResponseCode());
-      }
-      else
-      {
-         return response.getResponseCode();
-      }
-   }
-
-   public Xid[] xaScan() throws ActiveMQException
-   {
-      SessionXAGetInDoubtXidsResponseMessage response = (SessionXAGetInDoubtXidsResponseMessage) sessionChannel.sendBlocking(new PacketImpl(PacketImpl.SESS_XA_INDOUBT_XIDS), PacketImpl.SESS_XA_INDOUBT_XIDS_RESP);
-
-      List<Xid> xids = response.getXids();
-
-      Xid[] xidArray = xids.toArray(new Xid[xids.size()]);
-
-      return xidArray;
-   }
-
-   public void xaRollback(Xid xid, boolean wasStarted) throws ActiveMQException, XAException
-   {
-      SessionXARollbackMessage packet = new SessionXARollbackMessage(xid);
-
-      SessionXAResponseMessage response = (SessionXAResponseMessage) sessionChannel.sendBlocking(packet, PacketImpl.SESS_XA_RESP);
-
-      if (response.isError())
-      {
-         throw new XAException(response.getResponseCode());
-      }
-   }
-
-   public void xaStart(Xid xid, int flags) throws XAException, ActiveMQException
-   {
-      Packet packet;
-      if (flags == XAResource.TMJOIN)
-      {
-         packet = new SessionXAJoinMessage(xid);
-      }
-      else if (flags == XAResource.TMRESUME)
-      {
-         packet = new SessionXAResumeMessage(xid);
-      }
-      else if (flags == XAResource.TMNOFLAGS)
-      {
-         // Don't need to flush since the previous end will have done this
-         packet = new SessionXAStartMessage(xid);
-      }
-      else
-      {
-         throw new XAException(XAException.XAER_INVAL);
-      }
-
-      SessionXAResponseMessage response = (SessionXAResponseMessage) sessionChannel.sendBlocking(packet, PacketImpl.SESS_XA_RESP);
-
-      if (response.isError())
-      {
-         HornetQClientLogger.LOGGER.errorCallingStart(response.getMessage(), response.getResponseCode());
-         throw new XAException(response.getResponseCode());
-      }
-   }
-
-   public boolean configureTransactionTimeout(int seconds) throws ActiveMQException
-   {
-      SessionXASetTimeoutResponseMessage response = (SessionXASetTimeoutResponseMessage) sessionChannel.sendBlocking(new SessionXASetTimeoutMessage(seconds), PacketImpl.SESS_XA_SET_TIMEOUT_RESP);
-
-      return response.isOK();
-   }
-
-   public int recoverSessionTimeout() throws ActiveMQException
-   {
-      SessionXAGetTimeoutResponseMessage response = (SessionXAGetTimeoutResponseMessage) sessionChannel.sendBlocking(new PacketImpl(PacketImpl.SESS_XA_GET_TIMEOUT), PacketImpl.SESS_XA_GET_TIMEOUT_RESP);
-
-      return response.getTimeoutSeconds();
-   }
-
-   public void createQueue(SimpleString address, SimpleString queueName, SimpleString filterString, boolean durable, boolean temp) throws ActiveMQException
-   {
-      CreateQueueMessage request = new CreateQueueMessage(address, queueName, filterString, durable, temp, true);
-      sessionChannel.sendBlocking(request, PacketImpl.NULL_RESPONSE);
-   }
-
-   @Override
-   public boolean reattachOnNewConnection(RemotingConnection newConnection) throws ActiveMQException
-   {
-
-      this.remotingConnection = newConnection;
-
-      sessionChannel.transferConnection((CoreRemotingConnection) newConnection);
-
-      Packet request = new ReattachSessionMessage(name, sessionChannel.getLastConfirmedCommandID());
-
-      Channel channel1 = getCoreConnection().getChannel(1, -1);
-
-      ReattachSessionResponseMessage response = (ReattachSessionResponseMessage) channel1.sendBlocking(request, PacketImpl.REATTACH_SESSION_RESP);
-
-      if (response.isReattached())
-      {
-         if (HornetQClientLogger.LOGGER.isDebugEnabled())
-         {
-            HornetQClientLogger.LOGGER.debug("ClientSession reattached fine, replaying commands");
-         }
-         // The session was found on the server - we reattached transparently ok
-
-         sessionChannel.replayCommands(response.getLastConfirmedCommandID());
-
-         return true;
-      }
-      else
-      {
-
-         sessionChannel.clearCommands();
-
-         return false;
-      }
-
-   }
-
-   public void recreateSession(final String username,
-                               final String password,
-                               final int minLargeMessageSize,
-                               final boolean xa,
-                               final boolean autoCommitSends,
-                               final boolean autoCommitAcks,
-                               final boolean preAcknowledge,
-                               final SimpleString defaultAddress) throws ActiveMQException
-   {
-      Packet createRequest = new CreateSessionMessage(name,
-                                                      sessionChannel.getID(),
-                                                      getServerVersion(),
-                                                      username,
-                                                      password,
-                                                      minLargeMessageSize,
-                                                      xa,
-                                                      autoCommitSends,
-                                                      autoCommitAcks,
-                                                      preAcknowledge,
-                                                      confirmationWindow,
-                                                      defaultAddress == null ? null
-                                                         : defaultAddress.toString());
-      boolean retry;
-      do
-      {
-         try
-         {
-            getCreateChannel().sendBlocking(createRequest, PacketImpl.CREATESESSION_RESP);
-            retry = false;
-         }
-         catch (ActiveMQException e)
-         {
-            // the session was created while its server was starting, retry it:
-            if (e.getType() == ActiveMQExceptionType.SESSION_CREATION_REJECTED)
-            {
-               HornetQClientLogger.LOGGER.retryCreateSessionSeverStarting(name);
-               retry = true;
-               // sleep a little bit to avoid spinning too much
-               try
-               {
-                  Thread.sleep(10);
-               }
-               catch (InterruptedException ie)
-               {
-                  Thread.currentThread().interrupt();
-                  throw e;
-               }
-            }
-            else
-            {
-               throw e;
-            }
-         }
-      }
-      while (retry && !session.isClosing());
-   }
-
-   @Override
-   public void recreateConsumerOnServer(ClientConsumerInternal consumerInternal) throws ActiveMQException
-   {
-      ClientSession.QueueQuery queueInfo = consumerInternal.getQueueInfo();
-
-      // We try and recreate any non durable queues, since they probably won't be there unless
-      // they are defined in hornetq-configuration.xml
-      // This allows e.g. JMS non durable subs and temporary queues to continue to be used after failover
-      if (!queueInfo.isDurable())
-      {
-         CreateQueueMessage createQueueRequest = new CreateQueueMessage(queueInfo.getAddress(),
-                                                                        queueInfo.getName(),
-                                                                        queueInfo.getFilterString(),
-                                                                        false,
-                                                                        queueInfo.isTemporary(),
-                                                                        false);
-
-         sendPacketWithoutLock(sessionChannel, createQueueRequest);
-      }
-
-      SessionCreateConsumerMessage createConsumerRequest = new SessionCreateConsumerMessage(getConsumerID(consumerInternal),
-                                                                                            consumerInternal.getQueueName(),
-                                                                                            consumerInternal.getFilterString(),
-                                                                                            consumerInternal.isBrowseOnly(),
-                                                                                            false);
-
-      sendPacketWithoutLock(sessionChannel, createConsumerRequest);
-
-      int clientWindowSize = consumerInternal.getClientWindowSize();
-
-      if (clientWindowSize != 0)
-      {
-         SessionConsumerFlowCreditMessage packet = new SessionConsumerFlowCreditMessage(getConsumerID(consumerInternal),
-                                                                                        clientWindowSize);
-
-         sendPacketWithoutLock(sessionChannel, packet);
-      }
-      else
-      {
-         // https://jira.jboss.org/browse/HORNETQ-522
-         SessionConsumerFlowCreditMessage packet = new SessionConsumerFlowCreditMessage(getConsumerID(consumerInternal),
-                                                                                        1);
-         sendPacketWithoutLock(sessionChannel, packet);
-      }
-   }
-
-   public void xaFailed(Xid xid) throws ActiveMQException
-   {
-      sendPacketWithoutLock(sessionChannel, new SessionXAAfterFailedMessage(xid));
-   }
-
-   public void restartSession() throws ActiveMQException
-   {
-      sendPacketWithoutLock(sessionChannel, new PacketImpl(PacketImpl.SESS_START));
-   }
-
-   @Override
-   public void resetMetadata(HashMap<String, String> metaDataToSend)
-   {
-      // Resetting the metadata after failover
-      for (Map.Entry<String, String> entries : metaDataToSend.entrySet())
-      {
-         sendPacketWithoutLock(sessionChannel, new SessionAddMetaDataMessageV2(entries.getKey(), entries.getValue(), false));
-      }
-   }
-
-
-   private Channel getCreateChannel()
-   {
-      return getCoreConnection().getChannel(1, -1);
-   }
-
-   private CoreRemotingConnection getCoreConnection()
-   {
-      return (CoreRemotingConnection) remotingConnection;
-   }
-
-
-   /**
-    * This doesn't apply to other protocols probably, so it will be a hornetq exclusive feature
-    *
-    * @throws org.apache.activemq.api.core.ActiveMQException
-    */
-   private void handleConsumerDisconnected(DisconnectConsumerMessage packet) throws ActiveMQException
-   {
-      DisconnectConsumerMessage message = packet;
-
-      session.handleConsumerDisconnect(new HornetQConsumerContext(message.getConsumerId()));
-   }
-
-   private void handleReceivedMessagePacket(SessionReceiveMessage messagePacket) throws Exception
-   {
-      ClientMessageInternal msgi = (ClientMessageInternal) messagePacket.getMessage();
-
-      msgi.setDeliveryCount(messagePacket.getDeliveryCount());
-
-      msgi.setFlowControlSize(messagePacket.getPacketSize());
-
-      handleReceiveMessage(new HornetQConsumerContext(messagePacket.getConsumerID()), msgi);
-   }
-
-   private void handleReceiveLargeMessage(SessionReceiveLargeMessage serverPacket) throws Exception
-   {
-      ClientLargeMessageInternal clientLargeMessage = (ClientLargeMessageInternal) serverPacket.getLargeMessage();
-
-      clientLargeMessage.setFlowControlSize(serverPacket.getPacketSize());
-
-      clientLargeMessage.setDeliveryCount(serverPacket.getDeliveryCount());
-
-      handleReceiveLargeMessage(new HornetQConsumerContext(serverPacket.getConsumerID()), clientLargeMessage, serverPacket.getLargeMessageSize());
-   }
-
-
-   private void handleReceiveContinuation(SessionReceiveContinuationMessage continuationPacket) throws Exception
-   {
-      handleReceiveContinuation(new HornetQConsumerContext(continuationPacket.getConsumerID()), continuationPacket.getBody(), continuationPacket.getPacketSize(),
-                                continuationPacket.isContinues());
-   }
-
-
-   protected void handleReceiveProducerCredits(SessionProducerCreditsMessage message)
-   {
-      handleReceiveProducerCredits(message.getAddress(), message.getCredits());
-   }
-
-
-   protected void handleReceiveProducerFailCredits(SessionProducerCreditsFailMessage message)
-   {
-      handleReceiveProducerFailCredits(message.getAddress(), message.getCredits());
-   }
-
-   class ClientSessionPacketHandler implements ChannelHandler
-   {
-
-      public void handlePacket(final Packet packet)
-      {
-         byte type = packet.getType();
-
-         try
-         {
-            switch (type)
-            {
-               case DISCONNECT_CONSUMER:
-               {
-                  handleConsumerDisconnected((DisconnectConsumerMessage) packet);
-                  break;
-               }
-               case SESS_RECEIVE_CONTINUATION:
-               {
-                  handleReceiveContinuation((SessionReceiveContinuationMessage) packet);
-
-                  break;
-               }
-               case SESS_RECEIVE_MSG:
-               {
-                  handleReceivedMessagePacket((SessionReceiveMessage) packet);
-
-                  break;
-               }
-               case SESS_RECEIVE_LARGE_MSG:
-               {
-                  handleReceiveLargeMessage((SessionReceiveLargeMessage) packet);
-
-                  break;
-               }
-               case PacketImpl.SESS_PRODUCER_CREDITS:
-               {
-                  handleReceiveProducerCredits((SessionProducerCreditsMessage) packet);
-
-                  break;
-               }
-               case PacketImpl.SESS_PRODUCER_FAIL_CREDITS:
-               {
-                  handleReceiveProducerFailCredits((SessionProducerCreditsFailMessage) packet);
-
-                  break;
-               }
-               case EXCEPTION:
-               {
-                  // We can only log these exceptions
-                  // maybe we should cache it on SessionContext and throw an exception on any next calls
-                  HornetQExceptionMessage mem = (HornetQExceptionMessage) packet;
-
-                  HornetQClientLogger.LOGGER.receivedExceptionAsynchronously(mem.getException());
-
-                  break;
-               }
-               default:
-               {
-                  throw new IllegalStateException("Invalid packet: " + type);
-               }
-            }
-         }
-         catch (Exception e)
-         {
-            HornetQClientLogger.LOGGER.failedToHandlePacket(e);
-         }
-
-         sessionChannel.confirm(packet);
-      }
-   }
-
-   private long getConsumerID(ClientConsumer consumer)
-   {
-      return ((HornetQConsumerContext)consumer.getConsumerContext()).getId();
-   }
-
-   private ClassLoader lookupTCCL()
-   {
-      return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>()
-      {
-         public ClassLoader run()
-         {
-            return Thread.currentThread().getContextClassLoader();
-         }
-      });
-
-   }
-
-   private int calcWindowSize(final int windowSize)
-   {
-      int clientWindowSize;
-      if (windowSize == -1)
-      {
-         // No flow control - buffer can increase without bound! Only use with
-         // caution for very fast consumers
-         clientWindowSize = -1;
-      }
-      else if (windowSize == 0)
-      {
-         // Slow consumer - no buffering
-         clientWindowSize = 0;
-      }
-      else if (windowSize == 1)
-      {
-         // Slow consumer = buffer 1
-         clientWindowSize = 1;
-      }
-      else if (windowSize > 1)
-      {
-         // Client window size is half server window size
-         clientWindowSize = windowSize >> 1;
-      }
-      else
-      {
-         throw HornetQClientMessageBundle.BUNDLE.invalidWindowSize(windowSize);
-      }
-
-      return clientWindowSize;
-   }
-
-
-   private void sendPacketWithoutLock(final Channel parameterChannel, final Packet packet)
-   {
-      packet.setChannelID(parameterChannel.getID());
-
-      Connection conn = parameterChannel.getConnection().getTransportConnection();
-
-      ActiveMQBuffer buffer = packet.encode(this.getCoreConnection());
-
-      conn.write(buffer, false, false);
-   }
-
-
-}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/PacketDecoder.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/PacketDecoder.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/PacketDecoder.java
index 764f8ec..7aeace4 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/PacketDecoder.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/PacketDecoder.java
@@ -77,7 +77,7 @@ import static org.apache.activemq.core.protocol.core.impl.PacketImpl.SUBSCRIBE_T
 import java.io.Serializable;
 
 import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.core.client.HornetQClientMessageBundle;
+import org.apache.activemq.core.client.ActiveMQClientMessageBundle;
 import org.apache.activemq.core.protocol.core.Packet;
 import org.apache.activemq.core.protocol.core.impl.wireformat.CheckFailoverMessage;
 import org.apache.activemq.core.protocol.core.impl.wireformat.CheckFailoverReplyMessage;
@@ -91,7 +91,7 @@ import org.apache.activemq.core.protocol.core.impl.wireformat.CreateSharedQueueM
 import org.apache.activemq.core.protocol.core.impl.wireformat.DisconnectConsumerMessage;
 import org.apache.activemq.core.protocol.core.impl.wireformat.DisconnectMessage;
 import org.apache.activemq.core.protocol.core.impl.wireformat.DisconnectMessage_V2;
-import org.apache.activemq.core.protocol.core.impl.wireformat.HornetQExceptionMessage;
+import org.apache.activemq.core.protocol.core.impl.wireformat.ActiveMQExceptionMessage;
 import org.apache.activemq.core.protocol.core.impl.wireformat.NullResponseMessage;
 import org.apache.activemq.core.protocol.core.impl.wireformat.PacketsConfirmedMessage;
 import org.apache.activemq.core.protocol.core.impl.wireformat.Ping;
@@ -174,7 +174,7 @@ public abstract class PacketDecoder implements Serializable
          }
          case EXCEPTION:
          {
-            packet = new HornetQExceptionMessage();
+            packet = new ActiveMQExceptionMessage();
             break;
          }
          case PACKETS_CONFIRMED:
@@ -464,7 +464,7 @@ public abstract class PacketDecoder implements Serializable
          }
          default:
          {
-            throw HornetQClientMessageBundle.BUNDLE.invalidType(packetType);
+            throw ActiveMQClientMessageBundle.BUNDLE.invalidType(packetType);
          }
       }
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/RemotingConnectionImpl.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/RemotingConnectionImpl.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/RemotingConnectionImpl.java
index 7e5b4f0..9104d48 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/RemotingConnectionImpl.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/RemotingConnectionImpl.java
@@ -23,14 +23,14 @@ import org.apache.activemq.api.core.ActiveMQBuffer;
 import org.apache.activemq.api.core.ActiveMQException;
 import org.apache.activemq.api.core.Interceptor;
 import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.client.HornetQClientLogger;
+import org.apache.activemq.core.client.ActiveMQClientLogger;
 import org.apache.activemq.core.protocol.core.Channel;
 import org.apache.activemq.core.protocol.core.CoreRemotingConnection;
 import org.apache.activemq.core.protocol.core.Packet;
 import org.apache.activemq.core.protocol.core.impl.ChannelImpl.CHANNEL_ID;
 import org.apache.activemq.core.protocol.core.impl.wireformat.DisconnectMessage;
 import org.apache.activemq.core.protocol.core.impl.wireformat.DisconnectMessage_V2;
-import org.apache.activemq.core.security.HornetQPrincipal;
+import org.apache.activemq.core.security.ActiveMQPrincipal;
 import org.apache.activemq.spi.core.protocol.AbstractRemotingConnection;
 import org.apache.activemq.spi.core.remoting.Connection;
 import org.apache.activemq.utils.SimpleIDGenerator;
@@ -44,7 +44,7 @@ public class RemotingConnectionImpl extends AbstractRemotingConnection implement
    // Constants
    // ------------------------------------------------------------------------------------
 
-   private static final boolean isTrace = HornetQClientLogger.LOGGER.isTraceEnabled();
+   private static final boolean isTrace = ActiveMQClientLogger.LOGGER.isTraceEnabled();
 
    // Static
    // ---------------------------------------------------------------------------------------
@@ -210,7 +210,7 @@ public class RemotingConnectionImpl extends AbstractRemotingConnection implement
          destroyed = true;
       }
 
-      HornetQClientLogger.LOGGER.connectionFailureDetected(me.getMessage(), me.getType());
+      ActiveMQClientLogger.LOGGER.connectionFailureDetected(me.getMessage(), me.getType());
 
 
       try
@@ -219,7 +219,7 @@ public class RemotingConnectionImpl extends AbstractRemotingConnection implement
       }
       catch (Throwable e)
       {
-         HornetQClientLogger.LOGGER.warn(e.getMessage(), e);
+         ActiveMQClientLogger.LOGGER.warn(e.getMessage(), e);
       }
 
       // Then call the listeners
@@ -359,9 +359,9 @@ public class RemotingConnectionImpl extends AbstractRemotingConnection implement
       }
    }
 
-   public HornetQPrincipal getDefaultHornetQPrincipal()
+   public ActiveMQPrincipal getDefaultActiveMQPrincipal()
    {
-      return getTransportConnection().getDefaultHornetQPrincipal();
+      return getTransportConnection().getDefaultActiveMQPrincipal();
    }
 
    // Buffer Handler implementation
@@ -374,7 +374,7 @@ public class RemotingConnectionImpl extends AbstractRemotingConnection implement
 
          if (isTrace)
          {
-            HornetQClientLogger.LOGGER.trace("handling packet " + packet);
+            ActiveMQClientLogger.LOGGER.trace("handling packet " + packet);
          }
 
          if (packet.isAsyncExec() && executor != null)
@@ -391,7 +391,7 @@ public class RemotingConnectionImpl extends AbstractRemotingConnection implement
                   }
                   catch (Throwable t)
                   {
-                     HornetQClientLogger.LOGGER.errorHandlingPacket(t, packet);
+                     ActiveMQClientLogger.LOGGER.errorHandlingPacket(t, packet);
                   }
 
                   executing = false;
@@ -415,7 +415,7 @@ public class RemotingConnectionImpl extends AbstractRemotingConnection implement
       }
       catch (Exception e)
       {
-         HornetQClientLogger.LOGGER.errorDecodingPacket(e);
+         ActiveMQClientLogger.LOGGER.errorDecodingPacket(e);
       }
    }
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ActiveMQExceptionMessage.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ActiveMQExceptionMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ActiveMQExceptionMessage.java
new file mode 100644
index 0000000..14877f4
--- /dev/null
+++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ActiveMQExceptionMessage.java
@@ -0,0 +1,118 @@
+/*
+ * 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.protocol.core.impl.wireformat;
+
+import org.apache.activemq.api.core.ActiveMQBuffer;
+import org.apache.activemq.api.core.ActiveMQException;
+import org.apache.activemq.api.core.ActiveMQExceptionType;
+import org.apache.activemq.core.protocol.core.impl.PacketImpl;
+
+/**
+ * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>
+ * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a>
+ */
+public class ActiveMQExceptionMessage extends PacketImpl
+{
+
+   private ActiveMQException exception;
+
+   // Static --------------------------------------------------------
+
+   // Constructors --------------------------------------------------
+
+   public ActiveMQExceptionMessage(final ActiveMQException exception)
+   {
+      super(EXCEPTION);
+
+      this.exception = exception;
+   }
+
+   public ActiveMQExceptionMessage()
+   {
+      super(EXCEPTION);
+   }
+
+   // Public --------------------------------------------------------
+
+   @Override
+   public boolean isResponse()
+   {
+      return true;
+   }
+
+   public ActiveMQException getException()
+   {
+      return exception;
+   }
+
+   @Override
+   public void encodeRest(final ActiveMQBuffer buffer)
+   {
+      buffer.writeInt(exception.getType().getCode());
+      buffer.writeNullableString(exception.getMessage());
+   }
+
+   @Override
+   public void decodeRest(final ActiveMQBuffer buffer)
+   {
+      int code = buffer.readInt();
+      String msg = buffer.readNullableString();
+
+      exception = ActiveMQExceptionType.createException(code, msg);
+   }
+
+   @Override
+   public String toString()
+   {
+      return getParentString() + ", exception= " + exception + "]";
+   }
+
+   @Override
+   public int hashCode()
+   {
+      final int prime = 31;
+      int result = super.hashCode();
+      result = prime * result + ((exception == null) ? 0 : exception.hashCode());
+      return result;
+   }
+
+   @Override
+   public boolean equals(Object obj)
+   {
+      if (this == obj)
+      {
+         return true;
+      }
+      if (!super.equals(obj))
+      {
+         return false;
+      }
+      if (!(obj instanceof ActiveMQExceptionMessage))
+      {
+         return false;
+      }
+      ActiveMQExceptionMessage other = (ActiveMQExceptionMessage)obj;
+      if (exception == null)
+      {
+         if (other.exception != null)
+         {
+            return false;
+         }
+      }
+      else if (!exception.equals(other.exception))
+      {
+         return false;
+      }
+      return true;
+   }
+}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/HornetQExceptionMessage.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/HornetQExceptionMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/HornetQExceptionMessage.java
deleted file mode 100644
index f8bfe5a..0000000
--- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/HornetQExceptionMessage.java
+++ /dev/null
@@ -1,118 +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.protocol.core.impl.wireformat;
-
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.ActiveMQExceptionType;
-import org.apache.activemq.core.protocol.core.impl.PacketImpl;
-
-/**
- * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>
- * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a>
- */
-public class HornetQExceptionMessage extends PacketImpl
-{
-
-   private ActiveMQException exception;
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
-   public HornetQExceptionMessage(final ActiveMQException exception)
-   {
-      super(EXCEPTION);
-
-      this.exception = exception;
-   }
-
-   public HornetQExceptionMessage()
-   {
-      super(EXCEPTION);
-   }
-
-   // Public --------------------------------------------------------
-
-   @Override
-   public boolean isResponse()
-   {
-      return true;
-   }
-
-   public ActiveMQException getException()
-   {
-      return exception;
-   }
-
-   @Override
-   public void encodeRest(final ActiveMQBuffer buffer)
-   {
-      buffer.writeInt(exception.getType().getCode());
-      buffer.writeNullableString(exception.getMessage());
-   }
-
-   @Override
-   public void decodeRest(final ActiveMQBuffer buffer)
-   {
-      int code = buffer.readInt();
-      String msg = buffer.readNullableString();
-
-      exception = ActiveMQExceptionType.createException(code, msg);
-   }
-
-   @Override
-   public String toString()
-   {
-      return getParentString() + ", exception= " + exception + "]";
-   }
-
-   @Override
-   public int hashCode()
-   {
-      final int prime = 31;
-      int result = super.hashCode();
-      result = prime * result + ((exception == null) ? 0 : exception.hashCode());
-      return result;
-   }
-
-   @Override
-   public boolean equals(Object obj)
-   {
-      if (this == obj)
-      {
-         return true;
-      }
-      if (!super.equals(obj))
-      {
-         return false;
-      }
-      if (!(obj instanceof HornetQExceptionMessage))
-      {
-         return false;
-      }
-      HornetQExceptionMessage other = (HornetQExceptionMessage)obj;
-      if (exception == null)
-      {
-         if (other.exception != null)
-         {
-            return false;
-         }
-      }
-      else if (!exception.equals(other.exception))
-      {
-         return false;
-      }
-      return true;
-   }
-}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/ActiveMQAMQPFrameDecoder.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/ActiveMQAMQPFrameDecoder.java b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/ActiveMQAMQPFrameDecoder.java
new file mode 100644
index 0000000..dc6e658
--- /dev/null
+++ b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/ActiveMQAMQPFrameDecoder.java
@@ -0,0 +1,41 @@
+/*
+ * 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.remoting.impl.netty;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
+
+/**
+ * A Netty decoder specially optimised to to decode messages on the core protocol only
+ *
+ * @author <a href="tlee@redhat.com">Trustin Lee</a>
+ * @author <a href="nmaurer@redhat.com">Norman Maurer</a>
+ * @version $Revision: 7839 $, $Date: 2009-08-21 02:26:39 +0900 (2009-08-21, 금) $
+ */
+public class ActiveMQAMQPFrameDecoder extends LengthFieldBasedFrameDecoder
+{
+   public ActiveMQAMQPFrameDecoder()
+   {
+      // The interface itself is part of the buffer (hence the -4)
+      super(Integer.MAX_VALUE, 0, 4, -4 , 0);
+   }
+
+
+   @Override
+   protected ByteBuf extractFrame(ChannelHandlerContext ctx, ByteBuf buffer, int index, int length)
+   {
+      return super.extractFrame(ctx, buffer, index, length);
+   }
+
+}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/ActiveMQChannelHandler.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/ActiveMQChannelHandler.java b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/ActiveMQChannelHandler.java
new file mode 100644
index 0000000..d075a98
--- /dev/null
+++ b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/ActiveMQChannelHandler.java
@@ -0,0 +1,122 @@
+/*
+ * 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.remoting.impl.netty;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelDuplexHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.group.ChannelGroup;
+import org.apache.activemq.api.core.ActiveMQException;
+import org.apache.activemq.core.buffers.impl.ChannelBufferWrapper;
+import org.apache.activemq.core.client.ActiveMQClientLogger;
+import org.apache.activemq.core.client.ActiveMQClientMessageBundle;
+import org.apache.activemq.spi.core.remoting.BufferHandler;
+import org.apache.activemq.spi.core.remoting.ConnectionLifeCycleListener;
+
+
+/**
+ * Common handler implementation for client and server side handler.
+ *
+ * @author <a href="mailto:tlee@redhat.com">Trustin Lee</a>
+ * @author <a href="mailto:nmaurer@redhat.com">Norman Maurer</a>
+ * @version $Rev$, $Date$
+ */
+public class ActiveMQChannelHandler extends ChannelDuplexHandler
+{
+   private final ChannelGroup group;
+
+   private final BufferHandler handler;
+
+   private final ConnectionLifeCycleListener listener;
+
+   volatile boolean active;
+
+   protected ActiveMQChannelHandler(final ChannelGroup group,
+                                    final BufferHandler handler,
+                                    final ConnectionLifeCycleListener listener)
+   {
+      this.group = group;
+      this.handler = handler;
+      this.listener = listener;
+   }
+
+   @Override
+   public void channelActive(final ChannelHandlerContext ctx) throws Exception
+   {
+      group.add(ctx.channel());
+      ctx.fireChannelActive();
+   }
+
+   @Override
+   public void channelWritabilityChanged(ChannelHandlerContext ctx) throws Exception
+   {
+      // TODO: Think about the id thingy
+      listener.connectionReadyForWrites(channelId(ctx.channel()), ctx.channel().isWritable());
+   }
+
+   @Override
+   public void channelRead(final ChannelHandlerContext ctx, final Object msg) throws Exception
+   {
+      ByteBuf buffer = (ByteBuf) msg;
+
+      handler.bufferReceived(channelId(ctx.channel()), new ChannelBufferWrapper(buffer));
+   }
+
+   @Override
+   public void channelInactive(final ChannelHandlerContext ctx) throws Exception
+   {
+      synchronized (this)
+      {
+         if (active)
+         {
+            listener.connectionDestroyed(channelId(ctx.channel()));
+
+            active = false;
+         }
+      }
+   }
+
+   @Override
+   public void exceptionCaught(final ChannelHandlerContext ctx, final Throwable cause) throws Exception
+   {
+      if (!active)
+      {
+         return;
+      }
+      // We don't want to log this - since it is normal for this to happen during failover/reconnect
+      // and we don't want to spew out stack traces in that event
+      // The user has access to this exeception anyway via the ActiveMQException initial cause
+
+      ActiveMQException me = ActiveMQClientMessageBundle.BUNDLE.nettyError();
+      me.initCause(cause);
+
+      synchronized (listener)
+      {
+         try
+         {
+            listener.connectionException(channelId(ctx.channel()), me);
+            active = false;
+         }
+         catch (Exception ex)
+         {
+            ActiveMQClientLogger.LOGGER.errorCallingLifeCycleListener(ex);
+         }
+      }
+   }
+
+   protected static int channelId(Channel channel)
+   {
+      return channel.hashCode();
+   }
+}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/ActiveMQFrameDecoder2.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/ActiveMQFrameDecoder2.java b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/ActiveMQFrameDecoder2.java
new file mode 100644
index 0000000..4c74b1b
--- /dev/null
+++ b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/ActiveMQFrameDecoder2.java
@@ -0,0 +1,39 @@
+/*
+ * 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.remoting.impl.netty;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
+import org.apache.activemq.utils.DataConstants;
+
+/**
+ * A Netty decoder specially optimised to to decode messages on the core protocol only
+ *
+ * @author <a href="tlee@redhat.com">Trustin Lee</a>
+ * @author <a href="nmaurer@redhat.com">Norman Maurer</a>
+ * @version $Revision: 7839 $, $Date: 2009-08-21 02:26:39 +0900 (2009-08-21, 금) $
+ */
+public class ActiveMQFrameDecoder2 extends LengthFieldBasedFrameDecoder
+{
+   public ActiveMQFrameDecoder2()
+   {
+      super(Integer.MAX_VALUE, 0, DataConstants.SIZE_INT);
+   }
+
+   @Override
+   protected ByteBuf extractFrame(ChannelHandlerContext ctx, ByteBuf buffer, int index, int length)
+   {
+      return super.extractFrame(ctx, buffer, index, length).skipBytes(DataConstants.SIZE_INT);
+   }
+}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/HornetQAMQPFrameDecoder.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/HornetQAMQPFrameDecoder.java b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/HornetQAMQPFrameDecoder.java
deleted file mode 100644
index ed6bf75..0000000
--- a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/HornetQAMQPFrameDecoder.java
+++ /dev/null
@@ -1,41 +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.remoting.impl.netty;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
-
-/**
- * A Netty decoder specially optimised to to decode messages on the core protocol only
- *
- * @author <a href="tlee@redhat.com">Trustin Lee</a>
- * @author <a href="nmaurer@redhat.com">Norman Maurer</a>
- * @version $Revision: 7839 $, $Date: 2009-08-21 02:26:39 +0900 (2009-08-21, 금) $
- */
-public class HornetQAMQPFrameDecoder extends LengthFieldBasedFrameDecoder
-{
-   public HornetQAMQPFrameDecoder()
-   {
-      // The interface itself is part of the buffer (hence the -4)
-      super(Integer.MAX_VALUE, 0, 4, -4 , 0);
-   }
-
-
-   @Override
-   protected ByteBuf extractFrame(ChannelHandlerContext ctx, ByteBuf buffer, int index, int length)
-   {
-      return super.extractFrame(ctx, buffer, index, length);
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/HornetQChannelHandler.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/HornetQChannelHandler.java b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/HornetQChannelHandler.java
deleted file mode 100644
index c7e3fd6..0000000
--- a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/HornetQChannelHandler.java
+++ /dev/null
@@ -1,122 +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.remoting.impl.netty;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelDuplexHandler;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.group.ChannelGroup;
-import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.core.buffers.impl.ChannelBufferWrapper;
-import org.apache.activemq.core.client.HornetQClientLogger;
-import org.apache.activemq.core.client.HornetQClientMessageBundle;
-import org.apache.activemq.spi.core.remoting.BufferHandler;
-import org.apache.activemq.spi.core.remoting.ConnectionLifeCycleListener;
-
-
-/**
- * Common handler implementation for client and server side handler.
- *
- * @author <a href="mailto:tlee@redhat.com">Trustin Lee</a>
- * @author <a href="mailto:nmaurer@redhat.com">Norman Maurer</a>
- * @version $Rev$, $Date$
- */
-public class HornetQChannelHandler extends ChannelDuplexHandler
-{
-   private final ChannelGroup group;
-
-   private final BufferHandler handler;
-
-   private final ConnectionLifeCycleListener listener;
-
-   volatile boolean active;
-
-   protected HornetQChannelHandler(final ChannelGroup group,
-                                   final BufferHandler handler,
-                                   final ConnectionLifeCycleListener listener)
-   {
-      this.group = group;
-      this.handler = handler;
-      this.listener = listener;
-   }
-
-   @Override
-   public void channelActive(final ChannelHandlerContext ctx) throws Exception
-   {
-      group.add(ctx.channel());
-      ctx.fireChannelActive();
-   }
-
-   @Override
-   public void channelWritabilityChanged(ChannelHandlerContext ctx) throws Exception
-   {
-      // TODO: Think about the id thingy
-      listener.connectionReadyForWrites(channelId(ctx.channel()), ctx.channel().isWritable());
-   }
-
-   @Override
-   public void channelRead(final ChannelHandlerContext ctx, final Object msg) throws Exception
-   {
-      ByteBuf buffer = (ByteBuf) msg;
-
-      handler.bufferReceived(channelId(ctx.channel()), new ChannelBufferWrapper(buffer));
-   }
-
-   @Override
-   public void channelInactive(final ChannelHandlerContext ctx) throws Exception
-   {
-      synchronized (this)
-      {
-         if (active)
-         {
-            listener.connectionDestroyed(channelId(ctx.channel()));
-
-            active = false;
-         }
-      }
-   }
-
-   @Override
-   public void exceptionCaught(final ChannelHandlerContext ctx, final Throwable cause) throws Exception
-   {
-      if (!active)
-      {
-         return;
-      }
-      // We don't want to log this - since it is normal for this to happen during failover/reconnect
-      // and we don't want to spew out stack traces in that event
-      // The user has access to this exeception anyway via the ActiveMQException initial cause
-
-      ActiveMQException me = HornetQClientMessageBundle.BUNDLE.nettyError();
-      me.initCause(cause);
-
-      synchronized (listener)
-      {
-         try
-         {
-            listener.connectionException(channelId(ctx.channel()), me);
-            active = false;
-         }
-         catch (Exception ex)
-         {
-            HornetQClientLogger.LOGGER.errorCallingLifeCycleListener(ex);
-         }
-      }
-   }
-
-   protected static int channelId(Channel channel)
-   {
-      return channel.hashCode();
-   }
-}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/HornetQFrameDecoder2.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/HornetQFrameDecoder2.java b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/HornetQFrameDecoder2.java
deleted file mode 100644
index 17b5fc7..0000000
--- a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/HornetQFrameDecoder2.java
+++ /dev/null
@@ -1,39 +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.remoting.impl.netty;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
-import org.apache.activemq.utils.DataConstants;
-
-/**
- * A Netty decoder specially optimised to to decode messages on the core protocol only
- *
- * @author <a href="tlee@redhat.com">Trustin Lee</a>
- * @author <a href="nmaurer@redhat.com">Norman Maurer</a>
- * @version $Revision: 7839 $, $Date: 2009-08-21 02:26:39 +0900 (2009-08-21, 금) $
- */
-public class HornetQFrameDecoder2 extends LengthFieldBasedFrameDecoder
-{
-   public HornetQFrameDecoder2()
-   {
-      super(Integer.MAX_VALUE, 0, DataConstants.SIZE_INT);
-   }
-
-   @Override
-   protected ByteBuf extractFrame(ChannelHandlerContext ctx, ByteBuf buffer, int index, int length)
-   {
-      return super.extractFrame(ctx, buffer, index, length).skipBytes(DataConstants.SIZE_INT);
-   }
-}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnection.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnection.java b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnection.java
index 6dbf38a..b068b79 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnection.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnection.java
@@ -29,8 +29,8 @@ import org.apache.activemq.api.core.ActiveMQBuffers;
 import org.apache.activemq.api.core.ActiveMQInterruptedException;
 import org.apache.activemq.api.core.TransportConfiguration;
 import org.apache.activemq.core.buffers.impl.ChannelBufferWrapper;
-import org.apache.activemq.core.client.HornetQClientLogger;
-import org.apache.activemq.core.security.HornetQPrincipal;
+import org.apache.activemq.core.client.ActiveMQClientLogger;
+import org.apache.activemq.core.security.ActiveMQPrincipal;
 import org.apache.activemq.spi.core.protocol.RemotingConnection;
 import org.apache.activemq.spi.core.remoting.Connection;
 import org.apache.activemq.spi.core.remoting.ConnectionLifeCycleListener;
@@ -110,7 +110,7 @@ public class NettyConnection implements Connection
          }
          catch (Throwable e)
          {
-            HornetQClientLogger.LOGGER.warn(e.getMessage(), e);
+            ActiveMQClientLogger.LOGGER.warn(e.getMessage(), e);
          }
       }
    }
@@ -320,7 +320,7 @@ public class NettyConnection implements Connection
 
                      if (!ok)
                      {
-                        HornetQClientLogger.LOGGER.timeoutFlushingPacket();
+                        ActiveMQClientLogger.LOGGER.timeoutFlushingPacket();
                      }
 
                      break;
@@ -369,7 +369,7 @@ public class NettyConnection implements Connection
    }
 
    //never allow this
-   public HornetQPrincipal getDefaultHornetQPrincipal()
+   public ActiveMQPrincipal getDefaultActiveMQPrincipal()
    {
       return null;
    }
@@ -428,7 +428,7 @@ public class NettyConnection implements Connection
 
             if (!sslCloseFuture.awaitUninterruptibly(10000))
             {
-               HornetQClientLogger.LOGGER.timeoutClosingSSL();
+               ActiveMQClientLogger.LOGGER.timeoutClosingSSL();
             }
          }
          catch (Throwable t)
@@ -440,7 +440,7 @@ public class NettyConnection implements Connection
       ChannelFuture closeFuture = channel.close();
       if (!closeFuture.awaitUninterruptibly(10000))
       {
-         HornetQClientLogger.LOGGER.timeoutClosingNettyChannel();
+         ActiveMQClientLogger.LOGGER.timeoutClosingNettyChannel();
       }
    }
    // Inner classes -------------------------------------------------


Mime
View raw message