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/01/13 18:04:39 UTC
[13/13] camel git commit: CAMEL-8232: Camel Toolbox - Include
documentation about data formats
CAMEL-8232: Camel Toolbox - Include documentation about data formats
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/00f10040
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/00f10040
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/00f10040
Branch: refs/heads/master
Commit: 00f1004030f219723a558de1e252b479925d9938
Parents: b08ba26
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jan 13 17:11:12 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jan 13 17:33:30 2015 +0100
----------------------------------------------------------------------
.../org/apache/camel/model/dataformat/ZipFileDataFormat.java | 1 +
.../apache/camel/catalog/DefaultCamelComponentCatalog.java | 4 ++--
.../org/apache/camel/commands/AbstractCamelController.java | 8 ++++++--
.../apache/camel/maven/packaging/PackageDataFormatMojo.java | 3 +++
.../org/apache/camel/maven/packaging/PrepareCatalogMojo.java | 3 ++-
5 files changed, 14 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/00f10040/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 c1465a1..433e886 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
@@ -30,6 +30,7 @@ import org.apache.camel.spi.Label;
* Represents the ZIP file XML {@link org.apache.camel.spi.DataFormat}.
*/
@Label("dataformat,transformation")
+// TODO: use zipfile as name in Camel 3.0
@XmlRootElement(name = "zipFile")
@XmlAccessorType(XmlAccessType.FIELD)
public class ZipFileDataFormat extends DataFormatDefinition {
http://git-wip-us.apache.org/repos/asf/camel/blob/00f10040/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelComponentCatalog.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelComponentCatalog.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelComponentCatalog.java
index 417aee3..e52f205 100644
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelComponentCatalog.java
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelComponentCatalog.java
@@ -154,7 +154,7 @@ public class DefaultCamelComponentCatalog implements CamelComponentCatalog {
for (String name : names) {
String json = dataFormatJSonSchema(name);
if (json != null) {
- List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("model", json, false);
+ List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("dataformat", json, false);
for (Map<String, String> row : rows) {
if (row.containsKey("label")) {
String label = row.get("label");
@@ -280,7 +280,7 @@ public class DefaultCamelComponentCatalog implements CamelComponentCatalog {
for (String name : names) {
String json = dataFormatJSonSchema(name);
if (json != null) {
- List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("model", json, false);
+ List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("dataformat", json, false);
for (Map<String, String> row : rows) {
if (row.containsKey("label")) {
String label = row.get("label");
http://git-wip-us.apache.org/repos/asf/camel/blob/00f10040/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractCamelController.java
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractCamelController.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractCamelController.java
index db620cc..585711e 100644
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractCamelController.java
+++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractCamelController.java
@@ -162,10 +162,11 @@ public abstract class AbstractCamelController implements CamelController {
for (String name : names) {
// load dataformat json data, and parse it to gather the dataformat meta-data
String json = catalog.dataFormatJSonSchema(name);
- List<Map<String, String>> rows = JsonSchemaHelper.parseJsonSchema("model", json, false);
+ List<Map<String, String>> rows = JsonSchemaHelper.parseJsonSchema("dataformat", json, false);
String description = null;
String label = null;
+ String modelName = name;
// the status can be:
// - loaded = in use
// - classpath = on the classpath
@@ -176,7 +177,9 @@ public abstract class AbstractCamelController implements CamelController {
String artifactId = null;
String version = null;
for (Map<String, String> row : rows) {
- if (row.containsKey("description")) {
+ if (row.containsKey("modelName")) {
+ modelName = row.get("modelName");
+ } else if (row.containsKey("description")) {
description = row.get("description");
} else if (row.containsKey("label")) {
label = row.get("label");
@@ -193,6 +196,7 @@ public abstract class AbstractCamelController implements CamelController {
Map<String, String> row = new HashMap<String, String>();
row.put("name", name);
+ row.put("modelName", modelName);
row.put("status", status);
if (description != null) {
row.put("description", description);
http://git-wip-us.apache.org/repos/asf/camel/blob/00f10040/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 ee61f54..b18c39c 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
@@ -235,6 +235,9 @@ public class PackageDataFormatMojo extends AbstractMojo {
return "json";
} else if ("bindy-csv".equals(name) || "bindy-fixed".equals(name) || "bindy-kvp".equals(name)) {
return "bindy";
+ } else if ("zipfile".equals(name)) {
+ // darn should have been lower case
+ return "zipFile";
}
return name;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/00f10040/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
index 15a8e21..37ed638 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
@@ -260,6 +260,7 @@ public class PrepareCatalogMojo extends AbstractMojo {
}
}
+ getLog().info("Found " + componentFiles.size() + " component.properties files");
getLog().info("Found " + jsonFiles.size() + " component json files");
// make sure to create out dir
@@ -365,7 +366,7 @@ public class PrepareCatalogMojo extends AbstractMojo {
findDataFormatFilesRecursive(target, jsonFiles, dataFormatFiles, new CamelDataFormatsFileFilter());
}
- getLog().info("Found " + dataFormatFiles.size() + " dataformat.properties json files");
+ getLog().info("Found " + dataFormatFiles.size() + " dataformat.properties files");
getLog().info("Found " + jsonFiles.size() + " dataformat json files");
// make sure to create out dir