Repository: activemq-cli-tools Updated Branches: refs/heads/master f4ae5076b -> c5b6230d9
NO-JIRA: upgrading to ActiveMQ 5.14.4 and upgrading for new Artemis refactor Project: http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/commit/c5b6230d Tree: http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/tree/c5b6230d Diff: http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/diff/c5b6230d Branch: refs/heads/master Commit: c5b6230d922b164ac99e3430b33b9309bf529337 Parents: f4ae507 Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com> Authored: Tue Mar 7 09:07:23 2017 -0500 Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com> Committed: Tue Mar 7 09:07:23 2017 -0500 ---------------------------------------------------------------------- .../exporter/artemis/OpenWireMessageTypeConverter.java | 8 ++++---- pom.xml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/c5b6230d/activemq-kahadb-exporter/src/main/java/org/apache/activemq/cli/kahadb/exporter/artemis/OpenWireMessageTypeConverter.java ---------------------------------------------------------------------- diff --git a/activemq-kahadb-exporter/src/main/java/org/apache/activemq/cli/kahadb/exporter/artemis/OpenWireMessageTypeConverter.java b/activemq-kahadb-exporter/src/main/java/org/apache/activemq/cli/kahadb/exporter/artemis/OpenWireMessageTypeConverter.java index c921b48..662062a 100644 --- a/activemq-kahadb-exporter/src/main/java/org/apache/activemq/cli/kahadb/exporter/artemis/OpenWireMessageTypeConverter.java +++ b/activemq-kahadb-exporter/src/main/java/org/apache/activemq/cli/kahadb/exporter/artemis/OpenWireMessageTypeConverter.java @@ -16,9 +16,9 @@ */ package org.apache.activemq.cli.kahadb.exporter.artemis; +import org.apache.activemq.artemis.api.core.ICoreMessage; import org.apache.activemq.artemis.cli.commands.tools.XmlDataExporterUtil; import org.apache.activemq.artemis.core.protocol.openwire.OpenWireMessageConverter; -import org.apache.activemq.artemis.core.server.ServerMessage; import org.apache.activemq.artemis.jms.client.ActiveMQDestination; import org.apache.activemq.cli.kahadb.exporter.OpenWireExportConverter; import org.apache.activemq.cli.schema.BodyType; @@ -51,7 +51,7 @@ public class OpenWireMessageTypeConverter implements OpenWireExportConverter<Mes */ @Override public MessageType convert(final Message message) throws Exception { - final ServerMessage serverMessage = converter.inbound(message); + final ICoreMessage serverMessage = (ICoreMessage) converter.inbound(message); final MessageType messageType = convertAttributes(serverMessage); try { @@ -96,7 +96,7 @@ public class OpenWireMessageTypeConverter implements OpenWireExportConverter<Mes } } - private BodyType convertBody(final ServerMessage serverMessage) throws Exception { + private BodyType convertBody(final ICoreMessage serverMessage) throws Exception { String value = XmlDataExporterUtil.encodeMessageBody(serverMessage); //requires CDATA @@ -105,7 +105,7 @@ public class OpenWireMessageTypeConverter implements OpenWireExportConverter<Mes .build(); } - private MessageType convertAttributes(final ServerMessage message) { + private MessageType convertAttributes(final ICoreMessage message) { MessageType messageType = MessageType.builder() .withId(message.getMessageID()) .withTimestamp(message.getTimestamp()) http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/c5b6230d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 9541e1b..e0b6c81 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ <maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.target>1.8</maven.compiler.target> - <activemq-version>5.14.3</activemq-version> + <activemq-version>5.14.4</activemq-version> <artemis-version>2.0.0-SNAPSHOT</artemis-version> <slf4j-version>1.7.13</slf4j-version> <log4j-version>1.2.17</log4j-version>