http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/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 index d8a8833..f8bfe5a 100644 --- 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 @@ -12,9 +12,9 @@ */ package org.apache.activemq.core.protocol.core.impl.wireformat; -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.core.protocol.core.impl.PacketImpl; /** @@ -24,13 +24,13 @@ import org.apache.activemq.core.protocol.core.impl.PacketImpl; public class HornetQExceptionMessage extends PacketImpl { - private HornetQException exception; + private ActiveMQException exception; // Static -------------------------------------------------------- // Constructors -------------------------------------------------- - public HornetQExceptionMessage(final HornetQException exception) + public HornetQExceptionMessage(final ActiveMQException exception) { super(EXCEPTION); @@ -50,25 +50,25 @@ public class HornetQExceptionMessage extends PacketImpl return true; } - public HornetQException getException() + public ActiveMQException getException() { return exception; } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeInt(exception.getType().getCode()); buffer.writeNullableString(exception.getMessage()); } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { int code = buffer.readInt(); String msg = buffer.readNullableString(); - exception = HornetQExceptionType.createException(code, msg); + exception = ActiveMQExceptionType.createException(code, msg); } @Override
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/PacketsConfirmedMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/PacketsConfirmedMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/PacketsConfirmedMessage.java index e131808..daf799c 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/PacketsConfirmedMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/PacketsConfirmedMessage.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; /** @@ -47,13 +47,13 @@ public class PacketsConfirmedMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeInt(commandID); } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { commandID = buffer.readInt(); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/Ping.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/Ping.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/Ping.java index c0552c3..d0f4a47 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/Ping.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/Ping.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; /** @@ -43,13 +43,13 @@ public final class Ping extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeLong(connectionTTL); } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { connectionTTL = buffer.readLong(); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReattachSessionMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReattachSessionMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReattachSessionMessage.java index 8a4ea74..070b95b 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReattachSessionMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReattachSessionMessage.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; /** @@ -53,14 +53,14 @@ public class ReattachSessionMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeString(name); buffer.writeInt(lastConfirmedCommandID); } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { name = buffer.readString(); lastConfirmedCommandID = buffer.readInt(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReattachSessionResponseMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReattachSessionResponseMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReattachSessionResponseMessage.java index 7a0473c..cc6850b 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReattachSessionResponseMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/ReattachSessionResponseMessage.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; /** @@ -55,14 +55,14 @@ public class ReattachSessionResponseMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeInt(lastConfirmedCommandID); buffer.writeBoolean(reattached); } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { lastConfirmedCommandID = buffer.readInt(); reattached = buffer.readBoolean(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/RollbackMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/RollbackMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/RollbackMessage.java index 4b6bec5..b38ba9b 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/RollbackMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/RollbackMessage.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; /** @@ -54,13 +54,13 @@ public class RollbackMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeBoolean(considerLastMessageAsDelivered); } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { considerLastMessageAsDelivered = buffer.readBoolean(); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionAcknowledgeMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionAcknowledgeMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionAcknowledgeMessage.java index b8daa9e..89347a2 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionAcknowledgeMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionAcknowledgeMessage.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; /** @@ -60,7 +60,7 @@ public class SessionAcknowledgeMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeLong(consumerID); @@ -70,7 +70,7 @@ public class SessionAcknowledgeMessage extends PacketImpl } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { consumerID = buffer.readLong(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionAddMetaDataMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionAddMetaDataMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionAddMetaDataMessage.java index f545169..b8f92bb 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionAddMetaDataMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionAddMetaDataMessage.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; /** @@ -42,14 +42,14 @@ public class SessionAddMetaDataMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeString(key); buffer.writeString(data); } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { key = buffer.readString(); data = buffer.readString(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionAddMetaDataMessageV2.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionAddMetaDataMessageV2.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionAddMetaDataMessageV2.java index b75d972..f28d867 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionAddMetaDataMessageV2.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionAddMetaDataMessageV2.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; /** @@ -66,7 +66,7 @@ public class SessionAddMetaDataMessageV2 extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeString(key); buffer.writeString(data); @@ -74,7 +74,7 @@ public class SessionAddMetaDataMessageV2 extends PacketImpl } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { key = buffer.readString(); data = buffer.readString(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionBindingQueryMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionBindingQueryMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionBindingQueryMessage.java index 54a9bb7..18b5db7 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionBindingQueryMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionBindingQueryMessage.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; @@ -45,13 +45,13 @@ public class SessionBindingQueryMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeSimpleString(address); } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { address = buffer.readSimpleString(); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage.java index 20eb737..b2ede5e 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage.java @@ -15,7 +15,7 @@ package org.apache.activemq.core.protocol.core.impl.wireformat; import java.util.ArrayList; import java.util.List; -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; @@ -63,7 +63,7 @@ public class SessionBindingQueryResponseMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeBoolean(exists); buffer.writeInt(queueNames.size()); @@ -74,7 +74,7 @@ public class SessionBindingQueryResponseMessage extends PacketImpl } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { exists = buffer.readBoolean(); int numQueues = buffer.readInt(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionConsumerCloseMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionConsumerCloseMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionConsumerCloseMessage.java index 863c378..a48b6bb 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionConsumerCloseMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionConsumerCloseMessage.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; /** @@ -43,13 +43,13 @@ public class SessionConsumerCloseMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeLong(consumerID); } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { consumerID = buffer.readLong(); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionConsumerFlowCreditMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionConsumerFlowCreditMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionConsumerFlowCreditMessage.java index 259a188..980fb28 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionConsumerFlowCreditMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionConsumerFlowCreditMessage.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; /** @@ -50,14 +50,14 @@ public class SessionConsumerFlowCreditMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeLong(consumerID); buffer.writeInt(credits); } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { consumerID = buffer.readLong(); credits = buffer.readInt(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionContinuationMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionContinuationMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionContinuationMessage.java index a6cb077..e77dde4 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionContinuationMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionContinuationMessage.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; import org.apache.activemq.utils.DataConstants; @@ -75,7 +75,7 @@ public abstract class SessionContinuationMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeInt(body.length); buffer.writeBytes(body); @@ -83,7 +83,7 @@ public abstract class SessionContinuationMessage extends PacketImpl } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { int size = buffer.readInt(); body = new byte[size]; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionCreateConsumerMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionCreateConsumerMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionCreateConsumerMessage.java index 5e572ce..a9e167c 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionCreateConsumerMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionCreateConsumerMessage.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; @@ -103,7 +103,7 @@ public class SessionCreateConsumerMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeLong(id); buffer.writeSimpleString(queueName); @@ -113,7 +113,7 @@ public class SessionCreateConsumerMessage extends PacketImpl } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { id = buffer.readLong(); queueName = buffer.readSimpleString(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionDeleteQueueMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionDeleteQueueMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionDeleteQueueMessage.java index 1d14c8a..37d6747 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionDeleteQueueMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionDeleteQueueMessage.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; @@ -51,13 +51,13 @@ public class SessionDeleteQueueMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeSimpleString(queueName); } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { queueName = buffer.readSimpleString(); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionExpireMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionExpireMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionExpireMessage.java index f8368fb..dbad444 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionExpireMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionExpireMessage.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; /** @@ -59,7 +59,7 @@ public class SessionExpireMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeLong(consumerID); @@ -67,7 +67,7 @@ public class SessionExpireMessage extends PacketImpl } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { consumerID = buffer.readLong(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionForceConsumerDelivery.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionForceConsumerDelivery.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionForceConsumerDelivery.java index c5b986a..979f88b 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionForceConsumerDelivery.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionForceConsumerDelivery.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; /** @@ -51,14 +51,14 @@ public class SessionForceConsumerDelivery extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeLong(consumerID); buffer.writeLong(sequence); } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { consumerID = buffer.readLong(); sequence = buffer.readLong(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionIndividualAcknowledgeMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionIndividualAcknowledgeMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionIndividualAcknowledgeMessage.java index 9d4b58c..4f0248f 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionIndividualAcknowledgeMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionIndividualAcknowledgeMessage.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; /** @@ -68,7 +68,7 @@ public class SessionIndividualAcknowledgeMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeLong(consumerID); @@ -78,7 +78,7 @@ public class SessionIndividualAcknowledgeMessage extends PacketImpl } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { consumerID = buffer.readLong(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionProducerCreditsFailMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionProducerCreditsFailMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionProducerCreditsFailMessage.java index 5814942..2b86c79 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionProducerCreditsFailMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionProducerCreditsFailMessage.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; @@ -51,14 +51,14 @@ public class SessionProducerCreditsFailMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeInt(credits); buffer.writeSimpleString(address); } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { credits = buffer.readInt(); address = buffer.readSimpleString(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionProducerCreditsMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionProducerCreditsMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionProducerCreditsMessage.java index 164830e..1833145 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionProducerCreditsMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionProducerCreditsMessage.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; @@ -51,14 +51,14 @@ public class SessionProducerCreditsMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeInt(credits); buffer.writeSimpleString(address); } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { credits = buffer.readInt(); address = buffer.readSimpleString(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionQueueQueryMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionQueueQueryMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionQueueQueryMessage.java index 6f0306f..f873136 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionQueueQueryMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionQueueQueryMessage.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; @@ -45,13 +45,13 @@ public class SessionQueueQueryMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeSimpleString(queueName); } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { queueName = buffer.readSimpleString(); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage.java index ad5e400..21ffeac 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage.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.api.core.client.ClientSession; import org.apache.activemq.core.client.impl.QueueQueryImpl; @@ -130,7 +130,7 @@ public class SessionQueueQueryResponseMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeBoolean(exists); buffer.writeBoolean(durable); @@ -143,7 +143,7 @@ public class SessionQueueQueryResponseMessage extends PacketImpl } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { exists = buffer.readBoolean(); durable = buffer.readBoolean(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveClientLargeMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveClientLargeMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveClientLargeMessage.java index c718caf..175e9bd 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveClientLargeMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveClientLargeMessage.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.client.impl.ClientLargeMessageInternal; import org.apache.activemq.core.message.impl.MessageInternal; @@ -29,7 +29,7 @@ public class SessionReceiveClientLargeMessage extends SessionReceiveLargeMessage } @Override - public void decodeRest(HornetQBuffer buffer) + public void decodeRest(ActiveMQBuffer buffer) { super.decodeRest(buffer); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveContinuationMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveContinuationMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveContinuationMessage.java index 484a48a..893d454 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveContinuationMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveContinuationMessage.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.utils.DataConstants; /** @@ -80,7 +80,7 @@ public class SessionReceiveContinuationMessage extends SessionContinuationMessag // Public -------------------------------------------------------- @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { super.encodeRest(buffer); buffer.writeLong(consumerID); @@ -102,7 +102,7 @@ public class SessionReceiveContinuationMessage extends SessionContinuationMessag @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { super.decodeRest(buffer); consumerID = buffer.readLong(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveLargeMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveLargeMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveLargeMessage.java index d04df3a..7d0419a 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveLargeMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveLargeMessage.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.message.impl.MessageInternal; import org.apache.activemq.core.protocol.core.impl.PacketImpl; @@ -81,7 +81,7 @@ public class SessionReceiveLargeMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeLong(consumerID); buffer.writeInt(deliveryCount); @@ -90,7 +90,7 @@ public class SessionReceiveLargeMessage extends PacketImpl } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { consumerID = buffer.readLong(); deliveryCount = buffer.readInt(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveMessage.java index 73d66c8..0915a4b 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionReceiveMessage.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.message.impl.MessageInternal; import org.apache.activemq.spi.core.protocol.RemotingConnection; import org.apache.activemq.utils.DataConstants; @@ -58,9 +58,9 @@ public class SessionReceiveMessage extends MessagePacket } @Override - public HornetQBuffer encode(final RemotingConnection connection) + public ActiveMQBuffer encode(final RemotingConnection connection) { - HornetQBuffer buffer = message.getEncodedBuffer(); + ActiveMQBuffer buffer = message.getEncodedBuffer(); // Sanity check if (buffer.writerIndex() != message.getEndOfMessagePosition()) @@ -87,7 +87,7 @@ public class SessionReceiveMessage extends MessagePacket } @Override - public void decode(final HornetQBuffer buffer) + public void decode(final ActiveMQBuffer buffer) { channelID = buffer.readLong(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionRequestProducerCreditsMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionRequestProducerCreditsMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionRequestProducerCreditsMessage.java index 199f70d..5a60c9f 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionRequestProducerCreditsMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionRequestProducerCreditsMessage.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; @@ -58,14 +58,14 @@ public class SessionRequestProducerCreditsMessage extends PacketImpl // } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeInt(credits); buffer.writeSimpleString(address); } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { credits = buffer.readInt(); address = buffer.readSimpleString(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.java index 8b267e1..fecf94b 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.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.client.SendAcknowledgementHandler; import org.apache.activemq.core.message.impl.MessageInternal; @@ -94,7 +94,7 @@ public class SessionSendContinuationMessage extends SessionContinuationMessage } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { super.encodeRest(buffer); if (!continues) @@ -105,7 +105,7 @@ public class SessionSendContinuationMessage extends SessionContinuationMessage } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { super.decodeRest(buffer); if (!continues) http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionSendLargeMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionSendLargeMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionSendLargeMessage.java index 143e443..dcd89f8 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionSendLargeMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionSendLargeMessage.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.message.impl.MessageInternal; import org.apache.activemq.core.protocol.core.impl.PacketImpl; @@ -48,13 +48,13 @@ public class SessionSendLargeMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { largeMessage.encodeHeadersAndProperties(buffer); } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { largeMessage.decodeHeadersAndProperties(buffer); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionSendMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionSendMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionSendMessage.java index 48503ce..a3d5a82 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionSendMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionSendMessage.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.client.SendAcknowledgementHandler; import org.apache.activemq.core.message.impl.MessageInternal; import org.apache.activemq.spi.core.protocol.RemotingConnection; @@ -63,9 +63,9 @@ public class SessionSendMessage extends MessagePacket } @Override - public HornetQBuffer encode(final RemotingConnection connection) + public ActiveMQBuffer encode(final RemotingConnection connection) { - HornetQBuffer buffer = message.getEncodedBuffer(); + ActiveMQBuffer buffer = message.getEncodedBuffer(); // Sanity check if (buffer.writerIndex() != message.getEndOfMessagePosition()) @@ -93,7 +93,7 @@ public class SessionSendMessage extends MessagePacket } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { // Buffer comes in after having read standard headers and positioned at Beginning of body part http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAAfterFailedMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAAfterFailedMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAAfterFailedMessage.java index bae684a..e1519dd 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAAfterFailedMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAAfterFailedMessage.java @@ -14,7 +14,7 @@ package org.apache.activemq.core.protocol.core.impl.wireformat; import javax.transaction.xa.Xid; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.core.protocol.core.impl.PacketImpl; import org.apache.activemq.utils.XidCodecSupport; @@ -55,13 +55,13 @@ public class SessionXAAfterFailedMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { XidCodecSupport.encodeXid(xid, buffer); } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { xid = XidCodecSupport.decodeXid(buffer); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXACommitMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXACommitMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXACommitMessage.java index 42ca620..6822447 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXACommitMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXACommitMessage.java @@ -14,7 +14,7 @@ package org.apache.activemq.core.protocol.core.impl.wireformat; import javax.transaction.xa.Xid; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.core.protocol.core.impl.PacketImpl; import org.apache.activemq.utils.XidCodecSupport; @@ -58,14 +58,14 @@ public class SessionXACommitMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { XidCodecSupport.encodeXid(xid, buffer); buffer.writeBoolean(onePhase); } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { xid = XidCodecSupport.decodeXid(buffer); onePhase = buffer.readBoolean(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAEndMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAEndMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAEndMessage.java index c51e771..ae1669e 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAEndMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAEndMessage.java @@ -14,7 +14,7 @@ package org.apache.activemq.core.protocol.core.impl.wireformat; import javax.transaction.xa.Xid; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.core.protocol.core.impl.PacketImpl; import org.apache.activemq.utils.XidCodecSupport; @@ -52,14 +52,14 @@ public class SessionXAEndMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { XidCodecSupport.encodeXid(xid, buffer); buffer.writeBoolean(failed); } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { xid = XidCodecSupport.decodeXid(buffer); failed = buffer.readBoolean(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAForgetMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAForgetMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAForgetMessage.java index e8d2e90..b0e5cd7 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAForgetMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAForgetMessage.java @@ -14,7 +14,7 @@ package org.apache.activemq.core.protocol.core.impl.wireformat; import javax.transaction.xa.Xid; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.core.protocol.core.impl.PacketImpl; import org.apache.activemq.utils.XidCodecSupport; @@ -43,13 +43,13 @@ public class SessionXAForgetMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { XidCodecSupport.encodeXid(xid, buffer); } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { xid = XidCodecSupport.decodeXid(buffer); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java index 51decb9..34832ff 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java @@ -17,7 +17,7 @@ import java.util.List; import javax.transaction.xa.Xid; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.core.protocol.core.impl.PacketImpl; import org.apache.activemq.utils.XidCodecSupport; @@ -52,7 +52,7 @@ public class SessionXAGetInDoubtXidsResponseMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeInt(xids.size()); @@ -63,7 +63,7 @@ public class SessionXAGetInDoubtXidsResponseMessage extends PacketImpl } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { int len = buffer.readInt(); xids = new ArrayList<Xid>(len); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAGetTimeoutResponseMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAGetTimeoutResponseMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAGetTimeoutResponseMessage.java index 5e1983a..48ed4be 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAGetTimeoutResponseMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAGetTimeoutResponseMessage.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; /** @@ -47,13 +47,13 @@ public class SessionXAGetTimeoutResponseMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeInt(timeoutSeconds); } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { timeoutSeconds = buffer.readInt(); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAJoinMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAJoinMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAJoinMessage.java index 1229a47..2d8f017 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAJoinMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAJoinMessage.java @@ -14,7 +14,7 @@ package org.apache.activemq.core.protocol.core.impl.wireformat; import javax.transaction.xa.Xid; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.core.protocol.core.impl.PacketImpl; import org.apache.activemq.utils.XidCodecSupport; @@ -44,13 +44,13 @@ public class SessionXAJoinMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { XidCodecSupport.encodeXid(xid, buffer); } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { xid = XidCodecSupport.decodeXid(buffer); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAPrepareMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAPrepareMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAPrepareMessage.java index 98f5707..c75ab71 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAPrepareMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAPrepareMessage.java @@ -14,7 +14,7 @@ package org.apache.activemq.core.protocol.core.impl.wireformat; import javax.transaction.xa.Xid; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.core.protocol.core.impl.PacketImpl; import org.apache.activemq.utils.XidCodecSupport; @@ -46,13 +46,13 @@ public class SessionXAPrepareMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { XidCodecSupport.encodeXid(xid, buffer); } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { xid = XidCodecSupport.decodeXid(buffer); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAResponseMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAResponseMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAResponseMessage.java index f0a530e..43ea56e 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAResponseMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAResponseMessage.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; /** @@ -66,7 +66,7 @@ public class SessionXAResponseMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeBoolean(error); buffer.writeInt(responseCode); @@ -74,7 +74,7 @@ public class SessionXAResponseMessage extends PacketImpl } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { error = buffer.readBoolean(); responseCode = buffer.readInt(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAResumeMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAResumeMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAResumeMessage.java index ddfe9e2..18c0e22 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAResumeMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAResumeMessage.java @@ -14,7 +14,7 @@ package org.apache.activemq.core.protocol.core.impl.wireformat; import javax.transaction.xa.Xid; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.core.protocol.core.impl.PacketImpl; import org.apache.activemq.utils.XidCodecSupport; @@ -46,13 +46,13 @@ public class SessionXAResumeMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { XidCodecSupport.encodeXid(xid, buffer); } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { xid = XidCodecSupport.decodeXid(buffer); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXARollbackMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXARollbackMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXARollbackMessage.java index 1195bf7..e772e3b 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXARollbackMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXARollbackMessage.java @@ -14,7 +14,7 @@ package org.apache.activemq.core.protocol.core.impl.wireformat; import javax.transaction.xa.Xid; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.core.protocol.core.impl.PacketImpl; import org.apache.activemq.utils.XidCodecSupport; @@ -47,13 +47,13 @@ public class SessionXARollbackMessage extends PacketImpl @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { XidCodecSupport.encodeXid(xid, buffer); } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { xid = XidCodecSupport.decodeXid(buffer); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXASetTimeoutMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXASetTimeoutMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXASetTimeoutMessage.java index d266085..4a59599 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXASetTimeoutMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXASetTimeoutMessage.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; /** @@ -43,13 +43,13 @@ public class SessionXASetTimeoutMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeInt(timeoutSeconds); } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { timeoutSeconds = buffer.readInt(); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXASetTimeoutResponseMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXASetTimeoutResponseMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXASetTimeoutResponseMessage.java index 5ef2256..ca2cac9 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXASetTimeoutResponseMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXASetTimeoutResponseMessage.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; /** @@ -49,13 +49,13 @@ public class SessionXASetTimeoutResponseMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeBoolean(ok); } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { ok = buffer.readBoolean(); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAStartMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAStartMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAStartMessage.java index 9491440..409f37f 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAStartMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SessionXAStartMessage.java @@ -14,7 +14,7 @@ package org.apache.activemq.core.protocol.core.impl.wireformat; import javax.transaction.xa.Xid; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.core.protocol.core.impl.PacketImpl; import org.apache.activemq.utils.XidCodecSupport; @@ -54,13 +54,13 @@ public class SessionXAStartMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { XidCodecSupport.encodeXid(xid, buffer); } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { xid = XidCodecSupport.decodeXid(buffer); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessage.java index e12ff30..2bc589c 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessage.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; /** @@ -56,13 +56,13 @@ public class SubscribeClusterTopologyUpdatesMessage extends PacketImpl } @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeBoolean(clusterConnection); } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { clusterConnection = buffer.readBoolean(); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessageV2.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessageV2.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessageV2.java index 5e3a56f..7a1fba4 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessageV2.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessageV2.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; /** * @author <a href="mailto:tim....@jboss.com";>Tim Fox</a> @@ -40,7 +40,7 @@ public class SubscribeClusterTopologyUpdatesMessageV2 extends SubscribeClusterTo @Override - public void encodeRest(final HornetQBuffer buffer) + public void encodeRest(final ActiveMQBuffer buffer) { super.encodeRest(buffer); buffer.writeInt(clientVersion); @@ -55,7 +55,7 @@ public class SubscribeClusterTopologyUpdatesMessageV2 extends SubscribeClusterTo } @Override - public void decodeRest(final HornetQBuffer buffer) + public void decodeRest(final ActiveMQBuffer buffer) { super.decodeRest(buffer); clientVersion = buffer.readInt(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/FailureListener.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/FailureListener.java b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/FailureListener.java index cf52280..35e325e 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/FailureListener.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/FailureListener.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.core.remoting; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQException; /** * A FailureListener notifies the user when a connection failure occurred. @@ -28,7 +28,7 @@ public interface FailureListener * @param exception exception which has caused the connection to fail * @param failedOver */ - void connectionFailed(HornetQException exception, boolean failedOver); + void connectionFailed(ActiveMQException exception, boolean failedOver); /** * Notifies that a connection has failed due to the specified exception. @@ -37,5 +37,5 @@ public interface FailureListener * @param failedOver * @param scaleDownTargetNodeID the ID of the node to which messages are scaling down */ - void connectionFailed(HornetQException exception, boolean failedOver, String scaleDownTargetNodeID); + void connectionFailed(ActiveMQException exception, boolean failedOver, String scaleDownTargetNodeID); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/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 index 543b925..c7e3fd6 100644 --- 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 @@ -17,7 +17,7 @@ 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.HornetQException; +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; @@ -96,9 +96,9 @@ public class HornetQChannelHandler extends ChannelDuplexHandler } // 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 HornetQException initial cause + // The user has access to this exeception anyway via the ActiveMQException initial cause - HornetQException me = HornetQClientMessageBundle.BUNDLE.nettyError(); + ActiveMQException me = HornetQClientMessageBundle.BUNDLE.nettyError(); me.initCause(cause); synchronized (listener) http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/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 fbfef29..6dbf38a 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 @@ -24,9 +24,9 @@ import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelPromise; import io.netty.channel.EventLoop; import io.netty.handler.ssl.SslHandler; -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.buffers.impl.ChannelBufferWrapper; import org.apache.activemq.core.client.HornetQClientLogger; @@ -60,7 +60,7 @@ public class NettyConnection implements Connection private final boolean directDeliver; - private volatile HornetQBuffer batchBuffer; + private volatile ActiveMQBuffer batchBuffer; private final Map<String, Object> configuration; @@ -168,7 +168,7 @@ public class NettyConnection implements Connection listener.connectionDestroyed(getID()); } - public HornetQBuffer createBuffer(final int size) + public ActiveMQBuffer createBuffer(final int size) { return new ChannelBufferWrapper(channel.alloc().buffer(size)); } @@ -205,17 +205,17 @@ public class NettyConnection implements Connection } } - public void write(final HornetQBuffer buffer) + public void write(final ActiveMQBuffer buffer) { write(buffer, false, false); } - public void write(HornetQBuffer buffer, final boolean flush, final boolean batched) + public void write(ActiveMQBuffer buffer, final boolean flush, final boolean batched) { write(buffer, flush, batched, null); } - public void write(HornetQBuffer buffer, final boolean flush, final boolean batched, final ChannelFutureListener futureListener) + public void write(ActiveMQBuffer buffer, final boolean flush, final boolean batched, final ChannelFutureListener futureListener) { try @@ -228,7 +228,7 @@ public class NettyConnection implements Connection { // Lazily create batch buffer - batchBuffer = HornetQBuffers.dynamicBuffer(BATCHING_BUFFER_SIZE); + batchBuffer = ActiveMQBuffers.dynamicBuffer(BATCHING_BUFFER_SIZE); } if (batchBuffer != null) @@ -254,7 +254,7 @@ public class NettyConnection implements Connection { // Create a new buffer - batchBuffer = HornetQBuffers.dynamicBuffer(BATCHING_BUFFER_SIZE); + batchBuffer = ActiveMQBuffers.dynamicBuffer(BATCHING_BUFFER_SIZE); } } @@ -327,7 +327,7 @@ public class NettyConnection implements Connection } catch (InterruptedException e) { - throw new HornetQInterruptedException(e); + throw new ActiveMQInterruptedException(e); } } } @@ -339,7 +339,7 @@ public class NettyConnection 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-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnector.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnector.java b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnector.java index b4fa9c2..76ab107 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnector.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnector.java @@ -96,7 +96,7 @@ import io.netty.util.ResourceLeakDetector; import io.netty.util.concurrent.Future; 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.core.client.HornetQClientLogger; import org.apache.activemq.core.client.HornetQClientMessageBundle; import org.apache.activemq.core.client.impl.ClientSessionFactoryImpl; @@ -1110,7 +1110,7 @@ public class NettyConnector 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-core-client/src/main/java/org/apache/activemq/reader/MapMessageUtil.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/reader/MapMessageUtil.java b/activemq-core-client/src/main/java/org/apache/activemq/reader/MapMessageUtil.java index ec7c436..d2a80a6 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/reader/MapMessageUtil.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/reader/MapMessageUtil.java @@ -13,7 +13,7 @@ package org.apache.activemq.reader; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.api.core.Message; import org.apache.activemq.utils.TypedProperties; @@ -29,7 +29,7 @@ public class MapMessageUtil extends MessageUtil */ public static void writeBodyMap(Message message, TypedProperties properties) { - HornetQBuffer buff = getBodyBuffer(message); + ActiveMQBuffer buff = getBodyBuffer(message); buff.resetWriterIndex(); properties.encode(buff); } @@ -49,7 +49,7 @@ public class MapMessageUtil extends MessageUtil */ public static void readBodyMap(Message message, TypedProperties map) { - HornetQBuffer buff = getBodyBuffer(message); + ActiveMQBuffer buff = getBodyBuffer(message); buff.resetReaderIndex(); map.decode(buff); }
