Regen. This closes #2019
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6a807d60 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6a807d60 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6a807d60 Branch: refs/heads/master Commit: 6a807d6057744135147294a0c8f32f812c294e08 Parents: 38ff665 Author: Claus Ibsen <davscl...@apache.org> Authored: Mon Oct 16 11:10:45 2017 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon Oct 16 11:10:45 2017 +0200 ---------------------------------------------------------------------- .../src/main/docs/tarfile-dataformat.adoc | 3 ++- .../src/main/docs/zipfile-dataformat.adoc | 3 ++- .../springboot/TarFileDataFormatConfiguration.java | 13 +++++++++++++ .../springboot/ZipFileDataFormatConfiguration.java | 13 +++++++++++++ 4 files changed, 30 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/6a807d60/components/camel-tarfile/src/main/docs/tarfile-dataformat.adoc ---------------------------------------------------------------------- diff --git a/components/camel-tarfile/src/main/docs/tarfile-dataformat.adoc b/components/camel-tarfile/src/main/docs/tarfile-dataformat.adoc index 9f0c972..83134c1 100644 --- a/components/camel-tarfile/src/main/docs/tarfile-dataformat.adoc +++ b/components/camel-tarfile/src/main/docs/tarfile-dataformat.adoc @@ -14,7 +14,7 @@ aggregate multiple messages into a single Tar File. // dataformat options: START -The Tar File dataformat supports 3 options which are listed below. +The Tar File dataformat supports 4 options which are listed below. @@ -23,6 +23,7 @@ The Tar File dataformat supports 3 options which are listed below. | Name | Default | Java Type | Description | usingIterator | false | Boolean | If the tar file has more then one entry the setting this option to true allows to work with the splitter EIP to split the data using an iterator in a streaming mode. | allowEmptyDirectory | false | Boolean | If the tar file has more then one entry setting this option to true allows to get the iterator even if the directory is empty +| preservePathElements | false | Boolean | If the file name contains path elements setting this option to true allows the path to be maintained in the tar file. | contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML or application/json for data formats marshalling to JSon etc. |=== // dataformat options: END http://git-wip-us.apache.org/repos/asf/camel/blob/6a807d60/components/camel-zipfile/src/main/docs/zipfile-dataformat.adoc ---------------------------------------------------------------------- diff --git a/components/camel-zipfile/src/main/docs/zipfile-dataformat.adoc b/components/camel-zipfile/src/main/docs/zipfile-dataformat.adoc index 34282d1..fc37530 100644 --- a/components/camel-zipfile/src/main/docs/zipfile-dataformat.adoc +++ b/components/camel-zipfile/src/main/docs/zipfile-dataformat.adoc @@ -11,7 +11,7 @@ This data format supports ZIP64, as long as Java 7 or later is being used]. === ZipFile Options // dataformat options: START -The Zip File dataformat supports 3 options which are listed below. +The Zip File dataformat supports 4 options which are listed below. @@ -20,6 +20,7 @@ The Zip File dataformat supports 3 options which are listed below. | Name | Default | Java Type | Description | usingIterator | false | Boolean | If the zip file has more then one entry the setting this option to true allows to work with the splitter EIP to split the data using an iterator in a streaming mode. | allowEmptyDirectory | false | Boolean | If the zip file has more then one entry setting this option to true allows to get the iterator even if the directory is empty +| preservePathElements | false | Boolean | If the file name contains path elements setting this option to true allows the path to be maintained in the zip file. | contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML or application/json for data formats marshalling to JSon etc. |=== // dataformat options: END http://git-wip-us.apache.org/repos/asf/camel/blob/6a807d60/platforms/spring-boot/components-starter/camel-tarfile-starter/src/main/java/org/apache/camel/dataformat/tarfile/springboot/TarFileDataFormatConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-tarfile-starter/src/main/java/org/apache/camel/dataformat/tarfile/springboot/TarFileDataFormatConfiguration.java b/platforms/spring-boot/components-starter/camel-tarfile-starter/src/main/java/org/apache/camel/dataformat/tarfile/springboot/TarFileDataFormatConfiguration.java index 26a7e91..882929d 100644 --- a/platforms/spring-boot/components-starter/camel-tarfile-starter/src/main/java/org/apache/camel/dataformat/tarfile/springboot/TarFileDataFormatConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-tarfile-starter/src/main/java/org/apache/camel/dataformat/tarfile/springboot/TarFileDataFormatConfiguration.java @@ -44,6 +44,11 @@ public class TarFileDataFormatConfiguration */ private Boolean allowEmptyDirectory = false; /** + * If the file name contains path elements setting this option to true + * allows the path to be maintained in the tar file. + */ + private Boolean preservePathElements = false; + /** * Whether the data format should set the Content-Type header with the type * from the data format if the data format is capable of doing so. For * example application/xml for data formats marshalling to XML or @@ -67,6 +72,14 @@ public class TarFileDataFormatConfiguration this.allowEmptyDirectory = allowEmptyDirectory; } + public Boolean getPreservePathElements() { + return preservePathElements; + } + + public void setPreservePathElements(Boolean preservePathElements) { + this.preservePathElements = preservePathElements; + } + public Boolean getContentTypeHeader() { return contentTypeHeader; } http://git-wip-us.apache.org/repos/asf/camel/blob/6a807d60/platforms/spring-boot/components-starter/camel-zipfile-starter/src/main/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-zipfile-starter/src/main/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatConfiguration.java b/platforms/spring-boot/components-starter/camel-zipfile-starter/src/main/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatConfiguration.java index c188bc7..9b61a9b 100644 --- a/platforms/spring-boot/components-starter/camel-zipfile-starter/src/main/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-zipfile-starter/src/main/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatConfiguration.java @@ -44,6 +44,11 @@ public class ZipFileDataFormatConfiguration */ private Boolean allowEmptyDirectory = false; /** + * If the file name contains path elements setting this option to true + * allows the path to be maintained in the zip file. + */ + private Boolean preservePathElements = false; + /** * Whether the data format should set the Content-Type header with the type * from the data format if the data format is capable of doing so. For * example application/xml for data formats marshalling to XML or @@ -67,6 +72,14 @@ public class ZipFileDataFormatConfiguration this.allowEmptyDirectory = allowEmptyDirectory; } + public Boolean getPreservePathElements() { + return preservePathElements; + } + + public void setPreservePathElements(Boolean preservePathElements) { + this.preservePathElements = preservePathElements; + } + public Boolean getContentTypeHeader() { return contentTypeHeader; }
