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 c768850 Regen
c768850 is described below
commit c768850cf9cd2ae79f5284194158779844e6075a
Author: Claus Ibsen <[email protected]>
AuthorDate: Tue Apr 30 05:28:38 2019 +0200
Regen
---
.../modules/ROOT/pages/crypto-cms-component.adoc | 6 +++---
.../modules/ROOT/pages/jooq-component.adoc | 20 ++++++++++++++++----
2 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/docs/components/modules/ROOT/pages/crypto-cms-component.adoc
b/docs/components/modules/ROOT/pages/crypto-cms-component.adoc
index 90c385a..4c8106b 100644
--- a/docs/components/modules/ROOT/pages/crypto-cms-component.adoc
+++ b/docs/components/modules/ROOT/pages/crypto-cms-component.adoc
@@ -85,7 +85,7 @@ with the following path and query parameters:
| *unprotectedAttributes GeneratorProvider* (encrypt) | Provider of the
generator for the unprotected attributes. The default value is null which means
no unprotected attribute is added to the Enveloped Data object. See
https://tools.ietf.org/html/rfc5652#section-6.1. | | AttributesGenerator
Provider
| *toBase64* (encrypt_sign) | Indicates whether the Signed Data or Enveloped
Data instance shall be base 64 encoded. Default value is false. | false |
Boolean
| *includeContent* (sign) | Indicates whether the signed content should be
included into the Signed Data instance. If false then a detached Signed Data
instance is created in the header CamelCryptoCmsSignedData. | true | Boolean
-| *signer* (sign) | Signer information: reference to a bean which implements
org.apache.camel.component.crypto.cms.api.SignerInfo | | List
+| *signer* (sign) | Signer information: reference to bean(s) which implements
org.apache.camel.component.crypto.cms.api.SignerInfo. Multiple values can be
separated by comma | | String
| *signedDataHeaderBase64* (verify) | Indicates whether the value in the
header CamelCryptoCmsSignedData is base64 encoded. Default value is false. Only
relevant for detached signatures. In the detached signature case, the header
contains the Signed Data object. | false | Boolean
| *verifySignaturesOfAll Signers* (verify) | If true then the signatures of
all signers contained in the Signed Data object are verified. If false then
only one signature whose signer info matches with one of the specified
certificates is verified. Default value is true. | true | Boolean
|===
@@ -326,7 +326,7 @@ simpleReg.put("signer1", signerInfo1); //register signer
info in the registry
simpleReg.put("signer2", signerInfo2); //register signer info in the registry
from("direct:start")
-
.to("crypto-cms:sign://testsign?signer=#signer1&signer=#signer2&includeContent=true")
+
.to("crypto-cms:sign://testsign?signer=#signer1,#signer2&includeContent=true")
.to("crypto-cms:verify://testverify?keyStoreParameters=#keyStoreParameters")
.to("mock:result");
----
@@ -358,7 +358,7 @@ from("direct:start")
...
<route>
<from uri="direct:start" />
- <to
uri="crypto-cms:sign://testsign?signer=#signer1&signer=#signer2&includeContent=true"
/>
+ <to
uri="crypto-cms:sign://testsign?signer=#signer1,#signer2&includeContent=true"
/>
<to
uri="crypto-cms:verify://testverify?keyStoreParameters=#keyStoreParameters1" />
<to uri="mock:result" />
</route>
diff --git a/docs/components/modules/ROOT/pages/jooq-component.adoc
b/docs/components/modules/ROOT/pages/jooq-component.adoc
index 8a64ec0..f3a5ba4 100644
--- a/docs/components/modules/ROOT/pages/jooq-component.adoc
+++ b/docs/components/modules/ROOT/pages/jooq-component.adoc
@@ -57,23 +57,22 @@ The JOOQ component supports 2 options, which are listed
below.
The JOOQ endpoint is configured using URI syntax:
----
-jooq:entityType/operation
+jooq:entityType
----
with the following path and query parameters:
-==== Path Parameters (2 parameters):
+==== Path Parameters (1 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
| *entityType* | JOOQ entity class | | Class
-| *operation* | Type of operation to execute on query | NONE | JooqOperation
|===
-==== Query Parameters (21 parameters):
+==== Query Parameters (22 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -85,6 +84,7 @@ with the following path and query parameters:
| *exceptionHandler* (consumer) | To let the consumer use a custom
ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this
option is not in use. By default the consumer will deal with exceptions, that
will be logged at WARN or ERROR level and ignored. | | ExceptionHandler
| *exchangePattern* (consumer) | Sets the exchange pattern when the consumer
creates an exchange. | | ExchangePattern
| *pollStrategy* (consumer) | A pluggable
org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your
custom implementation to control error handling usually occurred during the
poll operation before an Exchange have been created and being routed in Camel.
| | PollingConsumerPoll Strategy
+| *operation* (producer) | Type of operation to execute on query | NONE |
JooqOperation
| *query* (producer) | To execute plain SQL query | | String
| *synchronous* (advanced) | Sets whether synchronous processing should be
strictly used, or Camel is allowed to use asynchronous processing (if
supported). | false | boolean
| *backoffErrorThreshold* (scheduler) | The number of subsequent error polls
(failed due some error) that should happen before the backoffMultipler should
kick-in. | | int
@@ -136,6 +136,18 @@ The component supports 7 options, which are listed below.
|===
// spring-boot-auto-configure options: END
+==== Operations
+
+When using jooq as a producer you can use any of the following `JooqOperation`
operations:
+
+[width="100%",cols="1,2",options="header"]
+|===
+| Operation | Description
+| none | Execute a query (default)
+| execute | Execute a query with no expected results
+| fetch | Execute a query and the result of the query is stored as the new
message body
+|===
+
==== Example:
JOOQ configuration:
