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/02/03 11:49:49 UTC
[1/3] camel git commit: Fixed test to use correct simple syntax
Repository: camel
Updated Branches:
refs/heads/camel-2.18.x 029fd8e70 -> f0d15106f
refs/heads/master 263874610 -> d29f25960
Fixed test to use correct simple syntax
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f0d15106
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f0d15106
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f0d15106
Branch: refs/heads/camel-2.18.x
Commit: f0d15106fde2a6a6c0ff3f3ae38b6c620fb8dd64
Parents: 029fd8e7
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Feb 3 12:31:10 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Feb 3 12:45:06 2017 +0100
----------------------------------------------------------------------
.../test/java/org/apache/camel/management/ManagedCBRTest.java | 4 ++--
.../apache/camel/util/DumpModelAsXmlChoiceFilterRouteTest.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f0d15106/camel-core/src/test/java/org/apache/camel/management/ManagedCBRTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedCBRTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedCBRTest.java
index 4003894..9c6c966 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedCBRTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedCBRTest.java
@@ -68,10 +68,10 @@ public class ManagedCBRTest extends ManagementTestSupport {
from("direct:start").routeId("route")
.to("mock:a").id("task-a")
.choice().id("choice")
- .when(simple("${body} contains Camel")).id("when")
+ .when(simple("${body} contains 'Camel'")).id("when")
.to("mock:b").id("task-b")
.to("mock:c").id("task-c")
- .when(simple("${body} contains Donkey")).id("when2")
+ .when(simple("${body} contains 'Donkey'")).id("when2")
.to("mock:d").id("task-d")
.otherwise().id("otherwise")
.to("mock:e").id("task-e")
http://git-wip-us.apache.org/repos/asf/camel/blob/f0d15106/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlChoiceFilterRouteTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlChoiceFilterRouteTest.java b/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlChoiceFilterRouteTest.java
index f589c85..e41fbb9 100644
--- a/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlChoiceFilterRouteTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlChoiceFilterRouteTest.java
@@ -57,7 +57,7 @@ public class DumpModelAsXmlChoiceFilterRouteTest extends ContextTestSupport {
.filter().header("extra-gold")
.to("mock:extra-gold")
.endChoice()
- .when().simple("${body} contains Camel")
+ .when().simple("${body} contains 'Camel'")
.to("mock:camel")
.otherwise()
.to("mock:other")
[3/3] camel git commit: Fixed invalid component docs. The enums is
automatic detected so no need for this extra work.
Posted by da...@apache.org.
Fixed invalid component docs. The enums is automatic detected so no need for this extra work.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d29f2596
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d29f2596
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d29f2596
Branch: refs/heads/master
Commit: d29f25960fe7efc35aed6f822ed30ff5667e922c
Parents: 789af10
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Feb 3 12:38:33 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Feb 3 12:47:53 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/camel/component/aws/ec2/EC2Configuration.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d29f2596/components/camel-aws/src/main/java/org/apache/camel/component/aws/ec2/EC2Configuration.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ec2/EC2Configuration.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ec2/EC2Configuration.java
index 00733bc..ffc0b66 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ec2/EC2Configuration.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ec2/EC2Configuration.java
@@ -36,8 +36,7 @@ public class EC2Configuration {
private String secretKey;
@UriParam(label = "producer")
private String amazonEc2Endpoint;
- @UriParam(label = "producer", enums = "createAndRunInstances, startInstances, stopInstances, terminateInstances, describeInstances, "
- + "describeInstancesStatus, rebootInstances, monitorInstances, unmonitorInstances, createTags, deleteTags")
+ @UriParam(label = "producer")
@Metadata(required = "true")
private EC2Operations operation;
@UriParam(label = "producer")
[2/3] camel git commit: Fixed test to use correct simple syntax
Posted by da...@apache.org.
Fixed test to use correct simple syntax
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/789af108
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/789af108
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/789af108
Branch: refs/heads/master
Commit: 789af108a916d3da18c80ecd4bfeeb8ef647efc9
Parents: 2638746
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Feb 3 12:31:10 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Feb 3 12:45:50 2017 +0100
----------------------------------------------------------------------
.../test/java/org/apache/camel/management/ManagedCBRTest.java | 4 ++--
.../apache/camel/util/DumpModelAsXmlChoiceFilterRouteTest.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/789af108/camel-core/src/test/java/org/apache/camel/management/ManagedCBRTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedCBRTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedCBRTest.java
index 4003894..9c6c966 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedCBRTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedCBRTest.java
@@ -68,10 +68,10 @@ public class ManagedCBRTest extends ManagementTestSupport {
from("direct:start").routeId("route")
.to("mock:a").id("task-a")
.choice().id("choice")
- .when(simple("${body} contains Camel")).id("when")
+ .when(simple("${body} contains 'Camel'")).id("when")
.to("mock:b").id("task-b")
.to("mock:c").id("task-c")
- .when(simple("${body} contains Donkey")).id("when2")
+ .when(simple("${body} contains 'Donkey'")).id("when2")
.to("mock:d").id("task-d")
.otherwise().id("otherwise")
.to("mock:e").id("task-e")
http://git-wip-us.apache.org/repos/asf/camel/blob/789af108/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlChoiceFilterRouteTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlChoiceFilterRouteTest.java b/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlChoiceFilterRouteTest.java
index f589c85..e41fbb9 100644
--- a/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlChoiceFilterRouteTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlChoiceFilterRouteTest.java
@@ -57,7 +57,7 @@ public class DumpModelAsXmlChoiceFilterRouteTest extends ContextTestSupport {
.filter().header("extra-gold")
.to("mock:extra-gold")
.endChoice()
- .when().simple("${body} contains Camel")
+ .when().simple("${body} contains 'Camel'")
.to("mock:camel")
.otherwise()
.to("mock:other")