camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [4/6] camel git commit: CAMEL-11147: camel-jms should include JMS 2.0 functionality.
Date Mon, 18 Sep 2017 12:42:34 GMT
CAMEL-11147: camel-jms should include JMS 2.0 functionality.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a7de396c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a7de396c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a7de396c

Branch: refs/heads/master
Commit: a7de396c7ce5e3f6650d09a780114a207e488a29
Parents: 8cb6b8f
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Mon Sep 18 14:09:12 2017 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Mon Sep 18 14:09:12 2017 +0200

----------------------------------------------------------------------
 components/camel-jms/pom.xml                        | 16 +++++++++++++++-
 .../org/apache/camel/component/jms/JmsEndpoint.java |  2 +-
 2 files changed, 16 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/a7de396c/components/camel-jms/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jms/pom.xml b/components/camel-jms/pom.xml
index 52b4750..26b165c 100644
--- a/components/camel-jms/pom.xml
+++ b/components/camel-jms/pom.xml
@@ -64,10 +64,10 @@
       <artifactId>spring-beans</artifactId>
     </dependency>
     <!-- either use JMS 1.1 or 2.0 provided by JMS client -->
+    <!-- here we use JMS 2.0 API but using JMS 1.1 should work as well -->
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-jms_2.0_spec</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
@@ -105,6 +105,13 @@
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-client</artifactId>
+      <!-- lets use JMS 2.0 api but camel-jms still works with ActiveMQ 5.x that is JMS
1.1 only -->
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.geronimo.specs</groupId>
+          <artifactId>geronimo-jms_1.1_spec</artifactId>
+        </exclusion>
+      </exclusions>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -123,6 +130,13 @@
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-pool</artifactId>
       <scope>test</scope>
+      <!-- lets use JMS 2.0 api but camel-jms still works with ActiveMQ 5.x that is JMS
1.1 only -->
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.geronimo.specs</groupId>
+          <artifactId>geronimo-jms_1.1_spec</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.xbean</groupId>

http://git-wip-us.apache.org/repos/asf/camel/blob/a7de396c/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
index 2604bb2..3f87f97 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
@@ -66,7 +66,7 @@ import org.springframework.util.ErrorHandler;
 /**
  * The jms component allows messages to be sent to (or consumed from) a JMS Queue or Topic.
  *
- * This component uses Spring JMS.
+ * This component uses Spring JMS and supports JMS 1.1 and 2.0 API.
  */
 @ManagedResource(description = "Managed JMS Endpoint")
 @UriEndpoint(firstVersion = "1.0.0", scheme = "jms", title = "JMS", syntax = "jms:destinationType:destinationName",
consumerClass = JmsConsumer.class, label = "messaging")


Mime
View raw message