You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/05/16 09:51:22 UTC

[31/50] [abbrv] camel git commit: Component docs

Component docs


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

Branch: refs/heads/kube-lb
Commit: 76f0a26a64c7bfe36b8ed16ba1e5ff6fa8a92c95
Parents: c7a0c3f
Author: Claus Ibsen <da...@apache.org>
Authored: Fri May 13 20:09:17 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon May 16 09:59:33 2016 +0200

----------------------------------------------------------------------
 .../camel/component/directvm/DirectVmEndpoint.java  |  6 ++----
 components/camel-aws/src/main/docs/aws-sqs.adoc     | 16 +++++++++-------
 .../camel/component/aws/sqs/SqsConfiguration.java   | 14 +++++++-------
 3 files changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/76f0a26a/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmEndpoint.java
index 88dcf50..74e3bee 100644
--- a/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmEndpoint.java
@@ -45,9 +45,9 @@ public class DirectVmEndpoint extends DefaultEndpoint implements AsyncEndpoint {
     private long timeout = 30000L;
     @UriParam(label = "producer")
     private boolean failIfNoConsumers = true;
-    @UriParam(label = "headerFilterStrategy")
+    @UriParam(label = "producer,advanced")
     private HeaderFilterStrategy headerFilterStrategy;
-    @UriParam(label = "propagateProperties", defaultValue = "false")
+    @UriParam(label = "advanced", defaultValue = "false")
     private Boolean propagateProperties;
 
     public DirectVmEndpoint(String endpointUri, DirectVmComponent component) {
@@ -125,7 +125,6 @@ public class DirectVmEndpoint extends DefaultEndpoint implements AsyncEndpoint {
     /**
      * Sets a {@link HeaderFilterStrategy} that will only be applied on producer endpoints (on both directions: request and response).
      * <p>Default value: none.</p>
-     * @param headerFilterStrategy
      */
     public void setHeaderFilterStrategy(HeaderFilterStrategy headerFilterStrategy) {
         this.headerFilterStrategy = headerFilterStrategy;
@@ -138,7 +137,6 @@ public class DirectVmEndpoint extends DefaultEndpoint implements AsyncEndpoint {
     /**
      * Whether to propagate or not properties from the producer side to the consumer side, and viceversa.
      * <p>Default value: true.</p>
-     * @param propagateProperties
      */
     public void setPropagateProperties(Boolean propagateProperties) {
         this.propagateProperties = propagateProperties;

http://git-wip-us.apache.org/repos/asf/camel/blob/76f0a26a/components/camel-aws/src/main/docs/aws-sqs.adoc
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/main/docs/aws-sqs.adoc b/components/camel-aws/src/main/docs/aws-sqs.adoc
index c4f8530..9ed1de2 100644
--- a/components/camel-aws/src/main/docs/aws-sqs.adoc
+++ b/components/camel-aws/src/main/docs/aws-sqs.adoc
@@ -41,6 +41,7 @@ The AWS Simple Queue Service component has no options.
 
 
 
+
 // endpoint options: START
 The AWS Simple Queue Service component supports 45 endpoint options which are listed below:
 
@@ -53,14 +54,7 @@ The AWS Simple Queue Service component supports 45 endpoint options which are li
 | amazonSQSClient | common |  | AmazonSQS | To use the AmazonSQS as client
 | amazonSQSEndpoint | common |  | String | The region with which the AWS-SQS client wants to work with. Only works if Camel creates the AWS-SQS client i.e. if you explicitly set amazonSQSClient then this setting will have no effect. You would have to set it on the client you create directly
 | headerFilterStrategy | common |  | HeaderFilterStrategy | To use a custom HeaderFilterStrategy to map headers to/from Camel.
-| maximumMessageSize | common |  | Integer | The maximumMessageSize (in bytes) an SQS message can contain for this queue.
-| messageRetentionPeriod | common |  | Integer | The messageRetentionPeriod (in seconds) a message will be retained by SQS for this queue.
-| policy | common |  | String | The policy for this queue
-| proxyHost | common |  | String | To define a proxy host when instantiating the SQS client
-| proxyPort | common |  | Integer | To define a proxy port when instantiating the SQS client
 | queueOwnerAWSAccountId | common |  | String | Specify the queue owner aws account id when you need to connect the queue with different account owner.
-| receiveMessageWaitTimeSeconds | common |  | Integer | If you do not specify WaitTimeSeconds in the request the queue attribute ReceiveMessageWaitTimeSeconds is used to determine how long to wait.
-| redrivePolicy | common |  | String | Specify the policy that send message to DeadLetter queue. See detail at Amazon docs.
 | region | common |  | String | Specify the queue region which could be used with queueOwnerAWSAccountId to build the service URL.
 | secretKey | common |  | String | Amazon AWS Secret Key
 | attributeNames | consumer |  | String | A list of attribute names to receive when consuming. Multiple names can be separated by comma.
@@ -93,6 +87,13 @@ The AWS Simple Queue Service component supports 45 endpoint options which are li
 | startScheduler | scheduler | true | boolean | Whether the scheduler should be auto started.
 | timeUnit | scheduler | MILLISECONDS | TimeUnit | Time unit for initialDelay and delay options.
 | useFixedDelay | scheduler | true | boolean | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details.
+| proxyHost | proxy |  | String | To define a proxy host when instantiating the SQS client
+| proxyPort | proxy |  | Integer | To define a proxy port when instantiating the SQS client
+| maximumMessageSize | queue |  | Integer | The maximumMessageSize (in bytes) an SQS message can contain for this queue.
+| messageRetentionPeriod | queue |  | Integer | The messageRetentionPeriod (in seconds) a message will be retained by SQS for this queue.
+| policy | queue |  | String | The policy for this queue
+| receiveMessageWaitTimeSeconds | queue |  | Integer | If you do not specify WaitTimeSeconds in the request the queue attribute ReceiveMessageWaitTimeSeconds is used to determine how long to wait.
+| redrivePolicy | queue |  | String | Specify the policy that send message to DeadLetter queue. See detail at Amazon docs.
 |=======================================================================
 {% endraw %}
 // endpoint options: END
@@ -102,6 +103,7 @@ The AWS Simple Queue Service component supports 45 endpoint options which are li
 
 
 
+
 Required SQS component options
 
 You have to provide the amazonSQSClient in the

http://git-wip-us.apache.org/repos/asf/camel/blob/76f0a26a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java
index 92ce834..b11e89d 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java
@@ -37,9 +37,9 @@ public class SqsConfiguration {
     private String queueOwnerAWSAccountId;
     @UriParam
     private String region;
-    @UriParam
+    @UriParam(label = "proxy")
     private String proxyHost;
-    @UriParam
+    @UriParam(label = "proxy")
     private Integer proxyPort;
 
     // consumer properties
@@ -67,17 +67,17 @@ public class SqsConfiguration {
     private Integer delaySeconds;
 
     // queue properties
-    @UriParam
+    @UriParam(label = "queue")
     private Integer maximumMessageSize;
-    @UriParam
+    @UriParam(label = "queue")
     private Integer messageRetentionPeriod;
-    @UriParam
+    @UriParam(label = "queue")
     private Integer receiveMessageWaitTimeSeconds;
-    @UriParam
+    @UriParam(label = "queue")
     private String policy;
     
     // dead letter queue properties
-    @UriParam
+    @UriParam(label = "queue")
     private String redrivePolicy;
 
     /**