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/06/15 12:17:17 UTC

[camel] branch master updated (dde196f -> 1dcb589)

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.


    from dde196f  Sync Properties
     new 915a6ff  Add main doc
     new 26f7a1e  Regen
     new 1dcb589  CAMEL-15190: Add main doc

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 core/camel-main/src/main/docs/main.adoc                   | 13 +++++++++++++
 .../components/modules/ROOT/pages/telegram-component.adoc |  3 ++-
 docs/components/modules/others/nav.adoc                   |  1 +
 docs/components/modules/others/pages/main.adoc            | 15 +++++++++++++++
 docs/gulpfile.js                                          |  2 +-
 5 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 core/camel-main/src/main/docs/main.adoc
 create mode 100644 docs/components/modules/others/pages/main.adoc


[camel] 01/03: Add main doc

Posted by da...@apache.org.
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

commit 915a6ffb06922b9fbdbc2a3b3b33ad4f2b84171e
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Jun 15 14:13:59 2020 +0200

    Add main doc
---
 core/camel-main/src/main/docs/main.adoc | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/core/camel-main/src/main/docs/main.adoc b/core/camel-main/src/main/docs/main.adoc
new file mode 100644
index 0000000..90ec50c
--- /dev/null
+++ b/core/camel-main/src/main/docs/main.adoc
@@ -0,0 +1,13 @@
+[[main-component]]
+= Main Component
+:docTitle: Main
+:artifactId: camel-main
+:description: Camel Main support
+:since: 3.0
+:supportLevel: Stable
+//Manually maintained attributes
+:group: Core
+
+*Since Camel {since}*
+
+This module is used for running Camel standalone via a main class extended from `camel-main`.
\ No newline at end of file


[camel] 02/03: Regen

Posted by da...@apache.org.
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

commit 26f7a1e31f387d861e009b49ab2b2b73b2ec22a0
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Jun 15 14:14:04 2020 +0200

    Regen
---
 docs/components/modules/ROOT/pages/telegram-component.adoc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/components/modules/ROOT/pages/telegram-component.adoc b/docs/components/modules/ROOT/pages/telegram-component.adoc
index 82ecb3a..1f147b4 100644
--- a/docs/components/modules/ROOT/pages/telegram-component.adoc
+++ b/docs/components/modules/ROOT/pages/telegram-component.adoc
@@ -95,7 +95,7 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (31 parameters):
+=== Query Parameters (32 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -117,6 +117,7 @@ with the following path and query parameters:
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *proxyHost* (proxy) | HTTP proxy host which could be used when sending out the message. |  | String
 | *proxyPort* (proxy) | HTTP proxy port which could be used when sending out the message. |  | Integer
+| *proxyType* (proxy) | HTTP proxy type which could be used when sending out the message. The value can be one of: HTTP, SOCKS4, SOCKS5 | HTTP | TelegramProxyType
 | *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffMultiplier* (scheduler) | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured. |  | int


[camel] 03/03: CAMEL-15190: Add main doc

Posted by da...@apache.org.
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

commit 1dcb589e26ad2f573e53d480b3a65f4a90641235
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Jun 15 14:16:41 2020 +0200

    CAMEL-15190: Add main doc
---
 docs/components/modules/others/nav.adoc        |  1 +
 docs/components/modules/others/pages/main.adoc | 15 +++++++++++++++
 docs/gulpfile.js                               |  2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/docs/components/modules/others/nav.adoc b/docs/components/modules/others/nav.adoc
index 9f1e7cd..7410a5f 100644
--- a/docs/components/modules/others/nav.adoc
+++ b/docs/components/modules/others/nav.adoc
@@ -12,6 +12,7 @@
 ** xref:jta.adoc[JTA]
 ** xref:leveldb.adoc[LevelDB]
 ** xref:lra.adoc[LRA]
+** xref:main.adoc[Main]
 ** xref:microprofile-config.adoc[Microprofile Config]
 ** xref:microprofile-fault-tolerance.adoc[Microprofile Fault Tolerance]
 ** xref:microprofile-health.adoc[Microprofile Health]
diff --git a/docs/components/modules/others/pages/main.adoc b/docs/components/modules/others/pages/main.adoc
new file mode 100644
index 0000000..293e274
--- /dev/null
+++ b/docs/components/modules/others/pages/main.adoc
@@ -0,0 +1,15 @@
+[[main-component]]
+= Main Component
+//THIS FILE IS COPIED: EDIT THE SOURCE FILE:
+:page-source: core/camel-main/src/main/docs/main.adoc
+:docTitle: Main
+:artifactId: camel-main
+:description: Camel Main support
+:since: 3.0
+:supportLevel: Stable
+//Manually maintained attributes
+:group: Core
+
+*Since Camel {since}*
+
+This module is used for running Camel standalone via a main class extended from `camel-main`.
\ No newline at end of file
diff --git a/docs/gulpfile.js b/docs/gulpfile.js
index 4904e57..b40e17e 100644
--- a/docs/gulpfile.js
+++ b/docs/gulpfile.js
@@ -58,7 +58,7 @@ function createComponentSymlinks() {
 
 function createComponentOthersSymlinks() {
     const f = filter(['**','!**/*-language.adoc', '!**/*-dataformat.adoc', '!**/*-component.adoc', '!**/*-summary.adoc'])
-    return src(['../core/camel-base/src/main/docs/*.adoc','../components/{*,*/*}/src/main/docs/*.adoc'])
+    return src(['../core/camel-base/src/main/docs/*.adoc','../core/camel-main/src/main/docs/*.adoc','../components/{*,*/*}/src/main/docs/*.adoc'])
         .pipe(f)
         .pipe(map((file, done) => {
             // this flattens the output to just .../pages/....adoc