Repository: camel Updated Branches: refs/heads/master 7d8ef004d -> ffd7713bf
Component docs Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ffd7713b Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ffd7713b Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ffd7713b Branch: refs/heads/master Commit: ffd7713bf2719cca0f7923c6d2a444cb1c0fc4e2 Parents: 7d8ef00 Author: Claus Ibsen <davscl...@apache.org> Authored: Mon Jun 15 14:36:16 2015 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon Jun 15 14:36:16 2015 +0200 ---------------------------------------------------------------------- .../component/aws/ec2/EC2Configuration.java | 32 +++++++++++++++----- .../camel/component/aws/ec2/EC2Endpoint.java | 7 +---- 2 files changed, 26 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/ffd7713b/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 67e3941..2d57fde 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 @@ -17,13 +17,16 @@ package org.apache.camel.component.aws.ec2; import com.amazonaws.services.ec2.AmazonEC2Client; - +import org.apache.camel.spi.Metadata; import org.apache.camel.spi.UriParam; import org.apache.camel.spi.UriParams; +import org.apache.camel.spi.UriPath; @UriParams public class EC2Configuration { - + + @UriPath(description = "Logical name") @Metadata(required = "true") + private String label; @UriParam private AmazonEC2Client amazonEc2Client; @UriParam @@ -32,13 +35,16 @@ public class EC2Configuration { private String secretKey; @UriParam private String amazonEc2Endpoint; - @UriParam + @UriParam @Metadata(required = "true") private EC2Operations operation; public AmazonEC2Client getAmazonEc2Client() { return amazonEc2Client; } - + + /** + * To use a existing configured AmazonEC2Client as client + */ public void setAmazonEc2Client(AmazonEC2Client amazonEc2Client) { this.amazonEc2Client = amazonEc2Client; } @@ -46,7 +52,10 @@ public class EC2Configuration { public String getAccessKey() { return accessKey; } - + + /** + * Amazon AWS Access Key + */ public void setAccessKey(String accessKey) { this.accessKey = accessKey; } @@ -54,7 +63,10 @@ public class EC2Configuration { public String getSecretKey() { return secretKey; } - + + /** + * Amazon AWS Secret Key + */ public void setSecretKey(String secretKey) { this.secretKey = secretKey; } @@ -62,7 +74,10 @@ public class EC2Configuration { public String getAmazonEc2Endpoint() { return amazonEc2Endpoint; } - + + /** + * The region with which the AWS-EC2 client wants to work with. + */ public void setAmazonEc2Endpoint(String amazonEc2Endpoint) { this.amazonEc2Endpoint = amazonEc2Endpoint; } @@ -71,6 +86,9 @@ public class EC2Configuration { return operation; } + /** + * The operation to perform + */ public void setOperation(EC2Operations operation) { this.operation = operation; } http://git-wip-us.apache.org/repos/asf/camel/blob/ffd7713b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ec2/EC2Endpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ec2/EC2Endpoint.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ec2/EC2Endpoint.java index 58a8836..c810666 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ec2/EC2Endpoint.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ec2/EC2Endpoint.java @@ -19,7 +19,6 @@ package org.apache.camel.component.aws.ec2; import com.amazonaws.auth.AWSCredentials; import com.amazonaws.auth.BasicAWSCredentials; import com.amazonaws.services.ec2.AmazonEC2Client; - import org.apache.camel.Component; import org.apache.camel.Consumer; import org.apache.camel.Processor; @@ -28,17 +27,13 @@ import org.apache.camel.impl.ScheduledPollEndpoint; import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriParam; import org.apache.camel.util.ObjectHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Defines the <a href="http://camel.apache.org/aws.html";>AWS EC2 Endpoint</a>. */ -@UriEndpoint(scheme = "aws-ec2", title = "AWS EC2", syntax = "aws-ec2:label", producerOnly = true, label = "cloud") +@UriEndpoint(scheme = "aws-ec2", title = "AWS EC2", syntax = "aws-ec2:label", producerOnly = true, label = "cloud,management") public class EC2Endpoint extends ScheduledPollEndpoint { - private static final Logger LOG = LoggerFactory.getLogger(EC2Endpoint.class); - private AmazonEC2Client ec2Client; @UriParam
