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:34 UTC
[1/5] activemq-artemis git commit: This closes #532
Repository: activemq-artemis
Updated Branches:
refs/heads/master 316845cc4 -> cd088888b
This closes #532
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/cd088888
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/cd088888
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/cd088888
Branch: refs/heads/master
Commit: cd088888b6b3a76f6803613be0f56888979ff629
Parents: 316845c 4842b62
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon May 23 18:26:21 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon May 23 18:26:21 2016 -0400
----------------------------------------------------------------------
.../org/apache/activemq/artemis/cli/commands/Create.java | 5 ++++-
.../activemq/artemis/cli/commands/etc/artemis.profile | 2 +-
.../artemis/api/core/management/AcceptorControl.java | 2 ++
.../api/core/management/ActiveMQComponentControl.java | 2 ++
.../server/management/impl/ManagementServiceImpl.java | 11 +++++------
pom.xml | 2 +-
6 files changed, 15 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
[2/5] activemq-artemis git commit: ARTEMIS-405 correct some missing
docs
Posted by cl...@apache.org.
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);
}
[5/5] activemq-artemis git commit: ARTEMIS-531 upgrade Jolokia
Posted by cl...@apache.org.
ARTEMIS-531 upgrade Jolokia
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/d6bbc9ce
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/d6bbc9ce
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/d6bbc9ce
Branch: refs/heads/master
Commit: d6bbc9ce35e417133b736cccc2eb1257c789d579
Parents: 6993aa9
Author: jbertram <jb...@apache.org>
Authored: Mon May 23 10:43:46 2016 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon May 23 18:26:21 2016 -0400
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d6bbc9ce/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index eef50be..5ac90e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -520,7 +520,7 @@
<groupId>org.jolokia</groupId>
<artifactId>jolokia-war</artifactId>
<type>war</type>
- <version>1.3.2</version>
+ <version>1.3.3</version>
<!-- License: Apache 2.0 -->
</dependency>
<!-- ## End Jetty Wed Dependencies ## -->
[3/5] activemq-artemis git commit: ARTEMIS-533 change HTTP port from
CLI
Posted by cl...@apache.org.
ARTEMIS-533 change HTTP port from CLI
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/6993aa9d
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/6993aa9d
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/6993aa9d
Branch: refs/heads/master
Commit: 6993aa9d844801b90fa7145d9d393a75f970b9d9
Parents: 316845c
Author: jbertram <jb...@apache.org>
Authored: Mon May 23 10:03:14 2016 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon May 23 18:26:21 2016 -0400
----------------------------------------------------------------------
.../java/org/apache/activemq/artemis/cli/commands/Create.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6993aa9d/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
index 3162bb4..84587c0 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
@@ -99,6 +99,9 @@ public class Create extends InputAbstract {
@Option(name = "--default-port", description = "The port number to use for the main 'artemis' acceptor (Default: 61616)")
int defaultPort = DEFAULT_PORT;
+ @Option(name = "--http-port", description = "The port number to use for embedded web server (Default: 8161)")
+ int httpPort = HTTP_PORT;
+
@Option(name = "--name", description = "The name of the broker (Default: same as host)")
String name;
@@ -524,7 +527,7 @@ public class Create extends InputAbstract {
filters.put("${stomp.port}", String.valueOf(STOMP_PORT + portOffset));
filters.put("${hq.port}", String.valueOf(HQ_PORT + portOffset));
filters.put("${mqtt.port}", String.valueOf(MQTT_PORT + portOffset));
- filters.put("${http.port}", String.valueOf(HTTP_PORT + portOffset));
+ filters.put("${http.port}", String.valueOf(httpPort + portOffset));
filters.put("${data.dir}", data);
filters.put("${max-hops}", String.valueOf(maxHops));
[4/5] activemq-artemis git commit: ARTEMIS-532 config RMI port for
remote JMX
Posted by cl...@apache.org.
ARTEMIS-532 config RMI port for remote JMX
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/4842b62d
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/4842b62d
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/4842b62d
Branch: refs/heads/master
Commit: 4842b62d2597e9a13c79104edd05f21887d80752
Parents: d9b721b
Author: jbertram <jb...@apache.org>
Authored: Mon May 23 16:34:50 2016 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon May 23 18:26:21 2016 -0400
----------------------------------------------------------------------
.../org/apache/activemq/artemis/cli/commands/etc/artemis.profile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4842b62d/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
index c341d14..a6c57fa 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
@@ -29,7 +29,7 @@ JAVA_ARGS="-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -X
# There might be options that you only want to enable on specifc commands, like setting a JMX port
# See https://issues.apache.org/jira/browse/ARTEMIS-318
#if [ "$1" = "run" ]; then
-# JAVA_ARGS="$JAVA_ARGS -Dcom.sun.management.jmxremote=true -Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false"
+# JAVA_ARGS="$JAVA_ARGS -Dcom.sun.management.jmxremote=true -Dcom.sun.management.jmxremote.port=1099 -Djava.rmi.activation.port=1098 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false"
#fi
# Debug args: Uncomment to enable debug