You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2014/11/20 00:57:26 UTC
[3/5] incubator-brooklyn git commit: [BROOKLYN-91] Update mbean ONs
to reflect changed naming convention in activemq-5.10.0
[BROOKLYN-91] Update mbean ONs to reflect changed naming convention in activemq-5.10.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/f1a3b6bd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/f1a3b6bd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/f1a3b6bd
Branch: refs/heads/master
Commit: f1a3b6bde9cc3a209b6a2846d12f661c717f31a3
Parents: 25e2761
Author: Hadrian Zbarcea <ha...@apache.org>
Authored: Wed Nov 19 17:14:47 2014 -0500
Committer: Hadrian Zbarcea <ha...@apache.org>
Committed: Wed Nov 19 17:14:47 2014 -0500
----------------------------------------------------------------------
.../java/brooklyn/entity/messaging/activemq/ActiveMQBroker.java | 4 ++--
.../brooklyn/entity/messaging/activemq/ActiveMQBrokerImpl.java | 2 +-
.../entity/messaging/activemq/ActiveMQDestinationImpl.java | 2 +-
.../brooklyn/entity/messaging/activemq/ActiveMQQueueImpl.java | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f1a3b6bd/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQBroker.java
----------------------------------------------------------------------
diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQBroker.java b/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQBroker.java
index 24090a1..1ef9cb2 100644
--- a/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQBroker.java
+++ b/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQBroker.java
@@ -45,7 +45,7 @@ public interface ActiveMQBroker extends SoftwareProcess, MessageBroker, UsesJmx,
ConfigKey<Duration> START_TIMEOUT = SoftwareProcess.START_TIMEOUT;
@SetFromFlag("version")
- public static final ConfigKey<String> SUGGESTED_VERSION = ConfigKeys.newConfigKeyWithDefault(SoftwareProcess.SUGGESTED_VERSION, "5.7.0");
+ public static final ConfigKey<String> SUGGESTED_VERSION = ConfigKeys.newConfigKeyWithDefault(SoftwareProcess.SUGGESTED_VERSION, "5.10.0");
@SetFromFlag("downloadUrl")
public static final AttributeSensorAndConfigKey<String,String> DOWNLOAD_URL = new StringAttributeSensorAndConfigKey(
@@ -54,7 +54,7 @@ public interface ActiveMQBroker extends SoftwareProcess, MessageBroker, UsesJmx,
/** download mirror, if desired */
@SetFromFlag("mirrorUrl")
public static final BasicConfigKey<String> MIRROR_URL = new BasicConfigKey<String>(String.class, "activemq.install.mirror.url", "URL of mirror",
- "http://www.mirrorservice.org/sites/ftp.apache.org/activemq/apache-activemq");
+ "http://www.mirrorservice.org/sites/ftp.apache.org/activemq");
@SetFromFlag("openWirePort")
public static final PortAttributeSensorAndConfigKey OPEN_WIRE_PORT = new PortAttributeSensorAndConfigKey("openwire.port", "OpenWire port", "61616+");
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f1a3b6bd/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQBrokerImpl.java
----------------------------------------------------------------------
diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQBrokerImpl.java b/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQBrokerImpl.java
index 8219daa..08fb6d2 100644
--- a/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQBrokerImpl.java
+++ b/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQBrokerImpl.java
@@ -88,7 +88,7 @@ public class ActiveMQBrokerImpl extends JMSBrokerImpl<ActiveMQQueue, ActiveMQTop
protected void connectSensors() {
setAttribute(BROKER_URL, String.format("tcp://%s:%d", getAttribute(HOSTNAME), getAttribute(OPEN_WIRE_PORT)));
- String brokerMbeanName = "org.apache.activemq:BrokerName=localhost,Type=Broker";
+ String brokerMbeanName = "org.apache.activemq:brokerName=localhost,type=Broker";
jmxFeed = JmxFeed.builder()
.entity(this)
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f1a3b6bd/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQDestinationImpl.java
----------------------------------------------------------------------
diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQDestinationImpl.java b/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQDestinationImpl.java
index e222bd1..d988268 100644
--- a/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQDestinationImpl.java
+++ b/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQDestinationImpl.java
@@ -41,7 +41,7 @@ public abstract class ActiveMQDestinationImpl extends JMSDestinationImpl impleme
//assume just one BrokerName at this endpoint
try {
- brokerMBeanName = new ObjectName("org.apache.activemq:BrokerName=localhost,Type=Broker");
+ brokerMBeanName = new ObjectName("org.apache.activemq:brokerName=localhost,type=Broker");
jmxHelper = new JmxHelper((EntityLocal) getParent());
} catch (MalformedObjectNameException e) {
throw Exceptions.propagate(e);
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f1a3b6bd/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQQueueImpl.java
----------------------------------------------------------------------
diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQQueueImpl.java b/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQQueueImpl.java
index 9737bd3..4e6b0d8 100644
--- a/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQQueueImpl.java
+++ b/software/messaging/src/main/java/brooklyn/entity/messaging/activemq/ActiveMQQueueImpl.java
@@ -55,7 +55,7 @@ public class ActiveMQQueueImpl extends ActiveMQDestinationImpl implements Active
@Override
protected void connectSensors() {
- String queue = String.format("org.apache.activemq:BrokerName=localhost,Type=Queue,Destination=%s", getName());
+ String queue = String.format("org.apache.activemq:type=Broker,brokerName=localhost,destinationType=Queue,destinationName=%s", getName());
jmxFeed = JmxFeed.builder()
.entity(this)