Repository: camel Updated Branches: refs/heads/master 8c58287cd -> 6fce772f2
CAMEL-10325 component docs Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6fce772f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6fce772f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6fce772f Branch: refs/heads/master Commit: 6fce772f2b01281443b95ca37264f38f03a09feb Parents: 7c4c1d6 Author: Andrea Cosentino <anco...@gmail.com> Authored: Fri Sep 16 11:47:20 2016 +0200 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Fri Sep 16 11:48:41 2016 +0200 ---------------------------------------------------------------------- components/camel-aws/src/main/docs/aws-ec2-component.adoc | 4 +++- .../org/apache/camel/component/aws/ec2/EC2Configuration.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/6fce772f/components/camel-aws/src/main/docs/aws-ec2-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/docs/aws-ec2-component.adoc b/components/camel-aws/src/main/docs/aws-ec2-component.adoc index ee873f2..6050a23 100644 --- a/components/camel-aws/src/main/docs/aws-ec2-component.adoc +++ b/components/camel-aws/src/main/docs/aws-ec2-component.adoc @@ -48,7 +48,7 @@ The AWS EC2 component supports 9 endpoint options which are listed below: | accessKey | producer | | String | Amazon AWS Access Key | amazonEc2Client | producer | | AmazonEC2Client | To use a existing configured AmazonEC2Client as client | amazonEc2Endpoint | producer | | String | The region with which the AWS-EC2 client wants to work with. -| operation | producer | | EC2Operations | *Required* The operation to perform +| operation | producer | | EC2Operations | *Required* The operation to perform. It can be createAndRunInstances startInstances stopInstances terminateInstances describeInstances describeInstancesStatus rebootInstances monitorInstances unmonitorInstances createTags or deleteTags | proxyHost | producer | | String | To define a proxy host when instantiating the SQS client | proxyPort | producer | | Integer | To define a proxy port when instantiating the SQS client | secretKey | producer | | String | Amazon AWS Secret Key @@ -95,6 +95,8 @@ Message headers evaluated by the EC2 producer |`CamelAwsEC2InstancesIds` |`Collection` |A collection of instances IDS to execute start, stop, describe and terminate operations on. + +|`CamelAwsEC2InstancesTags` |`Collection` |A collection of tags to add or remove from EC2 resources |======================================================================= Dependencies http://git-wip-us.apache.org/repos/asf/camel/blob/6fce772f/components/camel-aws/src/main/java/org/apache/camel/component/aws/ec2/EC2Configuration.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ec2/EC2Configuration.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ec2/EC2Configuration.java index 039477c..a7cc109 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ec2/EC2Configuration.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ec2/EC2Configuration.java @@ -95,7 +95,9 @@ public class EC2Configuration { } /** - * The operation to perform + * The operation to perform. It can be createAndRunInstances, startInstances, stopInstances, terminateInstances, + * describeInstances, describeInstancesStatus, rebootInstances, monitorInstances, unmonitorInstances, + * createTags or deleteTags */ public void setOperation(EC2Operations operation) { this.operation = operation;