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 9aecb1d Regen
9aecb1d is described below
commit 9aecb1dfe6b8db9ea1cc90f6644c552a42321c7f
Author: Claus Ibsen <[email protected]>
AuthorDate: Wed Apr 29 06:57:41 2020 +0200
Regen
---
bom/camel-bom/pom.xml | 5 ++++
docs/components/modules/ROOT/nav.adoc | 1 -
.../modules/ROOT/pages/salesforce-component.adoc | 16 +++++-----
.../pages/undertow-spring-security-component.adoc | 34 ---------------------
docs/components/modules/others/nav.adoc | 1 +
.../others/pages/undertow-spring-security.adoc | 35 ++++++++++++++++++++++
6 files changed, 49 insertions(+), 43 deletions(-)
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index 85da938..b9e75fb 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -1795,6 +1795,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-undertow-spring-security</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-univocity-parsers</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/docs/components/modules/ROOT/nav.adoc
b/docs/components/modules/ROOT/nav.adoc
index b67dbf9..99799e9 100644
--- a/docs/components/modules/ROOT/nav.adoc
+++ b/docs/components/modules/ROOT/nav.adoc
@@ -320,7 +320,6 @@
** xref:twitter-timeline-component.adoc[Twitter Timeline]
** xref:undertow-component.adoc[Undertow]
** xref:elytron-component.adoc[Undertow Elytron Security Provider]
-** xref:undertow-spring-security-component.adoc[Undertow Spring Security
Security Provider]
** xref:validator-component.adoc[Validator]
** xref:velocity-component.adoc[Velocity]
** xref:vertx-component.adoc[Vert.x]
diff --git a/docs/components/modules/ROOT/pages/salesforce-component.adoc
b/docs/components/modules/ROOT/pages/salesforce-component.adoc
index 585e373..280fc02 100644
--- a/docs/components/modules/ROOT/pages/salesforce-component.adoc
+++ b/docs/components/modules/ROOT/pages/salesforce-component.adoc
@@ -667,8 +667,8 @@ The Salesforce component supports 72 options, which are
listed below.
| *apexMethod* (common) | APEX method name | | String
| *apexQueryParams* (common) | Query params for APEX method | | Map
| *apexUrl* (common) | APEX method URL | | String
-| *apiVersion* (common) | Salesforce API version, defaults to
SalesforceEndpointConfig.DEFAULT_VERSION | | String
-| *backoffIncrement* (common) | Backoff interval increment for Streaming
connection restart attempts for failures beyond CometD auto-reconnect. | | long
+| *apiVersion* (common) | Salesforce API version. | 34.0 | String
+| *backoffIncrement* (common) | Backoff interval increment for Streaming
connection restart attempts for failures beyond CometD auto-reconnect. | 1000 |
long
| *batchId* (common) | Bulk API Batch ID | | String
| *contentType* (common) | Bulk API content type, one of XML, CSV, ZIP_XML,
ZIP_CSV. The value can be one of: XML, CSV, JSON, ZIP_XML, ZIP_CSV, ZIP_JSON |
| ContentType
| *defaultReplayId* (common) | Default replayId setting if no value is found
in initialReplayIdMap | | Long
@@ -682,8 +682,8 @@ The Salesforce component supports 72 options, which are
listed below.
| *instanceId* (common) | Salesforce1 Analytics report execution instance ID |
| String
| *jobId* (common) | Bulk API Job ID | | String
| *limit* (common) | Limit on number of returned records. Applicable to some
of the API, check the Salesforce documentation. | | Integer
-| *maxBackoff* (common) | Maximum backoff interval for Streaming connection
restart attempts for failures beyond CometD auto-reconnect. | | long
-| *notFoundBehaviour* (common) | Sets the behaviour of 404 not found status
received from Salesforce API. Should the body be set to NULL
NotFoundBehaviour#NULL or should a exception be signaled on the exchange
NotFoundBehaviour#EXCEPTION - the default. The value can be one of: EXCEPTION,
NULL | | NotFoundBehaviour
+| *maxBackoff* (common) | Maximum backoff interval for Streaming connection
restart attempts for failures beyond CometD auto-reconnect. | 30000 | long
+| *notFoundBehaviour* (common) | Sets the behaviour of 404 not found status
received from Salesforce API. Should the body be set to NULL
NotFoundBehaviour#NULL or should a exception be signaled on the exchange
NotFoundBehaviour#EXCEPTION - the default. The value can be one of: EXCEPTION,
NULL | EXCEPTION | NotFoundBehaviour
| *notifyForFields* (common) | Notify for fields, options are ALL, REFERENCED,
SELECT, WHERE. The value can be one of: ALL, REFERENCED, SELECT, WHERE | |
NotifyForFieldsEnum
| *notifyForOperationCreate* (common) | Notify for create operation, defaults
to false (API version = 29.0) | | Boolean
| *notifyForOperationDelete* (common) | Notify for delete operation, defaults
to false (API version = 29.0) | | Boolean
@@ -777,8 +777,8 @@ with the following path and query parameters:
| *apexMethod* (common) | APEX method name | | String
| *apexQueryParams* (common) | Query params for APEX method | | Map
| *apexUrl* (common) | APEX method URL | | String
-| *apiVersion* (common) | Salesforce API version, defaults to
SalesforceEndpointConfig.DEFAULT_VERSION | | String
-| *backoffIncrement* (common) | Backoff interval increment for Streaming
connection restart attempts for failures beyond CometD auto-reconnect. | | long
+| *apiVersion* (common) | Salesforce API version. | 34.0 | String
+| *backoffIncrement* (common) | Backoff interval increment for Streaming
connection restart attempts for failures beyond CometD auto-reconnect. | 1000 |
long
| *batchId* (common) | Bulk API Batch ID | | String
| *contentType* (common) | Bulk API content type, one of XML, CSV, ZIP_XML,
ZIP_CSV. The value can be one of: XML, CSV, JSON, ZIP_XML, ZIP_CSV, ZIP_JSON |
| ContentType
| *defaultReplayId* (common) | Default replayId setting if no value is found
in initialReplayIdMap | | Long
@@ -789,8 +789,8 @@ with the following path and query parameters:
| *instanceId* (common) | Salesforce1 Analytics report execution instance ID |
| String
| *jobId* (common) | Bulk API Job ID | | String
| *limit* (common) | Limit on number of returned records. Applicable to some
of the API, check the Salesforce documentation. | | Integer
-| *maxBackoff* (common) | Maximum backoff interval for Streaming connection
restart attempts for failures beyond CometD auto-reconnect. | | long
-| *notFoundBehaviour* (common) | Sets the behaviour of 404 not found status
received from Salesforce API. Should the body be set to NULL
NotFoundBehaviour#NULL or should a exception be signaled on the exchange
NotFoundBehaviour#EXCEPTION - the default. The value can be one of: EXCEPTION,
NULL | | NotFoundBehaviour
+| *maxBackoff* (common) | Maximum backoff interval for Streaming connection
restart attempts for failures beyond CometD auto-reconnect. | 30000 | long
+| *notFoundBehaviour* (common) | Sets the behaviour of 404 not found status
received from Salesforce API. Should the body be set to NULL
NotFoundBehaviour#NULL or should a exception be signaled on the exchange
NotFoundBehaviour#EXCEPTION - the default. The value can be one of: EXCEPTION,
NULL | EXCEPTION | NotFoundBehaviour
| *notifyForFields* (common) | Notify for fields, options are ALL, REFERENCED,
SELECT, WHERE. The value can be one of: ALL, REFERENCED, SELECT, WHERE | |
NotifyForFieldsEnum
| *notifyForOperationCreate* (common) | Notify for create operation, defaults
to false (API version = 29.0) | | Boolean
| *notifyForOperationDelete* (common) | Notify for delete operation, defaults
to false (API version = 29.0) | | Boolean
diff --git
a/docs/components/modules/ROOT/pages/undertow-spring-security-component.adoc
b/docs/components/modules/ROOT/pages/undertow-spring-security-component.adoc
deleted file mode 100644
index 1e1b7e0..0000000
--- a/docs/components/modules/ROOT/pages/undertow-spring-security-component.adoc
+++ /dev/null
@@ -1,34 +0,0 @@
-[[undertow-spring-security-component]]
-= Undertow Spring Security Security Provider
-//THIS FILE IS COPIED: EDIT THE SOURCE FILE:
-:page-source:
components/camel-undertow-spring-security/src/main/docs/undertow-spring-security-component.adoc
-//by hand
-:since: 3.2
-
-*Since Camel {since}*
-
-*OSGi is not supported*
-
-The Spring Security Provider provides Spring Security (5+) token bearer
security over camel-undertow component.
-To force camel-undertow to use spring security provider:
-- Add spring security provider library on classpath.
-- Provide instance of SpringSecurityConfiguration as `securityConfiguration`
-parameter into camel-undertow component or provide both
`securityConfiguration` and `securityProvider`
-into camel-undertow component.
-- Configure spring-security.
-
-Configuration has to provide all 3 security attributes:
-[width="100%"]
-|===
-| Name | Description | Type
-| *securityFiler* | Provides security filter gained from configured spring
security (5+). Filter could be obtained
-for example from DelegatingFilterProxyRegistrationBean. | Filter
-| *clieantRegistration* | Provides configuration of external security provider
which would be used by spring security |
-ClientRegistration
-|===
-
-Each exchange created by Undertow endpoint with spring security contains
header 'SpringSecurityProvider_principal' (
-name of header is provided as constant
`SpringSecurityProvider.PRINCIPAL_NAME_HEADER`) with current authorized identity
-as value or is not present (for not authorized requests)
-
-
diff --git a/docs/components/modules/others/nav.adoc
b/docs/components/modules/others/nav.adoc
index d8e733a..91e64ad 100644
--- a/docs/components/modules/others/nav.adoc
+++ b/docs/components/modules/others/nav.adoc
@@ -36,4 +36,5 @@
** xref:testcontainers-junit5.adoc[Testcontainers JUnit5]
** xref:testcontainers-spring.adoc[Testcontainers Spring]
** xref:testcontainers-spring-junit5.adoc[Testcontainers Spring Junit5]
+** xref:undertow-spring-security.adoc[Undertow Spring Security]
** xref:zipkin.adoc[Zipkin]
diff --git a/docs/components/modules/others/pages/undertow-spring-security.adoc
b/docs/components/modules/others/pages/undertow-spring-security.adoc
new file mode 100644
index 0000000..0e1a415
--- /dev/null
+++ b/docs/components/modules/others/pages/undertow-spring-security.adoc
@@ -0,0 +1,35 @@
+[[undertow-spring-security-component]]
+= Undertow Spring Security Component
+//THIS FILE IS COPIED: EDIT THE SOURCE FILE:
+:page-source:
components/camel-undertow-spring-security/src/main/docs/undertow-spring-security.adoc
+:docTitle: Undertow Spring Security
+:artifactId: camel-undertow-spring-security
+:description: Spring Security Provider for camel-undertow
+:since: 3.3
+:supportLevel: Stable
+
+*Since Camel {since}*
+
+*OSGi is not supported*
+
+
+The Spring Security Provider provides Spring Security (5.x) token bearer
security over camel-undertow component.
+To force camel-undertow to use spring security provider:
+
+* Add spring security provider library on classpath.
+* Provide instance of SpringSecurityConfiguration as `securityConfiguration`
+parameter into camel-undertow component or provide both
`securityConfiguration` and `securityProvider`
+into camel-undertow component.
+* Configure spring-security.
+
+Configuration has to provide following security attribute:
+[width="100%"]
+|===
+| Name | Description | Type
+| *securityFiler* | Provides security filter gained from configured spring
security (5.x). Filter could be obtained
+for example from DelegatingFilterProxyRegistrationBean. | Filter
+|===
+
+Each exchange created by Undertow endpoint with spring security contains
header 'SpringSecurityProvider_principal' (
+name of header is provided as a constant
`SpringSecurityProvider.PRINCIPAL_NAME_HEADER`) with current authorized identity
+as value or header is not present in case of rejected requests.
