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 2015/03/28 16:57:37 UTC
[1/6] camel git commit: CAMEL-8564: Add unit test
Repository: camel
Updated Branches:
refs/heads/camel-2.15.x 4bc81b1f6 -> c5363b16f
refs/heads/master 1620a9550 -> 7b76c6eba
CAMEL-8564: Add unit test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7b76c6eb
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7b76c6eb
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7b76c6eb
Branch: refs/heads/master
Commit: 7b76c6eba247e604343337ae325125006e4ec573
Parents: ae1ee94
Author: Ramon Marco L. Navarro <ra...@gmail.com>
Authored: Sat Mar 28 23:46:40 2015 +0800
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Mar 28 16:57:02 2015 +0100
----------------------------------------------------------------------
.../dsl/DataFormatStringDataTypeRefTest.scala | 50 ++++++++++++++++++++
1 file changed, 50 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7b76c6eb/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/DataFormatStringDataTypeRefTest.scala
----------------------------------------------------------------------
diff --git a/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/DataFormatStringDataTypeRefTest.scala b/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/DataFormatStringDataTypeRefTest.scala
new file mode 100644
index 0000000..c2ee163
--- /dev/null
+++ b/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/DataFormatStringDataTypeRefTest.scala
@@ -0,0 +1,50 @@
+/**
+ * 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.camel.scala
+package dsl
+
+import org.junit.Test
+import builder.RouteBuilder
+import test.Adult
+
+/**
+ * Test case for working with data formats
+ */
+class DataFormatStringDataTypeRefTest extends ScalaTestSupport {
+
+ @Test
+ def testDataFormat() {
+ val person = new Adult("Captain Nemo")
+ "mock:a" expect { _.received(person) }
+ test {
+ "direct:a" ! person
+ }
+ }
+
+ val builder =
+ new RouteBuilder {
+ //START SNIPPET: dataformat
+ "direct:a" marshal("serialization") to "direct:serialwithstringref"
+
+ "direct:serialwithstringref" ==> {
+ unmarshal("serialization")
+ to ("mock:a")
+ }
+ //END SNIPPET: dataformat
+ }
+
+}
[3/6] camel git commit: CAMEL-8564: Add support for dataformat ref
param
Posted by da...@apache.org.
CAMEL-8564: Add support for dataformat ref param
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ae1ee941
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ae1ee941
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ae1ee941
Branch: refs/heads/master
Commit: ae1ee941ae99c0d3603a5ac4159f5f525d75e2d4
Parents: c426a1e
Author: Ramon Marco L. Navarro <ra...@gmail.com>
Authored: Sat Mar 28 23:28:46 2015 +0800
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Mar 28 16:57:02 2015 +0100
----------------------------------------------------------------------
.../src/main/scala/org/apache/camel/scala/dsl/DSL.scala | 2 ++
.../scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala | 2 ++
.../scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala | 2 ++
3 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ae1ee941/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
----------------------------------------------------------------------
diff --git a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
index 7ee6a8d..3690c39 100644
--- a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
+++ b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
@@ -62,6 +62,7 @@ trait DSL {
def loop(expression: Exchange => Any) : SLoopDefinition
def marshal(format : DataFormatDefinition) : DSL
+ def marshal(dataFormatRef: String) : DSL
def multicast : SMulticastDefinition
def onCompletion : SOnCompletionDefinition
@@ -104,6 +105,7 @@ trait DSL {
def transform(expression: Exchange => Any) : DSL
def unmarshal(format: DataFormatDefinition) : DSL
+ def unmarshal(dataFormatRef: String) : DSL
def validate(expression: Exchange => Any) : DSL
http://git-wip-us.apache.org/repos/asf/camel/blob/ae1ee941/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
----------------------------------------------------------------------
diff --git a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
index 6d7c526..c7f81a5 100644
--- a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
+++ b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
@@ -92,6 +92,7 @@ abstract class SAbstractDefinition[P <: ProcessorDefinition[_]] extends DSL with
def loop(expression: Exchange => Any) = SLoopDefinition(target.loop(expression))
def marshal(format: DataFormatDefinition) = wrap(target.marshal(format))
+ def marshal(dataFormatRef: String) = wrap(target.marshal(dataFormatRef))
def multicast = SMulticastDefinition(target.multicast)
def onCompletion: SOnCompletionDefinition = {
@@ -152,6 +153,7 @@ abstract class SAbstractDefinition[P <: ProcessorDefinition[_]] extends DSL with
def transform(expression: Exchange => Any) = wrap(target.transform(expression))
def unmarshal(format: DataFormatDefinition) = wrap(target.unmarshal(format))
+ def unmarshal(dataFormatRef: String) = wrap(target.unmarshal(dataFormatRef))
def validate(expression: Exchange => Any) = wrap(target.validate(predicateBuilder(expression)))
http://git-wip-us.apache.org/repos/asf/camel/blob/ae1ee941/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala
----------------------------------------------------------------------
diff --git a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala
index 5b746f5..1734c8e 100644
--- a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala
+++ b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala
@@ -153,6 +153,7 @@ class RouteBuilder extends Preamble with DSL with RoutesBuilder with Languages w
def loop(expression: Exchange => Any) = stack.top.loop(expression)
def marshal(format: DataFormatDefinition) = stack.top.marshal(format)
+ def marshal(dataFormatRef: String) = stack.top.marshal(dataFormatRef)
def multicast = stack.top.multicast
def onCompletion = {
@@ -199,6 +200,7 @@ class RouteBuilder extends Preamble with DSL with RoutesBuilder with Languages w
def transform(expression: Exchange => Any) = stack.top.transform(expression)
def unmarshal(format: DataFormatDefinition) = stack.top.unmarshal(format)
+ def unmarshal(dataFormatRef: String) = stack.top.unmarshal(dataFormatRef)
def validate(expression: (Exchange) => Any) = stack.top.validate(expression)
[5/6] camel git commit: CAMEL-8564: Add support for dataformat ref
param
Posted by da...@apache.org.
CAMEL-8564: Add support for dataformat ref param
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/85168205
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/85168205
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/85168205
Branch: refs/heads/camel-2.15.x
Commit: 8516820581e776ef62c0f8865da3934e1759ce17
Parents: f4b6fbd
Author: Ramon Marco L. Navarro <ra...@gmail.com>
Authored: Sat Mar 28 23:28:46 2015 +0800
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Mar 28 16:59:45 2015 +0100
----------------------------------------------------------------------
.../src/main/scala/org/apache/camel/scala/dsl/DSL.scala | 2 ++
.../scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala | 2 ++
.../scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala | 2 ++
3 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/85168205/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
----------------------------------------------------------------------
diff --git a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
index 7ee6a8d..3690c39 100644
--- a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
+++ b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
@@ -62,6 +62,7 @@ trait DSL {
def loop(expression: Exchange => Any) : SLoopDefinition
def marshal(format : DataFormatDefinition) : DSL
+ def marshal(dataFormatRef: String) : DSL
def multicast : SMulticastDefinition
def onCompletion : SOnCompletionDefinition
@@ -104,6 +105,7 @@ trait DSL {
def transform(expression: Exchange => Any) : DSL
def unmarshal(format: DataFormatDefinition) : DSL
+ def unmarshal(dataFormatRef: String) : DSL
def validate(expression: Exchange => Any) : DSL
http://git-wip-us.apache.org/repos/asf/camel/blob/85168205/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
----------------------------------------------------------------------
diff --git a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
index 6c51449..c4b5f8b 100644
--- a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
+++ b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
@@ -92,6 +92,7 @@ abstract class SAbstractDefinition[P <: ProcessorDefinition[_]] extends DSL with
def loop(expression: Exchange => Any) = SLoopDefinition(target.loop(expression))
def marshal(format: DataFormatDefinition) = wrap(target.marshal(format))
+ def marshal(dataFormatRef: String) = wrap(target.marshal(dataFormatRef))
def multicast = SMulticastDefinition(target.multicast)
def onCompletion: SOnCompletionDefinition = {
@@ -152,6 +153,7 @@ abstract class SAbstractDefinition[P <: ProcessorDefinition[_]] extends DSL with
def transform(expression: Exchange => Any) = wrap(target.transform(expression))
def unmarshal(format: DataFormatDefinition) = wrap(target.unmarshal(format))
+ def unmarshal(dataFormatRef: String) = wrap(target.unmarshal(dataFormatRef))
def validate(expression: Exchange => Any) = wrap(target.validate(predicateBuilder(expression)))
http://git-wip-us.apache.org/repos/asf/camel/blob/85168205/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala
----------------------------------------------------------------------
diff --git a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala
index 5b746f5..1734c8e 100644
--- a/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala
+++ b/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala
@@ -153,6 +153,7 @@ class RouteBuilder extends Preamble with DSL with RoutesBuilder with Languages w
def loop(expression: Exchange => Any) = stack.top.loop(expression)
def marshal(format: DataFormatDefinition) = stack.top.marshal(format)
+ def marshal(dataFormatRef: String) = stack.top.marshal(dataFormatRef)
def multicast = stack.top.multicast
def onCompletion = {
@@ -199,6 +200,7 @@ class RouteBuilder extends Preamble with DSL with RoutesBuilder with Languages w
def transform(expression: Exchange => Any) = stack.top.transform(expression)
def unmarshal(format: DataFormatDefinition) = stack.top.unmarshal(format)
+ def unmarshal(dataFormatRef: String) = stack.top.unmarshal(dataFormatRef)
def validate(expression: (Exchange) => Any) = stack.top.validate(expression)
[2/6] camel git commit: CAMEL-8561: Camel Catalog - Add better
description of components and others
Posted by da...@apache.org.
CAMEL-8561: Camel Catalog - Add better description of components and others
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c426a1ee
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c426a1ee
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c426a1ee
Branch: refs/heads/master
Commit: c426a1eeff98cb896f2b552ffeec79f59a66d355
Parents: 1620a95
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Mar 28 08:37:01 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Mar 28 16:57:02 2015 +0100
----------------------------------------------------------------------
.../camel/maven/packaging/PackageLanguageMojo.java | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c426a1ee/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
index 2136e69..70166a2 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
@@ -167,7 +167,7 @@ public class PackageLanguageMojo extends AbstractMojo {
languageModel.setTitle("");
languageModel.setModelName(modelName);
languageModel.setLabel("");
- languageModel.setDescription(project.getDescription());
+ languageModel.setDescription("");
languageModel.setJavaType(javaType);
languageModel.setGroupId(project.getGroupId());
languageModel.setArtifactId(project.getArtifactId());
@@ -178,18 +178,15 @@ public class PackageLanguageMojo extends AbstractMojo {
if (row.containsKey("title")) {
languageModel.setTitle(row.get("title"));
}
+ if (row.containsKey("description")) {
+ languageModel.setDescription(row.get("description"));
+ }
if (row.containsKey("label")) {
languageModel.setLabel(row.get("label"));
}
if (row.containsKey("javaType")) {
languageModel.setModelJavaType(row.get("javaType"));
}
- // override description for camel-core, as otherwise its too generic
- if ("camel-core".equals(project.getArtifactId())) {
- if (row.containsKey("description")) {
- languageModel.setLabel(row.get("description"));
- }
- }
}
log.debug("Model " + languageModel);
[4/6] camel git commit: CAMEL-8561: Camel Catalog - Add better
description of components and others
Posted by da...@apache.org.
CAMEL-8561: Camel Catalog - Add better description of components and others
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f4b6fbdc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f4b6fbdc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f4b6fbdc
Branch: refs/heads/camel-2.15.x
Commit: f4b6fbdc4bff91c0127e2c12cbe1ac2709c4aead
Parents: 4bc81b1
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Mar 28 08:37:01 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Mar 28 16:59:39 2015 +0100
----------------------------------------------------------------------
.../camel/maven/packaging/PackageLanguageMojo.java | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f4b6fbdc/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
index 2136e69..70166a2 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
@@ -167,7 +167,7 @@ public class PackageLanguageMojo extends AbstractMojo {
languageModel.setTitle("");
languageModel.setModelName(modelName);
languageModel.setLabel("");
- languageModel.setDescription(project.getDescription());
+ languageModel.setDescription("");
languageModel.setJavaType(javaType);
languageModel.setGroupId(project.getGroupId());
languageModel.setArtifactId(project.getArtifactId());
@@ -178,18 +178,15 @@ public class PackageLanguageMojo extends AbstractMojo {
if (row.containsKey("title")) {
languageModel.setTitle(row.get("title"));
}
+ if (row.containsKey("description")) {
+ languageModel.setDescription(row.get("description"));
+ }
if (row.containsKey("label")) {
languageModel.setLabel(row.get("label"));
}
if (row.containsKey("javaType")) {
languageModel.setModelJavaType(row.get("javaType"));
}
- // override description for camel-core, as otherwise its too generic
- if ("camel-core".equals(project.getArtifactId())) {
- if (row.containsKey("description")) {
- languageModel.setLabel(row.get("description"));
- }
- }
}
log.debug("Model " + languageModel);
[6/6] camel git commit: CAMEL-8564: Add unit test
Posted by da...@apache.org.
CAMEL-8564: Add unit test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c5363b16
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c5363b16
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c5363b16
Branch: refs/heads/camel-2.15.x
Commit: c5363b16f08295694742cb7b10e54ef1cd92bc0d
Parents: 8516820
Author: Ramon Marco L. Navarro <ra...@gmail.com>
Authored: Sat Mar 28 23:46:40 2015 +0800
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Mar 28 16:59:50 2015 +0100
----------------------------------------------------------------------
.../dsl/DataFormatStringDataTypeRefTest.scala | 50 ++++++++++++++++++++
1 file changed, 50 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c5363b16/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/DataFormatStringDataTypeRefTest.scala
----------------------------------------------------------------------
diff --git a/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/DataFormatStringDataTypeRefTest.scala b/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/DataFormatStringDataTypeRefTest.scala
new file mode 100644
index 0000000..c2ee163
--- /dev/null
+++ b/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/DataFormatStringDataTypeRefTest.scala
@@ -0,0 +1,50 @@
+/**
+ * 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.camel.scala
+package dsl
+
+import org.junit.Test
+import builder.RouteBuilder
+import test.Adult
+
+/**
+ * Test case for working with data formats
+ */
+class DataFormatStringDataTypeRefTest extends ScalaTestSupport {
+
+ @Test
+ def testDataFormat() {
+ val person = new Adult("Captain Nemo")
+ "mock:a" expect { _.received(person) }
+ test {
+ "direct:a" ! person
+ }
+ }
+
+ val builder =
+ new RouteBuilder {
+ //START SNIPPET: dataformat
+ "direct:a" marshal("serialization") to "direct:serialwithstringref"
+
+ "direct:serialwithstringref" ==> {
+ unmarshal("serialization")
+ to ("mock:a")
+ }
+ //END SNIPPET: dataformat
+ }
+
+}