http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/ServerSessionPacketHandler.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/ServerSessionPacketHandler.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/ServerSessionPacketHandler.java index 57ac895..0290427 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/ServerSessionPacketHandler.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/ServerSessionPacketHandler.java @@ -51,9 +51,9 @@ import java.util.List; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import org.apache.activemq.api.core.HornetQException; -import org.apache.activemq.api.core.HornetQExceptionType; -import org.apache.activemq.api.core.HornetQInternalErrorException; +import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.api.core.ActiveMQExceptionType; +import org.apache.activemq.api.core.ActiveMQInternalErrorException; import org.apache.activemq.core.exception.HornetQXAException; import org.apache.activemq.core.journal.IOAsyncTask; import org.apache.activemq.core.persistence.StorageManager; @@ -162,7 +162,7 @@ public class ServerSessionPacketHandler implements ChannelHandler return channel.getID(); } - public void connectionFailed(final HornetQException exception, boolean failedOver) + public void connectionFailed(final ActiveMQException exception, boolean failedOver) { HornetQServerLogger.LOGGER.clientConnectionFailed(session.getName()); @@ -547,7 +547,7 @@ public class ServerSessionPacketHandler implements ChannelHandler HornetQServerLogger.LOGGER.caughtXaException(e); } } - catch (HornetQException e) + catch (ActiveMQException e) { if (requiresResponse) { @@ -556,7 +556,7 @@ public class ServerSessionPacketHandler implements ChannelHandler } else { - if (e.getType() == HornetQExceptionType.QUEUE_EXISTS) + if (e.getType() == ActiveMQExceptionType.QUEUE_EXISTS) { HornetQServerLogger.LOGGER.debug("Caught exception", e); } @@ -571,7 +571,7 @@ public class ServerSessionPacketHandler implements ChannelHandler if (requiresResponse) { HornetQServerLogger.LOGGER.warn("Sending unexpected exception to the client", t); - HornetQException hqe = new HornetQInternalErrorException(); + ActiveMQException hqe = new ActiveMQInternalErrorException(); hqe.initCause(t); response = new HornetQExceptionMessage(hqe); } @@ -600,7 +600,7 @@ public class ServerSessionPacketHandler implements ChannelHandler { HornetQServerLogger.LOGGER.errorProcessingIOCallback(errorCode, errorMessage); - HornetQExceptionMessage exceptionMessage = new HornetQExceptionMessage( HornetQExceptionType.createException(errorCode, errorMessage)); + HornetQExceptionMessage exceptionMessage = new HornetQExceptionMessage( ActiveMQExceptionType.createException(errorCode, errorMessage)); doConfirmAndResponse(confirmPacket, exceptionMessage, flush, closeChannel); }
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/CoreProtocolManager.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/CoreProtocolManager.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/CoreProtocolManager.java index 04209dc..956b67d 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/CoreProtocolManager.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/CoreProtocolManager.java @@ -20,7 +20,7 @@ import java.util.concurrent.Executor; import java.util.concurrent.RejectedExecutionException; import io.netty.channel.ChannelPipeline; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.api.core.Interceptor; import org.apache.activemq.api.core.Pair; import org.apache.activemq.api.core.TransportConfiguration; @@ -141,7 +141,7 @@ class CoreProtocolManager implements ProtocolManager sessionHandlers.remove(name); } - public void handleBuffer(RemotingConnection connection, HornetQBuffer buffer) + public void handleBuffer(RemotingConnection connection, ActiveMQBuffer buffer) { } @@ -159,7 +159,7 @@ class CoreProtocolManager implements ProtocolManager } @Override - public void handshake(NettyServerConnection connection, HornetQBuffer buffer) + public void handshake(NettyServerConnection connection, ActiveMQBuffer buffer) { //if we are not an old client then handshake if (buffer.getByte(0) == 'H' && http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/HornetQPacketHandler.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/HornetQPacketHandler.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/HornetQPacketHandler.java index 33e89e6..231b2c6 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/HornetQPacketHandler.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/HornetQPacketHandler.java @@ -12,9 +12,9 @@ */ package org.apache.activemq.core.protocol.core.impl; -import org.apache.activemq.api.core.HornetQException; -import org.apache.activemq.api.core.HornetQExceptionType; -import org.apache.activemq.api.core.HornetQInternalErrorException; +import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.api.core.ActiveMQExceptionType; +import org.apache.activemq.api.core.ActiveMQInternalErrorException; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.core.protocol.core.Channel; import org.apache.activemq.core.protocol.core.ChannelHandler; @@ -142,7 +142,7 @@ public class HornetQPacketHandler implements ChannelHandler // XXX HORNETQ-720 Taylor commented out this test. Should be verified. /*if (!server.checkActivate()) { - throw new HornetQException(HornetQException.SESSION_CREATION_REJECTED, + throw new ActiveMQException(ActiveMQException.SESSION_CREATION_REJECTED, "Server will not accept create session requests"); }*/ @@ -189,12 +189,12 @@ public class HornetQPacketHandler implements ChannelHandler response = new CreateSessionResponseMessage(server.getVersion().getIncrementingVersion()); } - catch (HornetQException e) + catch (ActiveMQException e) { - if (e.getType() == HornetQExceptionType.INCOMPATIBLE_CLIENT_SERVER_VERSIONS) + if (e.getType() == ActiveMQExceptionType.INCOMPATIBLE_CLIENT_SERVER_VERSIONS) { incompatibleVersion = true; - HornetQServerLogger.LOGGER.debug("Sending HornetQException after Incompatible client", e); + HornetQServerLogger.LOGGER.debug("Sending ActiveMQException after Incompatible client", e); } else { @@ -207,7 +207,7 @@ public class HornetQPacketHandler implements ChannelHandler { HornetQServerLogger.LOGGER.failedToCreateSession(e); - response = new HornetQExceptionMessage(new HornetQInternalErrorException()); + response = new HornetQExceptionMessage(new ActiveMQInternalErrorException()); } // send the exception to the client and destroy @@ -274,7 +274,7 @@ public class HornetQPacketHandler implements ChannelHandler { HornetQServerLogger.LOGGER.failedToReattachSession(e); - response = new HornetQExceptionMessage(new HornetQInternalErrorException()); + response = new HornetQExceptionMessage(new ActiveMQInternalErrorException()); } channel1.send(response); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupRegistrationMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupRegistrationMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupRegistrationMessage.java index ae6bf6b..430b3f5 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupRegistrationMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupRegistrationMessage.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.core.protocol.core.impl.PacketImpl; @@ -53,7 +53,7 @@ public final class BackupRegistrationMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeString(clusterUser); buffer.writeString(clusterPassword); @@ -62,7 +62,7 @@ public final class BackupRegistrationMessage extends PacketImpl } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { clusterUser = buffer.readString(); clusterPassword = buffer.readString(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupReplicationStartFailedMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupReplicationStartFailedMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupReplicationStartFailedMessage.java index cc5d0e6..fcf1c22 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupReplicationStartFailedMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupReplicationStartFailedMessage.java @@ -15,7 +15,7 @@ */ package org.apache.activemq.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.core.protocol.core.impl.PacketImpl; import java.util.Collections; @@ -78,13 +78,13 @@ public final class BackupReplicationStartFailedMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeInt(problem.code); } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { problem = getType(buffer.readInt()); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupRequestMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupRequestMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupRequestMessage.java index f2b77c8..a6fbb47 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupRequestMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupRequestMessage.java @@ -13,7 +13,7 @@ package org.apache.activemq.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.core.protocol.core.impl.PacketImpl; @@ -50,7 +50,7 @@ public class BackupRequestMessage extends PacketImpl } @Override - public void encodeRest(HornetQBuffer buffer) + public void encodeRest(ActiveMQBuffer buffer) { super.encodeRest(buffer); buffer.writeInt(backupSize); @@ -62,7 +62,7 @@ public class BackupRequestMessage extends PacketImpl } @Override - public void decodeRest(HornetQBuffer buffer) + public void decodeRest(ActiveMQBuffer buffer) { super.decodeRest(buffer); backupSize = buffer.readInt(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupResponseMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupResponseMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupResponseMessage.java index 1666ded..0f08edf 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupResponseMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/BackupResponseMessage.java @@ -13,7 +13,7 @@ package org.apache.activemq.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.core.protocol.core.impl.PacketImpl; public class BackupResponseMessage extends PacketImpl @@ -32,14 +32,14 @@ public class BackupResponseMessage extends PacketImpl } @Override - public void encodeRest(HornetQBuffer buffer) + public void encodeRest(ActiveMQBuffer buffer) { super.encodeRest(buffer); buffer.writeBoolean(backupStarted); } @Override - public void decodeRest(HornetQBuffer buffer) + public void decodeRest(ActiveMQBuffer buffer) { super.decodeRest(buffer); backupStarted = buffer.readBoolean(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ClusterConnectMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ClusterConnectMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ClusterConnectMessage.java index 4203ed6..ebced28 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ClusterConnectMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ClusterConnectMessage.java @@ -13,7 +13,7 @@ package org.apache.activemq.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.core.protocol.core.impl.PacketImpl; public class ClusterConnectMessage extends PacketImpl @@ -34,14 +34,14 @@ public class ClusterConnectMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeString(clusterUser); buffer.writeString(clusterPassword); } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { clusterUser = buffer.readString(); clusterPassword = buffer.readString(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ClusterConnectReplyMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ClusterConnectReplyMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ClusterConnectReplyMessage.java index 25dafb8..4f0f52c 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ClusterConnectReplyMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ClusterConnectReplyMessage.java @@ -13,7 +13,7 @@ package org.apache.activemq.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.core.protocol.core.impl.PacketImpl; public class ClusterConnectReplyMessage extends PacketImpl @@ -38,14 +38,14 @@ public class ClusterConnectReplyMessage extends PacketImpl } @Override - public void encodeRest(HornetQBuffer buffer) + public void encodeRest(ActiveMQBuffer buffer) { super.encodeRest(buffer); buffer.writeBoolean(authorized); } @Override - public void decodeRest(HornetQBuffer buffer) + public void decodeRest(ActiveMQBuffer buffer) { super.decodeRest(buffer); authorized = buffer.readBoolean(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java index 932af66..e88d6b2 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.core.protocol.core.impl.PacketImpl; @@ -111,7 +111,7 @@ public class NodeAnnounceMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeString(nodeID); buffer.writeNullableString(backupGroupName); @@ -139,7 +139,7 @@ public class NodeAnnounceMessage extends PacketImpl } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { this.nodeID = buffer.readString(); this.backupGroupName = buffer.readNullableString(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/QuorumVoteMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/QuorumVoteMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/QuorumVoteMessage.java index 9bcbd1a..ee6a3a7 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/QuorumVoteMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/QuorumVoteMessage.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.core.protocol.core.impl.PacketImpl; import org.apache.activemq.core.server.cluster.qourum.QuorumVoteHandler; @@ -24,7 +24,7 @@ public class QuorumVoteMessage extends PacketImpl private Vote vote; - private HornetQBuffer voteBuffer; + private ActiveMQBuffer voteBuffer; public QuorumVoteMessage() { @@ -39,7 +39,7 @@ public class QuorumVoteMessage extends PacketImpl } @Override - public void encodeRest(HornetQBuffer buffer) + public void encodeRest(ActiveMQBuffer buffer) { super.encodeRest(buffer); buffer.writeSimpleString(handler); @@ -47,7 +47,7 @@ public class QuorumVoteMessage extends PacketImpl } @Override - public void decodeRest(HornetQBuffer buffer) + public void decodeRest(ActiveMQBuffer buffer) { super.decodeRest(buffer); handler = buffer.readSimpleString(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/QuorumVoteReplyMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/QuorumVoteReplyMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/QuorumVoteReplyMessage.java index fb4e636..7c7dd97 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/QuorumVoteReplyMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/QuorumVoteReplyMessage.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.core.protocol.core.impl.PacketImpl; import org.apache.activemq.core.server.cluster.qourum.QuorumVoteHandler; @@ -22,7 +22,7 @@ public class QuorumVoteReplyMessage extends PacketImpl { private SimpleString handler; private Vote vote; - private HornetQBuffer voteBuffer; + private ActiveMQBuffer voteBuffer; public QuorumVoteReplyMessage(SimpleString handler, Vote vote) { @@ -53,7 +53,7 @@ public class QuorumVoteReplyMessage extends PacketImpl } @Override - public void encodeRest(HornetQBuffer buffer) + public void encodeRest(ActiveMQBuffer buffer) { super.encodeRest(buffer); buffer.writeSimpleString(handler); @@ -61,7 +61,7 @@ public class QuorumVoteReplyMessage extends PacketImpl } @Override - public void decodeRest(HornetQBuffer buffer) + public void decodeRest(ActiveMQBuffer buffer) { super.decodeRest(buffer); handler = buffer.readSimpleString(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationAddMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationAddMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationAddMessage.java index 7e9a119..37b3f07 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationAddMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationAddMessage.java @@ -14,7 +14,7 @@ package org.apache.activemq.core.protocol.core.impl.wireformat; import java.util.Arrays; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.core.journal.EncodingSupport; import org.apache.activemq.core.protocol.core.impl.PacketImpl; import org.apache.activemq.core.replication.ReplicationManager.ADD_OPERATION_TYPE; @@ -57,7 +57,7 @@ public final class ReplicationAddMessage extends PacketImpl // Public -------------------------------------------------------- @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeByte(journalID); @@ -69,7 +69,7 @@ public final class ReplicationAddMessage extends PacketImpl } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { journalID = buffer.readByte(); operation = ADD_OPERATION_TYPE.toOperation(buffer.readBoolean()); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationAddTXMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationAddTXMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationAddTXMessage.java index 98e8d52..0fb400c 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationAddTXMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationAddTXMessage.java @@ -14,7 +14,7 @@ package org.apache.activemq.core.protocol.core.impl.wireformat; import java.util.Arrays; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.core.journal.EncodingSupport; import org.apache.activemq.core.protocol.core.impl.PacketImpl; import org.apache.activemq.core.replication.ReplicationManager.ADD_OPERATION_TYPE; @@ -67,7 +67,7 @@ public class ReplicationAddTXMessage extends PacketImpl // Public -------------------------------------------------------- @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeByte(journalID); buffer.writeBoolean(operation.toBoolean()); @@ -79,7 +79,7 @@ public class ReplicationAddTXMessage extends PacketImpl } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { journalID = buffer.readByte(); operation = ADD_OPERATION_TYPE.toOperation(buffer.readBoolean()); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationCommitMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationCommitMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationCommitMessage.java index 86c2dea..5909e75 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationCommitMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationCommitMessage.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.core.protocol.core.impl.PacketImpl; /** @@ -44,7 +44,7 @@ public final class ReplicationCommitMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeByte(journalID); buffer.writeBoolean(rollback); @@ -52,7 +52,7 @@ public final class ReplicationCommitMessage extends PacketImpl } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { journalID = buffer.readByte(); rollback = buffer.readBoolean(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationDeleteMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationDeleteMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationDeleteMessage.java index d0efd84..25e50ac 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationDeleteMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationDeleteMessage.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.core.protocol.core.impl.PacketImpl; /** @@ -39,14 +39,14 @@ public final class ReplicationDeleteMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeByte(journalID); buffer.writeLong(id); } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { journalID = buffer.readByte(); id = buffer.readLong(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationDeleteTXMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationDeleteTXMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationDeleteTXMessage.java index e424dd1..1c7165c 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationDeleteTXMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationDeleteTXMessage.java @@ -14,7 +14,7 @@ package org.apache.activemq.core.protocol.core.impl.wireformat; import java.util.Arrays; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.core.journal.EncodingSupport; import org.apache.activemq.core.protocol.core.impl.PacketImpl; @@ -57,7 +57,7 @@ public class ReplicationDeleteTXMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeByte(journalID); buffer.writeLong(txId); @@ -67,7 +67,7 @@ public class ReplicationDeleteTXMessage extends PacketImpl } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { journalID = buffer.readByte(); txId = buffer.readLong(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLargeMessageBeginMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLargeMessageBeginMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLargeMessageBeginMessage.java index 0154b04..98fc95f 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLargeMessageBeginMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLargeMessageBeginMessage.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.core.protocol.core.impl.PacketImpl; /** @@ -39,13 +39,13 @@ public class ReplicationLargeMessageBeginMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeLong(messageId); } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { messageId = buffer.readLong(); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLargeMessageEndMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLargeMessageEndMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLargeMessageEndMessage.java index 2daa969..66731ae 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLargeMessageEndMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLargeMessageEndMessage.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.core.protocol.core.impl.PacketImpl; /** @@ -39,13 +39,13 @@ public class ReplicationLargeMessageEndMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeLong(messageId); } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { messageId = buffer.readLong(); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLargeMessageWriteMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLargeMessageWriteMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLargeMessageWriteMessage.java index 286cfaa..880f065 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLargeMessageWriteMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLargeMessageWriteMessage.java @@ -14,7 +14,7 @@ package org.apache.activemq.core.protocol.core.impl.wireformat; import java.util.Arrays; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.core.protocol.core.impl.PacketImpl; /** @@ -47,7 +47,7 @@ public final class ReplicationLargeMessageWriteMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeLong(messageId); buffer.writeInt(body.length); @@ -55,7 +55,7 @@ public final class ReplicationLargeMessageWriteMessage extends PacketImpl } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { messageId = buffer.readLong(); int size = buffer.readInt(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLiveIsStoppingMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLiveIsStoppingMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLiveIsStoppingMessage.java index 1f3f844..da6d4a0 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLiveIsStoppingMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationLiveIsStoppingMessage.java @@ -15,7 +15,7 @@ */ package org.apache.activemq.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.core.protocol.core.impl.PacketImpl; /** @@ -64,13 +64,13 @@ public final class ReplicationLiveIsStoppingMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeInt(liveStopping.code); } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { liveStopping = buffer.readInt() == 0 ? LiveStopping.STOP_CALLED : LiveStopping.FAIL_OVER; } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationPageEventMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationPageEventMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationPageEventMessage.java index 8329a5d..5cdb08f 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationPageEventMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationPageEventMessage.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.core.protocol.core.impl.PacketImpl; @@ -46,7 +46,7 @@ public class ReplicationPageEventMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeSimpleString(storeName); buffer.writeInt(pageNumber); @@ -54,7 +54,7 @@ public class ReplicationPageEventMessage extends PacketImpl } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { storeName = buffer.readSimpleString(); pageNumber = buffer.readInt(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationPageWriteMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationPageWriteMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationPageWriteMessage.java index 1e8ac44..f9673a0 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationPageWriteMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationPageWriteMessage.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.core.paging.PagedMessage; import org.apache.activemq.core.paging.impl.PagedMessageImpl; import org.apache.activemq.core.protocol.core.impl.PacketImpl; @@ -47,14 +47,14 @@ public class ReplicationPageWriteMessage extends PacketImpl // Public -------------------------------------------------------- @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeInt(pageNumber); pagedMessage.encode(buffer); } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { pageNumber = buffer.readInt(); pagedMessage = new PagedMessageImpl(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationPrepareMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationPrepareMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationPrepareMessage.java index 3793354..9fc9479 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationPrepareMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationPrepareMessage.java @@ -14,7 +14,7 @@ package org.apache.activemq.core.protocol.core.impl.wireformat; import java.util.Arrays; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.core.journal.EncodingSupport; import org.apache.activemq.core.protocol.core.impl.PacketImpl; @@ -50,7 +50,7 @@ public final class ReplicationPrepareMessage extends PacketImpl // Public -------------------------------------------------------- @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeByte(journalID); buffer.writeLong(txId); @@ -59,7 +59,7 @@ public final class ReplicationPrepareMessage extends PacketImpl } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { journalID = buffer.readByte(); txId = buffer.readLong(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationStartSyncMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationStartSyncMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationStartSyncMessage.java index ec0e59c..e959fc7 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationStartSyncMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationStartSyncMessage.java @@ -16,7 +16,7 @@ import java.security.InvalidParameterException; import java.util.Arrays; import java.util.List; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.core.journal.impl.JournalFile; import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.JournalContent; import org.apache.activemq.core.protocol.core.impl.PacketImpl; @@ -115,7 +115,7 @@ public class ReplicationStartSyncMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeBoolean(synchronizationIsFinished); buffer.writeBoolean(allowsAutoFailBack); @@ -131,7 +131,7 @@ public class ReplicationStartSyncMessage extends PacketImpl } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { synchronizationIsFinished = buffer.readBoolean(); allowsAutoFailBack = buffer.readBoolean(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationSyncFileMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationSyncFileMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationSyncFileMessage.java index 33797ec..394e483 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationSyncFileMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReplicationSyncFileMessage.java @@ -17,7 +17,7 @@ import java.util.Arrays; import java.util.EnumSet; import java.util.Set; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.core.persistence.impl.journal.JournalStorageManager.JournalContent; import org.apache.activemq.core.protocol.core.impl.PacketImpl; @@ -104,7 +104,7 @@ public final class ReplicationSyncFileMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeLong(fileId); if (fileId == -1) @@ -139,7 +139,7 @@ public final class ReplicationSyncFileMessage extends PacketImpl } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { fileId = buffer.readLong(); switch (FileType.getFileType(buffer.readByte())) http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ScaleDownAnnounceMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ScaleDownAnnounceMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ScaleDownAnnounceMessage.java index b6ee30b..19040ae 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ScaleDownAnnounceMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ScaleDownAnnounceMessage.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.core.protocol.core.impl.wireformat; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.core.protocol.core.impl.PacketImpl; @@ -34,14 +34,14 @@ public class ScaleDownAnnounceMessage extends PacketImpl } @Override - public void encodeRest(HornetQBuffer buffer) + public void encodeRest(ActiveMQBuffer buffer) { buffer.writeSimpleString(targetNodeId); buffer.writeSimpleString(scaledDownNodeId); } @Override - public void decodeRest(HornetQBuffer buffer) + public void decodeRest(ActiveMQBuffer buffer) { targetNodeId = buffer.readSimpleString(); scaledDownNodeId = buffer.readSimpleString(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMAcceptor.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMAcceptor.java b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMAcceptor.java index 1bc936f..c573cab 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMAcceptor.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMAcceptor.java @@ -17,7 +17,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.Executor; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.HornetQClient; import org.apache.activemq.api.core.management.CoreNotificationType; @@ -289,7 +289,7 @@ public final class InVMAcceptor implements Acceptor } } - public void connectionException(final Object connectionID, final HornetQException me) + public void connectionException(final Object connectionID, final ActiveMQException me) { listener.connectionException(connectionID, me); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMConnection.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMConnection.java b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMConnection.java index b411aa1..ec4ae0a 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMConnection.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMConnection.java @@ -20,9 +20,9 @@ import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.TimeUnit; import io.netty.channel.ChannelFutureListener; -import org.apache.activemq.api.core.HornetQBuffer; -import org.apache.activemq.api.core.HornetQBuffers; -import org.apache.activemq.api.core.HornetQInterruptedException; +import org.apache.activemq.api.core.ActiveMQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffers; +import org.apache.activemq.api.core.ActiveMQInterruptedException; import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.core.security.HornetQPrincipal; import org.apache.activemq.core.server.HornetQServerLogger; @@ -138,9 +138,9 @@ public class InVMConnection implements Connection } } - public HornetQBuffer createBuffer(final int size) + public ActiveMQBuffer createBuffer(final int size) { - return HornetQBuffers.dynamicBuffer(size); + return ActiveMQBuffers.dynamicBuffer(size); } public Object getID() @@ -152,19 +152,19 @@ public class InVMConnection implements Connection { } - public void write(final HornetQBuffer buffer) + public void write(final ActiveMQBuffer buffer) { write(buffer, false, false, null); } - public void write(final HornetQBuffer buffer, final boolean flush, final boolean batch) + public void write(final ActiveMQBuffer buffer, final boolean flush, final boolean batch) { write(buffer, flush, batch, null); } - public void write(final HornetQBuffer buffer, final boolean flush, final boolean batch, final ChannelFutureListener futureListener) + public void write(final ActiveMQBuffer buffer, final boolean flush, final boolean batch, final ChannelFutureListener futureListener) { - final HornetQBuffer copied = buffer.copy(0, buffer.capacity()); + final ActiveMQBuffer copied = buffer.copy(0, buffer.capacity()); copied.setIndex(buffer.readerIndex(), buffer.writerIndex()); @@ -227,7 +227,7 @@ public class InVMConnection implements Connection } catch (InterruptedException e) { - throw new HornetQInterruptedException(e); + throw new ActiveMQInterruptedException(e); } } } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMConnector.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMConnector.java b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMConnector.java index 4c9e243..d5f9480 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMConnector.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/InVMConnector.java @@ -19,7 +19,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.Executor; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.core.server.HornetQComponent; import org.apache.activemq.core.server.HornetQServerLogger; import org.apache.activemq.core.server.HornetQMessageBundle; @@ -239,7 +239,7 @@ public class InVMConnector extends AbstractConnector } } - public void connectionException(final Object connectionID, final HornetQException me) + public void connectionException(final Object connectionID, final ActiveMQException me) { // Execute on different thread to avoid deadlocks closeExecutor.execute(new Runnable() http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyAcceptor.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyAcceptor.java b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyAcceptor.java index 614e19a..be36072 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyAcceptor.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyAcceptor.java @@ -51,7 +51,7 @@ import io.netty.util.concurrent.GenericFutureListener; import io.netty.util.concurrent.GlobalEventExecutor; import org.apache.activemq.api.config.HornetQDefaultConfiguration; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.api.core.management.CoreNotificationType; @@ -729,7 +729,7 @@ public class NettyAcceptor implements Acceptor } } - public void connectionException(final Object connectionID, final HornetQException me) + public void connectionException(final Object connectionID, final ActiveMQException me) { // Execute on different thread to avoid deadlocks new Thread() http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyServerConnection.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyServerConnection.java b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyServerConnection.java index c49a4da..5278472 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyServerConnection.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyServerConnection.java @@ -15,7 +15,7 @@ package org.apache.activemq.core.remoting.impl.netty; import java.util.Map; import io.netty.channel.Channel; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.core.buffers.impl.ChannelBufferWrapper; import org.apache.activemq.spi.core.remoting.ConnectionLifeCycleListener; @@ -30,7 +30,7 @@ public class NettyServerConnection extends NettyConnection } @Override - public HornetQBuffer createBuffer(int size) + public ActiveMQBuffer createBuffer(int size) { return new ChannelBufferWrapper(channel.alloc().directBuffer(size), true); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/remoting/server/impl/RemotingServiceImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/remoting/server/impl/RemotingServiceImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/remoting/server/impl/RemotingServiceImpl.java index fc1c1b6..7fd9a46 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/remoting/server/impl/RemotingServiceImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/remoting/server/impl/RemotingServiceImpl.java @@ -31,9 +31,9 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; -import org.apache.activemq.api.core.HornetQBuffer; -import org.apache.activemq.api.core.HornetQException; -import org.apache.activemq.api.core.HornetQInterruptedException; +import org.apache.activemq.api.core.ActiveMQBuffer; +import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.api.core.ActiveMQInterruptedException; import org.apache.activemq.api.core.Interceptor; import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.core.config.Configuration; @@ -589,7 +589,7 @@ public class RemotingServiceImpl implements RemotingService, ConnectionLifeCycle } } - public void connectionException(final Object connectionID, final HornetQException me) + public void connectionException(final Object connectionID, final ActiveMQException me) { // We DO NOT call fail on connection exception, otherwise in event of real connection failure, the // connection will be failed, the session will be closed and won't be able to reconnect @@ -652,7 +652,7 @@ public class RemotingServiceImpl implements RemotingService, ConnectionLifeCycle private final class DelegatingBufferHandler implements BufferHandler { - public void bufferReceived(final Object connectionID, final HornetQBuffer buffer) + public void bufferReceived(final Object connectionID, final ActiveMQBuffer buffer) { ConnectionEntry conn = connections.get(connectionID); @@ -698,7 +698,7 @@ public class RemotingServiceImpl implements RemotingService, ConnectionLifeCycle } catch (InterruptedException e) { - throw new HornetQInterruptedException(e); + throw new ActiveMQInterruptedException(e); } } } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicationEndpoint.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicationEndpoint.java b/activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicationEndpoint.java index c39e05e..a65ac05 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicationEndpoint.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicationEndpoint.java @@ -27,7 +27,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.core.config.Configuration; import org.apache.activemq.core.journal.IOCriticalErrorListener; @@ -234,7 +234,7 @@ public final class ReplicationEndpoint implements ChannelHandler, HornetQCompone HornetQServerLogger.LOGGER.invalidPacketForReplication(packet); } } - catch (HornetQException e) + catch (ActiveMQException e) { HornetQServerLogger.LOGGER.errorHandlingReplicationPacket(e, packet); response = new HornetQExceptionMessage(e); @@ -259,9 +259,9 @@ public final class ReplicationEndpoint implements ChannelHandler, HornetQCompone /** * @param packet - * @throws HornetQException + * @throws org.apache.activemq.api.core.ActiveMQException */ - private void handleLiveStopping(ReplicationLiveIsStoppingMessage packet) throws HornetQException + private void handleLiveStopping(ReplicationLiveIsStoppingMessage packet) throws ActiveMQException { activation.remoteFailOver(packet.isFinalMessage()); } @@ -395,7 +395,7 @@ public final class ReplicationEndpoint implements ChannelHandler, HornetQCompone this.channel = channel; } - public void compareJournalInformation(final JournalLoadInformation[] journalInformation) throws HornetQException + public void compareJournalInformation(final JournalLoadInformation[] journalInformation) throws ActiveMQException { if (!activation.isRemoteBackupUpToDate()) { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicationManager.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicationManager.java b/activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicationManager.java index cccde8f..ced14b1 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicationManager.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/replication/ReplicationManager.java @@ -22,9 +22,9 @@ import java.util.Queue; import java.util.Set; import java.util.concurrent.ConcurrentLinkedQueue; -import org.apache.activemq.api.core.HornetQBuffer; -import org.apache.activemq.api.core.HornetQException; -import org.apache.activemq.api.core.HornetQExceptionType; +import org.apache.activemq.api.core.ActiveMQBuffer; +import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.api.core.ActiveMQExceptionType; import org.apache.activemq.api.core.Pair; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.SessionFailureListener; @@ -60,7 +60,6 @@ import org.apache.activemq.core.server.HornetQComponent; import org.apache.activemq.core.server.HornetQServerLogger; import org.apache.activemq.spi.core.protocol.RemotingConnection; import org.apache.activemq.utils.ExecutorFactory; -import org.omg.CORBA.portable.ResponseHandler; /** * Manages replication tasks on the live server (that is the live server side of a "remote backup" @@ -263,7 +262,7 @@ public final class ReplicationManager implements HornetQComponent } @Override - public synchronized void start() throws HornetQException + public synchronized void start() throws ActiveMQException { if (started) { @@ -413,9 +412,9 @@ public final class ReplicationManager implements HornetQComponent private final class ReplicatedSessionFailureListener implements SessionFailureListener { @Override - public void connectionFailed(final HornetQException me, boolean failedOver) + public void connectionFailed(final ActiveMQException me, boolean failedOver) { - if (me.getType() == HornetQExceptionType.DISCONNECTED) + if (me.getType() == ActiveMQExceptionType.DISCONNECTED) { // Backup has shut down - no need to log a stack trace HornetQServerLogger.LOGGER.replicationStopOnBackupShutdown(); @@ -436,12 +435,12 @@ public final class ReplicationManager implements HornetQComponent } @Override - public void connectionFailed(final HornetQException me, boolean failedOver, String scaleDownTargetNodeID) + public void connectionFailed(final ActiveMQException me, boolean failedOver, String scaleDownTargetNodeID) { connectionFailed(me, failedOver); } - public void beforeReconnect(final HornetQException me) + public void beforeReconnect(final ActiveMQException me) { } } @@ -462,11 +461,11 @@ public final class ReplicationManager implements HornetQComponent { static final NullEncoding instance = new NullEncoding(); - public void decode(final HornetQBuffer buffer) + public void decode(final ActiveMQBuffer buffer) { } - public void encode(final HornetQBuffer buffer) + public void encode(final ActiveMQBuffer buffer) { } @@ -479,7 +478,7 @@ public final class ReplicationManager implements HornetQComponent /** * Sends the whole content of the file to be duplicated. * - * @throws HornetQException + * @throws org.apache.activemq.api.core.ActiveMQException * @throws Exception */ public void syncJournalFile(JournalFile jf, JournalContent content) throws Exception @@ -594,10 +593,10 @@ public final class ReplicationManager implements HornetQComponent * * @param datafiles * @param contentType - * @throws HornetQException + * @throws org.apache.activemq.api.core.ActiveMQException */ public void sendStartSyncMessage(JournalFile[] datafiles, JournalContent contentType, String nodeID, - boolean allowsAutoFailBack) throws HornetQException + boolean allowsAutoFailBack) throws ActiveMQException { if (enabled) sendReplicatePacket(new ReplicationStartSyncMessage(datafiles, contentType, nodeID, allowsAutoFailBack)); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/server/HornetQMessageBundle.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/HornetQMessageBundle.java b/activemq-server/src/main/java/org/apache/activemq/core/server/HornetQMessageBundle.java index a90e82e..cd530c3 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/HornetQMessageBundle.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/HornetQMessageBundle.java @@ -13,23 +13,23 @@ package org.apache.activemq.core.server; +import org.apache.activemq.api.core.ActiveMQAddressFullException; +import org.apache.activemq.api.core.ActiveMQClusterSecurityException; +import org.apache.activemq.api.core.ActiveMQConnectionTimedOutException; +import org.apache.activemq.api.core.ActiveMQDisconnectedException; +import org.apache.activemq.api.core.ActiveMQDuplicateMetaDataException; +import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.api.core.ActiveMQIOErrorException; +import org.apache.activemq.api.core.ActiveMQIllegalStateException; +import org.apache.activemq.api.core.ActiveMQIncompatibleClientServerException; +import org.apache.activemq.api.core.ActiveMQInternalErrorException; +import org.apache.activemq.api.core.ActiveMQInvalidFilterExpressionException; +import org.apache.activemq.api.core.ActiveMQInvalidTransientQueueUseException; +import org.apache.activemq.api.core.ActiveMQNonExistentQueueException; +import org.apache.activemq.api.core.ActiveMQQueueExistsException; +import org.apache.activemq.api.core.ActiveMQSecurityException; +import org.apache.activemq.api.core.ActiveMQSessionCreationException; import org.apache.activemq.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq.api.core.HornetQAddressFullException; -import org.apache.activemq.api.core.HornetQClusterSecurityException; -import org.apache.activemq.api.core.HornetQConnectionTimedOutException; -import org.apache.activemq.api.core.HornetQDisconnectedException; -import org.apache.activemq.api.core.HornetQDuplicateMetaDataException; -import org.apache.activemq.api.core.HornetQException; -import org.apache.activemq.api.core.HornetQIOErrorException; -import org.apache.activemq.api.core.HornetQIllegalStateException; -import org.apache.activemq.api.core.HornetQIncompatibleClientServerException; -import org.apache.activemq.api.core.HornetQInternalErrorException; -import org.apache.activemq.api.core.HornetQInvalidFilterExpressionException; -import org.apache.activemq.api.core.HornetQInvalidTransientQueueUseException; -import org.apache.activemq.api.core.HornetQNonExistentQueueException; -import org.apache.activemq.api.core.HornetQQueueExistsException; -import org.apache.activemq.api.core.HornetQSecurityException; -import org.apache.activemq.api.core.HornetQSessionCreationException; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.core.postoffice.Binding; import org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationSyncFileMessage; @@ -73,31 +73,31 @@ public interface HornetQMessageBundle String serverDescribe(String identity, String describe); @Message(id = 119005, value = "connections for {0} closed by management", format = Message.Format.MESSAGE_FORMAT) - HornetQInternalErrorException connectionsClosedByManagement(String ipAddress); + ActiveMQInternalErrorException connectionsClosedByManagement(String ipAddress); @Message(id = 119006, value = "journals are not JournalImpl. You can''t set a replicator!", format = Message.Format.MESSAGE_FORMAT) - HornetQInternalErrorException notJournalImpl(); + ActiveMQInternalErrorException notJournalImpl(); @Message(id = 119007, value = "unhandled error during replication", format = Message.Format.MESSAGE_FORMAT) - HornetQInternalErrorException replicationUnhandledError(@Cause Exception e); + ActiveMQInternalErrorException replicationUnhandledError(@Cause Exception e); @Message(id = 119008, value = "Live Node contains more journals than the backup node. Probably a version match error", format = Message.Format.MESSAGE_FORMAT) - HornetQInternalErrorException replicationTooManyJournals(); + ActiveMQInternalErrorException replicationTooManyJournals(); @Message(id = 119009, value = "Unhandled file type {0}", format = Message.Format.MESSAGE_FORMAT) - HornetQInternalErrorException replicationUnhandledFileType(ReplicationSyncFileMessage.FileType fileType); + ActiveMQInternalErrorException replicationUnhandledFileType(ReplicationSyncFileMessage.FileType fileType); @Message(id = 119010, value = "Remote Backup can not be up-to-date!", format = Message.Format.MESSAGE_FORMAT) - HornetQInternalErrorException replicationBackupUpToDate(); + ActiveMQInternalErrorException replicationBackupUpToDate(); @Message(id = 119011, value = "unhandled data type!", format = Message.Format.MESSAGE_FORMAT) - HornetQInternalErrorException replicationUnhandledDataType(); + ActiveMQInternalErrorException replicationUnhandledDataType(); @Message(id = 119012, value = "No binding for divert {0}", format = Message.Format.MESSAGE_FORMAT) - HornetQInternalErrorException noBindingForDivert(SimpleString name); + ActiveMQInternalErrorException noBindingForDivert(SimpleString name); @Message(id = 119013, value = "Binding {0} is not a divert", format = Message.Format.MESSAGE_FORMAT) - HornetQInternalErrorException bindingNotDivert(SimpleString name); + ActiveMQInternalErrorException bindingNotDivert(SimpleString name); @Message(id = 119014, value = "Did not receive data from {0}. It is likely the client has exited or crashed without " @@ -106,70 +106,70 @@ public interface HornetQMessageBundle "You also might have configured connection-ttl and client-failure-check-period incorrectly. " + "Please check user manual for more information." + " The connection will now be closed.", format = Message.Format.MESSAGE_FORMAT) - HornetQConnectionTimedOutException clientExited(String remoteAddress); + ActiveMQConnectionTimedOutException clientExited(String remoteAddress); @Message(id = 119015, value = "Timeout on waiting I/O completion", format = Message.Format.MESSAGE_FORMAT) - HornetQIOErrorException ioTimeout(); + ActiveMQIOErrorException ioTimeout(); @Message(id = 119016, value = "queue {0} has been removed cannot deliver message, queues should not be removed when grouping is used", format = Message.Format.MESSAGE_FORMAT) - HornetQNonExistentQueueException groupingQueueRemoved(SimpleString chosenClusterName); + ActiveMQNonExistentQueueException groupingQueueRemoved(SimpleString chosenClusterName); @Message(id = 119017, value = "Queue {0} does not exist", format = Message.Format.MESSAGE_FORMAT) - HornetQNonExistentQueueException noSuchQueue(SimpleString queueName); + ActiveMQNonExistentQueueException noSuchQueue(SimpleString queueName); @Message(id = 119018, value = "Binding already exists {0}", format = Message.Format.MESSAGE_FORMAT) - HornetQQueueExistsException bindingAlreadyExists(Binding binding); + ActiveMQQueueExistsException bindingAlreadyExists(Binding binding); @Message(id = 119019, value = "Queue already exists {0}", format = Message.Format.MESSAGE_FORMAT) - HornetQQueueExistsException queueAlreadyExists(SimpleString queueName); + ActiveMQQueueExistsException queueAlreadyExists(SimpleString queueName); @Message(id = 119020, value = "Invalid filter: {0}", format = Message.Format.MESSAGE_FORMAT) - HornetQInvalidFilterExpressionException invalidFilter(@Cause Throwable e, SimpleString filter); + ActiveMQInvalidFilterExpressionException invalidFilter(@Cause Throwable e, SimpleString filter); @Message(id = 119021, value = "MessageId was not assigned to Message", format = Message.Format.MESSAGE_FORMAT) - HornetQIllegalStateException messageIdNotAssigned(); + ActiveMQIllegalStateException messageIdNotAssigned(); @Message(id = 119022, value = "Cannot compare journals if not in sync!", format = Message.Format.MESSAGE_FORMAT) - HornetQIllegalStateException journalsNotInSync(); + ActiveMQIllegalStateException journalsNotInSync(); @Message(id = 119023, value = "Connected server is not a backup server", format = Message.Format.MESSAGE_FORMAT) - HornetQIllegalStateException serverNotBackupServer(); + ActiveMQIllegalStateException serverNotBackupServer(); @Message(id = 119024, value = "Backup replication server is already connected to another server", format = Message.Format.MESSAGE_FORMAT) - HornetQIllegalStateException alreadyHaveReplicationServer(); + ActiveMQIllegalStateException alreadyHaveReplicationServer(); @Message(id = 119025, value = "Cannot delete queue {0} on binding {1} - it has consumers = {2}", format = Message.Format.MESSAGE_FORMAT) - HornetQIllegalStateException cannotDeleteQueue(SimpleString name, SimpleString queueName, String s); + ActiveMQIllegalStateException cannotDeleteQueue(SimpleString name, SimpleString queueName, String s); @Message(id = 119026, value = "Backup Server was not yet in sync with live", format = Message.Format.MESSAGE_FORMAT) - HornetQIllegalStateException backupServerNotInSync(); + ActiveMQIllegalStateException backupServerNotInSync(); @Message(id = 119027, value = "Could not find reference on consumer ID={0}, messageId = {1} queue = {2}", format = Message.Format.MESSAGE_FORMAT) - HornetQIllegalStateException consumerNoReference(Long id, Long messageID, SimpleString name); + ActiveMQIllegalStateException consumerNoReference(Long id, Long messageID, SimpleString name); @Message(id = 119028, value = "Consumer {0} doesn''t exist on the server", format = Message.Format.MESSAGE_FORMAT) - HornetQIllegalStateException consumerDoesntExist(long consumerID); + ActiveMQIllegalStateException consumerDoesntExist(long consumerID); @Message(id = 119029, value = "No address configured on the Server''s Session", format = Message.Format.MESSAGE_FORMAT) - HornetQIllegalStateException noAddress(); + ActiveMQIllegalStateException noAddress(); @Message(id = 119030, value = "large-message not initialized on server", format = Message.Format.MESSAGE_FORMAT) - HornetQIllegalStateException largeMessageNotInitialised(); + ActiveMQIllegalStateException largeMessageNotInitialised(); @Message(id = 119031, value = "Unable to validate user: {0}", format = Message.Format.MESSAGE_FORMAT) - HornetQSecurityException unableToValidateUser(String user); + ActiveMQSecurityException unableToValidateUser(String user); @Message(id = 119032, value = "User: {0} does not have permission=''{1}'' on address {2}", format = Message.Format.MESSAGE_FORMAT) - HornetQSecurityException userNoPermissions(String username, CheckType checkType, String saddress); + ActiveMQSecurityException userNoPermissions(String username, CheckType checkType, String saddress); @Message(id = 119033, value = "Server and client versions incompatible", format = Message.Format.MESSAGE_FORMAT) - HornetQIncompatibleClientServerException incompatibleClientServer(); + ActiveMQIncompatibleClientServerException incompatibleClientServer(); @Message(id = 119034, value = "Server not started", format = Message.Format.MESSAGE_FORMAT) - HornetQSessionCreationException serverNotStarted(); + ActiveMQSessionCreationException serverNotStarted(); @Message(id = 119035, value = "Metadata {0}={1} had been set already", format = Message.Format.MESSAGE_FORMAT) - HornetQDuplicateMetaDataException duplicateMetadata(String key, String data); + ActiveMQDuplicateMetaDataException duplicateMetadata(String key, String data); @Message(id = 119036, value = "Invalid type: {0}", format = Message.Format.MESSAGE_FORMAT) IllegalArgumentException invalidType(Object type); @@ -307,7 +307,7 @@ public interface HornetQMessageBundle * Exception used on on {@link org.apache.activemq.core.server.impl.HornetQServerImpl#destroyConnectionWithSessionMetadata(String, String)} */ @Message(id = 119078, value = "Disconnected per admin''s request on {0}={1}", format = Message.Format.MESSAGE_FORMAT) - HornetQDisconnectedException destroyConnectionWithSessionMetadataSendException(String key, String value); + ActiveMQDisconnectedException destroyConnectionWithSessionMetadataSendException(String key, String value); /** * Message used on on {@link org.apache.activemq.core.server.impl.HornetQServerImpl#destroyConnectionWithSessionMetadata(String, String)} @@ -316,25 +316,25 @@ public interface HornetQMessageBundle String destroyConnectionWithSessionMetadataNoSessionFound(String key, String value); @Message(id = 119080, value = "Invalid Page IO, PagingManager was stopped or closed", format = Message.Format.MESSAGE_FORMAT) - HornetQIllegalStateException invalidPageIO(); + ActiveMQIllegalStateException invalidPageIO(); @Message(id = 119081, value = "No Discovery Group configuration named {0} found", format = Message.Format.MESSAGE_FORMAT) - HornetQException noDiscoveryGroupFound(DiscoveryGroupConfiguration dg); + ActiveMQException noDiscoveryGroupFound(DiscoveryGroupConfiguration dg); @Message(id = 119082, value = "Queue {0} already exists on another subscription", format = Message.Format.MESSAGE_FORMAT) - HornetQInvalidTransientQueueUseException queueSubscriptionBelongsToDifferentAddress(SimpleString queueName); + ActiveMQInvalidTransientQueueUseException queueSubscriptionBelongsToDifferentAddress(SimpleString queueName); @Message(id = 119083, value = "Queue {0} has a different filter than requested", format = Message.Format.MESSAGE_FORMAT) - HornetQInvalidTransientQueueUseException queueSubscriptionBelongsToDifferentFilter(SimpleString queueName); + ActiveMQInvalidTransientQueueUseException queueSubscriptionBelongsToDifferentFilter(SimpleString queueName); @Message(id = 119085, value = "Classpath lacks a protocol-manager for protocol {0}", format = Message.Format.MESSAGE_FORMAT) - HornetQException noProtocolManagerFound(String protocol); + ActiveMQException noProtocolManagerFound(String protocol); // this code has to match with version 2.3.x as it's used on integration tests at Wildfly and JBoss EAP @Message(id = 119099, value = "Unable to authenticate cluster user: {0}", format = Message.Format.MESSAGE_FORMAT) - HornetQClusterSecurityException unableToValidateClusterUser(String user); + ActiveMQClusterSecurityException unableToValidateClusterUser(String user); @Message(id = 119100, value = "Trying to move a journal file that refers to a file instead of a directory: {0}", @@ -346,26 +346,26 @@ public interface HornetQMessageBundle IllegalStateException couldNotMoveJournal(File dir); @Message(id = 119102, value = "Address \"{0}\" is full.", format = Message.Format.MESSAGE_FORMAT) - HornetQAddressFullException addressIsFull(String addressName); + ActiveMQAddressFullException addressIsFull(String addressName); @Message(id = 119103, value = "No Connectors or Discovery Groups configured for Scale Down", format = Message.Format.MESSAGE_FORMAT) - HornetQException noConfigurationFoundForScaleDown(); + ActiveMQException noConfigurationFoundForScaleDown(); @Message(id = 119104, value = "Server is stopping. Message grouping not allowed", format = Message.Format.MESSAGE_FORMAT) - HornetQException groupWhileStopping(); + ActiveMQException groupWhileStopping(); @Message(id = 119105, value = "Server will not accept create session request since scale down has not occurred", format = Message.Format.MESSAGE_FORMAT) - HornetQSessionCreationException sessionNotFailedOver(); + ActiveMQSessionCreationException sessionNotFailedOver(); @Message(id = 119106, value = "Invalid slow consumer policy type {0}", format = Message.Format.MESSAGE_FORMAT) IllegalArgumentException invalidSlowConsumerPolicyType(String val); @Message(id = 119107, value = "consumer connections for address {0} closed by management", format = Message.Format.MESSAGE_FORMAT) - HornetQInternalErrorException consumerConnectionsClosedByManagement(String address); + ActiveMQInternalErrorException consumerConnectionsClosedByManagement(String address); @Message(id = 119108, value = "connections for user {0} closed by management", format = Message.Format.MESSAGE_FORMAT) - HornetQInternalErrorException connectionsForUserClosedByManagement(String userName); + ActiveMQInternalErrorException connectionsForUserClosedByManagement(String userName); @Message(id = 119109, value = "unsupported HA Policy Configuration {0}", format = Message.Format.MESSAGE_FORMAT) - HornetQIllegalStateException unsupportedHAPolicyConfiguration(Object o); + ActiveMQIllegalStateException unsupportedHAPolicyConfiguration(Object o); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/server/HornetQServerLogger.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/HornetQServerLogger.java b/activemq-server/src/main/java/org/apache/activemq/core/server/HornetQServerLogger.java index 9a6b1a0..1647d03 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/HornetQServerLogger.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/HornetQServerLogger.java @@ -40,7 +40,7 @@ import java.util.concurrent.Executor; import java.util.concurrent.ExecutorService; import io.netty.channel.Channel; -import org.apache.activemq.api.core.HornetQExceptionType; +import org.apache.activemq.api.core.ActiveMQExceptionType; import org.apache.activemq.api.core.Pair; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.core.client.impl.ServerLocatorInternal; @@ -577,7 +577,7 @@ public interface HornetQServerLogger extends BasicLogger @LogMessage(level = Logger.Level.WARN) @Message(id = 222067, value = "Connection failure has been detected: {0} [code={1}]", format = Message.Format.MESSAGE_FORMAT) - void connectionFailureDetected(String message, HornetQExceptionType type); + void connectionFailureDetected(String message, ActiveMQExceptionType type); @LogMessage(level = Logger.Level.WARN) @Message(id = 222069, value = "error cleaning up stomp connection", format = Message.Format.MESSAGE_FORMAT) http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/server/LargeServerMessage.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/LargeServerMessage.java b/activemq-server/src/main/java/org/apache/activemq/core/server/LargeServerMessage.java index 6e4bce8..c43e563 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/LargeServerMessage.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/LargeServerMessage.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.core.server; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.core.journal.SequentialFile; import org.apache.activemq.core.replication.ReplicatedLargeMessage; @@ -47,7 +47,7 @@ public interface LargeServerMessage extends ServerMessage, ReplicatedLargeMessag /** * @return - * @throws HornetQException + * @throws org.apache.activemq.api.core.ActiveMQException */ - SequentialFile getFile() throws HornetQException; + SequentialFile getFile() throws ActiveMQException; } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-server/src/main/java/org/apache/activemq/core/server/LiveNodeLocator.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/LiveNodeLocator.java b/activemq-server/src/main/java/org/apache/activemq/core/server/LiveNodeLocator.java index 2adbfcd..6d3985c 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/LiveNodeLocator.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/LiveNodeLocator.java @@ -13,7 +13,7 @@ package org.apache.activemq.core.server; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.Pair; import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.api.core.client.ClusterTopologyListener; @@ -48,12 +48,12 @@ public abstract class LiveNodeLocator implements ClusterTopologyListener /** * Locates a possible live server in a cluster with a timeout */ - public abstract void locateNode(long timeout) throws HornetQException; + public abstract void locateNode(long timeout) throws ActiveMQException; /** * Locates a possible live server in a cluster */ - public abstract void locateNode() throws HornetQException; + public abstract void locateNode() throws ActiveMQException; /** * Returns the current connector @@ -86,7 +86,7 @@ public abstract class LiveNodeLocator implements ClusterTopologyListener /** * connects to the cluster */ - public void connectToCluster(ServerLocatorInternal serverLocator) throws HornetQException + public void connectToCluster(ServerLocatorInternal serverLocator) throws ActiveMQException { serverLocator.connect(); }
