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/10/02 10:08:58 UTC
[1/4] camel git commit: Added test
Repository: camel
Updated Branches:
refs/heads/master e0b4e656a -> 5a5d4729c
Added test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ba826ae0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ba826ae0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ba826ae0
Branch: refs/heads/master
Commit: ba826ae0b4b3be6f302b1ca8aa313233964191cf
Parents: e0b4e65
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Oct 2 09:29:15 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Oct 2 09:29:15 2015 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/catalog/CamelCatalogTest.java | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ba826ae0/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 ea5f78d..34fa5c7 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
@@ -30,6 +30,16 @@ public class CamelCatalogTest extends TestCase {
private CamelCatalog catalog = new DefaultCamelCatalog();
@Test
+ public void testFindLanguageNames() throws Exception {
+ List<String> names = catalog.findLanguageNames();
+
+ assertTrue(names.contains("el"));
+ assertTrue(names.contains("simple"));
+ assertTrue(names.contains("spel"));
+ assertTrue(names.contains("xpath"));
+ }
+
+ @Test
public void testFindNames() throws Exception {
List<String> names = catalog.findComponentNames();
assertNotNull(names);
[3/4] camel git commit: Polish catalog
Posted by da...@apache.org.
Polish catalog
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3580583c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3580583c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3580583c
Branch: refs/heads/master
Commit: 3580583c9eb006fc10cf667e4a74752b5c1bb96f
Parents: 87802a4
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Oct 2 09:51:36 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Oct 2 09:51:36 2015 +0200
----------------------------------------------------------------------
.../maven/packaging/PackageDataFormatMojo.java | 2 +-
.../maven/packaging/PackageLanguageMojo.java | 28 +++++++++++++++++---
2 files changed, 25 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3580583c/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
index ca61d3e..b1301e7 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
@@ -363,7 +363,7 @@ public class PackageDataFormatMojo extends AbstractMojo {
private static String createParameterJsonSchema(DataFormatModel dataFormatModel, String schema) {
StringBuilder buffer = new StringBuilder("{");
- // component model
+ // dataformat model
buffer.append("\n \"dataformat\": {");
buffer.append("\n \"name\": \"").append(dataFormatModel.getName()).append("\",");
buffer.append("\n \"kind\": \"").append("dataformat").append("\",");
http://git-wip-us.apache.org/repos/asf/camel/blob/3580583c/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 fda5af3..070188a 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
@@ -110,7 +110,7 @@ public class PackageLanguageMojo extends AbstractMojo {
// first we need to setup the output directory because the next check
// can stop the build before the end and eclipse always needs to know about that directory
if (projectHelper != null) {
- projectHelper.addResource(project, languageOutDir.getPath(), Collections.singletonList("**/dataformat.properties"), Collections.emptyList());
+ projectHelper.addResource(project, languageOutDir.getPath(), Collections.singletonList("**/language.properties"), Collections.emptyList());
}
if (!PackageHelper.haveResourcesChanged(log, project, buildContext, "META-INF/services/org/apache/camel/language")) {
@@ -180,10 +180,14 @@ public class PackageLanguageMojo extends AbstractMojo {
List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("model", json, false);
for (Map<String, String> row : rows) {
if (row.containsKey("title")) {
- languageModel.setTitle(row.get("title"));
+ // title may be special for some languages
+ String title = asTitle(name, row.get("title"));
+ languageModel.setTitle(title);
}
if (row.containsKey("description")) {
- languageModel.setDescription(row.get("description"));
+ // description may be special for some languages
+ String desc = asDescription(name, row.get("description"));
+ languageModel.setDescription(desc);
}
if (row.containsKey("label")) {
languageModel.setLabel(row.get("label"));
@@ -314,6 +318,22 @@ public class PackageLanguageMojo extends AbstractMojo {
return name;
}
+ private static String asTitle(String name, String title) {
+ // special for some languages
+ if ("file".equals(name)) {
+ return "File";
+ }
+ return title;
+ }
+
+ private static String asDescription(String name, String description) {
+ // special for some languages
+ if ("file".equals(name)) {
+ return "For expressions and predicates using the file/simple language";
+ }
+ return description;
+ }
+
private static Artifact findCamelCoreArtifact(MavenProject project) {
// maybe this project is camel-core itself
Artifact artifact = project.getArtifact();
@@ -340,7 +360,7 @@ public class PackageLanguageMojo extends AbstractMojo {
private static String createParameterJsonSchema(LanguageModel languageModel, String schema) {
StringBuilder buffer = new StringBuilder("{");
- // component model
+ // language model
buffer.append("\n \"language\": {");
buffer.append("\n \"name\": \"").append(languageModel.getName()).append("\",");
buffer.append("\n \"kind\": \"").append("language").append("\",");
[2/4] camel git commit: Fixed catalog command in verbose mode
Posted by da...@apache.org.
Fixed catalog command in verbose mode
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/87802a49
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/87802a49
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/87802a49
Branch: refs/heads/master
Commit: 87802a49d7e8e8f9a09ab765ee76a2ab5aef63c5
Parents: ba826ae
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Oct 2 09:34:09 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Oct 2 09:34:09 2015 +0200
----------------------------------------------------------------------
.../org/apache/camel/commands/CatalogLanguageListCommand.java | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/87802a49/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogLanguageListCommand.java
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogLanguageListCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogLanguageListCommand.java
index 04ef0e2..ea7dbf3 100644
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogLanguageListCommand.java
+++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogLanguageListCommand.java
@@ -155,20 +155,17 @@ public class CatalogLanguageListCommand extends AbstractCamelCommand {
int nameLen = Math.min(columnWidths.get(NAME_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth());
int labelLen = Math.min(columnWidths.get(LABEL_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth());
int mavenLen = Math.min(columnWidths.get(MAVEN_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth());
- int descriptionLen = Math.min(columnWidths.get(DESCRIPTION_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth());
titleLen = Math.max(MIN_COLUMN_WIDTH, titleLen);
nameLen = Math.max(MIN_COLUMN_WIDTH, nameLen);
labelLen = Math.max(MIN_COLUMN_WIDTH, labelLen);
mavenLen = Math.max(MIN_COLUMN_WIDTH, mavenLen);
- descriptionLen = Math.max(MIN_COLUMN_WIDTH, descriptionLen);
final StringBuilder retval = new StringBuilder(DEFAULT_FORMAT_BUFFER_LENGTH);
retval.append(fieldPreamble).append("%-").append(titleLen).append('.').append(titleLen).append('s').append(fieldPostamble).append(' ');
retval.append(fieldPreamble).append("%-").append(nameLen).append('.').append(nameLen).append('s').append(fieldPostamble).append(' ');
retval.append(fieldPreamble).append("%-").append(labelLen).append('.').append(labelLen).append('s').append(fieldPostamble).append(' ');
retval.append(fieldPreamble).append("%-").append(mavenLen).append('.').append(mavenLen).append('s').append(fieldPostamble).append(' ');
- retval.append(fieldPreamble).append("%-").append(descriptionLen).append('.').append(descriptionLen).append('s').append(fieldPostamble).append(' ');
return retval.toString();
} else {
int titleLen = Math.min(columnWidths.get(TITLE_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth());
[4/4] camel git commit: Add more labels to data formats
Posted by da...@apache.org.
Add more labels to data formats
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5a5d4729
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5a5d4729
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5a5d4729
Branch: refs/heads/master
Commit: 5a5d4729c19d1d94f5244af316588bf959a25c7a
Parents: 3580583
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Oct 2 10:03:01 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Oct 2 10:03:01 2015 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/model/dataformat/BeanioDataFormat.java | 2 +-
.../java/org/apache/camel/model/dataformat/BindyDataFormat.java | 2 +-
.../java/org/apache/camel/model/dataformat/BoonDataFormat.java | 2 +-
.../java/org/apache/camel/model/dataformat/CastorDataFormat.java | 2 +-
.../java/org/apache/camel/model/dataformat/CryptoDataFormat.java | 2 +-
.../main/java/org/apache/camel/model/dataformat/CsvDataFormat.java | 2 +-
.../java/org/apache/camel/model/dataformat/FlatpackDataFormat.java | 2 +-
.../java/org/apache/camel/model/dataformat/JaxbDataFormat.java | 2 +-
.../java/org/apache/camel/model/dataformat/JibxDataFormat.java | 2 +-
.../java/org/apache/camel/model/dataformat/JsonDataFormat.java | 2 +-
.../main/java/org/apache/camel/model/dataformat/PGPDataFormat.java | 2 +-
.../org/apache/camel/model/dataformat/SerializationDataFormat.java | 2 +-
.../java/org/apache/camel/model/dataformat/SoapJaxbDataFormat.java | 2 +-
.../java/org/apache/camel/model/dataformat/StringDataFormat.java | 2 +-
.../java/org/apache/camel/model/dataformat/TarFileDataFormat.java | 2 +-
.../apache/camel/model/dataformat/UniVocityAbstractDataFormat.java | 2 +-
.../org/apache/camel/model/dataformat/UniVocityCsvDataFormat.java | 2 +-
.../camel/model/dataformat/UniVocityFixedWidthDataFormat.java | 2 +-
.../java/org/apache/camel/model/dataformat/UniVocityHeader.java | 2 +-
.../org/apache/camel/model/dataformat/UniVocityTsvDataFormat.java | 2 +-
.../java/org/apache/camel/model/dataformat/XMLBeansDataFormat.java | 2 +-
.../org/apache/camel/model/dataformat/XMLSecurityDataFormat.java | 2 +-
.../java/org/apache/camel/model/dataformat/XStreamDataFormat.java | 2 +-
.../java/org/apache/camel/model/dataformat/XmlJsonDataFormat.java | 2 +-
.../java/org/apache/camel/model/dataformat/XmlRpcDataFormat.java | 2 +-
.../java/org/apache/camel/model/dataformat/ZipFileDataFormat.java | 2 +-
.../java/org/apache/camel/model/language/ConstantExpression.java | 2 +-
.../main/java/org/apache/camel/model/language/ELExpression.java | 2 +-
.../apache/camel/model/language/ExchangePropertyExpression.java | 2 +-
.../java/org/apache/camel/model/language/GroovyExpression.java | 2 +-
.../java/org/apache/camel/model/language/HeaderExpression.java | 2 +-
.../java/org/apache/camel/model/language/JXPathExpression.java | 2 +-
.../java/org/apache/camel/model/language/JavaScriptExpression.java | 2 +-
.../java/org/apache/camel/model/language/JsonPathExpression.java | 2 +-
.../java/org/apache/camel/model/language/LanguageExpression.java | 2 +-
.../java/org/apache/camel/model/language/MethodCallExpression.java | 2 +-
.../main/java/org/apache/camel/model/language/MvelExpression.java | 2 +-
.../main/java/org/apache/camel/model/language/OgnlExpression.java | 2 +-
.../main/java/org/apache/camel/model/language/PhpExpression.java | 2 +-
.../java/org/apache/camel/model/language/PythonExpression.java | 2 +-
.../main/java/org/apache/camel/model/language/RefExpression.java | 2 +-
.../main/java/org/apache/camel/model/language/RubyExpression.java | 2 +-
.../java/org/apache/camel/model/language/SimpleExpression.java | 2 +-
.../main/java/org/apache/camel/model/language/SpELExpression.java | 2 +-
.../java/org/apache/camel/model/language/TokenizerExpression.java | 2 +-
.../java/org/apache/camel/model/language/VtdXmlExpression.java | 2 +-
.../org/apache/camel/model/language/XMLTokenizerExpression.java | 2 +-
.../main/java/org/apache/camel/model/language/XPathExpression.java | 2 +-
.../java/org/apache/camel/model/language/XQueryExpression.java | 2 +-
49 files changed, 49 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/dataformat/BeanioDataFormat.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/BeanioDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/BeanioDataFormat.java
index 8df5738..d6cfd40 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/BeanioDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/BeanioDataFormat.java
@@ -31,7 +31,7 @@ import org.apache.camel.spi.Metadata;
*
* @version
*/
-@Metadata(label = "dataformat,transformation", title = "BeanIO")
+@Metadata(label = "dataformat,transformation,csv", title = "BeanIO")
@XmlRootElement(name = "beanio")
@XmlAccessorType(XmlAccessType.FIELD)
public class BeanioDataFormat extends DataFormatDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java
index 76def26..cf07549 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java
@@ -34,7 +34,7 @@ import org.apache.camel.util.ObjectHelper;
*
* @version
*/
-@Metadata(label = "dataformat,transformation", title = "Bindy")
+@Metadata(label = "dataformat,transformation,csv", title = "Bindy")
@XmlRootElement(name = "bindy")
@XmlAccessorType(XmlAccessType.FIELD)
public class BindyDataFormat extends DataFormatDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/dataformat/BoonDataFormat.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/BoonDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/BoonDataFormat.java
index 675395c..465d09c 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/BoonDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/BoonDataFormat.java
@@ -32,7 +32,7 @@ import org.apache.camel.util.ObjectHelper;
/**
* Boon data format
*/
-@Metadata(label = "dataformat,transformation", title = "Boon")
+@Metadata(label = "dataformat,transformation,json", title = "Boon")
@XmlRootElement(name = "boon")
@XmlAccessorType(XmlAccessType.FIELD)
public class BoonDataFormat extends DataFormatDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/dataformat/CastorDataFormat.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/CastorDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/CastorDataFormat.java
index d3d7aa6..364b7d5 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/CastorDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/CastorDataFormat.java
@@ -31,7 +31,7 @@ import org.apache.camel.spi.Metadata;
*
* @version
*/
-@Metadata(label = "dataformat,transformation", title = "Castor")
+@Metadata(label = "dataformat,transformation,xml", title = "Castor")
@XmlRootElement(name = "castor")
@XmlAccessorType(XmlAccessType.FIELD)
public class CastorDataFormat extends DataFormatDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/dataformat/CryptoDataFormat.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/CryptoDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/CryptoDataFormat.java
index 0dbaf1e..03bafd8 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/CryptoDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/CryptoDataFormat.java
@@ -36,7 +36,7 @@ import org.apache.camel.util.ObjectHelper;
*
* @version
*/
-@Metadata(label = "dataformat,transformation", title = "Crypto (Java Cryptographic Extension)")
+@Metadata(label = "dataformat,transformation,security", title = "Crypto (Java Cryptographic Extension)")
@XmlRootElement(name = "crypto")
@XmlAccessorType(XmlAccessType.FIELD)
public class CryptoDataFormat extends DataFormatDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
index 2d976c9..83aeaa2 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
@@ -33,7 +33,7 @@ import org.apache.camel.util.ObjectHelper;
/**
* CSV data format
*/
-@Metadata(label = "dataformat,transformation", title = "CSV")
+@Metadata(label = "dataformat,transformation,csv", title = "CSV")
@XmlRootElement(name = "csv")
@XmlAccessorType(XmlAccessType.FIELD)
public class CsvDataFormat extends DataFormatDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java
index 050e7fb..dbf4e9b 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java
@@ -32,7 +32,7 @@ import org.apache.camel.util.ObjectHelper;
/**
* Flatpack data format
*/
-@Metadata(label = "dataformat,transformation", title = "Flatpack")
+@Metadata(label = "dataformat,transformation,csv", title = "Flatpack")
@XmlRootElement(name = "flatpack")
@XmlAccessorType(XmlAccessType.FIELD)
public class FlatpackDataFormat extends DataFormatDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
index 960bcdc..9ba6703 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
@@ -33,7 +33,7 @@ import org.apache.camel.util.ObjectHelper;
*
* @version
*/
-@Metadata(label = "dataformat,transformation", title = "JAXB")
+@Metadata(label = "dataformat,transformation,xml", title = "JAXB")
@XmlRootElement(name = "jaxb")
@XmlAccessorType(XmlAccessType.FIELD)
public class JaxbDataFormat extends DataFormatDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/dataformat/JibxDataFormat.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/JibxDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/JibxDataFormat.java
index f01b4ed..d9f0e24 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/JibxDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/JibxDataFormat.java
@@ -32,7 +32,7 @@ import org.apache.camel.util.ObjectHelper;
/**
* JiBX data format
*/
-@Metadata(label = "dataformat,transformation", title = "JiBX")
+@Metadata(label = "dataformat,transformation,xml", title = "JiBX")
@XmlRootElement(name = "jibx")
@XmlAccessorType(XmlAccessType.NONE)
public class JibxDataFormat extends DataFormatDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
index 3aceb18..c0127eb 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
@@ -34,7 +34,7 @@ import org.apache.camel.util.ObjectHelper;
*
* @version
*/
-@Metadata(label = "dataformat,transformation", title = "JSon")
+@Metadata(label = "dataformat,transformation,json", title = "JSon")
@XmlRootElement(name = "json")
@XmlAccessorType(XmlAccessType.FIELD)
public class JsonDataFormat extends DataFormatDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/dataformat/PGPDataFormat.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/PGPDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/PGPDataFormat.java
index 45622028..b05fd4f 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/PGPDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/PGPDataFormat.java
@@ -29,7 +29,7 @@ import org.apache.camel.spi.Metadata;
/**
* PGP data format
*/
-@Metadata(label = "dataformat,transformation", title = "PGP")
+@Metadata(label = "dataformat,transformation,security", title = "PGP")
@XmlRootElement(name = "pgp")
@XmlAccessorType(XmlAccessType.FIELD)
public class PGPDataFormat extends DataFormatDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/dataformat/SerializationDataFormat.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/SerializationDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/SerializationDataFormat.java
index 569ad44..4bc71a1 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/SerializationDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/SerializationDataFormat.java
@@ -28,7 +28,7 @@ import org.apache.camel.spi.RouteContext;
*
* @version
*/
-@Metadata(label = "dataformat,transformation", title = "Java Object Serialization")
+@Metadata(label = "dataformat,transformation,core", title = "Java Object Serialization")
@XmlRootElement(name = "serialization")
public class SerializationDataFormat extends DataFormatDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/dataformat/SoapJaxbDataFormat.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/SoapJaxbDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/SoapJaxbDataFormat.java
index 3837a84..386a614 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/SoapJaxbDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/SoapJaxbDataFormat.java
@@ -30,7 +30,7 @@ import org.apache.camel.spi.Metadata;
/**
* SOAP data format
*/
-@Metadata(label = "dataformat,transformation", title = "SOAP")
+@Metadata(label = "dataformat,transformation,xml", title = "SOAP")
@XmlRootElement(name = "soapjaxb")
@XmlAccessorType(XmlAccessType.FIELD)
public class SoapJaxbDataFormat extends DataFormatDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/dataformat/StringDataFormat.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/StringDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/StringDataFormat.java
index eedf2c6..f8e547a 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/StringDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/StringDataFormat.java
@@ -31,7 +31,7 @@ import org.apache.camel.spi.RouteContext;
*
* @version
*/
-@Metadata(label = "dataformat,transformation", title = "String Encoding")
+@Metadata(label = "dataformat,transformation,core", title = "String Encoding")
@XmlRootElement(name = "string")
@XmlAccessorType(XmlAccessType.FIELD)
public class StringDataFormat extends DataFormatDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/dataformat/TarFileDataFormat.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/TarFileDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/TarFileDataFormat.java
index ecd8e51..e7feab7 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/TarFileDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/TarFileDataFormat.java
@@ -29,7 +29,7 @@ import org.apache.camel.spi.Metadata;
/**
* Represents the TAR file XML {@link org.apache.camel.spi.DataFormat}.
*/
-@Metadata(label = "dataformat,transformation", title = "Tar File")
+@Metadata(label = "dataformat,transformation,file", title = "Tar File")
@XmlRootElement(name = "tarfile")
@XmlAccessorType(XmlAccessType.FIELD)
public class TarFileDataFormat extends DataFormatDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityAbstractDataFormat.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityAbstractDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityAbstractDataFormat.java
index f9a1a4d..c66cb2e 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityAbstractDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityAbstractDataFormat.java
@@ -31,7 +31,7 @@ import org.apache.camel.spi.Metadata;
/**
* Represents the common parts of all uniVocity {@link org.apache.camel.spi.DataFormat} parsers.
*/
-@Metadata(label = "dataformat,transformation", title = "uniVocity")
+@Metadata(label = "dataformat,transformation,csv", title = "uniVocity")
@XmlAccessorType(XmlAccessType.FIELD)
public abstract class UniVocityAbstractDataFormat extends DataFormatDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityCsvDataFormat.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityCsvDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityCsvDataFormat.java
index 67a025c..5a22747 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityCsvDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityCsvDataFormat.java
@@ -28,7 +28,7 @@ import org.apache.camel.spi.Metadata;
/**
* UniVocity CSV data format
*/
-@Metadata(label = "dataformat,transformation", title = "uniVocity CSV")
+@Metadata(label = "dataformat,transformation,csv", title = "uniVocity CSV")
@XmlRootElement(name = "univocity-csv")
@XmlAccessorType(XmlAccessType.FIELD)
public class UniVocityCsvDataFormat extends UniVocityAbstractDataFormat {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityFixedWidthDataFormat.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityFixedWidthDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityFixedWidthDataFormat.java
index 9a3317d..4af8535 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityFixedWidthDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityFixedWidthDataFormat.java
@@ -28,7 +28,7 @@ import org.apache.camel.spi.Metadata;
/**
* UniVocity fixed-width data format
*/
-@Metadata(label = "dataformat,transformation", title = "uniVocity Fixed Length")
+@Metadata(label = "dataformat,transformation,csv", title = "uniVocity Fixed Length")
@XmlRootElement(name = "univocity-fixed")
@XmlAccessorType(XmlAccessType.FIELD)
public class UniVocityFixedWidthDataFormat extends UniVocityAbstractDataFormat {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityHeader.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityHeader.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityHeader.java
index 212926e..7869577 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityHeader.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityHeader.java
@@ -27,7 +27,7 @@ import org.apache.camel.spi.Metadata;
/**
* To configure headers for UniVocity data formats.
*/
-@Metadata(label = "dataformat,transformation", title = "uniVocity Header")
+@Metadata(label = "dataformat,transformation,csv", title = "uniVocity Header")
@XmlRootElement(name = "univocity-header")
@XmlAccessorType(XmlAccessType.FIELD)
public class UniVocityHeader {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityTsvDataFormat.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityTsvDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityTsvDataFormat.java
index 445424a..5ccca90 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityTsvDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityTsvDataFormat.java
@@ -28,7 +28,7 @@ import org.apache.camel.spi.Metadata;
/**
* UniVocity TSV data format
*/
-@Metadata(label = "dataformat,transformation", title = "uniVocity TSV")
+@Metadata(label = "dataformat,transformation,csv", title = "uniVocity TSV")
@XmlRootElement(name = "univocity-tsv")
@XmlAccessorType(XmlAccessType.FIELD)
public class UniVocityTsvDataFormat extends UniVocityAbstractDataFormat {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLBeansDataFormat.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLBeansDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLBeansDataFormat.java
index 2e7760f..36a31e1 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLBeansDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLBeansDataFormat.java
@@ -29,7 +29,7 @@ import org.apache.camel.spi.Metadata;
*
* @version
*/
-@Metadata(label = "dataformat,transformation", title = "XML Beans")
+@Metadata(label = "dataformat,transformation,xml", title = "XML Beans")
@XmlRootElement(name = "xmlBeans")
@XmlAccessorType(XmlAccessType.FIELD)
public class XMLBeansDataFormat extends DataFormatDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java
index d50369e..bd3ab6e 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java
@@ -34,7 +34,7 @@ import org.apache.camel.util.jsse.KeyStoreParameters;
/**
* xml-security data format
*/
-@Metadata(label = "dataformat,transformation", title = "XML Security")
+@Metadata(label = "dataformat,transformation,xml,security", title = "XML Security")
@XmlRootElement(name = "secureXML")
@XmlAccessorType(XmlAccessType.FIELD)
public class XMLSecurityDataFormat extends DataFormatDefinition implements NamespaceAware {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
index 287b887..e1f86db 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
@@ -45,7 +45,7 @@ import org.apache.camel.util.ObjectHelper;
*
* @version
*/
-@Metadata(label = "dataformat,transformation", title = "XStream")
+@Metadata(label = "dataformat,transformation,xml,json", title = "XStream")
@XmlRootElement(name = "xstream")
@XmlAccessorType(XmlAccessType.NONE)
public class XStreamDataFormat extends DataFormatDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlJsonDataFormat.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlJsonDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlJsonDataFormat.java
index 471db08..848f171 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlJsonDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlJsonDataFormat.java
@@ -35,7 +35,7 @@ import org.apache.camel.spi.Metadata;
*
* @version
*/
-@Metadata(label = "dataformat,transformation", title = "XML JSon")
+@Metadata(label = "dataformat,transformation,xml,json", title = "XML JSon")
@XmlRootElement(name = "xmljson")
@XmlAccessorType(XmlAccessType.FIELD)
public class XmlJsonDataFormat extends DataFormatDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlRpcDataFormat.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlRpcDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlRpcDataFormat.java
index a963f82..fa4acb3 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlRpcDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlRpcDataFormat.java
@@ -29,7 +29,7 @@ import org.apache.camel.spi.Metadata;
/**
* xml-rpc data format
*/
-@Metadata(label = "dataformat,transformation", title = "XML RPC")
+@Metadata(label = "dataformat,transformation,xml", title = "XML RPC")
@XmlRootElement(name = "xmlrpc")
@XmlAccessorType(XmlAccessType.FIELD)
public class XmlRpcDataFormat extends DataFormatDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipFileDataFormat.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipFileDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipFileDataFormat.java
index cc02b1b..d87504f 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipFileDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipFileDataFormat.java
@@ -29,7 +29,7 @@ import org.apache.camel.spi.Metadata;
/**
* zip-file data format
*/
-@Metadata(label = "dataformat,transformation", title = "Zip File")
+@Metadata(label = "dataformat,transformation,file", title = "Zip File")
// TODO: use zipfile as name in Camel 3.0
@XmlRootElement(name = "zipFile")
@XmlAccessorType(XmlAccessType.FIELD)
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/language/ConstantExpression.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/ConstantExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/ConstantExpression.java
index 64233ea..124126b 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/ConstantExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/ConstantExpression.java
@@ -25,7 +25,7 @@ import org.apache.camel.spi.Metadata;
/**
* For expressions and predicates using a constant
*/
-@Metadata(label = "language", title = "Constant")
+@Metadata(label = "language,core", title = "Constant")
@XmlRootElement(name = "constant")
@XmlAccessorType(XmlAccessType.FIELD)
public class ConstantExpression extends ExpressionDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/language/ELExpression.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/ELExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/ELExpression.java
index 49e0392..7e34783 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/ELExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/ELExpression.java
@@ -27,7 +27,7 @@ import org.apache.camel.spi.Metadata;
*
* @version
*/
-@Metadata(label = "language", title = "EL")
+@Metadata(label = "language,script", title = "EL")
@XmlRootElement(name = "el")
@XmlAccessorType(XmlAccessType.FIELD)
public class ELExpression extends ExpressionDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/language/ExchangePropertyExpression.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/ExchangePropertyExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/ExchangePropertyExpression.java
index 77ee04d..2535eb4 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/ExchangePropertyExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/ExchangePropertyExpression.java
@@ -27,7 +27,7 @@ import org.apache.camel.spi.Metadata;
*
* @version
*/
-@Metadata(label = "language", title = "ExchangeProperty")
+@Metadata(label = "language,core", title = "ExchangeProperty")
@XmlRootElement(name = "exchangeProperty")
@XmlAccessorType(XmlAccessType.FIELD)
public class ExchangePropertyExpression extends ExpressionDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/language/GroovyExpression.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/GroovyExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/GroovyExpression.java
index d831813..ac674bc 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/GroovyExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/GroovyExpression.java
@@ -27,7 +27,7 @@ import org.apache.camel.spi.Metadata;
*
* @version
*/
-@Metadata(label = "language", title = "Groovy")
+@Metadata(label = "language,script", title = "Groovy")
@XmlRootElement(name = "groovy")
@XmlAccessorType(XmlAccessType.FIELD)
public class GroovyExpression extends ExpressionDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/language/HeaderExpression.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/HeaderExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/HeaderExpression.java
index 2078da9..3833690 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/HeaderExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/HeaderExpression.java
@@ -27,7 +27,7 @@ import org.apache.camel.spi.Metadata;
*
* @version
*/
-@Metadata(label = "language", title = "Header")
+@Metadata(label = "language,core", title = "Header")
@XmlRootElement(name = "header")
@XmlAccessorType(XmlAccessType.FIELD)
public class HeaderExpression extends ExpressionDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/language/JXPathExpression.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/JXPathExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/JXPathExpression.java
index a528885..023af06 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/JXPathExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/JXPathExpression.java
@@ -31,7 +31,7 @@ import org.apache.camel.spi.Metadata;
*
* @version
*/
-@Metadata(label = "language", title = "JXPath")
+@Metadata(label = "language,java", title = "JXPath")
@XmlRootElement(name = "jxpath")
@XmlAccessorType(XmlAccessType.FIELD)
public class JXPathExpression extends ExpressionDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/language/JavaScriptExpression.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/JavaScriptExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/JavaScriptExpression.java
index c47ae03..7221b1b 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/JavaScriptExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/JavaScriptExpression.java
@@ -27,7 +27,7 @@ import org.apache.camel.spi.Metadata;
*
* @version
*/
-@Metadata(label = "language", title = "JavaScript")
+@Metadata(label = "language,script", title = "JavaScript")
@XmlRootElement(name = "javaScript")
@XmlAccessorType(XmlAccessType.FIELD)
public class JavaScriptExpression extends ExpressionDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/language/JsonPathExpression.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/JsonPathExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/JsonPathExpression.java
index f5a7dd7..59bfa33 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/JsonPathExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/JsonPathExpression.java
@@ -33,7 +33,7 @@ import org.apache.camel.util.ObjectHelper;
*
* @version
*/
-@Metadata(label = "language", title = "JSonPath")
+@Metadata(label = "language,json", title = "JSonPath")
@XmlRootElement(name = "jsonpath")
@XmlAccessorType(XmlAccessType.FIELD)
public class JsonPathExpression extends ExpressionDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/language/LanguageExpression.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/LanguageExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/LanguageExpression.java
index 4bf831a..dcf6e29 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/LanguageExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/LanguageExpression.java
@@ -29,7 +29,7 @@ import org.apache.camel.spi.Metadata;
*
* @version
*/
-@Metadata(label = "language", title = "Language")
+@Metadata(label = "language,core", title = "Language")
@XmlRootElement(name = "language")
@XmlAccessorType(XmlAccessType.FIELD)
public class LanguageExpression extends ExpressionDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
index 6e60202..acc531c 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
@@ -42,7 +42,7 @@ import org.apache.camel.util.OgnlHelper;
*
* @version
*/
-@Metadata(label = "language", title = "Bean method")
+@Metadata(label = "language,core,java", title = "Bean method")
@XmlRootElement(name = "method")
@XmlAccessorType(XmlAccessType.FIELD)
public class MethodCallExpression extends ExpressionDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/language/MvelExpression.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/MvelExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/MvelExpression.java
index 3e89b89..56d0150 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/MvelExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/MvelExpression.java
@@ -27,7 +27,7 @@ import org.apache.camel.spi.Metadata;
*
* @version
*/
-@Metadata(label = "language", title = "MVEL")
+@Metadata(label = "language,java", title = "MVEL")
@XmlRootElement(name = "mvel")
@XmlAccessorType(XmlAccessType.FIELD)
public class MvelExpression extends ExpressionDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/language/OgnlExpression.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/OgnlExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/OgnlExpression.java
index 90f2e9f..f6ccd06 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/OgnlExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/OgnlExpression.java
@@ -27,7 +27,7 @@ import org.apache.camel.spi.Metadata;
*
* @version
*/
-@Metadata(label = "language", title = "OGNL")
+@Metadata(label = "language,java", title = "OGNL")
@XmlRootElement(name = "ognl")
@XmlAccessorType(XmlAccessType.FIELD)
public class OgnlExpression extends ExpressionDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/language/PhpExpression.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/PhpExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/PhpExpression.java
index 7655ca1..ab2e4d8 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/PhpExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/PhpExpression.java
@@ -27,7 +27,7 @@ import org.apache.camel.spi.Metadata;
*
* @version
*/
-@Metadata(label = "language", title = "PHP")
+@Metadata(label = "language,script", title = "PHP")
@XmlRootElement(name = "php")
@XmlAccessorType(XmlAccessType.FIELD)
public class PhpExpression extends ExpressionDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/language/PythonExpression.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/PythonExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/PythonExpression.java
index 2c37f9e..126e0e5 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/PythonExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/PythonExpression.java
@@ -27,7 +27,7 @@ import org.apache.camel.spi.Metadata;
*
* @version
*/
-@Metadata(label = "language", title = "Python")
+@Metadata(label = "language,script", title = "Python")
@XmlRootElement(name = "python")
@XmlAccessorType(XmlAccessType.FIELD)
public class PythonExpression extends ExpressionDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/language/RefExpression.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/RefExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/RefExpression.java
index a6f4d69..1ce4cf7 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/RefExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/RefExpression.java
@@ -25,7 +25,7 @@ import org.apache.camel.spi.Metadata;
/**
* For using a custom expression
*/
-@Metadata(label = "language", title = "Ref")
+@Metadata(label = "language,core", title = "Ref")
@XmlRootElement(name = "ref")
@XmlAccessorType(XmlAccessType.FIELD)
public class RefExpression extends ExpressionDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/language/RubyExpression.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/RubyExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/RubyExpression.java
index b94c802..c3daba4 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/RubyExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/RubyExpression.java
@@ -27,7 +27,7 @@ import org.apache.camel.spi.Metadata;
*
* @version
*/
-@Metadata(label = "language", title = "Ruby")
+@Metadata(label = "language,script", title = "Ruby")
@XmlRootElement(name = "ruby")
@XmlAccessorType(XmlAccessType.FIELD)
public class RubyExpression extends ExpressionDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/language/SimpleExpression.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/SimpleExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/SimpleExpression.java
index 84485b9..08bde18 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/SimpleExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/SimpleExpression.java
@@ -34,7 +34,7 @@ import org.apache.camel.util.ObjectHelper;
*
* @version
*/
-@Metadata(label = "language", title = "Simple")
+@Metadata(label = "language,core,java", title = "Simple")
@XmlRootElement(name = "simple")
@XmlAccessorType(XmlAccessType.FIELD)
public class SimpleExpression extends ExpressionDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/language/SpELExpression.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/SpELExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/SpELExpression.java
index 8d965de..503b956 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/SpELExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/SpELExpression.java
@@ -27,7 +27,7 @@ import org.apache.camel.spi.Metadata;
*
* @version
*/
-@Metadata(label = "language", title = "SpEL")
+@Metadata(label = "language,spring", title = "SpEL")
@XmlRootElement(name = "spel")
@XmlAccessorType(XmlAccessType.FIELD)
public class SpELExpression extends ExpressionDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/language/TokenizerExpression.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/TokenizerExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/TokenizerExpression.java
index cefa84e..cf09ca5 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/TokenizerExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/TokenizerExpression.java
@@ -33,7 +33,7 @@ import org.apache.camel.util.ExpressionToPredicateAdapter;
*
* @see TokenizeLanguage
*/
-@Metadata(label = "language", title = "Tokenize")
+@Metadata(label = "language,core", title = "Tokenize")
@XmlRootElement(name = "tokenize")
@XmlAccessorType(XmlAccessType.FIELD)
public class TokenizerExpression extends ExpressionDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/language/VtdXmlExpression.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/VtdXmlExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/VtdXmlExpression.java
index f93acfc..47adf2d 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/VtdXmlExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/VtdXmlExpression.java
@@ -27,7 +27,7 @@ import org.apache.camel.spi.Metadata;
*
* @version
*/
-@Metadata(label = "language", title = "VtdXML")
+@Metadata(label = "language,xml", title = "VtdXML")
@XmlRootElement(name = "vtdxml")
@XmlAccessorType(XmlAccessType.FIELD)
public class VtdXmlExpression extends NamespaceAwareExpression {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/language/XMLTokenizerExpression.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/XMLTokenizerExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/XMLTokenizerExpression.java
index cf53bb3..cb8f32f 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/XMLTokenizerExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/XMLTokenizerExpression.java
@@ -32,7 +32,7 @@ import org.apache.camel.spi.Metadata;
*
* @see XMLTokenizeLanguage
*/
-@Metadata(label = "language", title = "XML Tokenize")
+@Metadata(label = "language,core,xml", title = "XML Tokenize")
@XmlRootElement(name = "xtokenize")
@XmlAccessorType(XmlAccessType.FIELD)
public class XMLTokenizerExpression extends NamespaceAwareExpression {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/language/XPathExpression.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/XPathExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/XPathExpression.java
index 609a9e4..8fc05e4 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/XPathExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/XPathExpression.java
@@ -33,7 +33,7 @@ import org.apache.camel.util.ObjectHelper;
/**
* For XPath expressions and predicates
*/
-@Metadata(label = "language", title = "XPath")
+@Metadata(label = "language,core,xml", title = "XPath")
@XmlRootElement(name = "xpath")
@XmlAccessorType(XmlAccessType.FIELD)
public class XPathExpression extends NamespaceAwareExpression {
http://git-wip-us.apache.org/repos/asf/camel/blob/5a5d4729/camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java
index 0513d8e..12d71fb 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java
@@ -33,7 +33,7 @@ import org.apache.camel.util.ObjectHelper;
*
* @version
*/
-@Metadata(label = "language", title = "XQuery")
+@Metadata(label = "language,xml", title = "XQuery")
@XmlRootElement(name = "xquery")
@XmlAccessorType(XmlAccessType.FIELD)
public class XQueryExpression extends NamespaceAwareExpression {