You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2016/05/23 22:26:35 UTC
[2/5] activemq-artemis git commit: ARTEMIS-405 correct some missing
docs
ARTEMIS-405 correct some missing docs
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/d9b721b3
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/d9b721b3
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/d9b721b3
Branch: refs/heads/master
Commit: d9b721b35b6f98e5bed01ac0d8e199752f1af79d
Parents: d6bbc9c
Author: jbertram <jb...@apache.org>
Authored: Mon May 23 15:39:43 2016 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon May 23 18:26:21 2016 -0400
----------------------------------------------------------------------
.../artemis/api/core/management/AcceptorControl.java | 2 ++
.../api/core/management/ActiveMQComponentControl.java | 2 ++
.../server/management/impl/ManagementServiceImpl.java | 11 +++++------
3 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d9b721b3/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AcceptorControl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AcceptorControl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AcceptorControl.java
index 45df0df..a2c0604 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AcceptorControl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AcceptorControl.java
@@ -16,6 +16,7 @@
*/
package org.apache.activemq.artemis.api.core.management;
+import javax.management.MBeanOperationInfo;
import java.util.Map;
/**
@@ -46,5 +47,6 @@ public interface AcceptorControl extends ActiveMQComponentControl {
* Re-create the acceptor with the existing configuration values. Useful, for example, for reloading key/trust
* stores on acceptors which support SSL.
*/
+ @Operation(desc = "Re-create the acceptor with the existing configuration values. Useful, for example, for reloading key/trust stores on acceptors which support SSL.", impact = MBeanOperationInfo.ACTION)
void reload();
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d9b721b3/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQComponentControl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQComponentControl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQComponentControl.java
index 848e683..7c98b6b 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQComponentControl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQComponentControl.java
@@ -30,10 +30,12 @@ public interface ActiveMQComponentControl {
/**
* Starts this component.
*/
+ @Operation(desc = "starts this component")
void start() throws Exception;
/**
* Stops this component.
*/
+ @Operation(desc = "stops this component")
void stop() throws Exception;
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d9b721b3/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java
index 8187809..a43c666 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java
@@ -21,7 +21,6 @@ import javax.management.MBeanRegistrationException;
import javax.management.MBeanServer;
import javax.management.NotificationBroadcasterSupport;
import javax.management.ObjectName;
-import javax.management.StandardMBean;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -262,7 +261,7 @@ public class ManagementServiceImpl implements ManagementService {
public synchronized void registerDivert(final Divert divert, final DivertConfiguration config) throws Exception {
ObjectName objectName = objectNameBuilder.getDivertObjectName(divert.getUniqueName().toString());
DivertControl divertControl = new DivertControlImpl(divert, storageManager, config);
- registerInJMX(objectName, new StandardMBean(divertControl, DivertControl.class));
+ registerInJMX(objectName, divertControl);
registerInRegistry(ResourceNames.CORE_DIVERT + config.getName(), divertControl);
if (logger.isDebugEnabled()) {
@@ -282,7 +281,7 @@ public class ManagementServiceImpl implements ManagementService {
final TransportConfiguration configuration) throws Exception {
ObjectName objectName = objectNameBuilder.getAcceptorObjectName(configuration.getName());
AcceptorControl control = new AcceptorControlImpl(acceptor, storageManager, configuration);
- registerInJMX(objectName, new StandardMBean(control, AcceptorControl.class));
+ registerInJMX(objectName, control);
registerInRegistry(ResourceNames.CORE_ACCEPTOR + configuration.getName(), control);
}
@@ -320,7 +319,7 @@ public class ManagementServiceImpl implements ManagementService {
broadcastGroup.setNotificationService(this);
ObjectName objectName = objectNameBuilder.getBroadcastGroupObjectName(configuration.getName());
BroadcastGroupControl control = new BroadcastGroupControlImpl(broadcastGroup, storageManager, configuration);
- registerInJMX(objectName, new StandardMBean(control, BroadcastGroupControl.class));
+ registerInJMX(objectName, control);
registerInRegistry(ResourceNames.CORE_BROADCAST_GROUP + configuration.getName(), control);
}
@@ -337,7 +336,7 @@ public class ManagementServiceImpl implements ManagementService {
bridge.setNotificationService(this);
ObjectName objectName = objectNameBuilder.getBridgeObjectName(configuration.getName());
BridgeControl control = new BridgeControlImpl(bridge, storageManager, configuration);
- registerInJMX(objectName, new StandardMBean(control, BridgeControl.class));
+ registerInJMX(objectName, control);
registerInRegistry(ResourceNames.CORE_BRIDGE + configuration.getName(), control);
}
@@ -353,7 +352,7 @@ public class ManagementServiceImpl implements ManagementService {
final ClusterConnectionConfiguration configuration) throws Exception {
ObjectName objectName = objectNameBuilder.getClusterConnectionObjectName(configuration.getName());
ClusterConnectionControl control = new ClusterConnectionControlImpl(cluster, storageManager, configuration);
- registerInJMX(objectName, new StandardMBean(control, ClusterConnectionControl.class));
+ registerInJMX(objectName, control);
registerInRegistry(ResourceNames.CORE_CLUSTER_CONNECTION + configuration.getName(), control);
}