Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0D8631029E for ; Wed, 11 Mar 2015 09:14:03 +0000 (UTC) Received: (qmail 59907 invoked by uid 500); 11 Mar 2015 09:14:02 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 59864 invoked by uid 500); 11 Mar 2015 09:14:02 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 59855 invoked by uid 99); 11 Mar 2015 09:14:02 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Mar 2015 09:14:02 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 73005E0AD4; Wed, 11 Mar 2015 09:14:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davsclaus@apache.org To: commits@activemq.apache.org Message-Id: <3a5d886585ba4a599dc34fde672d72ca@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: activemq git commit: AMQ-5657: Upgrade to Camel 2.15.0 Date: Wed, 11 Mar 2015 09:14:02 +0000 (UTC) Repository: activemq Updated Branches: refs/heads/master 185213b44 -> 6097401c5 AMQ-5657: Upgrade to Camel 2.15.0 Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/6097401c Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/6097401c Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/6097401c Branch: refs/heads/master Commit: 6097401c50568ebf3561a41eb40a00b30bb89fdf Parents: 185213b Author: Claus Ibsen Authored: Wed Mar 11 10:00:46 2015 +0100 Committer: Claus Ibsen Committed: Wed Mar 11 10:07:20 2015 +0100 ---------------------------------------------------------------------- activemq-camel/pom.xml | 6 ++++- .../camel/component/broker/BrokerComponent.java | 2 +- .../component/broker/BrokerConfiguration.java | 5 ++++ .../camel/component/broker/BrokerEndpoint.java | 25 ++++++++++++++------ pom.xml | 4 ++-- 5 files changed, 31 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/6097401c/activemq-camel/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-camel/pom.xml b/activemq-camel/pom.xml index c1b8d0b..16bda1f 100755 --- a/activemq-camel/pom.xml +++ b/activemq-camel/pom.xml @@ -32,7 +32,7 @@ - org.springframework.jms*;version="[3,4)", + org.springframework.jms*;version="[3,5)", org.apache.activemq.pool, org.apache.camel*;version="${camel-version-range}", * @@ -40,6 +40,10 @@ org.apache.activemq.camel*;version:="${project.version}";-noimport:=true + + org.apache.camel.spi.ComponentResolver;component=activemq, + org.apache.camel.spi.ComponentResolver;component=broker + http://git-wip-us.apache.org/repos/asf/activemq/blob/6097401c/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerComponent.java ---------------------------------------------------------------------- diff --git a/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerComponent.java b/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerComponent.java index ea31f30..c300361 100644 --- a/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerComponent.java +++ b/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerComponent.java @@ -63,7 +63,7 @@ public class BrokerComponent extends UriEndpointComponent implements EndpointCom } ActiveMQDestination destination = ActiveMQDestination.createDestination(remaining, destinationType); - BrokerEndpoint brokerEndpoint = new BrokerEndpoint(uri, this, destination, brokerConfiguration); + BrokerEndpoint brokerEndpoint = new BrokerEndpoint(uri, this, remaining, destination, brokerConfiguration); setProperties(brokerEndpoint, parameters); return brokerEndpoint; } http://git-wip-us.apache.org/repos/asf/activemq/blob/6097401c/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerConfiguration.java ---------------------------------------------------------------------- diff --git a/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerConfiguration.java b/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerConfiguration.java index 6609533..f522f9b 100644 --- a/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerConfiguration.java +++ b/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerConfiguration.java @@ -17,7 +17,9 @@ package org.apache.activemq.camel.component.broker; import org.apache.camel.spi.UriParam; +import org.apache.camel.spi.UriParams; +@UriParams public class BrokerConfiguration { @UriParam @@ -27,6 +29,9 @@ public class BrokerConfiguration { return brokerName; } + /** + * Name of the broker + */ public void setBrokerName(String brokerName) { this.brokerName = brokerName; } http://git-wip-us.apache.org/repos/asf/activemq/blob/6097401c/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerEndpoint.java ---------------------------------------------------------------------- diff --git a/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerEndpoint.java b/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerEndpoint.java index 55e7f7b..7a10c95 100644 --- a/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerEndpoint.java +++ b/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerEndpoint.java @@ -31,26 +31,30 @@ import org.apache.camel.Producer; import org.apache.camel.Service; import org.apache.camel.api.management.ManagedResource; import org.apache.camel.impl.DefaultEndpoint; +import org.apache.camel.spi.Metadata; import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriParam; import org.apache.camel.spi.UriPath; import org.apache.camel.util.UnsafeUriCharactersEncoder; @ManagedResource(description = "Managed Camel Broker Endpoint") -@UriEndpoint(scheme = "broker", consumerClass = BrokerConsumer.class) +@UriEndpoint(scheme = "broker", consumerClass = BrokerConsumer.class, syntax = "broker:destination", label = "messaging") public class BrokerEndpoint extends DefaultEndpoint implements MultipleConsumersSupport, Service { static final String PRODUCER_BROKER_EXCHANGE = "producerBrokerExchange"; - @UriParam - private final BrokerConfiguration configuration; private MessageInterceptorRegistry messageInterceptorRegistry; - @UriPath - private final ActiveMQDestination destination; private List messageInterceptorList = new CopyOnWriteArrayList(); - public BrokerEndpoint(String uri, BrokerComponent component, ActiveMQDestination destination, BrokerConfiguration configuration) { + @UriPath(name = "destination") @Metadata(required = "true") + private String destinationName; + private final ActiveMQDestination destination; + @UriParam + private final BrokerConfiguration configuration; + + public BrokerEndpoint(String uri, BrokerComponent component, String destinationName, ActiveMQDestination destination, BrokerConfiguration configuration) { super(UnsafeUriCharactersEncoder.encode(uri), component); + this.destinationName = destinationName; this.destination = destination; this.configuration = configuration; } @@ -82,10 +86,17 @@ public class BrokerEndpoint extends DefaultEndpoint implements MultipleConsumers return destination; } + /** + * The name of the JMS destination + */ + public String getDestinationName() { + return destinationName; + } + @Override protected void doStart() throws Exception { super.doStart(); - messageInterceptorRegistry = MessageInterceptorRegistry.getInstance().get(configuration.getBrokerName()); + messageInterceptorRegistry = MessageInterceptorRegistry.getInstance().get(configuration.getBrokerName()); for (MessageInterceptor messageInterceptor : messageInterceptorList) { addMessageInterceptor(messageInterceptor); } http://git-wip-us.apache.org/repos/asf/activemq/blob/6097401c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 31e582b..e8d2b67 100755 --- a/pom.xml +++ b/pom.xml @@ -47,8 +47,8 @@ 1.1.0 1.1.1 1.0-M3-dev - 2.14.1 - [2.14,3) + 2.15.0 + [2.15,3) 2.2 1.8.3 3.2.1