This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit e8d59b81697381f3a599841e555627a42ea1066d Author: Andrea Cosentino <[email protected]> AuthorDate: Mon Aug 5 11:29:28 2019 +0200 CAMEL-13792 - Rename components to default names, Camel-hdfs2 to camel-hdfs - Updated docs link and regen --- .../camel-hdfs/src/main/docs/hdfs-component.adoc | 10 +++---- components/readme.adoc | 4 +-- docs/components/modules/ROOT/nav.adoc | 2 +- .../{hdfs2-component.adoc => hdfs-component.adoc} | 32 +++++++++++----------- docs/user-manual/modules/ROOT/pages/index.adoc | 2 +- .../camel-spring-boot-dependencies/pom.xml | 10 +++---- 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/components/camel-hdfs/src/main/docs/hdfs-component.adoc b/components/camel-hdfs/src/main/docs/hdfs-component.adoc index 1d222ea..d6c1721 100644 --- a/components/camel-hdfs/src/main/docs/hdfs-component.adoc +++ b/components/camel-hdfs/src/main/docs/hdfs-component.adoc @@ -150,7 +150,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s ---- <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-hdfs2-starter</artifactId> + <artifactId>camel-hdfs-starter</artifactId> <version>x.x.x</version> <!-- use the same version as your Camel core version --> </dependency> @@ -164,10 +164,10 @@ The component supports 4 options, which are listed below. [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type -| *camel.component.hdfs2.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean -| *camel.component.hdfs2.enabled* | Enable hdfs2 component | true | Boolean -| *camel.component.hdfs2.j-a-a-s-configuration* | To use the given configuration for security with JAAS. The option is a javax.security.auth.login.Configuration type. | | String -| *camel.component.hdfs2.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean +| *camel.component.hdfs.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean +| *camel.component.hdfs.enabled* | Whether to enable auto configuration of the hdfs component. This is enabled by default. | | Boolean +| *camel.component.hdfs.j-a-a-s-configuration* | To use the given configuration for security with JAAS. The option is a javax.security.auth.login.Configuration type. | | String +| *camel.component.hdfs.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean |=== // spring-boot-auto-configure options: END diff --git a/components/readme.adoc b/components/readme.adoc index d857c24..442597a 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -376,8 +376,8 @@ Number of Components: 297 in 234 JAR artifacts (0 deprecated) | link:camel-hbase/src/main/docs/hbase-component.adoc[HBase] (camel-hbase) + `hbase:tableName` | 2.10 | For reading/writing from/to an HBase store (Hadoop database). -| link:camel-hdfs2/src/main/docs/hdfs2-component.adoc[HDFS2] (camel-hdfs2) + -`hdfs2:hostName:port/path` | 2.14 | For reading/writing from/to an HDFS filesystem using Hadoop 2.x. +| link:camel-hdfs/src/main/docs/hdfs-component.adoc[HDFS] (camel-hdfs) + +`hdfs:hostName:port/path` | 2.14 | For reading/writing from/to an HDFS filesystem using Hadoop 2.x. | link:camel-hipchat/src/main/docs/hipchat-component.adoc[Hipchat] (camel-hipchat) + `hipchat:protocol:host:port` | 2.15 | The hipchat component supports producing and consuming messages from/to Hipchat service. diff --git a/docs/components/modules/ROOT/nav.adoc b/docs/components/modules/ROOT/nav.adoc index eaf1bea..c602e3c 100644 --- a/docs/components/modules/ROOT/nav.adoc +++ b/docs/components/modules/ROOT/nav.adoc @@ -148,7 +148,7 @@ * xref:hazelcast-topic-component.adoc[Hazelcast Topic Component] * xref:hazelcast.adoc[Hazelcast Component] * xref:hbase-component.adoc[HBase Component] -* xref:hdfs2-component.adoc[HDFS2 Component] +* xref:hdfs-component.adoc[HDFS Component] * xref:hipchat-component.adoc[Hipchat Component] * xref:hl7-dataformat.adoc[HL7 DataFormat] * xref:hl7terser-language.adoc[HL7 Terser Language] diff --git a/docs/components/modules/ROOT/pages/hdfs2-component.adoc b/docs/components/modules/ROOT/pages/hdfs-component.adoc similarity index 92% rename from docs/components/modules/ROOT/pages/hdfs2-component.adoc rename to docs/components/modules/ROOT/pages/hdfs-component.adoc index f42ba0e..d6c1721 100644 --- a/docs/components/modules/ROOT/pages/hdfs2-component.adoc +++ b/docs/components/modules/ROOT/pages/hdfs-component.adoc @@ -1,9 +1,9 @@ -[[hdfs2-component]] -= HDFS2 Component +[[hdfs-component]] += HDFS Component *Available as of Camel version 2.14* -The HDFS2 component enables you to read and write messages from/to an +The HDFS component enables you to read and write messages from/to an HDFS file system using Hadoop 2.x. HDFS is the distributed file system at the heart of http://hadoop.apache.org[Hadoop]. @@ -14,7 +14,7 @@ for this component: ------------------------------------------------------------ <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-hdfs2</artifactId> + <artifactId>camel-hdfs</artifactId> <version>x.x.x</version> <!-- use the same version as your Camel core version --> </dependency> @@ -24,7 +24,7 @@ for this component: [source,java] ---------------------------------------- -hdfs2://hostname[:port][/path][?options] +hdfs://hostname[:port][/path][?options] ---------------------------------------- You can append query options to the URI in the following format, @@ -41,7 +41,7 @@ a different file per split named using the configured UuidGenerator. -When consuming from hdfs2 then in normal mode, a file is split into +When consuming from hdfs then in normal mode, a file is split into chunks, producing a message per chunk. You can configure the size of the chunk using the chunkSize option. If you want to read from hdfs and write to a regular file using the file component, then you can use the @@ -54,7 +54,7 @@ fileMode=Append to append each of the chunks together. // component options: START -The HDFS2 component supports 3 options, which are listed below. +The HDFS component supports 3 options, which are listed below. @@ -73,10 +73,10 @@ The HDFS2 component supports 3 options, which are listed below. // endpoint options: START -The HDFS2 endpoint is configured using URI syntax: +The HDFS endpoint is configured using URI syntax: ---- -hdfs2:hostName:port/path +hdfs:hostName:port/path ---- with the following path and query parameters: @@ -150,7 +150,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s ---- <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-hdfs2-starter</artifactId> + <artifactId>camel-hdfs-starter</artifactId> <version>x.x.x</version> <!-- use the same version as your Camel core version --> </dependency> @@ -164,10 +164,10 @@ The component supports 4 options, which are listed below. [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type -| *camel.component.hdfs2.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean -| *camel.component.hdfs2.enabled* | Enable hdfs2 component | true | Boolean -| *camel.component.hdfs2.j-a-a-s-configuration* | To use the given configuration for security with JAAS. The option is a javax.security.auth.login.Configuration type. | | String -| *camel.component.hdfs2.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean +| *camel.component.hdfs.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean +| *camel.component.hdfs.enabled* | Whether to enable auto configuration of the hdfs component. This is enabled by default. | | Boolean +| *camel.component.hdfs.j-a-a-s-configuration* | To use the given configuration for security with JAAS. The option is a javax.security.auth.login.Configuration type. | | String +| *camel.component.hdfs.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean |=== // spring-boot-auto-configure options: END @@ -223,7 +223,7 @@ for example: [source,java] ----------------------------------------------------------------- -hdfs2://localhost/tmp/simple-file?splitStrategy=IDLE:1000,BYTES:5 +hdfs://localhost/tmp/simple-file?splitStrategy=IDLE:1000,BYTES:5 ----------------------------------------------------------------- it means: a new file is created either when it has been idle for more @@ -249,7 +249,7 @@ split strategy. == Controlling to close file stream -When using the xref:hdfs2-component.adoc[HDFS2] producer *without* a split +When using the xref:hdfs-component.adoc[HDFS] producer *without* a split strategy, then the file output stream is by default closed after the write. However you may want to keep the stream open, and only explicitly close the stream later. For that you can use the header diff --git a/docs/user-manual/modules/ROOT/pages/index.adoc b/docs/user-manual/modules/ROOT/pages/index.adoc index b9905c0..353487e 100644 --- a/docs/user-manual/modules/ROOT/pages/index.adoc +++ b/docs/user-manual/modules/ROOT/pages/index.adoc @@ -274,7 +274,7 @@ camel routes without them knowing ** xref:components::hazelcast-set-component.adoc[Hazelcast Set] ** xref:components::hazelcast-topic-component.adoc[Hazelcast Topic] ** xref:components::hbase-component.adoc[HBase] -** xref:components::hdfs2-component.adoc[HDFS2] +** xref:components::hdfs-component.adoc[HDFS] ** xref:components::hipchat-component.adoc[Hipchat] ** xref:components::http-component.adoc[HTTP] ** xref:components::iec60870-client-component.adoc[IEC 60870 Client] diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml index c1281f8..d3e7368 100644 --- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml +++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml @@ -213,7 +213,7 @@ <dependency> <groupId>net.sf.saxon</groupId> <artifactId>Saxon-HE</artifactId> - <version>9.9.1-3</version> + <version>9.9.1-4</version> </dependency> <dependency> <groupId>ognl</groupId> @@ -1469,12 +1469,12 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-hdfs2</artifactId> + <artifactId>camel-hdfs</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-hdfs2-starter</artifactId> + <artifactId>camel-hdfs-starter</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -3661,12 +3661,12 @@ <dependency> <groupId>org.apache.pulsar</groupId> <artifactId>pulsar-client</artifactId> - <version>2.3.2</version> + <version>2.4.0</version> </dependency> <dependency> <groupId>org.apache.pulsar</groupId> <artifactId>pulsar-client-admin</artifactId> - <version>2.3.2</version> + <version>2.4.0</version> </dependency> <dependency> <groupId>org.apache.ws.commons.axiom</groupId>
