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 2016/08/19 09:14:36 UTC
camel git commit: CAMEL-9541: Fixed data format description.
Repository: camel
Updated Branches:
refs/heads/master db1d9eb70 -> 898128ba6
CAMEL-9541: Fixed data format description.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/898128ba
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/898128ba
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/898128ba
Branch: refs/heads/master
Commit: 898128ba6d065082235f096139827820e5660637
Parents: db1d9eb
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Aug 19 11:14:11 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Aug 19 11:14:11 2016 +0200
----------------------------------------------------------------------
camel-core/readme.adoc | 8 ++++----
.../org/apache/camel/model/dataformat/GzipDataFormat.java | 2 +-
.../org/apache/camel/model/dataformat/JsonDataFormat.java | 2 +-
.../org/apache/camel/model/dataformat/LZFDataFormat.java | 2 +-
.../org/apache/camel/model/dataformat/StringDataFormat.java | 2 +-
.../org/apache/camel/model/dataformat/TarFileDataFormat.java | 2 +-
.../apache/camel/model/dataformat/XMLSecurityDataFormat.java | 2 +-
.../org/apache/camel/model/dataformat/XStreamDataFormat.java | 2 +-
.../org/apache/camel/model/dataformat/XmlJsonDataFormat.java | 2 +-
.../org/apache/camel/model/dataformat/XmlRpcDataFormat.java | 2 +-
.../org/apache/camel/model/dataformat/ZipDataFormat.java | 2 +-
.../org/apache/camel/model/dataformat/ZipFileDataFormat.java | 2 +-
.../camel/impl/springboot/GzipDataFormatConfiguration.java | 2 +-
.../springboot/SerializationDataFormatConfiguration.java | 2 +-
.../camel/impl/springboot/StringDataFormatConfiguration.java | 2 +-
.../camel/impl/springboot/ZipDataFormatConfiguration.java | 2 +-
.../apache/camel/maven/packaging/PackageDataFormatMojo.java | 2 +-
17 files changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/898128ba/camel-core/readme.adoc
----------------------------------------------------------------------
diff --git a/camel-core/readme.adoc b/camel-core/readme.adoc
index 1dacf07..8058c58 100644
--- a/camel-core/readme.adoc
+++ b/camel-core/readme.adoc
@@ -105,13 +105,13 @@ Data Formats
|=======================================================================
| Data Format | Description
-| link:camel-core/src/main/docs/gzip-dataformat.adoc[GZip] (camel-core) | The Core Camel Java DSL based router
+| link:camel-core/src/main/docs/gzip-dataformat.adoc[GZip] (camel-core) | GZip compression data format
-| link:camel-core/src/main/docs/serialization-dataformat.adoc[Java Object Serialization] (camel-core) | The Core Camel Java DSL based router
+| link:camel-core/src/main/docs/serialization-dataformat.adoc[Java Object Serialization] (camel-core) | Java Object Serialization data format
-| link:camel-core/src/main/docs/string-dataformat.adoc[String Encoding] (camel-core) | The Core Camel Java DSL based router
+| link:camel-core/src/main/docs/string-dataformat.adoc[String Encoding] (camel-core) | String (text based) data format
-| link:camel-core/src/main/docs/zip-dataformat.adoc[Zip Deflate Compression] (camel-core) | The Core Camel Java DSL based router
+| link:camel-core/src/main/docs/zip-dataformat.adoc[Zip Deflate Compression] (camel-core) | Zip compression data format (not for zip files)
|=======================================================================
// dataformats: END
http://git-wip-us.apache.org/repos/asf/camel/blob/898128ba/camel-core/src/main/java/org/apache/camel/model/dataformat/GzipDataFormat.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/GzipDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/GzipDataFormat.java
index 1a640c1..0a1813b 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/GzipDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/GzipDataFormat.java
@@ -24,7 +24,7 @@ import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.RouteContext;
/**
- * GZip data format
+ * GZip compression data format
*
* @version
*/
http://git-wip-us.apache.org/repos/asf/camel/blob/898128ba/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 41e553c..4ee2413 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
@@ -31,7 +31,7 @@ import org.apache.camel.util.CollectionStringBuffer;
import org.apache.camel.util.ObjectHelper;
/**
- * Json data format
+ * JSon data format
*
* @version
*/
http://git-wip-us.apache.org/repos/asf/camel/blob/898128ba/camel-core/src/main/java/org/apache/camel/model/dataformat/LZFDataFormat.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/LZFDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/LZFDataFormat.java
index 30f7852..cd87e81 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/LZFDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/LZFDataFormat.java
@@ -27,7 +27,7 @@ import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.Metadata;
/**
- * lzf data format
+ * LZF compression data format
*/
@Metadata(label = "dataformat,transformation", title = "LZF Deflate Compression")
@XmlRootElement(name = "lzf")
http://git-wip-us.apache.org/repos/asf/camel/blob/898128ba/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 f8e547a..124b91e 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
@@ -27,7 +27,7 @@ import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.RouteContext;
/**
- * Represents the String (text based) {@link DataFormat}
+ * String (text based) data format
*
* @version
*/
http://git-wip-us.apache.org/repos/asf/camel/blob/898128ba/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 e7feab7..bd004a4 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
@@ -27,7 +27,7 @@ import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.Metadata;
/**
- * Represents the TAR file XML {@link org.apache.camel.spi.DataFormat}.
+ * TAR file data format
*/
@Metadata(label = "dataformat,transformation,file", title = "Tar File")
@XmlRootElement(name = "tarfile")
http://git-wip-us.apache.org/repos/asf/camel/blob/898128ba/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 bd3ab6e..78f6b8b 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
@@ -32,7 +32,7 @@ import org.apache.camel.spi.NamespaceAware;
import org.apache.camel.util.jsse.KeyStoreParameters;
/**
- * xml-security data format
+ * XML-Security data format
*/
@Metadata(label = "dataformat,transformation,xml,security", title = "XML Security")
@XmlRootElement(name = "secureXML")
http://git-wip-us.apache.org/repos/asf/camel/blob/898128ba/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 a7a22f3..71082e4 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
@@ -42,7 +42,7 @@ import org.apache.camel.util.CollectionStringBuffer;
import org.apache.camel.util.ObjectHelper;
/**
- * xstream data format
+ * XStream data format
*
* @version
*/
http://git-wip-us.apache.org/repos/asf/camel/blob/898128ba/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 848f171..b10efc0 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
@@ -31,7 +31,7 @@ import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.Metadata;
/**
- * xml-json data format
+ * XML-JSon data format
*
* @version
*/
http://git-wip-us.apache.org/repos/asf/camel/blob/898128ba/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 b065876..84f48a5 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
@@ -27,7 +27,7 @@ import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.Metadata;
/**
- * xml-rpc data format
+ * XML-RPC data format
*/
@Metadata(label = "dataformat,transformation,xml", title = "XML RPC")
@XmlRootElement(name = "xmlrpc")
http://git-wip-us.apache.org/repos/asf/camel/blob/898128ba/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipDataFormat.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipDataFormat.java
index dec3efb..ba70879 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipDataFormat.java
@@ -28,7 +28,7 @@ import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.RouteContext;
/**
- * zip data format (not for zip files)
+ * Zip compression data format (not for zip files)
*/
@Metadata(label = "dataformat,transformation", title = "Zip Deflate Compression")
@XmlRootElement(name = "zip")
http://git-wip-us.apache.org/repos/asf/camel/blob/898128ba/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 d87504f..f89f87e 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
@@ -27,7 +27,7 @@ import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.Metadata;
/**
- * zip-file data format
+ * Zip-file data format
*/
@Metadata(label = "dataformat,transformation,file", title = "Zip File")
// TODO: use zipfile as name in Camel 3.0
http://git-wip-us.apache.org/repos/asf/camel/blob/898128ba/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/GzipDataFormatConfiguration.java
----------------------------------------------------------------------
diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/GzipDataFormatConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/GzipDataFormatConfiguration.java
index df614d4..bcbd9cd 100644
--- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/GzipDataFormatConfiguration.java
+++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/GzipDataFormatConfiguration.java
@@ -19,7 +19,7 @@ package org.apache.camel.impl.springboot;
import org.springframework.boot.context.properties.ConfigurationProperties;
/**
- * The Core Camel Java DSL based router
+ * GZip compression data format
*
* Generated by camel-package-maven-plugin - do not edit this file!
*/
http://git-wip-us.apache.org/repos/asf/camel/blob/898128ba/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/SerializationDataFormatConfiguration.java
----------------------------------------------------------------------
diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/SerializationDataFormatConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/SerializationDataFormatConfiguration.java
index ed78fab..d62fd2d 100644
--- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/SerializationDataFormatConfiguration.java
+++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/SerializationDataFormatConfiguration.java
@@ -19,7 +19,7 @@ package org.apache.camel.impl.springboot;
import org.springframework.boot.context.properties.ConfigurationProperties;
/**
- * The Core Camel Java DSL based router
+ * Java Object Serialization data format
*
* Generated by camel-package-maven-plugin - do not edit this file!
*/
http://git-wip-us.apache.org/repos/asf/camel/blob/898128ba/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/StringDataFormatConfiguration.java
----------------------------------------------------------------------
diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/StringDataFormatConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/StringDataFormatConfiguration.java
index 575b37e..c879cf8 100644
--- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/StringDataFormatConfiguration.java
+++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/StringDataFormatConfiguration.java
@@ -19,7 +19,7 @@ package org.apache.camel.impl.springboot;
import org.springframework.boot.context.properties.ConfigurationProperties;
/**
- * The Core Camel Java DSL based router
+ * String (text based) data format
*
* Generated by camel-package-maven-plugin - do not edit this file!
*/
http://git-wip-us.apache.org/repos/asf/camel/blob/898128ba/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/ZipDataFormatConfiguration.java
----------------------------------------------------------------------
diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/ZipDataFormatConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/ZipDataFormatConfiguration.java
index 5601c25..8950916 100644
--- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/ZipDataFormatConfiguration.java
+++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/ZipDataFormatConfiguration.java
@@ -19,7 +19,7 @@ package org.apache.camel.impl.springboot;
import org.springframework.boot.context.properties.ConfigurationProperties;
/**
- * The Core Camel Java DSL based router
+ * Zip compression data format (not for zip files)
*
* Generated by camel-package-maven-plugin - do not edit this file!
*/
http://git-wip-us.apache.org/repos/asf/camel/blob/898128ba/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 7df7a6b..06106ae 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
@@ -191,7 +191,7 @@ public class PackageDataFormatMojo extends AbstractMojo {
// override description for camel-core, as otherwise its too generic
if ("camel-core".equals(project.getArtifactId())) {
if (row.containsKey("description")) {
- dataFormatModel.setLabel(row.get("description"));
+ dataFormatModel.setDescription(row.get("description"));
}
}
}