Fixed doc
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2ad690ad Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2ad690ad Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2ad690ad Branch: refs/heads/eventbus Commit: 2ad690ad0f8e27abb80307daaf0be6af043d5520 Parents: 0479f3b Author: Claus Ibsen <davscl...@apache.org> Authored: Thu May 5 14:51:03 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu May 5 14:51:03 2016 +0200 ---------------------------------------------------------------------- components/camel-aws/src/main/docs/aws-s3.adoc | 40 +++------------------ 1 file changed, 4 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/2ad690ad/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 59c10e9..d1be3af 100644 --- a/components/camel-aws/src/main/docs/aws-s3.adoc +++ b/components/camel-aws/src/main/docs/aws-s3.adoc @@ -86,8 +86,6 @@ The AWS S3 Storage Service component supports 38 endpoint options which are list -|======================================================================= - Required S3 component options You have to provide the amazonS3Client in the @@ -115,36 +113,19 @@ Message headers evaluated by the S3 producer [width="100%",cols="10%,10%,80%",options="header",] |======================================================================= |Header |Type |Description - |`CamelAwsS3Key` |`String` |The key under which this object will be stored. - |`CamelAwsS3ContentLength` |`Long` |The content length of this object. - |`CamelAwsS3ContentType` |`String` |The content type of this object. - |`CamelAwsS3ContentControl` |`String` |*Camel 2.8.2:* The content control of this object. - |`CamelAwsS3ContentDisposition` |`String` |*Camel 2.8.2:* The content disposition of this object. - |`CamelAwsS3ContentEncoding` |`String` |*Camel 2.8.2:* The content encoding of this object. - |`CamelAwsS3ContentMD5` |`String` |*Camel 2.8.2:* The md5 checksum of this object. - |`CamelAwsS3LastModified` |`java.util.Date` |*Camel 2.8.2:* The last modified timestamp of this object. - |`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 -`com.amazonaws.services.s3.model.CannedAccessControlList` for allowed -values. - -|`CamelAwsS3Acl` |`com.amazonaws.services.s3.model.AccessControlList` |*Camel 2.11.0:* a well constructed Amazon S3 Access Control List object. -see `com.amazonaws.services.s3.model.AccessControlList` for more details - +|`CamelAwsS3CannedAcl` |`String` |*Camel 2.11.0:* The canned acl that will be applied to the object. see `com.amazonaws.services.s3.model.CannedAccessControlList` for allowed values. +|`CamelAwsS3Acl` |`com.amazonaws.services.s3.model.AccessControlList` |*Camel 2.11.0:* a well constructed Amazon S3 Access Control List object. see `com.amazonaws.services.s3.model.AccessControlList` for more details |`CamelAwsS3Headers` |`Map<String,String>` |*Camel 2.15.0*: support to get or set custom objectMetadata headers. - -|CamelAwsS3ServerSideEncryption |String |*Camel 2.16:* Sets the server-side encryption algorithm when encrypting -the object using AWS-managed keys. For example use AES256. +|`CamelAwsS3ServerSideEncryption` |String |*Camel 2.16:* Sets the server-side encryption algorithm when encrypting the object using AWS-managed keys. For example use AES256. |======================================================================= [[AWS-S3-MessageheaderssetbytheS3producer]] @@ -155,9 +136,7 @@ Message headers set by the S3 producer |======================================================================= |Header |Type |Description |`CamelAwsS3ETag` |`String` |The ETag value for the newly uploaded object. - |`CamelAwsS3VersionId` |`String` |The *optional* version ID of the newly uploaded object. - |======================================================================= [[AWS-S3-MessageheaderssetbytheS3consumer]] @@ -169,45 +148,34 @@ Message headers set by the S3 consumer |Header |Type |Description |`CamelAwsS3Key` |`String` |The key under which this object is stored. - |`CamelAwsS3BucketName` |`String` |The name of the bucket in which this object is contained. - |`CamelAwsS3ETag` |`String` |The hex encoded 128-bit MD5 digest of the associated object according to RFC 1864. This data is used as an integrity check to verify that the data received by the caller is the same data that was sent by Amazon S3. - |`CamelAwsS3LastModified` |`Date` |The value of the Last-Modified header, indicating the date and time at which Amazon S3 last recorded a modification to the associated object. - |`CamelAwsS3VersionId` |`String` |The version ID of the associated Amazon S3 object if available. Version IDs are only assigned to objects when an object is uploaded to an Amazon S3 bucket that has object versioning enabled. - |`CamelAwsS3ContentType` |`String` |The Content-Type HTTP header, which indicates the type of content stored in the associated object. The value of this header is a standard MIME type. - |`CamelAwsS3ContentMD5` |`String` |The base64 encoded 128-bit MD5 digest of the associated object (content - not including headers) according to RFC 1864. This data is used as a message integrity check to verify that the data received by Amazon S3 is the same data that the caller sent. - |`CamelAwsS3ContentLength` |`Long` |The Content-Length HTTP header indicating the size of the associated object in bytes. - |`CamelAwsS3ContentEncoding` |`String` |The *optional* Content-Encoding HTTP header specifying what content encodings have been applied to the object and what decoding mechanisms must be applied in order to obtain the media-type referenced by the Content-Type field. - |`CamelAwsS3ContentDisposition` |`String` |The *optional* Content-Disposition HTTP header, which specifies presentational information such as the recommended filename for the object to be saved as. - |`CamelAwsS3ContentControl` |`String` |The *optional* Cache-Control HTTP header which allows the user to specify caching behavior along the HTTP request/reply chain. - -|CamelAwsS3ServerSideEncryption |String |*Camel 2.16:* The server-side encryption algorithm when encrypting the +|`CamelAwsS3ServerSideEncryption` |String |*Camel 2.16:* The server-side encryption algorithm when encrypting the object using AWS-managed keys. |=======================================================================
