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 2020/05/06 17:46:58 UTC
[camel] branch master updated: CAMEL-15021: fixed docs thanks Kamil
for spotting this.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new cd06352 CAMEL-15021: fixed docs thanks Kamil for spotting this.
cd06352 is described below
commit cd0635240ec362b49f9de46ec773e2952c175806
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed May 6 19:46:17 2020 +0200
CAMEL-15021: fixed docs thanks Kamil for spotting this.
---
components/camel-scheduler/src/main/docs/scheduler-component.adoc | 4 ++--
components/camel-timer/src/main/docs/timer-component.adoc | 7 +------
docs/components/modules/ROOT/pages/kafka-component.adoc | 6 ++++--
docs/components/modules/ROOT/pages/scheduler-component.adoc | 4 ++--
docs/components/modules/ROOT/pages/timer-component.adoc | 7 +------
docs/components/modules/others/pages/platform-http-vertx.adoc | 2 +-
6 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/components/camel-scheduler/src/main/docs/scheduler-component.adoc b/components/camel-scheduler/src/main/docs/scheduler-component.adoc
index ff6a658..2c9bdea 100644
--- a/components/camel-scheduler/src/main/docs/scheduler-component.adoc
+++ b/components/camel-scheduler/src/main/docs/scheduler-component.adoc
@@ -134,7 +134,7 @@ To set up a route that generates an event every 60 seconds:
[source,java]
----
-from("scheduler://foo?delay=60s").to("bean:myBean?method=someMethodName");
+from("scheduler://foo?delay=60000").to("bean:myBean?method=someMethodName");
----
The above route will generate an event and then invoke the
@@ -146,7 +146,7 @@ And the route in Spring DSL:
[source,xml]
----
<route>
- <from uri="scheduler://foo?delay=60s"/>
+ <from uri="scheduler://foo?delay=60000"/>
<to uri="bean:myBean?method=someMethodName"/>
</route>
----
diff --git a/components/camel-timer/src/main/docs/timer-component.adoc b/components/camel-timer/src/main/docs/timer-component.adoc
index 84643c8..495d855 100644
--- a/components/camel-timer/src/main/docs/timer-component.adoc
+++ b/components/camel-timer/src/main/docs/timer-component.adoc
@@ -129,14 +129,9 @@ To set up a route that generates an event every 60 seconds:
from("timer://foo?fixedRate=true&period=60000").to("bean:myBean?method=someMethodName");
----
-[TIP]
-====
-Instead of 60000 you can use period=60s which is more friendly to read.
-====
-
The above route will generate an event and then invoke the
`someMethodName` method on the bean called `myBean` in the
-Registry such as JNDI or Spring.
+Registry.
And the route in Spring DSL:
diff --git a/docs/components/modules/ROOT/pages/kafka-component.adoc b/docs/components/modules/ROOT/pages/kafka-component.adoc
index 8e4c8de..0459e2b 100644
--- a/docs/components/modules/ROOT/pages/kafka-component.adoc
+++ b/docs/components/modules/ROOT/pages/kafka-component.adoc
@@ -42,7 +42,7 @@ kafka:topic[?options]
// component options: START
-The Kafka component supports 96 options, which are listed below.
+The Kafka component supports 97 options, which are listed below.
@@ -55,6 +55,7 @@ The Kafka component supports 96 options, which are listed below.
| *configuration* (common) | Allows to pre-configure the Kafka component with common options that the endpoints will reuse. | | KafkaConfiguration
| *headerFilterStrategy* (common) | To use a custom HeaderFilterStrategy to filter header to and from Camel message. | | HeaderFilterStrategy
| *reconnectBackoffMaxMs* (common) | The maximum amount of time in milliseconds to wait when reconnecting to a broker that has repeatedly failed to connect. If provided, the backoff per host will increase exponentially for each consecutive connection failure, up to this maximum. After calculating the backoff increase, 20% random jitter is added to avoid connection storms. | 1000 | Integer
+| *shutdownTimeout* (common) | Timeout in milli seconds to wait gracefully for the consumer or producer to shutdown and terminate its worker threads. | 30000 | int
| *allowManualCommit* (consumer) | Whether to allow doing manual commits via KafkaManualCommit. If this option is enabled then an instance of KafkaManualCommit is stored on the Exchange message header, which allows end users to access this API and perform manual offset commits via the Kafka consumer. | false | boolean
| *autoCommitEnable* (consumer) | If true, periodically commit to ZooKeeper the offset of messages already fetched by the consumer. This committed offset will be used when the process fails as the position from which the new consumer will begin. | true | Boolean
| *autoCommitIntervalMs* (consumer) | The frequency in ms that the consumer offsets are committed to zookeeper. | 5000 | Integer
@@ -169,7 +170,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (96 parameters):
+=== Query Parameters (97 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -180,6 +181,7 @@ with the following path and query parameters:
| *clientId* (common) | The client id is a user-specified string sent in each request to help trace calls. It should logically identify the application making the request. | | String
| *headerFilterStrategy* (common) | To use a custom HeaderFilterStrategy to filter header to and from Camel message. | | HeaderFilterStrategy
| *reconnectBackoffMaxMs* (common) | The maximum amount of time in milliseconds to wait when reconnecting to a broker that has repeatedly failed to connect. If provided, the backoff per host will increase exponentially for each consecutive connection failure, up to this maximum. After calculating the backoff increase, 20% random jitter is added to avoid connection storms. | 1000 | Integer
+| *shutdownTimeout* (common) | Timeout in milli seconds to wait gracefully for the consumer or producer to shutdown and terminate its worker threads. | 30000 | int
| *allowManualCommit* (consumer) | Whether to allow doing manual commits via KafkaManualCommit. If this option is enabled then an instance of KafkaManualCommit is stored on the Exchange message header, which allows end users to access this API and perform manual offset commits via the Kafka consumer. | false | boolean
| *autoCommitEnable* (consumer) | If true, periodically commit to ZooKeeper the offset of messages already fetched by the consumer. This committed offset will be used when the process fails as the position from which the new consumer will begin. | true | Boolean
| *autoCommitIntervalMs* (consumer) | The frequency in ms that the consumer offsets are committed to zookeeper. | 5000 | Integer
diff --git a/docs/components/modules/ROOT/pages/scheduler-component.adoc b/docs/components/modules/ROOT/pages/scheduler-component.adoc
index 8f1c9cb..ffbfb4b 100644
--- a/docs/components/modules/ROOT/pages/scheduler-component.adoc
+++ b/docs/components/modules/ROOT/pages/scheduler-component.adoc
@@ -136,7 +136,7 @@ To set up a route that generates an event every 60 seconds:
[source,java]
----
-from("scheduler://foo?delay=60s").to("bean:myBean?method=someMethodName");
+from("scheduler://foo?delay=60000").to("bean:myBean?method=someMethodName");
----
The above route will generate an event and then invoke the
@@ -148,7 +148,7 @@ And the route in Spring DSL:
[source,xml]
----
<route>
- <from uri="scheduler://foo?delay=60s"/>
+ <from uri="scheduler://foo?delay=60000"/>
<to uri="bean:myBean?method=someMethodName"/>
</route>
----
diff --git a/docs/components/modules/ROOT/pages/timer-component.adoc b/docs/components/modules/ROOT/pages/timer-component.adoc
index 57d78ab..5de7e2e 100644
--- a/docs/components/modules/ROOT/pages/timer-component.adoc
+++ b/docs/components/modules/ROOT/pages/timer-component.adoc
@@ -131,14 +131,9 @@ To set up a route that generates an event every 60 seconds:
from("timer://foo?fixedRate=true&period=60000").to("bean:myBean?method=someMethodName");
----
-[TIP]
-====
-Instead of 60000 you can use period=60s which is more friendly to read.
-====
-
The above route will generate an event and then invoke the
`someMethodName` method on the bean called `myBean` in the
-Registry such as JNDI or Spring.
+Registry.
And the route in Spring DSL:
diff --git a/docs/components/modules/others/pages/platform-http-vertx.adoc b/docs/components/modules/others/pages/platform-http-vertx.adoc
index f695e49..0f5799e 100644
--- a/docs/components/modules/others/pages/platform-http-vertx.adoc
+++ b/docs/components/modules/others/pages/platform-http-vertx.adoc
@@ -39,7 +39,7 @@ final CamelContext context = new DefaultCamelContext();
VertxPlatformHttpServerConfiguration conf = new VertxPlatformHttpServerConfiguration();
conf.setBindPort(port);
-context.addService(new VertxPlatformHttpServer(context, conf), true, true);
+context.addService(new VertxPlatformHttpServer(conf));
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {