This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 60f4190eb3b844039462455040f471ea139c3ca5
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Mon Mar 2 17:02:17 2020 +0100
Extract languages into camel-core-languages so that we don't have a build
cycle between camel-base / camel-core-engine
---
components/camel-ftp/pom.xml | 5 +++++
components/camel-hdfs/pom.xml | 5 +++++
components/camel-jcache/pom.xml | 5 +++++
components/camel-jpa/pom.xml | 4 ++++
core/camel-allcomponents/pom.xml | 4 ++++
core/camel-base/pom.xml | 4 ----
.../java/org/apache/camel/builder/SimpleBuilder.java | 3 +--
.../camel/model/language/TokenizerExpression.java | 3 +--
.../reifier/language/TokenizerExpressionReifier.java | 1 -
core/{camel-base => camel-core-languages}/pom.xml | 20 +++-----------------
.../services/org/apache/camel/language.properties | 4 ++--
.../services/org/apache/camel/language/constant | 2 ++
.../org/apache/camel/language/exchangeProperty | 2 ++
.../META-INF/services/org/apache/camel/language/file | 2 ++
.../services/org/apache/camel/language/header | 2 ++
.../META-INF/services/org/apache/camel/language/ref | 2 ++
.../services/org/apache/camel/language/simple | 2 ++
.../services/org/apache/camel/language/tokenize | 2 ++
.../org/apache/camel/language/constant/constant.json | 2 +-
.../org/apache/camel/language/header/header.json | 2 +-
.../camel/language/property/exchangeProperty.json | 2 +-
.../resources/org/apache/camel/language/ref/ref.json | 2 +-
.../org/apache/camel/language/simple/file.json | 2 +-
.../org/apache/camel/language/simple/simple.json | 2 +-
.../apache/camel/language/tokenizer/tokenize.json | 2 +-
.../src/main/docs/constant-language.adoc | 0
.../src/main/docs/exchangeProperty-language.adoc | 0
.../src/main/docs/file-language.adoc | 0
.../src/main/docs/header-language.adoc | 0
.../src/main/docs/properties-component.adoc | 0
.../src/main/docs/ref-language.adoc | 0
.../src/main/docs/simple-language.adoc | 0
.../src/main/docs/tokenize-language.adoc | 0
.../camel/language/constant/ConstantLanguage.java | 0
.../org/apache/camel/language/constant/package.html | 0
.../apache/camel/language/header/HeaderLanguage.java | 0
.../org/apache/camel/language/header/package.html | 0
.../main/java/org/apache/camel/language/package.html | 0
.../language/property/ExchangePropertyLanguage.java | 0
.../org/apache/camel/language/property/package.html | 0
.../org/apache/camel/language/ref/RefLanguage.java | 0
.../java/org/apache/camel/language/ref/package.html | 0
.../camel/language/simple/BaseSimpleParser.java | 0
.../apache/camel/language/simple/FileLanguage.java | 0
.../org/apache/camel/language/simple/Simple.java | 0
.../language/simple/SimpleExpressionBuilder.java | 0
.../language/simple/SimpleExpressionParser.java | 0
.../apache/camel/language/simple/SimpleLanguage.java | 0
.../camel/language/simple/SimplePredicateParser.java | 0
.../camel/language/simple/SimpleTokenizer.java | 0
.../camel/language/simple/ast/BaseSimpleNode.java | 0
.../camel/language/simple/ast/BinaryExpression.java | 0
.../org/apache/camel/language/simple/ast/Block.java | 0
.../apache/camel/language/simple/ast/BlockEnd.java | 0
.../apache/camel/language/simple/ast/BlockStart.java | 0
.../camel/language/simple/ast/CompositeNodes.java | 0
.../camel/language/simple/ast/DoubleQuoteEnd.java | 0
.../camel/language/simple/ast/DoubleQuoteStart.java | 0
.../camel/language/simple/ast/LiteralExpression.java | 0
.../camel/language/simple/ast/LiteralNode.java | 0
.../camel/language/simple/ast/LogicalExpression.java | 0
.../camel/language/simple/ast/NullExpression.java | 0
.../camel/language/simple/ast/SimpleFunctionEnd.java | 0
.../simple/ast/SimpleFunctionExpression.java | 0
.../language/simple/ast/SimpleFunctionStart.java | 0
.../apache/camel/language/simple/ast/SimpleNode.java | 0
.../camel/language/simple/ast/SingleQuoteEnd.java | 0
.../camel/language/simple/ast/SingleQuoteStart.java | 0
.../camel/language/simple/ast/UnaryExpression.java | 0
.../apache/camel/language/simple/ast/package.html | 0
.../org/apache/camel/language/simple/package.html | 0
.../language/simple/types/BinaryOperatorType.java | 0
.../language/simple/types/LogicalOperatorType.java | 0
.../simple/types/SimpleIllegalSyntaxException.java | 0
.../language/simple/types/SimpleParserException.java | 0
.../camel/language/simple/types/SimpleToken.java | 0
.../camel/language/simple/types/SimpleTokenType.java | 0
.../camel/language/simple/types/TokenType.java | 0
.../language/simple/types/UnaryOperatorType.java | 0
.../apache/camel/language/simple/types/package.html | 0
.../camel/language/tokenizer/TokenizeLanguage.java | 0
.../org/apache/camel/language/tokenizer/package.html | 0
.../org/apache/camel/properties-component-factory | 18 ++++++++++++++++++
core/camel-core-osgi/pom.xml | 5 +++++
core/camel-core/pom.xml | 4 ++++
core/pom.xml | 1 +
parent/pom.xml | 5 +++++
.../camel/maven/packaging/EndpointDslMojo.java | 2 +-
88 files changed, 85 insertions(+), 36 deletions(-)
diff --git a/components/camel-ftp/pom.xml b/components/camel-ftp/pom.xml
index 2bfa959..5d2ccc5 100644
--- a/components/camel-ftp/pom.xml
+++ b/components/camel-ftp/pom.xml
@@ -66,6 +66,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-core-languages</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-ssh</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-hdfs/pom.xml b/components/camel-hdfs/pom.xml
index f56b047..6ffd8ae 100644
--- a/components/camel-hdfs/pom.xml
+++ b/components/camel-hdfs/pom.xml
@@ -133,6 +133,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core-languages</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
diff --git a/components/camel-jcache/pom.xml b/components/camel-jcache/pom.xml
index 940be68..81ff9fb 100644
--- a/components/camel-jcache/pom.xml
+++ b/components/camel-jcache/pom.xml
@@ -66,6 +66,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core-languages</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>com.hazelcast</groupId>
<artifactId>hazelcast</artifactId>
<version>${hazelcast-version}</version>
diff --git a/components/camel-jpa/pom.xml b/components/camel-jpa/pom.xml
index 10fd32f..291af52 100644
--- a/components/camel-jpa/pom.xml
+++ b/components/camel-jpa/pom.xml
@@ -50,6 +50,10 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-core-languages</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-spring</artifactId>
</dependency>
<dependency>
diff --git a/core/camel-allcomponents/pom.xml b/core/camel-allcomponents/pom.xml
index 3347fd4..64d3bc9 100644
--- a/core/camel-allcomponents/pom.xml
+++ b/core/camel-allcomponents/pom.xml
@@ -324,6 +324,10 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-core-languages</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-couchbase</artifactId>
</dependency>
<dependency>
diff --git a/core/camel-base/pom.xml b/core/camel-base/pom.xml
index 6546846..d2db70b 100644
--- a/core/camel-base/pom.xml
+++ b/core/camel-base/pom.xml
@@ -33,10 +33,6 @@
<name>Camel :: Base</name>
<description>The Base Camel Framework</description>
- <properties>
- <camel-prepare-component>true</camel-prepare-component>
- </properties>
-
<dependencies>
<!-- required dependencies by camel-base -->
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/builder/SimpleBuilder.java
b/core/camel-core-engine/src/main/java/org/apache/camel/builder/SimpleBuilder.java
index ce43eab..894e5e6 100644
---
a/core/camel-core-engine/src/main/java/org/apache/camel/builder/SimpleBuilder.java
+++
b/core/camel-core-engine/src/main/java/org/apache/camel/builder/SimpleBuilder.java
@@ -21,7 +21,6 @@ import org.apache.camel.CamelExecutionException;
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
import org.apache.camel.Predicate;
-import org.apache.camel.language.simple.Simple;
import org.apache.camel.spi.ExpressionResultTypeAware;
import org.apache.camel.spi.Language;
import org.apache.camel.spi.PropertyConfigurer;
@@ -30,7 +29,7 @@ import org.apache.camel.support.ScriptHelper;
import org.apache.camel.support.component.PropertyConfigurerSupport;
/**
- * Creates an {@link Simple} language builder.
+ * Creates an {@link org.apache.camel.language.simple.Simple} language builder.
* <p/>
* This builder is available in the Java DSL from the {@link RouteBuilder}
which
* means that using simple language for {@link Expression}s or
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/model/language/TokenizerExpression.java
b/core/camel-core-engine/src/main/java/org/apache/camel/model/language/TokenizerExpression.java
index bd9e4ed..adba172 100644
---
a/core/camel-core-engine/src/main/java/org/apache/camel/model/language/TokenizerExpression.java
+++
b/core/camel-core-engine/src/main/java/org/apache/camel/model/language/TokenizerExpression.java
@@ -21,14 +21,13 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
-import org.apache.camel.language.tokenizer.TokenizeLanguage;
import org.apache.camel.spi.Metadata;
/**
* To use Camel message body or header with a tokenizer in Camel expressions or
* predicates.
*
- * @see TokenizeLanguage
+ * @see org.apache.camel.language.tokenizer.TokenizeLanguage
*/
@Metadata(firstVersion = "2.0.0", label = "language,core", title = "Tokenize")
@XmlRootElement(name = "tokenize")
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/language/TokenizerExpressionReifier.java
b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/language/TokenizerExpressionReifier.java
index f56ba1c..ef08490 100644
---
a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/language/TokenizerExpressionReifier.java
+++
b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/language/TokenizerExpressionReifier.java
@@ -22,7 +22,6 @@ import java.util.Map;
import org.apache.camel.CamelContext;
import org.apache.camel.Expression;
import org.apache.camel.Predicate;
-import org.apache.camel.language.tokenizer.TokenizeLanguage;
import org.apache.camel.model.language.ExpressionDefinition;
import org.apache.camel.model.language.TokenizerExpression;
import org.apache.camel.spi.Language;
diff --git a/core/camel-base/pom.xml b/core/camel-core-languages/pom.xml
similarity index 72%
copy from core/camel-base/pom.xml
copy to core/camel-core-languages/pom.xml
index 6546846..5f2f403 100644
--- a/core/camel-base/pom.xml
+++ b/core/camel-core-languages/pom.xml
@@ -27,10 +27,10 @@
<relativePath>..</relativePath>
</parent>
- <artifactId>camel-base</artifactId>
+ <artifactId>camel-core-languages</artifactId>
<packaging>jar</packaging>
- <name>Camel :: Base</name>
+ <name>Camel :: Core Languages</name>
<description>The Base Camel Framework</description>
<properties>
@@ -39,25 +39,11 @@
<dependencies>
- <!-- required dependencies by camel-base -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-management-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-support</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-util</artifactId>
+ <artifactId>camel-core-engine</artifactId>
</dependency>
- <!-- required logging api dependency by camel-base -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
diff --git
a/core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/language.properties
b/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language.properties
similarity index 76%
rename from
core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/language.properties
rename to
core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language.properties
index 52fc654..73e589c 100644
---
a/core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/language.properties
+++
b/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language.properties
@@ -1,7 +1,7 @@
# Generated by camel build tools - do NOT edit this file!
languages=constant exchangeProperty file header ref simple tokenize
groupId=org.apache.camel
-artifactId=camel-base
+artifactId=camel-core-languages
version=3.2.0-SNAPSHOT
-projectName=Camel :: Base
+projectName=Camel :: Core Languages
projectDescription=The Base Camel Framework
diff --git
a/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language/constant
b/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language/constant
new file mode 100644
index 0000000..4610522
--- /dev/null
+++
b/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language/constant
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.language.constant.ConstantLanguage
diff --git
a/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language/exchangeProperty
b/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language/exchangeProperty
new file mode 100644
index 0000000..a67aa4c
--- /dev/null
+++
b/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language/exchangeProperty
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.language.property.ExchangePropertyLanguage
diff --git
a/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language/file
b/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language/file
new file mode 100644
index 0000000..bf95732
--- /dev/null
+++
b/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language/file
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.language.simple.FileLanguage
diff --git
a/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language/header
b/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language/header
new file mode 100644
index 0000000..a608af5
--- /dev/null
+++
b/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language/header
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.language.header.HeaderLanguage
diff --git
a/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language/ref
b/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language/ref
new file mode 100644
index 0000000..74daf84
--- /dev/null
+++
b/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language/ref
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.language.ref.RefLanguage
diff --git
a/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language/simple
b/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language/simple
new file mode 100644
index 0000000..4b84522
--- /dev/null
+++
b/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language/simple
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.language.simple.SimpleLanguage
diff --git
a/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language/tokenize
b/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language/tokenize
new file mode 100644
index 0000000..1c2b127
--- /dev/null
+++
b/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language/tokenize
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.language.tokenizer.TokenizeLanguage
diff --git
a/core/camel-base/src/generated/resources/org/apache/camel/language/constant/constant.json
b/core/camel-core-languages/src/generated/resources/org/apache/camel/language/constant/constant.json
similarity index 97%
rename from
core/camel-base/src/generated/resources/org/apache/camel/language/constant/constant.json
rename to
core/camel-core-languages/src/generated/resources/org/apache/camel/language/constant/constant.json
index f91599a..3c9ea71 100644
---
a/core/camel-base/src/generated/resources/org/apache/camel/language/constant/constant.json
+++
b/core/camel-core-languages/src/generated/resources/org/apache/camel/language/constant/constant.json
@@ -12,7 +12,7 @@
"javaType": "org.apache.camel.language.constant.ConstantLanguage",
"modelJavaType": "org.apache.camel.model.language.ConstantExpression",
"groupId": "org.apache.camel",
- "artifactId": "camel-base",
+ "artifactId": "camel-core-languages",
"version": "3.2.0-SNAPSHOT"
},
"properties": {
diff --git
a/core/camel-base/src/generated/resources/org/apache/camel/language/header/header.json
b/core/camel-core-languages/src/generated/resources/org/apache/camel/language/header/header.json
similarity index 96%
rename from
core/camel-base/src/generated/resources/org/apache/camel/language/header/header.json
rename to
core/camel-core-languages/src/generated/resources/org/apache/camel/language/header/header.json
index 4c67e3e..0fc1356 100644
---
a/core/camel-base/src/generated/resources/org/apache/camel/language/header/header.json
+++
b/core/camel-core-languages/src/generated/resources/org/apache/camel/language/header/header.json
@@ -12,7 +12,7 @@
"javaType": "org.apache.camel.language.header.HeaderLanguage",
"modelJavaType": "org.apache.camel.model.language.HeaderExpression",
"groupId": "org.apache.camel",
- "artifactId": "camel-base",
+ "artifactId": "camel-core-languages",
"version": "3.2.0-SNAPSHOT"
},
"properties": {
diff --git
a/core/camel-base/src/generated/resources/org/apache/camel/language/property/exchangeProperty.json
b/core/camel-core-languages/src/generated/resources/org/apache/camel/language/property/exchangeProperty.json
similarity index 96%
rename from
core/camel-base/src/generated/resources/org/apache/camel/language/property/exchangeProperty.json
rename to
core/camel-core-languages/src/generated/resources/org/apache/camel/language/property/exchangeProperty.json
index da11bca..280a3d4 100644
---
a/core/camel-base/src/generated/resources/org/apache/camel/language/property/exchangeProperty.json
+++
b/core/camel-core-languages/src/generated/resources/org/apache/camel/language/property/exchangeProperty.json
@@ -12,7 +12,7 @@
"javaType": "org.apache.camel.language.property.ExchangePropertyLanguage",
"modelJavaType":
"org.apache.camel.model.language.ExchangePropertyExpression",
"groupId": "org.apache.camel",
- "artifactId": "camel-base",
+ "artifactId": "camel-core-languages",
"version": "3.2.0-SNAPSHOT"
},
"properties": {
diff --git
a/core/camel-base/src/generated/resources/org/apache/camel/language/ref/ref.json
b/core/camel-core-languages/src/generated/resources/org/apache/camel/language/ref/ref.json
similarity index 96%
rename from
core/camel-base/src/generated/resources/org/apache/camel/language/ref/ref.json
rename to
core/camel-core-languages/src/generated/resources/org/apache/camel/language/ref/ref.json
index 78e820c..34b1a9f 100644
---
a/core/camel-base/src/generated/resources/org/apache/camel/language/ref/ref.json
+++
b/core/camel-core-languages/src/generated/resources/org/apache/camel/language/ref/ref.json
@@ -12,7 +12,7 @@
"javaType": "org.apache.camel.language.ref.RefLanguage",
"modelJavaType": "org.apache.camel.model.language.RefExpression",
"groupId": "org.apache.camel",
- "artifactId": "camel-base",
+ "artifactId": "camel-core-languages",
"version": "3.2.0-SNAPSHOT"
},
"properties": {
diff --git
a/core/camel-base/src/generated/resources/org/apache/camel/language/simple/file.json
b/core/camel-core-languages/src/generated/resources/org/apache/camel/language/simple/file.json
similarity index 97%
rename from
core/camel-base/src/generated/resources/org/apache/camel/language/simple/file.json
rename to
core/camel-core-languages/src/generated/resources/org/apache/camel/language/simple/file.json
index 02918b4..4d824d8 100644
---
a/core/camel-base/src/generated/resources/org/apache/camel/language/simple/file.json
+++
b/core/camel-core-languages/src/generated/resources/org/apache/camel/language/simple/file.json
@@ -12,7 +12,7 @@
"javaType": "org.apache.camel.language.simple.FileLanguage",
"modelJavaType": "org.apache.camel.model.language.SimpleExpression",
"groupId": "org.apache.camel",
- "artifactId": "camel-base",
+ "artifactId": "camel-core-languages",
"version": "3.2.0-SNAPSHOT"
},
"properties": {
diff --git
a/core/camel-base/src/generated/resources/org/apache/camel/language/simple/simple.json
b/core/camel-core-languages/src/generated/resources/org/apache/camel/language/simple/simple.json
similarity index 97%
rename from
core/camel-base/src/generated/resources/org/apache/camel/language/simple/simple.json
rename to
core/camel-core-languages/src/generated/resources/org/apache/camel/language/simple/simple.json
index 93453d12..5a179cf 100644
---
a/core/camel-base/src/generated/resources/org/apache/camel/language/simple/simple.json
+++
b/core/camel-core-languages/src/generated/resources/org/apache/camel/language/simple/simple.json
@@ -12,7 +12,7 @@
"javaType": "org.apache.camel.language.simple.SimpleLanguage",
"modelJavaType": "org.apache.camel.model.language.SimpleExpression",
"groupId": "org.apache.camel",
- "artifactId": "camel-base",
+ "artifactId": "camel-core-languages",
"version": "3.2.0-SNAPSHOT"
},
"properties": {
diff --git
a/core/camel-base/src/generated/resources/org/apache/camel/language/tokenizer/tokenize.json
b/core/camel-core-languages/src/generated/resources/org/apache/camel/language/tokenizer/tokenize.json
similarity index 99%
rename from
core/camel-base/src/generated/resources/org/apache/camel/language/tokenizer/tokenize.json
rename to
core/camel-core-languages/src/generated/resources/org/apache/camel/language/tokenizer/tokenize.json
index ec3c7ff..4bec7f5 100644
---
a/core/camel-base/src/generated/resources/org/apache/camel/language/tokenizer/tokenize.json
+++
b/core/camel-core-languages/src/generated/resources/org/apache/camel/language/tokenizer/tokenize.json
@@ -12,7 +12,7 @@
"javaType": "org.apache.camel.language.tokenizer.TokenizeLanguage",
"modelJavaType": "org.apache.camel.model.language.TokenizerExpression",
"groupId": "org.apache.camel",
- "artifactId": "camel-base",
+ "artifactId": "camel-core-languages",
"version": "3.2.0-SNAPSHOT"
},
"properties": {
diff --git a/core/camel-base/src/main/docs/constant-language.adoc
b/core/camel-core-languages/src/main/docs/constant-language.adoc
similarity index 100%
rename from core/camel-base/src/main/docs/constant-language.adoc
rename to core/camel-core-languages/src/main/docs/constant-language.adoc
diff --git a/core/camel-base/src/main/docs/exchangeProperty-language.adoc
b/core/camel-core-languages/src/main/docs/exchangeProperty-language.adoc
similarity index 100%
rename from core/camel-base/src/main/docs/exchangeProperty-language.adoc
rename to core/camel-core-languages/src/main/docs/exchangeProperty-language.adoc
diff --git a/core/camel-base/src/main/docs/file-language.adoc
b/core/camel-core-languages/src/main/docs/file-language.adoc
similarity index 100%
rename from core/camel-base/src/main/docs/file-language.adoc
rename to core/camel-core-languages/src/main/docs/file-language.adoc
diff --git a/core/camel-base/src/main/docs/header-language.adoc
b/core/camel-core-languages/src/main/docs/header-language.adoc
similarity index 100%
rename from core/camel-base/src/main/docs/header-language.adoc
rename to core/camel-core-languages/src/main/docs/header-language.adoc
diff --git a/core/camel-base/src/main/docs/properties-component.adoc
b/core/camel-core-languages/src/main/docs/properties-component.adoc
similarity index 100%
rename from core/camel-base/src/main/docs/properties-component.adoc
rename to core/camel-core-languages/src/main/docs/properties-component.adoc
diff --git a/core/camel-base/src/main/docs/ref-language.adoc
b/core/camel-core-languages/src/main/docs/ref-language.adoc
similarity index 100%
rename from core/camel-base/src/main/docs/ref-language.adoc
rename to core/camel-core-languages/src/main/docs/ref-language.adoc
diff --git a/core/camel-base/src/main/docs/simple-language.adoc
b/core/camel-core-languages/src/main/docs/simple-language.adoc
similarity index 100%
rename from core/camel-base/src/main/docs/simple-language.adoc
rename to core/camel-core-languages/src/main/docs/simple-language.adoc
diff --git a/core/camel-base/src/main/docs/tokenize-language.adoc
b/core/camel-core-languages/src/main/docs/tokenize-language.adoc
similarity index 100%
rename from core/camel-base/src/main/docs/tokenize-language.adoc
rename to core/camel-core-languages/src/main/docs/tokenize-language.adoc
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/constant/ConstantLanguage.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/constant/ConstantLanguage.java
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/constant/ConstantLanguage.java
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/constant/ConstantLanguage.java
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/constant/package.html
b/core/camel-core-languages/src/main/java/org/apache/camel/language/constant/package.html
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/constant/package.html
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/constant/package.html
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/header/HeaderLanguage.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/header/HeaderLanguage.java
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/header/HeaderLanguage.java
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/header/HeaderLanguage.java
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/header/package.html
b/core/camel-core-languages/src/main/java/org/apache/camel/language/header/package.html
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/header/package.html
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/header/package.html
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/package.html
b/core/camel-core-languages/src/main/java/org/apache/camel/language/package.html
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/package.html
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/package.html
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/property/ExchangePropertyLanguage.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/property/ExchangePropertyLanguage.java
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/property/ExchangePropertyLanguage.java
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/property/ExchangePropertyLanguage.java
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/property/package.html
b/core/camel-core-languages/src/main/java/org/apache/camel/language/property/package.html
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/property/package.html
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/property/package.html
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/ref/RefLanguage.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/ref/RefLanguage.java
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/ref/RefLanguage.java
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/ref/RefLanguage.java
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/ref/package.html
b/core/camel-core-languages/src/main/java/org/apache/camel/language/ref/package.html
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/ref/package.html
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/ref/package.html
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/simple/BaseSimpleParser.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/BaseSimpleParser.java
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/simple/BaseSimpleParser.java
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/simple/BaseSimpleParser.java
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/simple/FileLanguage.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/FileLanguage.java
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/simple/FileLanguage.java
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/simple/FileLanguage.java
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/simple/Simple.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/Simple.java
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/simple/Simple.java
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/simple/Simple.java
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/simple/SimpleExpressionParser.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleExpressionParser.java
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/simple/SimpleExpressionParser.java
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleExpressionParser.java
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/BaseSimpleNode.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/BaseSimpleNode.java
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/simple/ast/BaseSimpleNode.java
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/BaseSimpleNode.java
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/BinaryExpression.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/BinaryExpression.java
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/simple/ast/BinaryExpression.java
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/BinaryExpression.java
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/Block.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/Block.java
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/simple/ast/Block.java
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/Block.java
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/BlockEnd.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/BlockEnd.java
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/simple/ast/BlockEnd.java
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/BlockEnd.java
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/BlockStart.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/BlockStart.java
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/simple/ast/BlockStart.java
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/BlockStart.java
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/CompositeNodes.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/CompositeNodes.java
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/simple/ast/CompositeNodes.java
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/CompositeNodes.java
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/DoubleQuoteEnd.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/DoubleQuoteEnd.java
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/simple/ast/DoubleQuoteEnd.java
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/DoubleQuoteEnd.java
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/DoubleQuoteStart.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/DoubleQuoteStart.java
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/simple/ast/DoubleQuoteStart.java
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/DoubleQuoteStart.java
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/LiteralExpression.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/LiteralExpression.java
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/simple/ast/LiteralExpression.java
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/LiteralExpression.java
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/LiteralNode.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/LiteralNode.java
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/simple/ast/LiteralNode.java
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/LiteralNode.java
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/LogicalExpression.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/LogicalExpression.java
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/simple/ast/LogicalExpression.java
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/LogicalExpression.java
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/NullExpression.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/NullExpression.java
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/simple/ast/NullExpression.java
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/NullExpression.java
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionEnd.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionEnd.java
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionEnd.java
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionEnd.java
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionStart.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionStart.java
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionStart.java
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionStart.java
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/SimpleNode.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleNode.java
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/simple/ast/SimpleNode.java
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleNode.java
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/SingleQuoteEnd.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SingleQuoteEnd.java
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/simple/ast/SingleQuoteEnd.java
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SingleQuoteEnd.java
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/SingleQuoteStart.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SingleQuoteStart.java
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/simple/ast/SingleQuoteStart.java
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SingleQuoteStart.java
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/UnaryExpression.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/UnaryExpression.java
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/simple/ast/UnaryExpression.java
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/UnaryExpression.java
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/package.html
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/package.html
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/simple/ast/package.html
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/package.html
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/simple/package.html
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/package.html
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/simple/package.html
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/simple/package.html
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/simple/types/BinaryOperatorType.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/BinaryOperatorType.java
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/simple/types/BinaryOperatorType.java
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/BinaryOperatorType.java
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/simple/types/LogicalOperatorType.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/LogicalOperatorType.java
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/simple/types/LogicalOperatorType.java
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/LogicalOperatorType.java
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/simple/types/SimpleIllegalSyntaxException.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/SimpleIllegalSyntaxException.java
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/simple/types/SimpleIllegalSyntaxException.java
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/SimpleIllegalSyntaxException.java
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/simple/types/SimpleParserException.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/SimpleParserException.java
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/simple/types/SimpleParserException.java
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/SimpleParserException.java
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/simple/types/SimpleToken.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/SimpleToken.java
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/simple/types/SimpleToken.java
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/SimpleToken.java
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/simple/types/SimpleTokenType.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/SimpleTokenType.java
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/simple/types/SimpleTokenType.java
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/SimpleTokenType.java
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/simple/types/TokenType.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/TokenType.java
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/simple/types/TokenType.java
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/TokenType.java
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/simple/types/UnaryOperatorType.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/UnaryOperatorType.java
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/simple/types/UnaryOperatorType.java
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/UnaryOperatorType.java
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/simple/types/package.html
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/package.html
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/simple/types/package.html
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/package.html
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java
diff --git
a/core/camel-base/src/main/java/org/apache/camel/language/tokenizer/package.html
b/core/camel-core-languages/src/main/java/org/apache/camel/language/tokenizer/package.html
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/language/tokenizer/package.html
rename to
core/camel-core-languages/src/main/java/org/apache/camel/language/tokenizer/package.html
diff --git
a/core/camel-core-languages/src/main/resources/META-INF/services/org/apache/camel/properties-component-factory
b/core/camel-core-languages/src/main/resources/META-INF/services/org/apache/camel/properties-component-factory
new file mode 100644
index 0000000..9f34c8f
--- /dev/null
+++
b/core/camel-core-languages/src/main/resources/META-INF/services/org/apache/camel/properties-component-factory
@@ -0,0 +1,18 @@
+#
+# 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.
+#
+
+class=org.apache.camel.component.properties.PropertiesComponent
diff --git a/core/camel-core-osgi/pom.xml b/core/camel-core-osgi/pom.xml
index 462f74c..85f790f 100644
--- a/core/camel-core-osgi/pom.xml
+++ b/core/camel-core-osgi/pom.xml
@@ -68,6 +68,11 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-core-languages</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-file</artifactId>
<scope>test</scope>
</dependency>
diff --git a/core/camel-core/pom.xml b/core/camel-core/pom.xml
index 2f09da1..d27de25 100644
--- a/core/camel-core/pom.xml
+++ b/core/camel-core/pom.xml
@@ -39,6 +39,10 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-engine</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core-languages</artifactId>
+ </dependency>
<!-- core components -->
<dependency>
diff --git a/core/pom.xml b/core/pom.xml
index 6832277..01a5f37 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -45,6 +45,7 @@
<module>camel-base</module>
<module>camel-xml-jaxp</module>
<module>camel-core-engine</module>
+ <module>camel-core-languages</module>
<module>camel-xml-io</module>
<module>camel-xml-jaxb</module>
<module>camel-core</module>
diff --git a/parent/pom.xml b/parent/pom.xml
index 15a8515..bb1714a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -805,6 +805,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-core-languages</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-endpointdsl</artifactId>
<version>${project.version}</version>
</dependency>
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
index d62283e..8ccc582 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
@@ -824,7 +824,7 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
enumClass.getJavaDoc().setText("Proxy enum for <code>" + type
+ "</code> enum.");
enumClasses.put(enumClassName, enumClass);
for (Object value : loadClass(type).getEnumConstants()) {
- enumClass.addValue(value.toString().replace('.',
'_').replace('-', '_'));
+ enumClass.addValue((((Enum<?>) value).name()).replace('.',
'_').replace('-', '_'));
}
}
type = javaClass.getPackage() + "." + javaClass.getName() + "$" +
enumClassName;
