diff --git a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/browse.js b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/browse.js index ac5a91bd50..35ee593719 100644 --- a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/browse.js +++ b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/browse.js @@ -63,6 +63,11 @@ var ARTEMIS = (function(ARTEMIS) { field: 'redelivered', displayName: 'Redelivered', width: '10%' + }, + { + field: 'largeMessage', + displayName: 'Large', + width: '10%' } ]; var attributes = defaultAttributes; diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/openmbean/CompositeDataConstants.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/openmbean/CompositeDataConstants.java index d9d70155b1..feae788315 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/openmbean/CompositeDataConstants.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/openmbean/CompositeDataConstants.java @@ -29,10 +29,11 @@ public interface CompositeDataConstants { String TIMESTAMP = "timestamp"; String BODY = "BodyPreview"; String TEXT_BODY = "text"; + String LARGE_MESSAGE = "largeMessage"; String PROPERTIES = "PropertiesText"; String ADDRESS_DESCRIPTION = "The Address"; - String MESSAGE_ID_DESCRIPTION = " The message ID"; + String MESSAGE_ID_DESCRIPTION = "The message ID"; String USER_ID_DESCRIPTION = "The user ID"; String TYPE_DESCRIPTION = "The message type"; String DURABLE_DESCRIPTION = "Is the message durable"; @@ -41,6 +42,7 @@ public interface CompositeDataConstants { String REDELIVERED_DESCRIPTION = "Has the message been redelivered"; String TIMESTAMP_DESCRIPTION = "The message timestamp"; String BODY_DESCRIPTION = "The message body"; + String LARGE_MESSAGE_DESCRIPTION = "Is the message treated as a large message"; String PROPERTIES_DESCRIPTION = "The properties text"; // User properties diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/openmbean/OpenTypeSupport.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/openmbean/OpenTypeSupport.java index 6c7a9b5a45..c19be9ca4e 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/openmbean/OpenTypeSupport.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/openmbean/OpenTypeSupport.java @@ -108,6 +108,7 @@ public final class OpenTypeSupport { addItem(CompositeDataConstants.PRIORITY, CompositeDataConstants.PRIORITY_DESCRIPTION, SimpleType.BYTE); addItem(CompositeDataConstants.REDELIVERED, CompositeDataConstants.REDELIVERED_DESCRIPTION, SimpleType.BOOLEAN); addItem(CompositeDataConstants.TIMESTAMP, CompositeDataConstants.TIMESTAMP_DESCRIPTION, SimpleType.STRING); + addItem(CompositeDataConstants.LARGE_MESSAGE, CompositeDataConstants.LARGE_MESSAGE_DESCRIPTION, SimpleType.BOOLEAN); addItem(CompositeDataConstants.PROPERTIES, CompositeDataConstants.PROPERTIES_DESCRIPTION, SimpleType.STRING); @@ -148,6 +149,7 @@ public final class OpenTypeSupport { rc.put(CompositeDataConstants.TIMESTAMP, dateFormat.format(new Date(m.getTimestamp()))); rc.put(CompositeDataConstants.PRIORITY, m.getPriority()); rc.put(CompositeDataConstants.REDELIVERED, ref.getDeliveryCount() > 1); + rc.put(CompositeDataConstants.LARGE_MESSAGE, m.isLargeMessage()); Map propertyMap = m.toPropertyMap();