You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by da...@apache.org on 2015/04/03 09:26:56 UTC
[1/2] activemq git commit: Upgrade to Camel 2.15.1
Repository: activemq
Updated Branches:
refs/heads/master 299410820 -> 94f1e98ad
Upgrade to Camel 2.15.1
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/9f040144
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/9f040144
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/9f040144
Branch: refs/heads/master
Commit: 9f040144f2bdd0075eb0766325bdf81bb51080a4
Parents: 2994108
Author: Claus Ibsen <cl...@gmail.com>
Authored: Fri Apr 3 09:07:31 2015 +0200
Committer: Claus Ibsen <cl...@gmail.com>
Committed: Fri Apr 3 09:17:56 2015 +0200
----------------------------------------------------------------------
.../org/apache/activemq/camel/component/broker/BrokerEndpoint.java | 2 +-
pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/9f040144/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 7a10c95..5479022 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
@@ -38,7 +38,7 @@ import org.apache.camel.spi.UriPath;
import org.apache.camel.util.UnsafeUriCharactersEncoder;
@ManagedResource(description = "Managed Camel Broker Endpoint")
-@UriEndpoint(scheme = "broker", consumerClass = BrokerConsumer.class, syntax = "broker:destination", label = "messaging")
+@UriEndpoint(scheme = "broker", syntax = "broker:destination", consumerClass = BrokerConsumer.class, title = "Broker", label = "messaging")
public class BrokerEndpoint extends DefaultEndpoint implements MultipleConsumersSupport, Service {
static final String PRODUCER_BROKER_EXCHANGE = "producerBrokerExchange";
http://git-wip-us.apache.org/repos/asf/activemq/blob/9f040144/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a26b242..c5ebd5d 100755
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
<aries-version>1.1.0</aries-version>
<aries-transaction-version>1.1.1</aries-transaction-version>
<axion-version>1.0-M3-dev</axion-version>
- <camel-version>2.15.0</camel-version>
+ <camel-version>2.15.1</camel-version>
<camel-version-range>[2.15,3)</camel-version-range>
<cglib-version>2.2</cglib-version>
<commons-beanutils-version>1.8.3</commons-beanutils-version>
[2/2] activemq git commit: AMQ-5693: Include component documentation
for activemq-camel
Posted by da...@apache.org.
AMQ-5693: Include component documentation for activemq-camel
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/94f1e98a
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/94f1e98a
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/94f1e98a
Branch: refs/heads/master
Commit: 94f1e98adc81cb3a4f13c1316e992296d212248a
Parents: 9f04014
Author: Claus Ibsen <cl...@gmail.com>
Authored: Fri Apr 3 09:29:20 2015 +0200
Committer: Claus Ibsen <cl...@gmail.com>
Committed: Fri Apr 3 09:29:20 2015 +0200
----------------------------------------------------------------------
.../camel/component/ActiveMQEndpoint.java | 31 ++++++++++++++++++++
1 file changed, 31 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/94f1e98a/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQEndpoint.java
----------------------------------------------------------------------
diff --git a/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQEndpoint.java b/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQEndpoint.java
new file mode 100644
index 0000000..1268f61
--- /dev/null
+++ b/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQEndpoint.java
@@ -0,0 +1,31 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.camel.component;
+
+import org.apache.camel.component.jms.JmsConsumer;
+import org.apache.camel.component.jms.JmsEndpoint;
+import org.apache.camel.spi.UriEndpoint;
+
+/**
+ * ActiveMQ endpoint.
+ */
+@UriEndpoint(scheme = "activemq", title = "ActiveMQ", syntax = "activemq:destinationType:destinationName", consumerClass = JmsConsumer.class, label = "messaging")
+public class ActiveMQEndpoint extends JmsEndpoint {
+
+ // needed for component documentation
+
+}
\ No newline at end of file