You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/01/29 14:15:40 UTC
[1/3] camel git commit: camel-catalog - Fixed a bug when using temp
queues in jms component.
Repository: camel
Updated Branches:
refs/heads/camel-2.17.x a46b89019 -> 9432a793b
refs/heads/camel-2.18.x 26d773002 -> 3112e08f1
refs/heads/master c9d95e211 -> 9c44f6ac7
camel-catalog - Fixed a bug when using temp queues in jms component.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9c44f6ac
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9c44f6ac
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9c44f6ac
Branch: refs/heads/master
Commit: 9c44f6ac79331ba0333db920259b5c52efd0d36c
Parents: c9d95e2
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Jan 29 15:13:47 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Jan 29 15:13:47 2017 +0100
----------------------------------------------------------------------
.../camel/catalog/DefaultCamelCatalog.java | 2 +-
.../apache/camel/catalog/CamelCatalogTest.java | 21 +++++++++++++++++++-
2 files changed, 21 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/9c44f6ac/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index 3e5826f..8d49810 100644
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -1473,7 +1473,7 @@ public class DefaultCamelCatalog implements CamelCatalog {
// special for activemq/jms where the enum for destinationType causes a token issue as it includes a colon
// for 'temp:queue' and 'temp:topic' values
- if ("activemq".equals(scheme) || "jms".equals("scheme")) {
+ if ("activemq".equals(scheme) || "jms".equals(scheme)) {
if (uriPath.startsWith("temp:")) {
prevPath = 5;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9c44f6ac/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
index 8efeed3..300b2a1 100644
--- a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
+++ b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
@@ -513,7 +513,26 @@ public class CamelCatalogTest {
catalog.addComponent("activemq", "org.apache.activemq.camel.component.ActiveMQComponent");
// activemq
- EndpointValidationResult result = catalog.validateEndpointProperties("activemq:temp:queue:cheese");
+ EndpointValidationResult result = catalog.validateEndpointProperties("activemq:temp:queue:cheese?jmsMessageType=Bytes");
+ assertTrue(result.isSuccess());
+ result = catalog.validateEndpointProperties("activemq:temp:queue:cheese?jmsMessageType=Bytes");
+ assertTrue(result.isSuccess());
+ result = catalog.validateEndpointProperties("activemq:temp:queue:cheese?jmsMessageType=Bytes", false, true, false);
+ assertTrue(result.isSuccess());
+ result = catalog.validateEndpointProperties("activemq:temp:queue:cheese?jmsMessageType=Bytes", false, false, true);
+ assertTrue(result.isSuccess());
+ }
+
+ @Test
+ public void validateJmsProperties() throws Exception {
+ // jms
+ EndpointValidationResult result = catalog.validateEndpointProperties("jms:temp:queue:cheese?jmsMessageType=Bytes");
+ assertTrue(result.isSuccess());
+ result = catalog.validateEndpointProperties("jms:temp:queue:cheese?jmsMessageType=Bytes");
+ assertTrue(result.isSuccess());
+ result = catalog.validateEndpointProperties("jms:temp:queue:cheese?jmsMessageType=Bytes", false, true, false);
+ assertTrue(result.isSuccess());
+ result = catalog.validateEndpointProperties("jms:temp:queue:cheese?jmsMessageType=Bytes", false, false, true);
assertTrue(result.isSuccess());
}
[2/3] camel git commit: camel-catalog - Fixed a bug when using temp
queues in jms component.
Posted by da...@apache.org.
camel-catalog - Fixed a bug when using temp queues in jms component.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3112e08f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3112e08f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3112e08f
Branch: refs/heads/camel-2.18.x
Commit: 3112e08f1499e28c10ab595a02e04591299f093b
Parents: 26d7730
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Jan 29 15:13:47 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Jan 29 15:15:03 2017 +0100
----------------------------------------------------------------------
.../camel/catalog/DefaultCamelCatalog.java | 2 +-
.../apache/camel/catalog/CamelCatalogTest.java | 21 +++++++++++++++++++-
2 files changed, 21 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3112e08f/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index ebe8a9b..a5d5167 100644
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -1329,7 +1329,7 @@ public class DefaultCamelCatalog implements CamelCatalog {
// special for activemq/jms where the enum for destinationType causes a token issue as it includes a colon
// for 'temp:queue' and 'temp:topic' values
- if ("activemq".equals(scheme) || "jms".equals("scheme")) {
+ if ("activemq".equals(scheme) || "jms".equals(scheme)) {
if (uriPath.startsWith("temp:")) {
prevPath = 5;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/3112e08f/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
index 5a67797..318f7f1 100644
--- a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
+++ b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
@@ -513,7 +513,26 @@ public class CamelCatalogTest {
catalog.addComponent("activemq", "org.apache.activemq.camel.component.ActiveMQComponent");
// activemq
- EndpointValidationResult result = catalog.validateEndpointProperties("activemq:temp:queue:cheese");
+ EndpointValidationResult result = catalog.validateEndpointProperties("activemq:temp:queue:cheese?jmsMessageType=Bytes");
+ assertTrue(result.isSuccess());
+ result = catalog.validateEndpointProperties("activemq:temp:queue:cheese?jmsMessageType=Bytes");
+ assertTrue(result.isSuccess());
+ result = catalog.validateEndpointProperties("activemq:temp:queue:cheese?jmsMessageType=Bytes", false, true, false);
+ assertTrue(result.isSuccess());
+ result = catalog.validateEndpointProperties("activemq:temp:queue:cheese?jmsMessageType=Bytes", false, false, true);
+ assertTrue(result.isSuccess());
+ }
+
+ @Test
+ public void validateJmsProperties() throws Exception {
+ // jms
+ EndpointValidationResult result = catalog.validateEndpointProperties("jms:temp:queue:cheese?jmsMessageType=Bytes");
+ assertTrue(result.isSuccess());
+ result = catalog.validateEndpointProperties("jms:temp:queue:cheese?jmsMessageType=Bytes");
+ assertTrue(result.isSuccess());
+ result = catalog.validateEndpointProperties("jms:temp:queue:cheese?jmsMessageType=Bytes", false, true, false);
+ assertTrue(result.isSuccess());
+ result = catalog.validateEndpointProperties("jms:temp:queue:cheese?jmsMessageType=Bytes", false, false, true);
assertTrue(result.isSuccess());
}
[3/3] camel git commit: camel-catalog - Fixed a bug when using temp
queues in jms component.
Posted by da...@apache.org.
camel-catalog - Fixed a bug when using temp queues in jms component.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9432a793
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9432a793
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9432a793
Branch: refs/heads/camel-2.17.x
Commit: 9432a793b30df01620fe0c922b7dfece6bca97a9
Parents: a46b890
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Jan 29 15:13:47 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Jan 29 15:15:22 2017 +0100
----------------------------------------------------------------------
.../camel/catalog/DefaultCamelCatalog.java | 2 +-
.../apache/camel/catalog/CamelCatalogTest.java | 21 +++++++++++++++++++-
2 files changed, 21 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/9432a793/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index eb5035b..0a972f4 100644
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -1072,7 +1072,7 @@ public class DefaultCamelCatalog implements CamelCatalog {
// special for activemq/jms where the enum for destinationType causes a token issue as it includes a colon
// for 'temp:queue' and 'temp:topic' values
- if ("activemq".equals(scheme) || "jms".equals("scheme")) {
+ if ("activemq".equals(scheme) || "jms".equals(scheme)) {
if (uriPath.startsWith("temp:")) {
prevPath = 5;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9432a793/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
index 2499227..ee15ae2 100644
--- a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
+++ b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
@@ -457,7 +457,26 @@ public class CamelCatalogTest {
catalog.addComponent("activemq", "org.apache.activemq.camel.component.ActiveMQComponent");
// activemq
- EndpointValidationResult result = catalog.validateEndpointProperties("activemq:temp:queue:cheese");
+ EndpointValidationResult result = catalog.validateEndpointProperties("activemq:temp:queue:cheese?jmsMessageType=Bytes");
+ assertTrue(result.isSuccess());
+ result = catalog.validateEndpointProperties("activemq:temp:queue:cheese?jmsMessageType=Bytes");
+ assertTrue(result.isSuccess());
+ result = catalog.validateEndpointProperties("activemq:temp:queue:cheese?jmsMessageType=Bytes", false, true, false);
+ assertTrue(result.isSuccess());
+ result = catalog.validateEndpointProperties("activemq:temp:queue:cheese?jmsMessageType=Bytes", false, false, true);
+ assertTrue(result.isSuccess());
+ }
+
+ @Test
+ public void validateJmsProperties() throws Exception {
+ // jms
+ EndpointValidationResult result = catalog.validateEndpointProperties("jms:temp:queue:cheese?jmsMessageType=Bytes");
+ assertTrue(result.isSuccess());
+ result = catalog.validateEndpointProperties("jms:temp:queue:cheese?jmsMessageType=Bytes");
+ assertTrue(result.isSuccess());
+ result = catalog.validateEndpointProperties("jms:temp:queue:cheese?jmsMessageType=Bytes", false, true, false);
+ assertTrue(result.isSuccess());
+ result = catalog.validateEndpointProperties("jms:temp:queue:cheese?jmsMessageType=Bytes", false, false, true);
assertTrue(result.isSuccess());
}