This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-2.x by this push:
new 1b5a3d9 Updating some docs + spring boot dependencies for CXF
1b5a3d9 is described below
commit 1b5a3d999ddad564de22432b1e67d5f682f1a3b8
Author: Colm O hEigeartaigh <cohei...@apache.org>
AuthorDate: Thu Jan 16 16:29:24 2020 +0000
Updating some docs + spring boot dependencies for CXF
---
.../src/main/docs/pulsar-component.adoc | 4 +-
.../modules/ROOT/pages/http4-component.adoc | 7 +--
.../modules/ROOT/pages/pulsar-component.adoc | 44 +++++++++++++++--
.../camel-spring-boot-dependencies/pom.xml | 56 +++++++++++-----------
4 files changed, 76 insertions(+), 35 deletions(-)
diff --git a/components/camel-pulsar/src/main/docs/pulsar-component.adoc
b/components/camel-pulsar/src/main/docs/pulsar-component.adoc
index 164ade4..9f3031f 100644
--- a/components/camel-pulsar/src/main/docs/pulsar-component.adoc
+++ b/components/camel-pulsar/src/main/docs/pulsar-component.adoc
@@ -114,15 +114,17 @@ When using Spring Boot make sure to use the following
Maven dependency to have s
----
-The component supports 3 options, which are listed below.
+The component supports 5 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
+| *camel.component.pulsar.allow-manual-acknowledgement* | Whether to allow
manual message acknowledgements. If this option is enabled, then messages are
not immediately acknowledged after being consumed. Instead, an instance of
PulsarMessageReceipt is stored as a header on the org.apache.camel.Exchange.
Messages can then be acknowledged using PulsarMessageReceipt at any time before
the ackTimeout occurs. | false | Boolean
| *camel.component.pulsar.enabled* | Whether to enable auto configuration of
the pulsar component. This is enabled by default. | | Boolean
| *camel.component.pulsar.pulsar-client* | The pulsar client. The option is a
org.apache.pulsar.client.api.PulsarClient type. | | String
+| *camel.component.pulsar.pulsar-message-receipt-factory* | Provide a factory
to create an alternate implementation of PulsarMessageReceipt. The option is a
org.apache.camel.component.pulsar.PulsarMessageReceiptFactory type. | | String
| *camel.component.pulsar.resolve-property-placeholders* | Whether the
component should resolve property placeholders on itself when starting. Only
properties which are of String type can use property placeholders. | true |
Boolean
|===
// spring-boot-auto-configure options: END
diff --git a/docs/components/modules/ROOT/pages/http4-component.adoc
b/docs/components/modules/ROOT/pages/http4-component.adoc
index 6af0a10..56f540e 100644
--- a/docs/components/modules/ROOT/pages/http4-component.adoc
+++ b/docs/components/modules/ROOT/pages/http4-component.adoc
@@ -110,7 +110,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (49 parameters):
+=== Query Parameters (50 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -126,7 +126,8 @@ with the following path and query parameters:
| *connectionClose* (producer) | Specifies whether a Connection Close header
must be added to HTTP Request. By default connectionClose is false. | false |
boolean
| *cookieStore* (producer) | To use a custom CookieStore. By default the
BasicCookieStore is used which is an in-memory only cookie store. Notice if
bridgeEndpoint=true then the cookie store is forced to be a noop cookie store
as cookie shouldn't be stored as we are just bridging (eg acting as a proxy).
If a cookieHandler is set then the cookie store is also forced to be a noop
cookie store as cookie handling is then performed by the cookieHandler. | |
CookieStore
| *copyHeaders* (producer) | If this option is true then IN exchange headers
will be copied to OUT exchange headers according to copy strategy. Setting this
to false, allows to only include the headers from the HTTP response (not
propagating IN headers). | true | boolean
-| *deleteWithBody* (producer) | Whether the HTTP DELETE should include the
message body or not. By default HTTP DELETE do not include any HTTP message.
However in some rare cases users may need to be able to include the message
body. | false | boolean
+| *deleteWithBody* (producer) | Whether the HTTP DELETE should include the
message body or not. By default HTTP DELETE do not include any HTTP body.
However in some rare cases users may need to be able to include the message
body. | false | boolean
+| *getWithBody* (producer) | Whether the HTTP GET should include the message
body or not. By default HTTP GET do not include any HTTP body. However in some
rare cases users may need to be able to include the message body. | false |
boolean
| *httpMethod* (producer) | Configure the HTTP method to use. The HttpMethod
header cannot override this option if set. | | HttpMethods
| *ignoreResponseBody* (producer) | If this option is true, The http producer
won't read response body and cache the input stream | false | boolean
| *preserveHostHeader* (producer) | If the option is true, HttpProducer will
set the Host header to the value contained in the current exchange Host header,
useful in reverse proxy applications where you want the Host header received by
the downstream server to reflect the URL called by the upstream client, this
allows applications which use the Host header to generate accurate URL's for a
proxied service | false | boolean
@@ -569,7 +570,7 @@ int responseCode =
out.getHeader(Exchange.HTTP_RESPONSE_CODE, Integer.class);
To disable cookies you can set the HTTP Client to ignore cookies by
adding this URI option:
- `httpClient.cookiePolicy=ignoreCookies`
+ `httpClient.cookieSpec=ignoreCookies`
== Advanced Usage
diff --git a/docs/components/modules/ROOT/pages/pulsar-component.adoc
b/docs/components/modules/ROOT/pages/pulsar-component.adoc
index e48416d..4a912f5 100644
--- a/docs/components/modules/ROOT/pages/pulsar-component.adoc
+++ b/docs/components/modules/ROOT/pages/pulsar-component.adoc
@@ -30,7 +30,7 @@ pulsar:[persistent|non-persistent]://tenant/namespace/topic
// component options: START
-The Apache Pulsar component supports 3 options, which are listed below.
+The Apache Pulsar component supports 5 options, which are listed below.
@@ -39,6 +39,8 @@ The Apache Pulsar component supports 3 options, which are
listed below.
| Name | Description | Default | Type
| *autoConfiguration* (common) | The pulsar autoconfiguration | |
AutoConfiguration
| *pulsarClient* (common) | The pulsar client | | PulsarClient
+| *allowManual Acknowledgement* (consumer) | Whether to allow manual message
acknowledgements. If this option is enabled, then messages are not immediately
acknowledged after being consumed. Instead, an instance of PulsarMessageReceipt
is stored as a header on the org.apache.camel.Exchange. Messages can then be
acknowledged using PulsarMessageReceipt at any time before the ackTimeout
occurs. | false | boolean
+| *pulsarMessageReceipt Factory* (consumer) | Provide a factory to create an
alternate implementation of PulsarMessageReceipt. | | PulsarMessageReceipt
Factory
| *resolveProperty Placeholders* (advanced) | Whether the component should
resolve property placeholders on itself when starting. Only properties which
are of String type can use property placeholders. | true | boolean
|===
// component options: END
@@ -66,12 +68,15 @@ with the following path and query parameters:
|===
-=== Query Parameters (20 parameters):
+=== Query Parameters (23 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
+| *ackGroupTimeMillis* (consumer) | Group the consumer acknowledgments for the
specified time in milliseconds - defaults to 100 | 100 | long
+| *ackTimeoutMillis* (consumer) | Timeout for unacknowledged messages in
milliseconds - defaults to 10000 | 10000 | long
+| *allowManualAcknowledgement* (consumer) | Whether to allow manual message
acknowledgements. If this option is enabled, then messages are not immediately
acknowledged after being consumed. Instead, an instance of PulsarMessageReceipt
is stored as a header on the org.apache.camel.Exchange. Messages can then be
acknowledged using PulsarMessageReceipt at any time before the ackTimeout
occurs. | false | boolean
| *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
| *consumerName* (consumer) | Name of the consumer when subscription is
EXCLUSIVE | sole-consumer | String
| *consumerNamePrefix* (consumer) | Prefix to add to consumer names when a
SHARED or FAILOVER subscription is used | cons | String
@@ -110,15 +115,48 @@ When using Spring Boot make sure to use the following
Maven dependency to have s
----
-The component supports 3 options, which are listed below.
+The component supports 5 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
+| *camel.component.pulsar.allow-manual-acknowledgement* | Whether to allow
manual message acknowledgements. If this option is enabled, then messages are
not immediately acknowledged after being consumed. Instead, an instance of
PulsarMessageReceipt is stored as a header on the org.apache.camel.Exchange.
Messages can then be acknowledged using PulsarMessageReceipt at any time before
the ackTimeout occurs. | false | Boolean
| *camel.component.pulsar.enabled* | Whether to enable auto configuration of
the pulsar component. This is enabled by default. | | Boolean
| *camel.component.pulsar.pulsar-client* | The pulsar client. The option is a
org.apache.pulsar.client.api.PulsarClient type. | | String
+| *camel.component.pulsar.pulsar-message-receipt-factory* | Provide a factory
to create an alternate implementation of PulsarMessageReceipt. The option is a
org.apache.camel.component.pulsar.PulsarMessageReceiptFactory type. | | String
| *camel.component.pulsar.resolve-property-placeholders* | Whether the
component should resolve property placeholders on itself when starting. Only
properties which are of String type can use property placeholders. | true |
Boolean
|===
// spring-boot-auto-configure options: END
+
+// message-headers options: START
+=== Message headers evaluated by the Pulsar producer
+
+
+[width="100%",cols="10%,10%,80%",options="header",]
+|===
+| Header | Type | Description
+| `CamelPulsarProducerMessageKey` | `String` | Sets the key on the message for
the Pulsar routing policy
+| `CamelPulsarProducerMessageProperties` | `Map<String,String>` | The
properties to set on the Pulsar message
+| `CamelPulsarProducerEventTime` | `long` | Sets the event time on the message
+|===
+
+=== Message headers set by the Pulsar consumer
+
+
+[width="100%",cols="10%,10%,80%",options="header",]
+|===
+| Header | Type | Description
+| `properties` | `Map<String,String>` | The properties from the Pulsar message
or the empty Map if unset on the Pulsar message
+| `producer_name` | `String` | The name of the producer that created the
message
+| `sequence_id` | `long` | Sequence identifier of the Pulsar message
+| `publish_time` | `long` | Time the Pulsar message was published to the topic
+| `message_id` | `MessageId` | Unique identifier of the message
+| `event_time` | `long` | The event time associated with the message or 0 if
unset on the Pulsar message
+| `key` | `String` | The key of the Pulsar message in String form or the empty
string if unset on the Pulsar message
+| `key_bytes` | `byte[]` | The bytes in the key. If the key has been base64
encoded, it is decoded before being returned. Otherwise, if the key is a plain
string, the UTF-8 encoded bytes of the string.
+| `topic_name` | `String` | The topic to which the message was published
+| `manual_acknowledgement` | `PulsarManualAcknowledgement` | If
allowManualAcknowledgement is set, this will contain the object for manually
acknowledging the Pulsar message; otherwise it is unset
+|===
+// message-headers options: END
diff --git
a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index cf0e7af..bce04fa 100644
---
a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++
b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -3226,142 +3226,142 @@
<dependency>
<groupId>org.apache.cxf.services.sts</groupId>
<artifactId>cxf-services-sts-core</artifactId>
- <version>3.3.4</version>
+ <version>3.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf.services.ws-discovery</groupId>
<artifactId>cxf-services-ws-discovery-api</artifactId>
- <version>3.3.4</version>
+ <version>3.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
- <version>3.3.4</version>
+ <version>3.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId>
- <version>3.3.4</version>
+ <version>3.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-xml</artifactId>
- <version>3.3.4</version>
+ <version>3.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-databinding-jaxb</artifactId>
- <version>3.3.4</version>
+ <version>3.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-features-clustering</artifactId>
- <version>3.3.4</version>
+ <version>3.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-features-logging</artifactId>
- <version>3.3.4</version>
+ <version>3.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>3.3.4</version>
+ <version>3.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>3.3.4</version>
+ <version>3.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-simple</artifactId>
- <version>3.3.4</version>
+ <version>3.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-management</artifactId>
- <version>3.3.4</version>
+ <version>3.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
- <version>3.3.4</version>
+ <version>3.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-providers</artifactId>
- <version>3.3.4</version>
+ <version>3.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-oauth2</artifactId>
- <version>3.3.4</version>
+ <version>3.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-service-description-swagger</artifactId>
- <version>3.3.4</version>
+ <version>3.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
- <version>3.3.4</version>
+ <version>3.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
- <version>3.3.4</version>
+ <version>3.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-jms</artifactId>
- <version>3.3.4</version>
+ <version>3.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-local</artifactId>
- <version>3.3.4</version>
+ <version>3.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-addr</artifactId>
- <version>3.3.4</version>
+ <version>3.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-mex</artifactId>
- <version>3.3.4</version>
+ <version>3.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-policy</artifactId>
- <version>3.3.4</version>
+ <version>3.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-rm</artifactId>
- <version>3.3.4</version>
+ <version>3.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
- <version>3.3.4</version>
+ <version>3.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security-oauth2</artifactId>
- <version>3.3.4</version>
+ <version>3.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-wsdl</artifactId>
- <version>3.3.4</version>
+ <version>3.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-testutils</artifactId>
- <version>3.3.4</version>
+ <version>3.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.ftpserver</groupId>
