Return-Path: X-Original-To: apmail-brooklyn-commits-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C97F1106FA for ; Wed, 19 Nov 2014 23:57:50 +0000 (UTC) Received: (qmail 33050 invoked by uid 500); 19 Nov 2014 23:57:50 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 33025 invoked by uid 500); 19 Nov 2014 23:57:50 -0000 Mailing-List: contact commits-help@brooklyn.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.incubator.apache.org Delivered-To: mailing list commits@brooklyn.incubator.apache.org Received: (qmail 33016 invoked by uid 99); 19 Nov 2014 23:57:50 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Nov 2014 23:57:50 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 19 Nov 2014 23:57:27 +0000 Received: (qmail 30987 invoked by uid 99); 19 Nov 2014 23:57:25 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Nov 2014 23:57:25 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C79E0945D80; Wed, 19 Nov 2014 23:57:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: heneveld@apache.org To: commits@brooklyn.incubator.apache.org Date: Wed, 19 Nov 2014 23:57:26 -0000 Message-Id: In-Reply-To: <3981b3692ddb48a8a32d6883c60dfb7d@git.apache.org> References: <3981b3692ddb48a8a32d6883c60dfb7d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/5] incubator-brooklyn git commit: [BROOKLYN-91] Update mbean ONs to reflect changed naming convention in activemq-5.10.0 X-Virus-Checked: Checked by ClamAV on apache.org [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 Authored: Wed Nov 19 17:14:47 2014 -0500 Committer: Hadrian Zbarcea 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 START_TIMEOUT = SoftwareProcess.START_TIMEOUT; @SetFromFlag("version") - public static final ConfigKey SUGGESTED_VERSION = ConfigKeys.newConfigKeyWithDefault(SoftwareProcess.SUGGESTED_VERSION, "5.7.0"); + public static final ConfigKey SUGGESTED_VERSION = ConfigKeys.newConfigKeyWithDefault(SoftwareProcess.SUGGESTED_VERSION, "5.10.0"); @SetFromFlag("downloadUrl") public static final AttributeSensorAndConfigKey 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 MIRROR_URL = new BasicConfigKey(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