You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/09/23 13:33:28 UTC
[camel] branch camel-2.24.x updated: Regen
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-2.24.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-2.24.x by this push:
new e153732 Regen
e153732 is described below
commit e1537324b4e2aa40f8f486c421214bf82b9c5aeb
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Sep 23 15:32:32 2019 +0200
Regen
---
camel-core/readme.adoc | 6 +++---
components/camel-ftp/src/main/docs/ftp-component.adoc | 2 +-
components/camel-ftp/src/main/docs/ftps-component.adoc | 2 +-
components/camel-ftp/src/main/docs/sftp-component.adoc | 2 +-
.../src/main/docs/google-sheets-stream-component.adoc | 2 +-
components/readme.adoc | 4 ++--
docs/components/modules/ROOT/nav.adoc | 12 ++++++------
.../src/main/resources/camel-connector-schema.json | 2 +-
.../myfoo-connector/src/main/resources/camel-connector.json | 4 ++--
.../xslt/springboot/XsltComponentConfiguration.java | 10 +++++-----
10 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/camel-core/readme.adoc b/camel-core/readme.adoc
index 25473fc..601cc9a 100644
--- a/camel-core/readme.adoc
+++ b/camel-core/readme.adoc
@@ -106,7 +106,7 @@ Data Formats
// dataformats: START
-Number of Data Formats: 4 in 39 JAR artifacts (3 deprecated)
+Number of Data Formats: 4 in 39 JAR artifacts (5 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
@@ -114,9 +114,9 @@ Number of Data Formats: 4 in 39 JAR artifacts (3 deprecated)
| link:src/main/docs/gzip-dataformat.adoc[GZip] (camel-core) | 2.0 | The GZip data format is a message compression and de-compression format (which works with the popular gzip/gunzip tools).
-| link:src/main/docs/serialization-dataformat.adoc[Java Object Serialization] (camel-core) | 2.12 | Serialization is a data format which uses the standard Java Serialization mechanism to unmarshal a binary payload into Java objects or to marshal Java objects into a binary blob.
+| link:src/main/docs/serialization-dataformat.adoc[Java Object Serialization] (camel-core) | 2.12 | *deprecated* Serialization is a data format which uses the standard Java Serialization mechanism to unmarshal a binary payload into Java objects or to marshal Java objects into a binary blob.
-| link:src/main/docs/string-dataformat.adoc[String Encoding] (camel-core) | 2.12 | String data format is a textual based format that supports character encoding.
+| link:src/main/docs/string-dataformat.adoc[String Encoding] (camel-core) | 2.12 | *deprecated* String data format is a textual based format that supports character encoding.
| link:src/main/docs/zip-dataformat.adoc[Zip Deflate Compression] (camel-core) | 2.12 | Zip Deflate Compression data format is a message compression and de-compression format (not zip files).
|===
diff --git a/components/camel-ftp/src/main/docs/ftp-component.adoc b/components/camel-ftp/src/main/docs/ftp-component.adoc
index d9a974e..b002b51 100644
--- a/components/camel-ftp/src/main/docs/ftp-component.adoc
+++ b/components/camel-ftp/src/main/docs/ftp-component.adoc
@@ -187,7 +187,7 @@ with the following path and query parameters:
| *minDepth* (filter) | The minimum depth to start processing when recursively processing a directory. Using minDepth=1 means the base directory. Using minDepth=2 means the first sub directory. | | int
| *move* (filter) | Expression (such as Simple Language) used to dynamically set the filename when moving it after processing. To move files into a .done subdirectory just enter .done. | | String
| *exclusiveReadLockStrategy* (lock) | Pluggable read-lock as a org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy implementation. | | GenericFileExclusive ReadLockStrategy
-| *readLock* (lock) | Used by consumer, to only poll the files if it has exclusive read-lock on the file (i.e. the file is not in-progress or being written). Camel will wait until the file lock is granted. This option provides the build in strategies: none - No read lock is in use markerFile - Camel creates a marker file (fileName.camelLock) and then holds a lock on it. This option is not available for the FTP component changed - Changed is using file length/modification timestamp to det [...]
+| *readLock* (lock) | Used by consumer, to only poll the files if it has exclusive read-lock on the file (i.e. the file is not in-progress or being written). Camel will wait until the file lock is granted. This option provides the build in strategies: none - No read lock is in use markerFile - Camel creates a marker file (fileName.camelLock) and then holds a lock on it. This option is not available for the FTP component changed - Changed is using file length/modification timestamp to det [...]
| *readLockCheckInterval* (lock) | Interval in millis for the read-lock, if supported by the read lock. This interval is used for sleeping between attempts to acquire the read lock. For example when using the changed read lock, you can set a higher interval period to cater for slow writes. The default of 1 sec. may be too fast if the producer is very slow writing the file. Notice: For FTP the default readLockCheckInterval is 5000. The readLockTimeout value must be higher than readLockChe [...]
| *readLockDeleteOrphanLock Files* (lock) | Whether or not read lock with marker files should upon startup delete any orphan read lock files, which may have been left on the file system, if Camel was not properly shutdown (such as a JVM crash). If turning this option to false then any orphaned lock file will cause Camel to not attempt to pickup that file, this could also be due another node is concurrently reading files from the same shared directory. | true | boolean
| *readLockLoggingLevel* (lock) | Logging level used when a read lock could not be acquired. By default a DEBUG is logged. You can change this level, for example to OFF to not have any logging. This option is only applicable for readLock of types: changed, fileLock, idempotent, idempotent-changed, idempotent-rename, rename. | DEBUG | LoggingLevel
diff --git a/components/camel-ftp/src/main/docs/ftps-component.adoc b/components/camel-ftp/src/main/docs/ftps-component.adoc
index e0e1958..cc93937 100644
--- a/components/camel-ftp/src/main/docs/ftps-component.adoc
+++ b/components/camel-ftp/src/main/docs/ftps-component.adoc
@@ -147,7 +147,7 @@ with the following path and query parameters:
| *minDepth* (filter) | The minimum depth to start processing when recursively processing a directory. Using minDepth=1 means the base directory. Using minDepth=2 means the first sub directory. | | int
| *move* (filter) | Expression (such as Simple Language) used to dynamically set the filename when moving it after processing. To move files into a .done subdirectory just enter .done. | | String
| *exclusiveReadLockStrategy* (lock) | Pluggable read-lock as a org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy implementation. | | GenericFileExclusive ReadLockStrategy
-| *readLock* (lock) | Used by consumer, to only poll the files if it has exclusive read-lock on the file (i.e. the file is not in-progress or being written). Camel will wait until the file lock is granted. This option provides the build in strategies: none - No read lock is in use markerFile - Camel creates a marker file (fileName.camelLock) and then holds a lock on it. This option is not available for the FTP component changed - Changed is using file length/modification timestamp to det [...]
+| *readLock* (lock) | Used by consumer, to only poll the files if it has exclusive read-lock on the file (i.e. the file is not in-progress or being written). Camel will wait until the file lock is granted. This option provides the build in strategies: none - No read lock is in use markerFile - Camel creates a marker file (fileName.camelLock) and then holds a lock on it. This option is not available for the FTP component changed - Changed is using file length/modification timestamp to det [...]
| *readLockCheckInterval* (lock) | Interval in millis for the read-lock, if supported by the read lock. This interval is used for sleeping between attempts to acquire the read lock. For example when using the changed read lock, you can set a higher interval period to cater for slow writes. The default of 1 sec. may be too fast if the producer is very slow writing the file. Notice: For FTP the default readLockCheckInterval is 5000. The readLockTimeout value must be higher than readLockChe [...]
| *readLockDeleteOrphanLock Files* (lock) | Whether or not read lock with marker files should upon startup delete any orphan read lock files, which may have been left on the file system, if Camel was not properly shutdown (such as a JVM crash). If turning this option to false then any orphaned lock file will cause Camel to not attempt to pickup that file, this could also be due another node is concurrently reading files from the same shared directory. | true | boolean
| *readLockIdempotentRelease Async* (lock) | Whether the delayed release task should be synchronous or asynchronous. See more details at the readLockIdempotentReleaseDelay option. | false | boolean
diff --git a/components/camel-ftp/src/main/docs/sftp-component.adoc b/components/camel-ftp/src/main/docs/sftp-component.adoc
index db80fa5..559b8c4 100644
--- a/components/camel-ftp/src/main/docs/sftp-component.adoc
+++ b/components/camel-ftp/src/main/docs/sftp-component.adoc
@@ -131,7 +131,7 @@ with the following path and query parameters:
| *minDepth* (filter) | The minimum depth to start processing when recursively processing a directory. Using minDepth=1 means the base directory. Using minDepth=2 means the first sub directory. | | int
| *move* (filter) | Expression (such as Simple Language) used to dynamically set the filename when moving it after processing. To move files into a .done subdirectory just enter .done. | | String
| *exclusiveReadLockStrategy* (lock) | Pluggable read-lock as a org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy implementation. | | GenericFileExclusive ReadLockStrategy
-| *readLock* (lock) | Used by consumer, to only poll the files if it has exclusive read-lock on the file (i.e. the file is not in-progress or being written). Camel will wait until the file lock is granted. This option provides the build in strategies: none - No read lock is in use markerFile - Camel creates a marker file (fileName.camelLock) and then holds a lock on it. This option is not available for the FTP component changed - Changed is using file length/modification timestamp to det [...]
+| *readLock* (lock) | Used by consumer, to only poll the files if it has exclusive read-lock on the file (i.e. the file is not in-progress or being written). Camel will wait until the file lock is granted. This option provides the build in strategies: none - No read lock is in use markerFile - Camel creates a marker file (fileName.camelLock) and then holds a lock on it. This option is not available for the FTP component changed - Changed is using file length/modification timestamp to det [...]
| *readLockCheckInterval* (lock) | Interval in millis for the read-lock, if supported by the read lock. This interval is used for sleeping between attempts to acquire the read lock. For example when using the changed read lock, you can set a higher interval period to cater for slow writes. The default of 1 sec. may be too fast if the producer is very slow writing the file. Notice: For FTP the default readLockCheckInterval is 5000. The readLockTimeout value must be higher than readLockChe [...]
| *readLockDeleteOrphanLock Files* (lock) | Whether or not read lock with marker files should upon startup delete any orphan read lock files, which may have been left on the file system, if Camel was not properly shutdown (such as a JVM crash). If turning this option to false then any orphaned lock file will cause Camel to not attempt to pickup that file, this could also be due another node is concurrently reading files from the same shared directory. | true | boolean
| *readLockIdempotentRelease Async* (lock) | Whether the delayed release task should be synchronous or asynchronous. See more details at the readLockIdempotentReleaseDelay option. | false | boolean
diff --git a/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc b/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc
index e0e2b83..ac98fdc 100644
--- a/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc
+++ b/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc
@@ -137,7 +137,7 @@ The component supports 17 options, which are listed below.
| *camel.component.google-sheets-stream.configuration.client-secret* | Client secret of the sheets application | | String
| *camel.component.google-sheets-stream.configuration.include-grid-data* | True if grid data should be returned. | false | Boolean
| *camel.component.google-sheets-stream.configuration.major-dimension* | Specifies the major dimension that results should use.. | ROWS | String
-| *camel.component.google-sheets-stream.configuration.max-results* | Specify the maximum number of returned results. This will limit the number of rows in a returned value range data set or the number of returned value ranges in a batch request. | 0 | Integer
+| *camel.component.google-sheets-stream.configuration.max-results* | Specify the maximum number of returned results. This will limit the number of rows in a returned value range data set or the number of returned value ranges in a batch request. | 10 | Integer
| *camel.component.google-sheets-stream.configuration.range* | Specifies the range of rows and columns in a sheet to get data from. | | String
| *camel.component.google-sheets-stream.configuration.refresh-token* | OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the current one expires - a necessity if the application is long-lived. | | String
| *camel.component.google-sheets-stream.configuration.scopes* | Specifies the level of permissions you want a sheets application to have to a user account. See https://developers.google.com/identity/protocols/googlescopes for more info. | | List
diff --git a/components/readme.adoc b/components/readme.adoc
index 9f5519d..7f3a4fd 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -21,7 +21,7 @@ Number of Components: 311 in 211 JAR artifacts (24 deprecated)
`flink:endpointType` | 2.18 | The flink component can be used to send DataSet jobs to Apache Flink cluster.
| link:camel-pulsar/src/main/docs/pulsar-component.adoc[Apache Pulsar] (camel-pulsar) +
-`pulsar:persistence://tenant/namespace/topic` | | Camel Apache Pulsar Component
+`pulsar:uri` | 2.24 | Camel Apache Pulsar Component
| link:camel-spark/src/main/docs/spark-component.adoc[Apache Spark] (camel-spark) +
`spark:endpointType` | 2.17 | The spark component can be used to send RDD or DataFrame jobs to Apache Spark cluster.
@@ -949,7 +949,7 @@ Data Formats
^^^^^^^^^^^^
// dataformats: START
-Number of Data Formats: 49 in 39 JAR artifacts (3 deprecated)
+Number of Data Formats: 49 in 39 JAR artifacts (5 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
diff --git a/docs/components/modules/ROOT/nav.adoc b/docs/components/modules/ROOT/nav.adoc
index 3fd0770..d773b29 100644
--- a/docs/components/modules/ROOT/nav.adoc
+++ b/docs/components/modules/ROOT/nav.adoc
@@ -1,21 +1,20 @@
* xref:ahc-component.adoc[AHC Component]
-* xref:ahc-ws-component.adoc[AHC Websocket Component]
* xref:amqp-component.adoc[AMQP Component]
+* xref:ahc-ws-component.adoc[AHC Websocket Component]
* xref:apns-component.adoc[APNS Component]
* xref:asn1-dataformat.adoc[ASN.1 File DataFormat]
* xref:asterisk-component.adoc[Asterisk Component]
* xref:atmos-component.adoc[Atmos Component]
* xref:atmosphere-websocket-component.adoc[Atmosphere Websocket Component]
* xref:atom-component.adoc[Atom Component]
-* xref:avro-component.adoc[Avro Component]
-* xref:avro-dataformat.adoc[Avro DataFormat]
* xref:atomix-map-component.adoc[Atomix Map Component]
* xref:atomix-messaging-component.adoc[Atomix Messaging Component]
* xref:atomix-multimap-component.adoc[Atomix MultiMap Component]
* xref:atomix-queue-component.adoc[Atomix Queue Component]
* xref:atomix-set-component.adoc[Atomix Set Component]
* xref:atomix-value-component.adoc[Atomix Value Component]
-* xref:aws-xray.adoc[AWS XRay Component]
+* xref:avro-component.adoc[Avro Component]
+* xref:avro-dataformat.adoc[Avro DataFormat]
* xref:aws-cw-component.adoc[AWS CloudWatch Component]
* xref:aws-ddb-component.adoc[AWS DynamoDB Component]
* xref:aws-ddbstream-component.adoc[AWS DynamoDB Streams Component]
@@ -33,6 +32,7 @@
* xref:aws-sqs-component.adoc[AWS Simple Queue Service Component]
* xref:aws-swf-component.adoc[AWS Simple Workflow Component]
* xref:aws.adoc[Camel Components for Amazon Web Services]
+* xref:aws-xray.adoc[AWS XRay Component]
* xref:azure-blob-component.adoc[Azure Storage Blob Service Component]
* xref:azure-queue-component.adoc[Azure Storage Queue Service Component]
* xref:azure.adoc[Camel Components for Windows Azure Services]
@@ -340,18 +340,18 @@
* xref:swagger-java.adoc[Swagger Java Component]
* xref:syslog-dataformat.adoc[Syslog DataFormat]
* xref:tidyMarkup-dataformat.adoc[TidyMarkup DataFormat]
-* xref:tarfile-dataformat.adoc[Tar File DataFormat]
* xref:telegram-component.adoc[Telegram Component]
+* xref:tarfile-dataformat.adoc[Tar File DataFormat]
* xref:test.adoc[Test Component]
* xref:test-blueprint.adoc[Blueprint Testing]
* xref:test-cdi.adoc[CDI Testing]
* xref:test-karaf.adoc[Test Karaf]
* xref:test-spring.adoc[Test Spring]
* xref:testcontainers.adoc[Testcontainers]
-* xref:testcontainers-spring.adoc[Testcontainers Spring]
* xref:testng.adoc[TestNG (deprecated)]
* xref:thrift-component.adoc[Thrift Component]
* xref:thrift-dataformat.adoc[Thrift DataFormat]
+* xref:testcontainers-spring.adoc[Testcontainers Spring]
* xref:tika-component.adoc[Tika Component]
* xref:twilio-component.adoc[Twilio Component]
* xref:twitter-component.adoc[Twitter Component (deprecated)]
diff --git a/platforms/myfoo-connector/src/main/resources/camel-connector-schema.json b/platforms/myfoo-connector/src/main/resources/camel-connector-schema.json
index 9ec069b..13f5cf0 100644
--- a/platforms/myfoo-connector/src/main/resources/camel-connector-schema.json
+++ b/platforms/myfoo-connector/src/main/resources/camel-connector-schema.json
@@ -14,7 +14,7 @@
"javaType":"org.myfoo.connector.MyFooComponent",
"groupId":"org.apache.camel",
"artifactId":"myfoo-connector",
- "version":"2.24.2-SNAPSHOT"
+ "version":"2.24.3-SNAPSHOT"
},
"componentProperties":{
diff --git a/platforms/myfoo-connector/src/main/resources/camel-connector.json b/platforms/myfoo-connector/src/main/resources/camel-connector.json
index fc486e0..26c0016 100644
--- a/platforms/myfoo-connector/src/main/resources/camel-connector.json
+++ b/platforms/myfoo-connector/src/main/resources/camel-connector.json
@@ -2,14 +2,14 @@
"baseScheme" : "timer",
"baseGroupId" : "org.apache.camel",
"baseArtifactId" : "camel-core",
- "baseVersion" : "2.24.2-SNAPSHOT",
+ "baseVersion" : "2.24.3-SNAPSHOT",
"baseJavaType" : "org.apache.camel.component.timer.TimerComponent",
"name" : "MyFoo",
"scheme" : "my-foo",
"javaType" : "org.myfoo.connector.MyFooComponent",
"groupId" : "org.myfoo",
"artifactId" : "myfoo-connector",
- "version" : "2.24.2-SNAPSHOT",
+ "version" : "2.24.3-SNAPSHOT",
"description" : "Something cool",
"labels" : [ "foo", "timer" ],
"pattern" : "From",
diff --git a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/xslt/springboot/XsltComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/xslt/springboot/XsltComponentConfiguration.java
index fabb30d..7676de4 100644
--- a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/xslt/springboot/XsltComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/xslt/springboot/XsltComponentConfiguration.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.xslt.springboot;
+import java.util.Map;
import javax.annotation.Generated;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.transform.TransformerFactory;
@@ -82,10 +83,9 @@ public class XsltComponentConfiguration
*/
private String saxonConfiguration;
/**
- * To set custom Saxon configuration properties. The option is a
- * java.util.Map<java.lang.String,java.lang.Object> type.
+ * To set custom Saxon configuration properties
*/
- private String saxonConfigurationProperties;
+ private Map<String, Object> saxonConfigurationProperties;
/**
* Whether the component should resolve property placeholders on itself when
* starting. Only properties which are of String type can use property
@@ -149,12 +149,12 @@ public class XsltComponentConfiguration
this.saxonConfiguration = saxonConfiguration;
}
- public String getSaxonConfigurationProperties() {
+ public Map<String, Object> getSaxonConfigurationProperties() {
return saxonConfigurationProperties;
}
public void setSaxonConfigurationProperties(
- String saxonConfigurationProperties) {
+ Map<String, Object> saxonConfigurationProperties) {
this.saxonConfigurationProperties = saxonConfigurationProperties;
}