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 2019/05/21 10:45:50 UTC
[camel] branch master updated (340e6e3 -> 06f5217)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 340e6e3 Camel-Azure: Removed empty tables from docs (queue)
new 4cf7e65 camel3 - add todo
new 06f5217 [CAMEL-13371] Move languages to camel-base
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
components/readme.adoc | 16 +++++++---------
core/camel-core/readme.adoc | 19 -------------------
.../camel/language/tokenizer/TokenizeLanguage.java | 2 ++
.../camel/maven/packaging/PrepareCatalogMojo.java | 14 ++++++++++----
4 files changed, 19 insertions(+), 32 deletions(-)
[camel] 01/02: camel3 - add todo
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4cf7e655cddc95396af5c061f5eb390b589473a8
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue May 21 11:33:50 2019 +0200
camel3 - add todo
---
.../main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/core/camel-core/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java b/core/camel-core/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java
index c0130dc..9ba1a2f 100644
--- a/core/camel-core/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java
+++ b/core/camel-core/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java
@@ -40,6 +40,8 @@ import org.apache.camel.util.ObjectHelper;
@org.apache.camel.spi.annotations.Language("tokenize")
public class TokenizeLanguage implements Language, IsSingleton {
+ // TODO: Move this to camel-base
+
private String token;
private String endToken;
private String inheritNamespaceTagName;
[camel] 02/02: [CAMEL-13371] Move languages to camel-base
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 06f5217126208f71bd40a202ccabd05fbb36586a
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue May 21 12:45:24 2019 +0200
[CAMEL-13371] Move languages to camel-base
---
components/readme.adoc | 16 +++++++---------
core/camel-core/readme.adoc | 19 -------------------
.../camel/maven/packaging/PrepareCatalogMojo.java | 14 ++++++++++----
3 files changed, 17 insertions(+), 32 deletions(-)
diff --git a/components/readme.adoc b/components/readme.adoc
index 86e7a55..be98681 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -1000,7 +1000,7 @@ Number of Data Formats: 43 in 35 JAR artifacts (0 deprecated)
==== Expression Languages
// languages: START
-Number of Languages: 17 in 11 JAR artifacts (0 deprecated)
+Number of Languages: 16 in 11 JAR artifacts (0 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
@@ -1008,15 +1008,15 @@ Number of Languages: 17 in 11 JAR artifacts (0 deprecated)
| link:camel-bean/src/main/docs/bean-language.adoc[Bean method] (camel-bean) | 1.3 | To use a Java bean (aka method call) in Camel expressions or predicates.
-| link:../core/camel-core/src/main/docs/constant-language.adoc[Constant] (camel-core) | 1.5 | To use a constant value in Camel expressions or predicates.
+| link:camel-base/src/main/docs/constant-language.adoc[Constant] (camel-base) | 1.5 | To use a constant value in Camel expressions or predicates.
-| link:../core/camel-core/src/main/docs/exchangeProperty-language.adoc[ExchangeProperty] (camel-core) | 2.0 | To use a Camel Exchange property in expressions or predicates.
+| link:camel-base/src/main/docs/exchangeProperty-language.adoc[ExchangeProperty] (camel-base) | 2.0 | To use a Camel Exchange property in expressions or predicates.
-| link:../core/camel-core/src/main/docs/file-language.adoc[File] (camel-core) | 1.1 | For expressions and predicates using the file/simple language
+| link:camel-base/src/main/docs/file-language.adoc[File] (camel-base) | 1.1 | For expressions and predicates using the file/simple language
| link:camel-groovy/src/main/docs/groovy-language.adoc[Groovy] (camel-groovy) | 1.3 | To use Groovy scripts in Camel expressions or predicates.
-| link:../core/camel-core/src/main/docs/header-language.adoc[Header] (camel-core) | 1.5 | To use a Camel Message header in expressions or predicates.
+| link:camel-base/src/main/docs/header-language.adoc[Header] (camel-base) | 1.5 | To use a Camel Message header in expressions or predicates.
| link:camel-hl7/src/main/docs/hl7terser-language.adoc[HL7 Terser] (camel-hl7) | 2.11 | To use HL7 terser scripts in Camel expressions or predicates.
@@ -1026,14 +1026,12 @@ Number of Languages: 17 in 11 JAR artifacts (0 deprecated)
| link:camel-ognl/src/main/docs/ognl-language.adoc[OGNL] (camel-ognl) | 1.1 | To use OGNL scripts in Camel expressions or predicates.
-| link:../core/camel-core/src/main/docs/ref-language.adoc[Ref] (camel-core) | 2.8 | Reference to an existing Camel expression or predicate, which is looked up from the Camel registry.
+| link:camel-base/src/main/docs/ref-language.adoc[Ref] (camel-base) | 2.8 | Reference to an existing Camel expression or predicate, which is looked up from the Camel registry.
-| link:../core/camel-core/src/main/docs/simple-language.adoc[Simple] (camel-core) | 1.1 | To use Camels built-in Simple language in Camel expressions or predicates.
+| link:camel-base/src/main/docs/simple-language.adoc[Simple] (camel-base) | 1.1 | To use Camels built-in Simple language in Camel expressions or predicates.
| link:camel-spring/src/main/docs/spel-language.adoc[SpEL] (camel-spring) | 2.7 | To use Spring Expression Language (SpEL) in Camel expressions or predicates.
-| link:../core/camel-core/src/main/docs/tokenize-language.adoc[Tokenize] (camel-core) | 2.0 | To use Camel message body or header with a tokenizer in Camel expressions or predicates.
-
| link:camel-jaxp/src/main/docs/xtokenize-language.adoc[XML Tokenize] (camel-jaxp) | 2.14 | To use Camel message body or header with a XML tokenizer in Camel expressions or predicates.
| link:camel-xpath/src/main/docs/xpath-language.adoc[XPath] (camel-xpath) | 1.1 | To use XPath (XML) in Camel expressions or predicates.
diff --git a/core/camel-core/readme.adoc b/core/camel-core/readme.adoc
index 92571b6..2eab73a 100644
--- a/core/camel-core/readme.adoc
+++ b/core/camel-core/readme.adoc
@@ -10,26 +10,7 @@
==== Expression Languages
// languages: START
-Number of Languages: 7 in 1 JAR artifacts (0 deprecated)
-[width="100%",cols="4,1,5",options="header"]
-|===
-| Language | Available From | Description
-
-| link:src/main/docs/constant-language.adoc[Constant] (camel-core) | 1.5 | To use a constant value in Camel expressions or predicates.
-
-| link:src/main/docs/exchangeProperty-language.adoc[ExchangeProperty] (camel-core) | 2.0 | To use a Camel Exchange property in expressions or predicates.
-
-| link:src/main/docs/file-language.adoc[File] (camel-core) | 1.1 | For expressions and predicates using the file/simple language
-
-| link:src/main/docs/header-language.adoc[Header] (camel-core) | 1.5 | To use a Camel Message header in expressions or predicates.
-
-| link:src/main/docs/ref-language.adoc[Ref] (camel-core) | 2.8 | Reference to an existing Camel expression or predicate, which is looked up from the Camel registry.
-
-| link:src/main/docs/simple-language.adoc[Simple] (camel-core) | 1.1 | To use Camels built-in Simple language in Camel expressions or predicates.
-
-| link:src/main/docs/tokenize-language.adoc[Tokenize] (camel-core) | 2.0 | To use Camel message body or header with a tokenizer in Camel expressions or predicates.
-|===
// languages: END
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
index 84ccce8..6d2c498 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
@@ -135,12 +135,18 @@ public class PrepareCatalogMojo extends AbstractMojo {
protected File componentsDir;
/**
- * The camel-core directory where camel-core components are
+ * The camel-core directory
*/
@Parameter(defaultValue = "${project.build.directory}/../../../core/camel-core")
protected File coreDir;
/**
+ * The camel-base directory
+ */
+ @Parameter(defaultValue = "${project.build.directory}/../../../core/camel-base")
+ protected File baseDir;
+
+ /**
* The directory where the camel-spring XML models are
*/
@Parameter(defaultValue = "${project.build.directory}/../../../components/camel-spring")
@@ -704,11 +710,11 @@ public class PrepareCatalogMojo extends AbstractMojo {
}
}
}
- if (coreDir != null && coreDir.isDirectory()) {
- File target = new File(coreDir, "target/classes");
+ if (baseDir != null && baseDir.isDirectory()) {
+ File target = new File(baseDir, "target/classes");
findLanguageFilesRecursive(target, jsonFiles, languageFiles, new CamelLanguagesFileFilter());
// also look in camel-jaxp
- target = new File(coreDir, "../camel-jaxp/target/classes");
+ target = new File(baseDir, "../camel-jaxp/target/classes");
findLanguageFilesRecursive(target, jsonFiles, languageFiles, new CamelLanguagesFileFilter());
}