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 2018/01/27 12:13:50 UTC
[camel] branch master updated (10381a3 -> 4898e51)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 10381a3 Upgrade Chronicle Wire to version 1.10.15
new 68ce434 Camel-AWS S3: Removed unused imports
new 3c8bb33 Camel-AWS S3: some options are only advanced
new 4898e51 Camel-AWS S3: Regen docs
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
components/camel-aws/src/main/docs/aws-s3-component.adoc | 4 ++--
.../java/org/apache/camel/component/aws/s3/S3Configuration.java | 8 ++++----
.../main/java/org/apache/camel/component/aws/s3/S3Endpoint.java | 1 -
3 files changed, 6 insertions(+), 7 deletions(-)
--
To stop receiving notification emails like this one, please contact
acosentino@apache.org.
[camel] 01/03: Camel-AWS S3: Removed unused imports
Posted by ac...@apache.org.
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 68ce4349096d9ecdaf17472e6487c5f59a3c2fc8
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Sat Jan 27 12:57:01 2018 +0100
Camel-AWS S3: Removed unused imports
---
.../src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java
index 31fba55..5209456 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java
@@ -26,7 +26,6 @@ import com.amazonaws.regions.Regions;
import com.amazonaws.services.s3.AmazonS3;
import com.amazonaws.services.s3.AmazonS3ClientBuilder;
import com.amazonaws.services.s3.AmazonS3EncryptionClientBuilder;
-import com.amazonaws.services.s3.S3ClientOptions;
import com.amazonaws.services.s3.model.CreateBucketRequest;
import com.amazonaws.services.s3.model.ListObjectsRequest;
import com.amazonaws.services.s3.model.ObjectMetadata;
--
To stop receiving notification emails like this one, please contact
acosentino@apache.org.
[camel] 02/03: Camel-AWS S3: some options are only advanced
Posted by ac...@apache.org.
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 3c8bb334d0a1f4a01ce5a88082c6b8d043ada37c
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Sat Jan 27 13:02:01 2018 +0100
Camel-AWS S3: some options are only advanced
---
.../java/org/apache/camel/component/aws/s3/S3Configuration.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java
index 8fd11ff..1c794d8 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java
@@ -69,15 +69,15 @@ public class S3Configuration implements Cloneable {
private S3Operations operation;
@UriParam(label = "consumer,advanced", defaultValue = "true")
private boolean autocloseBody = true;
- @UriParam(label = "common")
+ @UriParam(label = "common,advanced")
private EncryptionMaterials encryptionMaterials;
- @UriParam(label = "common", defaultValue = "false")
+ @UriParam(label = "common,advanced", defaultValue = "false")
private boolean useEncryption;
@UriParam(label = "common, advanced", defaultValue = "false")
private boolean chunkedEncodingDisabled;
- @UriParam(label = "producer", defaultValue = "false")
+ @UriParam(label = "producer,advanced", defaultValue = "false")
private boolean useAwsKMS;
- @UriParam(label = "producer")
+ @UriParam(label = "producer,advanced")
private String awsKMSKeyId;
public long getPartSize() {
--
To stop receiving notification emails like this one, please contact
acosentino@apache.org.
[camel] 03/03: Camel-AWS S3: Regen docs
Posted by ac...@apache.org.
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 4898e51d6798b448176315f924374c7d6bba771b
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Sat Jan 27 13:11:38 2018 +0100
Camel-AWS S3: Regen docs
---
components/camel-aws/src/main/docs/aws-s3-component.adoc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/camel-aws/src/main/docs/aws-s3-component.adoc b/components/camel-aws/src/main/docs/aws-s3-component.adoc
index 157096a..5fa0b09 100644
--- a/components/camel-aws/src/main/docs/aws-s3-component.adoc
+++ b/components/camel-aws/src/main/docs/aws-s3-component.adoc
@@ -84,12 +84,12 @@ with the following path and query parameters:
| Name | Description | Default | Type
| *amazonS3Client* (common) | Reference to a com.amazonaws.services.sqs.AmazonS3 in the link:registry.htmlRegistry. | | AmazonS3
| *amazonS3Endpoint* (common) | The region with which the AWS-S3 client wants to work with. | | String
-| *encryptionMaterials* (common) | The encryption materials to use in case of Symmetric/Asymmetric client usage | | EncryptionMaterials
| *pathStyleAccess* (common) | Whether or not the S3 client should use path style access | false | boolean
| *policy* (common) | The policy for this queue to set in the com.amazonaws.services.s3.AmazonS3setBucketPolicy() method. | | String
| *proxyHost* (common) | To define a proxy host when instantiating the SQS client | | String
| *proxyPort* (common) | Specify a proxy port to be used inside the client definition. | | Integer
| *region* (common) | The region where the bucket is located. This option is used in the com.amazonaws.services.s3.model.CreateBucketRequest. | | String
+| *encryptionMaterials* (common) | The encryption materials to use in case of Symmetric/Asymmetric client usage | | EncryptionMaterials
| *useEncryption* (common) | Define if encryption must be used or not | false | boolean
| *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler which mean any exceptions occurred while the consumer is trying to pickup incoming messages or the likes will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions that will be logged at WARN or ERROR level and ignored. | false | boolean
| *deleteAfterRead* (consumer) | Delete objects from S3 after they have been retrieved. The delete is only performed if the Exchange is committed. If a rollback occurs the object is not deleted. If this option is false then the same objects will be retrieve over and over again on the polls. Therefore you need to use the Idempotent Consumer EIP in the route to filter out duplicates. You can filter using the link S3ConstantsBUCKET_NAME and link S3ConstantsKEY headers or only the link S3Con [...]
@@ -103,13 +103,13 @@ with the following path and query parameters:
| *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this options is not in use. By default the consumer will deal with exceptions that will be logged at WARN or ERROR level and ignored. | | ExceptionHandler
| *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. | | ExchangePattern
| *pollStrategy* (consumer) | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. | | PollingConsumerPoll Strategy
-| *awsKMSKeyId* (producer) | Define the id of KMS key to use in case KMS is enabled | | String
| *deleteAfterWrite* (producer) | Delete file object after the S3 file has been uploaded | false | boolean
| *multiPartUpload* (producer) | If it is true camel will upload the file with multi part format the part size is decided by the option of partSize | false | boolean
| *operation* (producer) | The operation to do in case the user don't want to do only an upload | | S3Operations
| *partSize* (producer) | Setup the partSize which is used in multi part upload the default size is 25M. | 26214400 | long
| *serverSideEncryption* (producer) | Sets the server-side encryption algorithm when encrypting the object using AWS-managed keys. For example use AES256. | | String
| *storageClass* (producer) | The storage class to set in the com.amazonaws.services.s3.model.PutObjectRequest request. | | String
+| *awsKMSKeyId* (producer) | Define the id of KMS key to use in case KMS is enabled | | String
| *useAwsKMS* (producer) | Define if KMS must be used or not | false | boolean
| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported). | false | boolean
| *chunkedEncodingDisabled* ( advanced) | Define if disabled Chunked Encoding is true or false | false | boolean
--
To stop receiving notification emails like this one, please contact
acosentino@apache.org.