camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acosent...@apache.org
Subject [1/4] camel git commit: CAMEL-10100: Add support for copyObject in camel aws-s3 - Updated docs
Date Tue, 05 Jul 2016 11:22:26 GMT
Repository: camel
Updated Branches:
  refs/heads/master 3ed19b765 -> 535e1fdc6


CAMEL-10100: Add support for copyObject in camel aws-s3 - Updated docs


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/535e1fdc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/535e1fdc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/535e1fdc

Branch: refs/heads/master
Commit: 535e1fdc6b06eab8661b0fce386415786172fc76
Parents: 5086efe
Author: Andrea Cosentino <ancosen@gmail.com>
Authored: Tue Jul 5 12:46:13 2016 +0200
Committer: Andrea Cosentino <ancosen@gmail.com>
Committed: Tue Jul 5 12:46:50 2016 +0200

----------------------------------------------------------------------
 components/camel-aws/src/main/docs/aws-s3.adoc          | 12 +++++++++++-
 .../apache/camel/component/aws/s3/S3Configuration.java  |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/535e1fdc/components/camel-aws/src/main/docs/aws-s3.adoc
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/main/docs/aws-s3.adoc b/components/camel-aws/src/main/docs/aws-s3.adoc
index 8a7e81b..3163af3 100644
--- a/components/camel-aws/src/main/docs/aws-s3.adoc
+++ b/components/camel-aws/src/main/docs/aws-s3.adoc
@@ -132,7 +132,9 @@ Message headers evaluated by the S3 producer
 |=======================================================================
 |Header |Type |Description
 
-|`CamelAwsS3Key` |`String` |The key under which this object will be stored.
+|`CamelAwsS3BucketName` |`String` |The bucket Name which this object will be stored or which
will be used for the current operation
+
+|`CamelAwsS3BucketDestinationName` |`String` |*Camel 2.18*: The bucket Destination Name which
will be used for the current operation
 
 |`CamelAwsS3ContentLength` |`Long` |The content length of this object.
 
@@ -146,8 +148,14 @@ Message headers evaluated by the S3 producer
 
 |`CamelAwsS3ContentMD5` |`String` |*Camel 2.8.2:* The md5 checksum of this object.
 
+|`CamelAwsS3DestinationKey` |`String` |*Camel 2.18*:The Destination key which will be used
for the current operation
+
+|`CamelAwsS3Key` |`String` |The key under which this object will be stored or which will
be used for the current operation
+
 |`CamelAwsS3LastModified` |`java.util.Date` |*Camel 2.8.2:* The last modified timestamp of
this object.
 
+|`CamelAwsS3Operation` |`java.util.Date` |*Camel 2.18*: The operation to perform
+
 |`CamelAwsS3StorageClass` |`String` |*Camel 2.8.4:* The storage class of this object.
 
 |`CamelAwsS3CannedAcl` |`String` |*Camel 2.11.0:* The canned acl that will be applied to
the object. see
@@ -161,6 +169,8 @@ see `com.amazonaws.services.s3.model.AccessControlList` for more details
 
 |`CamelAwsS3ServerSideEncryption` |String |*Camel 2.16:* Sets the server-side encryption
algorithm when encrypting
 the object using AWS-managed keys. For example use AES256.
+
+|`CamelAwsS3VersionId` |`String` |The version Id of the object to be stored or returned from
the current operation
 |=======================================================================
 
 [[AWS-S3-MessageheaderssetbytheS3producer]]

http://git-wip-us.apache.org/repos/asf/camel/blob/535e1fdc/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java
----------------------------------------------------------------------
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 4939832..d363025 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
@@ -62,7 +62,7 @@ public class S3Configuration implements Cloneable {
     private boolean includeBody = true;
     @UriParam
     private boolean pathStyleAccess;
-    @UriParam(label = "producer")
+    @UriParam(label = "producer", enums = "copyObject")
     private S3Operations operation;
 
     public long getPartSize() {


Mime
View raw message