You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ma...@apache.org on 2016/07/21 15:59:00 UTC

[1/2] activemq-artemis git commit: This closes #651

Repository: activemq-artemis
Updated Branches:
  refs/heads/master cfaaba41d -> e8b189a74


This closes #651


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/e8b189a7
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/e8b189a7
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/e8b189a7

Branch: refs/heads/master
Commit: e8b189a74ffd9c976b9efd7038470f34874c52e7
Parents: cfaaba4 27ef1b2
Author: Martyn Taylor <mt...@redhat.com>
Authored: Thu Jul 21 16:58:41 2016 +0100
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Thu Jul 21 16:58:41 2016 +0100

----------------------------------------------------------------------
 .../artemis/api/jms/management/DestinationControl.java      | 9 ++++++++-
 .../artemis/jms/management/impl/JMSTopicControlImpl.java    | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------



[2/2] activemq-artemis git commit: ARTEMIS-405 more docs for JMS destinations

Posted by ma...@apache.org.
ARTEMIS-405 more docs for JMS destinations


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/27ef1b2b
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/27ef1b2b
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/27ef1b2b

Branch: refs/heads/master
Commit: 27ef1b2bf092e953ee49eac7e99e3cfb7b72d898
Parents: cfaaba4
Author: jbertram <jb...@apache.org>
Authored: Wed Jul 20 16:44:00 2016 -0500
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Thu Jul 21 16:58:41 2016 +0100

----------------------------------------------------------------------
 .../artemis/api/jms/management/DestinationControl.java      | 9 ++++++++-
 .../artemis/jms/management/impl/JMSTopicControlImpl.java    | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/27ef1b2b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/DestinationControl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/DestinationControl.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/DestinationControl.java
index 678fb21..afd07ca 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/DestinationControl.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/DestinationControl.java
@@ -18,6 +18,7 @@ package org.apache.activemq.artemis.api.jms.management;
 
 import javax.management.MBeanOperationInfo;
 
+import org.apache.activemq.artemis.api.core.management.Attribute;
 import org.apache.activemq.artemis.api.core.management.Operation;
 import org.apache.activemq.artemis.api.core.management.Parameter;
 
@@ -30,31 +31,37 @@ public interface DestinationControl {
    /**
     * Returns the name of this destination.
     */
+   @Attribute(desc = "the name of this destination")
    String getName();
 
    /**
-    * Returns the ActiveMQ Artemis address corresponding to this destination.
+    * Returns the address corresponding to this destination.
     */
+   @Attribute(desc = "the address corresponding to this destination")
    String getAddress();
 
    /**
     * Returns whether this destination is temporary.
     */
+   @Attribute(desc = "whether this destination is temporary")
    boolean isTemporary();
 
    /**
     * Returns the number of messages currently in this destination.
     */
+   @Attribute(desc = "the number of messages currently in this destination")
    long getMessageCount() throws Exception;
 
    /**
     * Returns the number of messages that this queue is currently delivering to its consumers.
     */
+   @Attribute(desc = "the number of messages that this queue is currently delivering to its consumers")
    int getDeliveringCount();
 
    /**
     * Returns the number of messages added to this queue since it was created.
     */
+   @Attribute(desc = "the number of messages added to this queue since it was created")
    long getMessagesAdded();
 
    // Operations ----------------------------------------------------

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/27ef1b2b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSTopicControlImpl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSTopicControlImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSTopicControlImpl.java
index 63d3d45..5a0842d 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSTopicControlImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSTopicControlImpl.java
@@ -365,7 +365,7 @@ public class JMSTopicControlImpl extends StandardMBean implements TopicControl {
    @Override
    public MBeanInfo getMBeanInfo() {
       MBeanInfo info = super.getMBeanInfo();
-      return new MBeanInfo(info.getClassName(), info.getDescription(), info.getAttributes(), info.getConstructors(), MBeanInfoHelper.getMBeanOperationsInfo(TopicControl.class), info.getNotifications());
+      return new MBeanInfo(info.getClassName(), info.getDescription(), MBeanInfoHelper.getMBeanAttributesInfo(TopicControl.class), info.getConstructors(), MBeanInfoHelper.getMBeanOperationsInfo(TopicControl.class), info.getNotifications());
    }
 
    // Inner classes -------------------------------------------------