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 2019/12/18 19:12:08 UTC
[camel] branch master updated (a9b52e9 -> 4e4648a)
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 a9b52e9 CAMEL-13903: camel-telegram - use a stock HTTP client instead of the JAX-RS client (#3414)
new 89c0642 CAMEL-13903: Remove cxf import in pom
new 4e4648a Regen
The 2 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:
components/camel-telegram/pom.xml | 6 ------
components/camel-telegram/src/main/docs/telegram-component.adoc | 2 +-
docs/components/modules/ROOT/nav.adoc | 1 -
docs/components/modules/ROOT/pages/aws-translate-component.adoc | 4 +++-
docs/components/modules/ROOT/pages/telegram-component.adoc | 2 +-
5 files changed, 5 insertions(+), 10 deletions(-)
[camel] 02/02: 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 4e4648a107747984fd7ac8ff833a8ae4d980d5e0
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Dec 18 20:11:43 2019 +0100
Regen
---
docs/components/modules/ROOT/nav.adoc | 1 -
docs/components/modules/ROOT/pages/aws-translate-component.adoc | 4 +++-
docs/components/modules/ROOT/pages/telegram-component.adoc | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/docs/components/modules/ROOT/nav.adoc b/docs/components/modules/ROOT/nav.adoc
index fab718f..ee5e565 100644
--- a/docs/components/modules/ROOT/nav.adoc
+++ b/docs/components/modules/ROOT/nav.adoc
@@ -42,7 +42,6 @@
* xref:aws-sqs-component.adoc[AWS Simple Queue Service Component]
* xref:aws-swf-component.adoc[AWS Simple Workflow Component]
* xref:aws-translate-component.adoc[AWS Translate Component]
-* xref:aws-translate-component.adoc[AWS Translate Component]
* xref:aws-xray.adoc[AWS XRay Component]
* xref:azure-blob-component.adoc[Azure Storage Blob Service Component]
* xref:azure-queue-component.adoc[Azure Storage Queue Service Component]
diff --git a/docs/components/modules/ROOT/pages/aws-translate-component.adoc b/docs/components/modules/ROOT/pages/aws-translate-component.adoc
index 9c667da..82505c6 100644
--- a/docs/components/modules/ROOT/pages/aws-translate-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws-translate-component.adoc
@@ -1,6 +1,6 @@
[[aws-translate-component]]
= AWS Translate Component
-:page-source: components/camel-aws-translate/bin/src/main/docs/aws-translate-component.adoc
+:page-source: components/camel-aws-translate/src/main/docs/aws-translate-component.adoc
*Since Camel 3.0*
@@ -153,6 +153,8 @@ the https://aws.amazon.com/translate/[Amazon Translate] service.
|`CamelAwsTranslateTargetLanguage` |`String` |The text target language
+|`CamelAwsTranslateTerminologyNames` |`String` |The terminologies to use
+
|`CamelAwsTranslateOperation` |`String` |The operation to perform
|=======================================================================
diff --git a/docs/components/modules/ROOT/pages/telegram-component.adoc b/docs/components/modules/ROOT/pages/telegram-component.adoc
index 26fd3de..02ade84 100644
--- a/docs/components/modules/ROOT/pages/telegram-component.adoc
+++ b/docs/components/modules/ROOT/pages/telegram-component.adoc
@@ -59,7 +59,7 @@ The Telegram component supports 7 options, which are listed below.
| *authorizationToken* (security) | The default Telegram authorization token to be used when the information is not provided in the endpoints. | | String
| *client* (advanced) | To use a custom AsyncHttpClient | | AsyncHttpClient
| *clientConfig* (advanced) | To configure the AsyncHttpClient to use a custom com.ning.http.client.AsyncHttpClientConfig instance. | | AsyncHttpClientConfig
-| *baseUri* (common) | Set an alternative base URI, e.g. when you want to test the component against a mock Telegram API. | | String
+| *baseUri* (advanced) | Set an alternative base URI, e.g. when you want to test the component against a mock Telegram API. | https://api.telegram.org | String
| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
| *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
| *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
[camel] 01/02: CAMEL-13903: Remove cxf import in pom
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 89c0642606d406629076246deeaa49b4da9862a4
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Dec 18 20:11:33 2019 +0100
CAMEL-13903: Remove cxf import in pom
---
components/camel-telegram/pom.xml | 6 ------
components/camel-telegram/src/main/docs/telegram-component.adoc | 2 +-
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/components/camel-telegram/pom.xml b/components/camel-telegram/pom.xml
index 73a03b9..8dddc87 100644
--- a/components/camel-telegram/pom.xml
+++ b/components/camel-telegram/pom.xml
@@ -32,12 +32,6 @@
<name>Camel :: Telegram</name>
<description>Camel Telegram support</description>
- <properties>
- <camel.osgi.import.additional>
- org.apache.cxf.*;version="${cxf-version-range}"
- </camel.osgi.import.additional>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/components/camel-telegram/src/main/docs/telegram-component.adoc b/components/camel-telegram/src/main/docs/telegram-component.adoc
index b855e31..1f93c08 100644
--- a/components/camel-telegram/src/main/docs/telegram-component.adoc
+++ b/components/camel-telegram/src/main/docs/telegram-component.adoc
@@ -58,7 +58,7 @@ The Telegram component supports 7 options, which are listed below.
| *authorizationToken* (security) | The default Telegram authorization token to be used when the information is not provided in the endpoints. | | String
| *client* (advanced) | To use a custom AsyncHttpClient | | AsyncHttpClient
| *clientConfig* (advanced) | To configure the AsyncHttpClient to use a custom com.ning.http.client.AsyncHttpClientConfig instance. | | AsyncHttpClientConfig
-| *baseUri* (common) | Set an alternative base URI, e.g. when you want to test the component against a mock Telegram API. | | String
+| *baseUri* (advanced) | Set an alternative base URI, e.g. when you want to test the component against a mock Telegram API. | https://api.telegram.org | String
| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
| *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
| *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean