You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2017/04/11 14:12:01 UTC
[05/13] camel git commit: CAMEL-10650: adding docs and fixing tests
CAMEL-10650: adding docs and fixing tests
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6cfdf421
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6cfdf421
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6cfdf421
Branch: refs/heads/master
Commit: 6cfdf4214288854d2f91a0fbf407ee1df99a8a01
Parents: 1f3c10e
Author: Nicola Ferraro <ni...@gmail.com>
Authored: Tue Apr 11 15:58:43 2017 +0200
Committer: Nicola Ferraro <ni...@gmail.com>
Committed: Tue Apr 11 16:04:22 2017 +0200
----------------------------------------------------------------------
.../src/main/docs/ahc-ws-component.adoc | 3 +-
.../camel-ahc/src/main/docs/ahc-component.adoc | 3 +-
.../src/main/docs/cometd-component.adoc | 3 +-
.../src/main/docs/consul-component.adoc | 3 +-
.../camel-cxf/src/main/docs/cxf-component.adoc | 3 +-
.../src/main/docs/cxfrs-component.adoc | 3 +-
.../src/main/docs/etcd-component.adoc | 6 ++--
.../camel-ftp/src/main/docs/ftps-component.adoc | 11 ++++++-
.../src/main/docs/http-component.adoc | 2 +-
.../src/main/docs/http4-component.adoc | 3 +-
.../camel-irc/src/main/docs/irc-component.adoc | 11 ++++++-
.../src/main/docs/jetty-component.adoc | 3 +-
.../src/main/docs/kafka-component.adoc | 6 ++--
.../src/main/docs/lumberjack-component.adoc | 2 +-
.../src/main/docs/mail-component.adoc | 3 +-
.../src/main/docs/mina2-component.adoc | 6 ++--
.../src/main/docs/nats-component.adoc | 11 ++++++-
.../src/main/docs/netty-http-component.adoc | 3 +-
.../src/main/docs/netty-component.adoc | 3 +-
.../src/main/docs/netty4-http-component.adoc | 3 +-
.../src/main/docs/netty4-component.adoc | 3 +-
.../src/main/docs/olingo2-component.adoc | 3 +-
.../src/main/docs/olingo4-component.adoc | 3 +-
.../src/main/docs/restlet-component.adoc | 3 +-
.../src/main/docs/salesforce-component.adoc | 3 +-
.../src/main/docs/servicenow-component.adoc | 6 ++--
.../src/main/docs/spring-ws-component.adoc | 11 ++++++-
.../src/main/docs/stomp-component.adoc | 3 +-
.../src/main/docs/undertow-component.adoc | 3 +-
.../src/main/docs/websocket-component.adoc | 5 ++-
.../springboot/AhcComponentConfiguration.java | 13 ++++++++
.../ws/springboot/WsComponentConfiguration.java | 13 ++++++++
.../CometdComponentConfiguration.java | 13 ++++++++
.../ConsulComponentConfiguration.java | 26 +++++++--------
.../springboot/CxfRsComponentConfiguration.java | 13 ++++++++
.../springboot/CxfComponentConfiguration.java | 13 ++++++++
.../springboot/EtcdComponentConfiguration.java | 26 +++++++--------
.../FtpsComponentAutoConfiguration.java | 34 ++++++++++++++++++--
.../springboot/FtpsComponentConfiguration.java | 13 ++++++++
.../springboot/HttpComponentConfiguration.java | 4 +--
.../HttpComponentSSLAutoConfiguration.java | 2 +-
.../springboot/HttpComponentConfiguration.java | 13 ++++++++
.../IrcComponentAutoConfiguration.java | 34 ++++++++++++++++++--
.../springboot/IrcComponentConfiguration.java | 13 ++++++++
.../JettyHttpComponentConfiguration9.java | 13 ++++++++
.../camel/component/jetty9/Jetty9SSLTest.java | 6 +++-
.../springboot/KafkaComponentConfiguration.java | 26 +++++++--------
.../LumberjackComponentConfiguration.java | 2 +-
.../springboot/MailComponentConfiguration.java | 13 ++++++++
.../springboot/Mina2ComponentConfiguration.java | 26 +++++++--------
.../NatsComponentAutoConfiguration.java | 34 ++++++++++++++++++--
.../springboot/NatsComponentConfiguration.java | 13 ++++++++
.../NettyHttpComponentConfiguration.java | 13 ++++++++
.../springboot/NettyComponentConfiguration.java | 13 ++++++++
.../NettyHttpComponentConfiguration.java | 13 ++++++++
.../http/springboot/Netty4HttpSSLTest.java | 6 +++-
.../springboot/NettyComponentConfiguration.java | 13 ++++++++
.../Olingo2ComponentConfiguration.java | 13 ++++++++
.../Olingo4ComponentConfiguration.java | 13 ++++++++
.../RestletComponentConfiguration.java | 13 ++++++++
.../SalesforceComponentConfiguration.java | 13 ++++++++
.../ServiceNowComponentConfiguration.java | 26 +++++++--------
...ingWebserviceComponentAutoConfiguration.java | 34 +++++++++++++++++++-
.../SpringWebserviceComponentConfiguration.java | 13 ++++++++
.../springboot/StompComponentConfiguration.java | 26 +++++++--------
.../UndertowComponentConfiguration.java | 13 ++++++++
.../component/undertow/UndertowSSLTest.java | 3 +-
.../WebsocketComponentConfiguration.java | 4 +--
68 files changed, 592 insertions(+), 134 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/6cfdf421/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc b/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc
index a8f0370..e887901 100644
--- a/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc
+++ b/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc
@@ -41,7 +41,7 @@ various configuration options of the AHC component.
// component options: START
-The AHC Websocket component supports 7 options which are listed below.
+The AHC Websocket component supports 8 options which are listed below.
@@ -53,6 +53,7 @@ The AHC Websocket component supports 7 options which are listed below.
| **clientConfig** (advanced) | To configure the AsyncHttpClient to use a custom com.ning.http.client.AsyncHttpClientConfig instance. | | AsyncHttpClientConfig
| **sslContextParameters** (security) | Reference to a org.apache.camel.util.jsse.SSLContextParameters in the Registry. Note that configuring this option will override any SSL/TLS configuration options provided through the clientConfig option at the endpoint or component level. | | SSLContextParameters
| **allowJavaSerialized Object** (advanced) | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | boolean
+| **useGlobalSslContext Parameters** (security) | Enable usage of global SSL context parameters. | false | boolean
| **headerFilterStrategy** (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. | | HeaderFilterStrategy
| **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
|=======================================================================
http://git-wip-us.apache.org/repos/asf/camel/blob/6cfdf421/components/camel-ahc/src/main/docs/ahc-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-ahc/src/main/docs/ahc-component.adoc b/components/camel-ahc/src/main/docs/ahc-component.adoc
index 48a5c63..a261d05 100644
--- a/components/camel-ahc/src/main/docs/ahc-component.adoc
+++ b/components/camel-ahc/src/main/docs/ahc-component.adoc
@@ -97,7 +97,7 @@ with the following path and query parameters:
// component options: START
-The AHC component supports 7 options which are listed below.
+The AHC component supports 8 options which are listed below.
@@ -109,6 +109,7 @@ The AHC component supports 7 options which are listed below.
| **clientConfig** (advanced) | To configure the AsyncHttpClient to use a custom com.ning.http.client.AsyncHttpClientConfig instance. | | AsyncHttpClientConfig
| **sslContextParameters** (security) | Reference to a org.apache.camel.util.jsse.SSLContextParameters in the Registry. Note that configuring this option will override any SSL/TLS configuration options provided through the clientConfig option at the endpoint or component level. | | SSLContextParameters
| **allowJavaSerialized Object** (advanced) | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | boolean
+| **useGlobalSslContext Parameters** (security) | Enable usage of global SSL context parameters. | false | boolean
| **headerFilterStrategy** (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. | | HeaderFilterStrategy
| **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
|=======================================================================
http://git-wip-us.apache.org/repos/asf/camel/blob/6cfdf421/components/camel-cometd/src/main/docs/cometd-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-cometd/src/main/docs/cometd-component.adoc b/components/camel-cometd/src/main/docs/cometd-component.adoc
index 1b2d637..c101e07 100644
--- a/components/camel-cometd/src/main/docs/cometd-component.adoc
+++ b/components/camel-cometd/src/main/docs/cometd-component.adoc
@@ -48,7 +48,7 @@ where `cometds:` represents an SSL configured endpoint.
// component options: START
-The CometD component supports 7 options which are listed below.
+The CometD component supports 8 options which are listed below.
@@ -61,6 +61,7 @@ The CometD component supports 7 options which are listed below.
| **securityPolicy** (security) | To use a custom configured SecurityPolicy to control authorization | | SecurityPolicy
| **extensions** (common) | To use a list of custom BayeuxServer.Extension that allows modifying incoming and outgoing requests. | | List
| **sslContextParameters** (security) | To configure security using SSLContextParameters | | SSLContextParameters
+| **useGlobalSslContext Parameters** (security) | Enable usage of global SSL context parameters. | false | boolean
| **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
http://git-wip-us.apache.org/repos/asf/camel/blob/6cfdf421/components/camel-consul/src/main/docs/consul-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-consul/src/main/docs/consul-component.adoc b/components/camel-consul/src/main/docs/consul-component.adoc
index 10c66d4..bcf7da0 100644
--- a/components/camel-consul/src/main/docs/consul-component.adoc
+++ b/components/camel-consul/src/main/docs/consul-component.adoc
@@ -35,7 +35,7 @@ You can append query options to the URI in the following format:
// component options: START
-The Consul component supports 8 options which are listed below.
+The Consul component supports 9 options which are listed below.
@@ -45,6 +45,7 @@ The Consul component supports 8 options which are listed below.
| **url** (common) | The Consul agent URL | | String
| **datacenter** (common) | The data center | | String
| **sslContextParameters** (common) | SSL configuration using an org.apache.camel.util.jsse.SSLContextParameters instance. | | SSLContextParameters
+| **useGlobalSslContext Parameters** (security) | Enable usage of global SSL context parameters. | false | boolean
| **aclToken** (common) | Sets the ACL token to be used with Consul | | String
| **userName** (common) | Sets the username to be used for basic authentication | | String
| **password** (common) | Sets the password to be used for basic authentication | | String
http://git-wip-us.apache.org/repos/asf/camel/blob/6cfdf421/components/camel-cxf/src/main/docs/cxf-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/main/docs/cxf-component.adoc b/components/camel-cxf/src/main/docs/cxf-component.adoc
index 2479464..c8d56a7 100644
--- a/components/camel-cxf/src/main/docs/cxf-component.adoc
+++ b/components/camel-cxf/src/main/docs/cxf-component.adoc
@@ -112,7 +112,7 @@ cxf:bean:cxfEndpoint?wsdlURL=wsdl/hello_world.wsdl&dataFormat=PAYLOAD
// component options: START
-The CXF component supports 3 options which are listed below.
+The CXF component supports 4 options which are listed below.
@@ -120,6 +120,7 @@ The CXF component supports 3 options which are listed below.
|=======================================================================
| Name | Description | Default | Type
| **allowStreaming** (advanced) | This option controls whether the CXF component when running in PAYLOAD mode will DOM parse the incoming messages into DOM Elements or keep the payload as a javax.xml.transform.Source object that would allow streaming in some cases. | | Boolean
+| **useGlobalSslContext Parameters** (security) | Enable usage of global SSL context parameters. | false | boolean
| **headerFilterStrategy** (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. | | HeaderFilterStrategy
| **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
|=======================================================================
http://git-wip-us.apache.org/repos/asf/camel/blob/6cfdf421/components/camel-cxf/src/main/docs/cxfrs-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/main/docs/cxfrs-component.adoc b/components/camel-cxf/src/main/docs/cxfrs-component.adoc
index 2cd74dd..6c594f4 100644
--- a/components/camel-cxf/src/main/docs/cxfrs-component.adoc
+++ b/components/camel-cxf/src/main/docs/cxfrs-component.adoc
@@ -54,13 +54,14 @@ cxfrs:bean:cxfEndpoint?resourceClasses=org.apache.camel.rs.Example
// component options: START
-The CXF-RS component supports 2 options which are listed below.
+The CXF-RS component supports 3 options which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|=======================================================================
| Name | Description | Default | Type
+| **useGlobalSslContext Parameters** (security) | Enable usage of global SSL context parameters. | false | boolean
| **headerFilterStrategy** (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. | | HeaderFilterStrategy
| **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
|=======================================================================
http://git-wip-us.apache.org/repos/asf/camel/blob/6cfdf421/components/camel-etcd/src/main/docs/etcd-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-etcd/src/main/docs/etcd-component.adoc b/components/camel-etcd/src/main/docs/etcd-component.adoc
index 519b7b6..aca5019 100644
--- a/components/camel-etcd/src/main/docs/etcd-component.adoc
+++ b/components/camel-etcd/src/main/docs/etcd-component.adoc
@@ -14,7 +14,7 @@ etcd:namespace/path[?options]
### URI Options
// component options: START
-The etcd component supports 6 options which are listed below.
+The etcd component supports 7 options which are listed below.
@@ -26,6 +26,7 @@ The etcd component supports 6 options which are listed below.
| **userName** (common) | The user name to use for basic authentication. | | String
| **password** (common) | The password to use for basic authentication. | | String
| **configuration** (advanced) | Sets the common configuration shared among endpoints | | EtcdConfiguration
+| **useGlobalSslContext Parameters** (security) | Enable usage of global SSL context parameters. | false | boolean
| **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
@@ -46,7 +47,7 @@ with the following path and query parameters:
| **path** | The path the endpoint refers to | | String
|=======================================================================
-#### Query Parameters (30 parameters):
+#### Query Parameters (29 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|=======================================================================
@@ -79,7 +80,6 @@ with the following path and query parameters:
| **useFixedDelay** (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
| **password** (security) | The password to use for basic authentication. | | String
| **sslContextParameters** (security) | To configure security using SSLContextParameters. | | SSLContextParameters
-| **useGlobalSslContext Parameters** (security) | Enable usage of Camel global SSL parameters. | false | boolean
| **userName** (security) | The user name to use for basic authentication. | | String
|=======================================================================
// endpoint options: END
http://git-wip-us.apache.org/repos/asf/camel/blob/6cfdf421/components/camel-ftp/src/main/docs/ftps-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-ftp/src/main/docs/ftps-component.adoc b/components/camel-ftp/src/main/docs/ftps-component.adoc
index a307922..bf80e23 100644
--- a/components/camel-ftp/src/main/docs/ftps-component.adoc
+++ b/components/camel-ftp/src/main/docs/ftps-component.adoc
@@ -25,7 +25,16 @@ For more information you can look at link:ftp.html[FTP component]
The options below are exclusive for the FTPS component.
// component options: START
-The FTPS component has no options.
+The FTPS component supports 2 options which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|=======================================================================
+| Name | Description | Default | Type
+| **useGlobalSslContext Parameters** (security) | Enable usage of global SSL context parameters. | false | boolean
+| **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
http://git-wip-us.apache.org/repos/asf/camel/blob/6cfdf421/components/camel-http/src/main/docs/http-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-http/src/main/docs/http-component.adoc b/components/camel-http/src/main/docs/http-component.adoc
index 5499706..5830634 100644
--- a/components/camel-http/src/main/docs/http-component.adoc
+++ b/components/camel-http/src/main/docs/http-component.adoc
@@ -126,7 +126,7 @@ The HTTP component supports 8 options which are listed below.
| **httpBinding** (producer) | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. | | HttpBinding
| **httpConfiguration** (producer) | To use the shared HttpConfiguration as base configuration. | | HttpConfiguration
| **allowJavaSerialized Object** (producer) | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | boolean
-| **useGlobalSSLContext Parameters** (security) | Enable usage of global SSL context parameters. | false | boolean
+| **useGlobalSslContext Parameters** (security) | Enable usage of global SSL context parameters. | false | boolean
| **headerFilterStrategy** (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. | | HeaderFilterStrategy
| **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
|=======================================================================
http://git-wip-us.apache.org/repos/asf/camel/blob/6cfdf421/components/camel-http4/src/main/docs/http4-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-http4/src/main/docs/http4-component.adoc b/components/camel-http4/src/main/docs/http4-component.adoc
index 43644df..a2c9be3 100644
--- a/components/camel-http4/src/main/docs/http4-component.adoc
+++ b/components/camel-http4/src/main/docs/http4-component.adoc
@@ -51,7 +51,7 @@ route, use the link:jetty.html[Jetty Component] instead.
// component options: START
-The HTTP4 component supports 14 options which are listed below.
+The HTTP4 component supports 15 options which are listed below.
@@ -62,6 +62,7 @@ The HTTP4 component supports 14 options which are listed below.
| **clientConnectionManager** (advanced) | To use a custom and shared HttpClientConnectionManager to manage connections. If this has been configured then this is always used for all endpoints created by this component. | | HttpClientConnection Manager
| **httpContext** (advanced) | To use a custom org.apache.http.protocol.HttpContext when executing requests. | | HttpContext
| **sslContextParameters** (security) | To configure security using SSLContextParameters. Important: Only one instance of org.apache.camel.util.jsse.SSLContextParameters is supported per HttpComponent. If you need to use 2 or more different instances you need to define a new HttpComponent per instance you need. | | SSLContextParameters
+| **useGlobalSslContext Parameters** (security) | Enable usage of global SSL context parameters. | false | boolean
| **x509HostnameVerifier** (security) | To use a custom X509HostnameVerifier such as DefaultHostnameVerifier or org.apache.http.conn.ssl.NoopHostnameVerifier. | | HostnameVerifier
| **maxTotalConnections** (advanced) | The maximum number of connections. | 200 | int
| **connectionsPerRoute** (advanced) | The maximum number of connections per route. | 20 | int
http://git-wip-us.apache.org/repos/asf/camel/blob/6cfdf421/components/camel-irc/src/main/docs/irc-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-irc/src/main/docs/irc-component.adoc b/components/camel-irc/src/main/docs/irc-component.adoc
index 36e8b1a..05f280a 100644
--- a/components/camel-irc/src/main/docs/irc-component.adoc
+++ b/components/camel-irc/src/main/docs/irc-component.adoc
@@ -34,7 +34,16 @@ You can append query options to the URI in the following format,
// component options: START
-The IRC component has no options.
+The IRC component supports 2 options which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|=======================================================================
+| Name | Description | Default | Type
+| **useGlobalSslContext Parameters** (security) | Enable usage of global SSL context parameters. | false | boolean
+| **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
http://git-wip-us.apache.org/repos/asf/camel/blob/6cfdf421/components/camel-jetty9/src/main/docs/jetty-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-jetty9/src/main/docs/jetty-component.adoc b/components/camel-jetty9/src/main/docs/jetty-component.adoc
index 92853f3..27d78cb 100644
--- a/components/camel-jetty9/src/main/docs/jetty-component.adoc
+++ b/components/camel-jetty9/src/main/docs/jetty-component.adoc
@@ -52,7 +52,7 @@ You can append query options to the URI in the following format,
// component options: START
-The Jetty 9 component supports 32 options which are listed below.
+The Jetty 9 component supports 33 options which are listed below.
@@ -80,6 +80,7 @@ The Jetty 9 component supports 32 options which are listed below.
| **continuationTimeout** (consumer) | Allows to set a timeout in millis when using Jetty as consumer (server). By default Jetty uses 30000. You can use a value of = 0 to never expire. If a timeout occurs then the request will be expired and Jetty will return back a http error 503 to the client. This option is only in use when using Jetty with the Asynchronous Routing Engine. | 30000 | Long
| **useContinuation** (consumer) | Whether or not to use Jetty continuations for the Jetty Server. | true | boolean
| **sslContextParameters** (security) | To configure security using SSLContextParameters | | SSLContextParameters
+| **useGlobalSslContext Parameters** (security) | Enable usage of global SSL context parameters | false | boolean
| **responseBufferSize** (common) | Allows to configure a custom value of the response buffer size on the Jetty connectors. | | Integer
| **requestBufferSize** (common) | Allows to configure a custom value of the request buffer size on the Jetty connectors. | | Integer
| **requestHeaderSize** (common) | Allows to configure a custom value of the request header size on the Jetty connectors. | | Integer
http://git-wip-us.apache.org/repos/asf/camel/blob/6cfdf421/components/camel-kafka/src/main/docs/kafka-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-kafka/src/main/docs/kafka-component.adoc b/components/camel-kafka/src/main/docs/kafka-component.adoc
index 659bb9a..4604e9c 100644
--- a/components/camel-kafka/src/main/docs/kafka-component.adoc
+++ b/components/camel-kafka/src/main/docs/kafka-component.adoc
@@ -34,7 +34,7 @@ kafka:topic[?options]
// component options: START
-The Kafka component supports 4 options which are listed below.
+The Kafka component supports 5 options which are listed below.
@@ -44,6 +44,7 @@ The Kafka component supports 4 options which are listed below.
| **configuration** (common) | Allows to pre-configure the Kafka component with common options that the endpoints will reuse. | | KafkaConfiguration
| **brokers** (common) | URL of the Kafka brokers to use. The format is host1:port1host2:port2 and the list can be a subset of brokers or a VIP pointing to a subset of brokers. This option is known as bootstrap.servers in the Kafka documentation. | | String
| **workerPool** (advanced) | To use a shared custom worker pool for continue routing Exchange after kafka server has acknowledge the message that was sent to it from KafkaProducer using asynchronous non-blocking processing. If using this option then you must handle the lifecycle of the thread pool to shut the pool down when no longer needed. | | ExecutorService
+| **useGlobalSslContext Parameters** (security) | Enable usage of global SSL context parameters. | false | boolean
| **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
@@ -65,7 +66,7 @@ with the following path and query parameters:
| **topic** | *Required* Name of the topic to use. On the consumer you can use comma to separate multiple topics. A producer can only send a message to a single topic. | | String
|=======================================================================
-#### Query Parameters (83 parameters):
+#### Query Parameters (82 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|=======================================================================
@@ -152,7 +153,6 @@ with the following path and query parameters:
| **sslTruststoreLocation** (security) | The location of the trust store file. | | String
| **sslTruststorePassword** (security) | The password for the trust store file. | | String
| **sslTruststoreType** (security) | The file format of the trust store file. Default value is JKS. | JKS | String
-| **useGlobalSslContext Parameters** (security) | Enable usage of Camel global SSL config | false | boolean
|=======================================================================
// endpoint options: END
http://git-wip-us.apache.org/repos/asf/camel/blob/6cfdf421/components/camel-lumberjack/src/main/docs/lumberjack-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-lumberjack/src/main/docs/lumberjack-component.adoc b/components/camel-lumberjack/src/main/docs/lumberjack-component.adoc
index bbd89c2..663cbd3 100644
--- a/components/camel-lumberjack/src/main/docs/lumberjack-component.adoc
+++ b/components/camel-lumberjack/src/main/docs/lumberjack-component.adoc
@@ -45,7 +45,7 @@ The Lumberjack component supports 3 options which are listed below.
|=======================================================================
| Name | Description | Default | Type
| **sslContextParameters** (security) | Sets the default SSL configuration to use for all the endpoints. You can also configure it directly at the endpoint level. | | SSLContextParameters
-| **useGlobalSslContext Parameters** (security) | Enable usage of Camel global SSL parameters | false | boolean
+| **useGlobalSslContext Parameters** (security) | Enable usage of global SSL context parameters. | false | boolean
| **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
http://git-wip-us.apache.org/repos/asf/camel/blob/6cfdf421/components/camel-mail/src/main/docs/mail-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-mail/src/main/docs/mail-component.adoc b/components/camel-mail/src/main/docs/mail-component.adoc
index 5a23607..c3ed88d 100644
--- a/components/camel-mail/src/main/docs/mail-component.adoc
+++ b/components/camel-mail/src/main/docs/mail-component.adoc
@@ -77,7 +77,7 @@ You can append query options to the URI in the following format,
// component options: START
-The Mail component supports 3 options which are listed below.
+The Mail component supports 4 options which are listed below.
@@ -86,6 +86,7 @@ The Mail component supports 3 options which are listed below.
| Name | Description | Default | Type
| **configuration** (advanced) | Sets the Mail configuration | | MailConfiguration
| **contentTypeResolver** (advanced) | Resolver to determine Content-Type for file attachments. | | ContentTypeResolver
+| **useGlobalSslContext Parameters** (security) | Enable usage of global SSL context parameters. | false | boolean
| **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
http://git-wip-us.apache.org/repos/asf/camel/blob/6cfdf421/components/camel-mina2/src/main/docs/mina2-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-mina2/src/main/docs/mina2-component.adoc b/components/camel-mina2/src/main/docs/mina2-component.adoc
index 900fcce..90741c3 100644
--- a/components/camel-mina2/src/main/docs/mina2-component.adoc
+++ b/components/camel-mina2/src/main/docs/mina2-component.adoc
@@ -63,7 +63,7 @@ You can append query options to the URI in the following format,
// component options: START
-The Mina2 component supports 2 options which are listed below.
+The Mina2 component supports 3 options which are listed below.
@@ -71,6 +71,7 @@ The Mina2 component supports 2 options which are listed below.
|=======================================================================
| Name | Description | Default | Type
| **configuration** (advanced) | To use the shared mina configuration. | | Mina2Configuration
+| **useGlobalSslContext Parameters** (security) | Enable usage of global SSL context parameters. | false | boolean
| **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
@@ -99,7 +100,7 @@ with the following path and query parameters:
| **port** | *Required* Port number | | int
|=======================================================================
-#### Query Parameters (27 parameters):
+#### Query Parameters (26 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|=======================================================================
@@ -130,7 +131,6 @@ with the following path and query parameters:
| **textlineDelimiter** (codec) | Only used for TCP and if textline=true. Sets the text line delimiter to use. If none provided Camel will use DEFAULT. This delimiter is used to mark the end of text. | | Mina2TextLineDelimiter
| **autoStartTls** (security) | Whether to auto start SSL handshake. | true | boolean
| **sslContextParameters** (security) | To configure SSL security. | | SSLContextParameters
-| **useGlobalSslContext Parameters** (security) | Enable usage of Camel global sslContextParameters. | true | boolean
|=======================================================================
// endpoint options: END
http://git-wip-us.apache.org/repos/asf/camel/blob/6cfdf421/components/camel-nats/src/main/docs/nats-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-nats/src/main/docs/nats-component.adoc b/components/camel-nats/src/main/docs/nats-component.adoc
index 82e366e..b8a6ed7 100644
--- a/components/camel-nats/src/main/docs/nats-component.adoc
+++ b/components/camel-nats/src/main/docs/nats-component.adoc
@@ -30,7 +30,16 @@ Where�*servers*�represents the list of NATS servers.
// component options: START
-The Nats component has no options.
+The Nats component supports 2 options which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|=======================================================================
+| Name | Description | Default | Type
+| **useGlobalSslContext Parameters** (security) | Enable usage of global SSL context parameters. | false | boolean
+| **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
http://git-wip-us.apache.org/repos/asf/camel/blob/6cfdf421/components/camel-netty-http/src/main/docs/netty-http-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-netty-http/src/main/docs/netty-http-component.adoc b/components/camel-netty-http/src/main/docs/netty-http-component.adoc
index 6becdcd..c33165b 100644
--- a/components/camel-netty-http/src/main/docs/netty-http-component.adoc
+++ b/components/camel-netty-http/src/main/docs/netty-http-component.adoc
@@ -76,7 +76,7 @@ options related to UDP transport.
// component options: START
-The Netty HTTP component supports 6 options which are listed below.
+The Netty HTTP component supports 7 options which are listed below.
@@ -87,6 +87,7 @@ The Netty HTTP component supports 6 options which are listed below.
| **configuration** (common) | To use the NettyConfiguration as configuration when creating endpoints. | | NettyHttpConfiguration
| **headerFilterStrategy** (advanced) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter headers. | | HeaderFilterStrategy
| **securityConfiguration** (security) | Refers to a org.apache.camel.component.netty.http.NettyHttpSecurityConfiguration for configuring secure web resources. | | NettyHttpSecurity Configuration
+| **useGlobalSslContext Parameters** (security) | Enable usage of global SSL context parameters. | false | boolean
| **maximumPoolSize** (advanced) | The core pool size for the ordered thread pool if its in use. The default value is 16. | 16 | int
| **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
|=======================================================================
http://git-wip-us.apache.org/repos/asf/camel/blob/6cfdf421/components/camel-netty/src/main/docs/netty-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-netty/src/main/docs/netty-component.adoc b/components/camel-netty/src/main/docs/netty-component.adoc
index 66a0275..e9af5ae 100644
--- a/components/camel-netty/src/main/docs/netty-component.adoc
+++ b/components/camel-netty/src/main/docs/netty-component.adoc
@@ -56,7 +56,7 @@ You can append query options to the URI in the following format,
// component options: START
-The Netty component supports 3 options which are listed below.
+The Netty component supports 4 options which are listed below.
@@ -65,6 +65,7 @@ The Netty component supports 3 options which are listed below.
| Name | Description | Default | Type
| **configuration** (advanced) | To use the NettyConfiguration as configuration when creating endpoints. | | NettyConfiguration
| **maximumPoolSize** (advanced) | The core pool size for the ordered thread pool if its in use. The default value is 16. | 16 | int
+| **useGlobalSslContext Parameters** (security) | Enable usage of global SSL context parameters. | false | boolean
| **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
http://git-wip-us.apache.org/repos/asf/camel/blob/6cfdf421/components/camel-netty4-http/src/main/docs/netty4-http-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-netty4-http/src/main/docs/netty4-http-component.adoc b/components/camel-netty4-http/src/main/docs/netty4-http-component.adoc
index 364c7e4..62ef156 100644
--- a/components/camel-netty4-http/src/main/docs/netty4-http-component.adoc
+++ b/components/camel-netty4-http/src/main/docs/netty4-http-component.adoc
@@ -75,7 +75,7 @@ related to UDP transport.
// component options: START
-The Netty4 HTTP component supports 7 options which are listed below.
+The Netty4 HTTP component supports 8 options which are listed below.
@@ -86,6 +86,7 @@ The Netty4 HTTP component supports 7 options which are listed below.
| **configuration** (common) | To use the NettyConfiguration as configuration when creating endpoints. | | NettyHttpConfiguration
| **headerFilterStrategy** (advanced) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter headers. | | HeaderFilterStrategy
| **securityConfiguration** (security) | Refers to a org.apache.camel.component.netty4.http.NettyHttpSecurityConfiguration for configuring secure web resources. | | NettyHttpSecurity Configuration
+| **useGlobalSslContext Parameters** (security) | Enable usage of global SSL context parameters. | false | boolean
| **maximumPoolSize** (advanced) | The thread pool size for the EventExecutorGroup if its in use. The default value is 16. | 16 | int
| **executorService** (advanced) | To use the given EventExecutorGroup | | EventExecutorGroup
| **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
http://git-wip-us.apache.org/repos/asf/camel/blob/6cfdf421/components/camel-netty4/src/main/docs/netty4-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/main/docs/netty4-component.adoc b/components/camel-netty4/src/main/docs/netty4-component.adoc
index 3bbb49c..6c55a7a 100644
--- a/components/camel-netty4/src/main/docs/netty4-component.adoc
+++ b/components/camel-netty4/src/main/docs/netty4-component.adoc
@@ -53,7 +53,7 @@ You can append query options to the URI in the following format,
// component options: START
-The Netty4 component supports 4 options which are listed below.
+The Netty4 component supports 5 options which are listed below.
@@ -63,6 +63,7 @@ The Netty4 component supports 4 options which are listed below.
| **maximumPoolSize** (advanced) | The thread pool size for the EventExecutorGroup if its in use. The default value is 16. | 16 | int
| **configuration** (advanced) | To use the NettyConfiguration as configuration when creating endpoints. | | NettyConfiguration
| **executorService** (advanced) | To use the given EventExecutorGroup | | EventExecutorGroup
+| **useGlobalSslContext Parameters** (security) | Enable usage of global SSL context parameters. | false | boolean
| **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
http://git-wip-us.apache.org/repos/asf/camel/blob/6cfdf421/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc b/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc
index c4a4842..ae4723b 100644
--- a/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc
+++ b/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc
@@ -43,7 +43,7 @@ for this component:
// component options: START
-The Olingo2 component supports 2 options which are listed below.
+The Olingo2 component supports 3 options which are listed below.
@@ -51,6 +51,7 @@ The Olingo2 component supports 2 options which are listed below.
|=======================================================================
| Name | Description | Default | Type
| **configuration** (common) | To use the shared configuration | | Olingo2Configuration
+| **useGlobalSslContext Parameters** (security) | Enable usage of global SSL context parameters. | false | boolean
| **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
http://git-wip-us.apache.org/repos/asf/camel/blob/6cfdf421/components/camel-olingo4/camel-olingo4-component/src/main/docs/olingo4-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-olingo4/camel-olingo4-component/src/main/docs/olingo4-component.adoc b/components/camel-olingo4/camel-olingo4-component/src/main/docs/olingo4-component.adoc
index 980372c..44eeb53 100644
--- a/components/camel-olingo4/camel-olingo4-component/src/main/docs/olingo4-component.adoc
+++ b/components/camel-olingo4/camel-olingo4-component/src/main/docs/olingo4-component.adoc
@@ -43,7 +43,7 @@ for this component:
// component options: START
-The Olingo4 component supports 2 options which are listed below.
+The Olingo4 component supports 3 options which are listed below.
@@ -51,6 +51,7 @@ The Olingo4 component supports 2 options which are listed below.
|=======================================================================
| Name | Description | Default | Type
| **configuration** (common) | To use the shared configuration | | Olingo4Configuration
+| **useGlobalSslContext Parameters** (security) | Enable usage of global SSL context parameters. | false | boolean
| **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
http://git-wip-us.apache.org/repos/asf/camel/blob/6cfdf421/components/camel-restlet/src/main/docs/restlet-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-restlet/src/main/docs/restlet-component.adoc b/components/camel-restlet/src/main/docs/restlet-component.adoc
index 6730bbe..95b8b33 100644
--- a/components/camel-restlet/src/main/docs/restlet-component.adoc
+++ b/components/camel-restlet/src/main/docs/restlet-component.adoc
@@ -62,7 +62,7 @@ option.
// component options: START
-The Restlet component supports 21 options which are listed below.
+The Restlet component supports 22 options which are listed below.
@@ -88,6 +88,7 @@ The Restlet component supports 21 options which are listed below.
| **port** (consumer) | To configure the port number for the restlet consumer routes. This allows to configure this once to reuse the same port for these consumers. | | int
| **synchronous** (producer) | Whether to use synchronous Restlet Client for the producer. Setting this option to true can yield faster performance as it seems the Restlet synchronous Client works better. | | Boolean
| **enabledConverters** (advanced) | A list of converters to enable as full class name or simple class name. All the converters automatically registered are enabled if empty or null | | List
+| **useGlobalSslContext Parameters** (security) | Enable usage of global SSL context parameters. | false | boolean
| **headerFilterStrategy** (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. | | HeaderFilterStrategy
| **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
|=======================================================================
http://git-wip-us.apache.org/repos/asf/camel/blob/6cfdf421/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc b/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc
index 2091745..c950e34 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc
@@ -470,7 +470,7 @@ link:salesforce.html[Salesforce].
// component options: START
-The Salesforce component supports 26 options which are listed below.
+The Salesforce component supports 27 options which are listed below.
@@ -490,6 +490,7 @@ The Salesforce component supports 26 options which are listed below.
| **config** (common) | Global endpoint configuration - use to set values that are common to all endpoints | | SalesforceEndpoint Config
| **httpClientProperties** (common) | Used to set any properties that can be configured on the underlying HTTP client. Have a look at properties of SalesforceHttpClient and the Jetty HttpClient for all available options. | | Map
| **sslContextParameters** (security) | SSL parameters to use see SSLContextParameters class for all available options. | | SSLContextParameters
+| **useGlobalSslContext Parameters** (security) | Enable usage of global SSL context parameters | false | boolean
| **httpProxyHost** (proxy) | Hostname of the HTTP proxy server to use. | | String
| **httpProxyPort** (proxy) | Port number of the HTTP proxy server to use. | | Integer
| **httpProxyUsername** (security) | Username to use to authenticate against the HTTP proxy server. | | String
http://git-wip-us.apache.org/repos/asf/camel/blob/6cfdf421/components/camel-servicenow/src/main/docs/servicenow-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-servicenow/src/main/docs/servicenow-component.adoc b/components/camel-servicenow/src/main/docs/servicenow-component.adoc
index 4355b66..b946415 100644
--- a/components/camel-servicenow/src/main/docs/servicenow-component.adoc
+++ b/components/camel-servicenow/src/main/docs/servicenow-component.adoc
@@ -30,7 +30,7 @@ for this component:
// component options: START
-The ServiceNow component supports 8 options which are listed below.
+The ServiceNow component supports 9 options which are listed below.
@@ -44,6 +44,7 @@ The ServiceNow component supports 8 options which are listed below.
| **oauthClientId** (security) | OAuth2 ClientID | | String
| **oauthClientSecret** (security) | OAuth2 ClientSecret | | String
| **oauthTokenUrl** (security) | OAuth token Url | | String
+| **useGlobalSslContext Parameters** (security) | Enable usage of global SSL context parameters. | false | boolean
| **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
@@ -64,7 +65,7 @@ with the following path and query parameters:
| **instanceName** | *Required* The ServiceNow instance name | | String
|=======================================================================
-#### Query Parameters (41 parameters):
+#### Query Parameters (40 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|=======================================================================
@@ -108,7 +109,6 @@ with the following path and query parameters:
| **proxyPassword** (security) | Password for proxy authentication | | String
| **proxyUserName** (security) | Username for proxy authentication | | String
| **sslContextParameters** (security) | To configure security using SSLContextParameters. See http://camel.apache.org/camel-configuration-utilities.html | | SSLContextParameters
-| **useGlobalSslContext Parameters** (security) | Enable usage of Camel global SSL configuration. | false | boolean
| **userName** (security) | *Required* ServiceNow user account name MUST be provided | | String
|=======================================================================
// endpoint options: END
http://git-wip-us.apache.org/repos/asf/camel/blob/6cfdf421/components/camel-spring-ws/src/main/docs/spring-ws-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-spring-ws/src/main/docs/spring-ws-component.adoc b/components/camel-spring-ws/src/main/docs/spring-ws-component.adoc
index 2a671a6..75761cd 100644
--- a/components/camel-spring-ws/src/main/docs/spring-ws-component.adoc
+++ b/components/camel-spring-ws/src/main/docs/spring-ws-component.adoc
@@ -81,7 +81,16 @@ You can append query *options* to the URI in the following format,
// component options: START
-The Spring WebService component has no options.
+The Spring WebService component supports 2 options which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|=======================================================================
+| Name | Description | Default | Type
+| **useGlobalSslContext Parameters** (security) | Enable usage of global SSL context parameters. | false | boolean
+| **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
http://git-wip-us.apache.org/repos/asf/camel/blob/6cfdf421/components/camel-stomp/src/main/docs/stomp-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-stomp/src/main/docs/stomp-component.adoc b/components/camel-stomp/src/main/docs/stomp-component.adoc
index 6ad7c7a..d1e735a 100644
--- a/components/camel-stomp/src/main/docs/stomp-component.adoc
+++ b/components/camel-stomp/src/main/docs/stomp-component.adoc
@@ -34,7 +34,7 @@ Where *destination* is the name of the queue.
// component options: START
-The Stomp component supports 6 options which are listed below.
+The Stomp component supports 7 options which are listed below.
@@ -46,6 +46,7 @@ The Stomp component supports 6 options which are listed below.
| **login** (security) | The username | | String
| **passcode** (security) | The password | | String
| **host** (common) | The virtual host | | String
+| **useGlobalSslContext Parameters** (security) | Enable usage of global SSL context parameters. | false | boolean
| **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
http://git-wip-us.apache.org/repos/asf/camel/blob/6cfdf421/components/camel-undertow/src/main/docs/undertow-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-undertow/src/main/docs/undertow-component.adoc b/components/camel-undertow/src/main/docs/undertow-component.adoc
index 0ce11fc..cf5883f 100644
--- a/components/camel-undertow/src/main/docs/undertow-component.adoc
+++ b/components/camel-undertow/src/main/docs/undertow-component.adoc
@@ -38,7 +38,7 @@ You can append query options to the URI in the following format,
// component options: START
-The Undertow component supports 4 options which are listed below.
+The Undertow component supports 5 options which are listed below.
@@ -47,6 +47,7 @@ The Undertow component supports 4 options which are listed below.
| Name | Description | Default | Type
| **undertowHttpBinding** (advanced) | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. | | UndertowHttpBinding
| **sslContextParameters** (security) | To configure security using SSLContextParameters | | SSLContextParameters
+| **useGlobalSslContext Parameters** (security) | Enable usage of global SSL context parameters. | false | boolean
| **hostOptions** (advanced) | To configure common options such as thread pools | | UndertowHostOptions
| **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
|=======================================================================
http://git-wip-us.apache.org/repos/asf/camel/blob/6cfdf421/components/camel-websocket/src/main/docs/websocket-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-websocket/src/main/docs/websocket-component.adoc b/components/camel-websocket/src/main/docs/websocket-component.adoc
index 6091347..0183e35 100644
--- a/components/camel-websocket/src/main/docs/websocket-component.adoc
+++ b/components/camel-websocket/src/main/docs/websocket-component.adoc
@@ -50,7 +50,7 @@ The Jetty Websocket component supports 14 options which are listed below.
| **maxThreads** (advanced) | To set a value for maximum number of threads in server thread pool. MaxThreads/minThreads or threadPool fields are required due to switch to Jetty9. The default values for maxThreads is 1 2 noCores. | | Integer
| **threadPool** (advanced) | To use a custom thread pool for the server. MaxThreads/minThreads or threadPool fields are required due to switch to Jetty9. | | ThreadPool
| **sslContextParameters** (security) | To configure security using SSLContextParameters | | SSLContextParameters
-| **useGlobalSslContext Parameters** (security) | Enable usage of Camel global SSL context parameters | true | boolean
+| **useGlobalSslContext Parameters** (security) | Enable usage of global SSL context parameters. | false | boolean
| **socketFactory** (common) | To configure a map which contains custom WebSocketFactory for sub protocols. The key in the map is the sub protocol. The default key is reserved for the default implementation. | | Map
| **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
|=======================================================================
@@ -82,7 +82,7 @@ with the following path and query parameters:
| **resourceUri** | *Required* Name of the websocket channel to use | | String
|=======================================================================
-#### Query Parameters (19 parameters):
+#### Query Parameters (18 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|=======================================================================
@@ -105,7 +105,6 @@ with the following path and query parameters:
| **filterPath** (cors) | Context path for filtering CORS | | String
| **enableJmx** (monitoring) | If this option is true Jetty JMX support will be enabled for this endpoint. See Jetty JMX support for more details. | false | boolean
| **sslContextParameters** (security) | To configure security using SSLContextParameters | | SSLContextParameters
-| **useGlobalSslContext Parameters** (security) | Enable usage of Camel global SSL context parameters | true | boolean
|=======================================================================
// endpoint options: END
http://git-wip-us.apache.org/repos/asf/camel/blob/6cfdf421/platforms/spring-boot/components-starter/camel-ahc-starter/src/main/java/org/apache/camel/component/ahc/springboot/AhcComponentConfiguration.java
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/components-starter/camel-ahc-starter/src/main/java/org/apache/camel/component/ahc/springboot/AhcComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-ahc-starter/src/main/java/org/apache/camel/component/ahc/springboot/AhcComponentConfiguration.java
index 73d3941..d48437f 100644
--- a/platforms/spring-boot/components-starter/camel-ahc-starter/src/main/java/org/apache/camel/component/ahc/springboot/AhcComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-ahc-starter/src/main/java/org/apache/camel/component/ahc/springboot/AhcComponentConfiguration.java
@@ -66,6 +66,10 @@ public class AhcComponentConfiguration {
*/
private Boolean allowJavaSerializedObject = false;
/**
+ * Enable usage of global SSL context parameters.
+ */
+ private Boolean useGlobalSslContextParameters = false;
+ /**
* To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter
* header to and from Camel message.
*/
@@ -119,6 +123,15 @@ public class AhcComponentConfiguration {
this.allowJavaSerializedObject = allowJavaSerializedObject;
}
+ public Boolean getUseGlobalSslContextParameters() {
+ return useGlobalSslContextParameters;
+ }
+
+ public void setUseGlobalSslContextParameters(
+ Boolean useGlobalSslContextParameters) {
+ this.useGlobalSslContextParameters = useGlobalSslContextParameters;
+ }
+
public HeaderFilterStrategy getHeaderFilterStrategy() {
return headerFilterStrategy;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/6cfdf421/platforms/spring-boot/components-starter/camel-ahc-ws-starter/src/main/java/org/apache/camel/component/ahc/ws/springboot/WsComponentConfiguration.java
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/components-starter/camel-ahc-ws-starter/src/main/java/org/apache/camel/component/ahc/ws/springboot/WsComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-ahc-ws-starter/src/main/java/org/apache/camel/component/ahc/ws/springboot/WsComponentConfiguration.java
index 15fb8db..160a961 100644
--- a/platforms/spring-boot/components-starter/camel-ahc-ws-starter/src/main/java/org/apache/camel/component/ahc/ws/springboot/WsComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-ahc-ws-starter/src/main/java/org/apache/camel/component/ahc/ws/springboot/WsComponentConfiguration.java
@@ -66,6 +66,10 @@ public class WsComponentConfiguration {
*/
private Boolean allowJavaSerializedObject = false;
/**
+ * Enable usage of global SSL context parameters.
+ */
+ private Boolean useGlobalSslContextParameters = false;
+ /**
* To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter
* header to and from Camel message.
*/
@@ -119,6 +123,15 @@ public class WsComponentConfiguration {
this.allowJavaSerializedObject = allowJavaSerializedObject;
}
+ public Boolean getUseGlobalSslContextParameters() {
+ return useGlobalSslContextParameters;
+ }
+
+ public void setUseGlobalSslContextParameters(
+ Boolean useGlobalSslContextParameters) {
+ this.useGlobalSslContextParameters = useGlobalSslContextParameters;
+ }
+
public HeaderFilterStrategy getHeaderFilterStrategy() {
return headerFilterStrategy;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/6cfdf421/platforms/spring-boot/components-starter/camel-cometd-starter/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentConfiguration.java
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/components-starter/camel-cometd-starter/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-cometd-starter/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentConfiguration.java
index 50c8f20..eacf933 100644
--- a/platforms/spring-boot/components-starter/camel-cometd-starter/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-cometd-starter/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentConfiguration.java
@@ -60,6 +60,10 @@ public class CometdComponentConfiguration {
@NestedConfigurationProperty
private SSLContextParameters sslContextParameters;
/**
+ * Enable usage of global SSL context parameters.
+ */
+ private Boolean useGlobalSslContextParameters = false;
+ /**
* Whether the component should resolve property placeholders on itself when
* starting. Only properties which are of String type can use property
* placeholders.
@@ -115,6 +119,15 @@ public class CometdComponentConfiguration {
this.sslContextParameters = sslContextParameters;
}
+ public Boolean getUseGlobalSslContextParameters() {
+ return useGlobalSslContextParameters;
+ }
+
+ public void setUseGlobalSslContextParameters(
+ Boolean useGlobalSslContextParameters) {
+ this.useGlobalSslContextParameters = useGlobalSslContextParameters;
+ }
+
public Boolean getResolvePropertyPlaceholders() {
return resolvePropertyPlaceholders;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/6cfdf421/platforms/spring-boot/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/ConsulComponentConfiguration.java
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/ConsulComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/ConsulComponentConfiguration.java
index fe3b8c5..9e8b957 100644
--- a/platforms/spring-boot/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/ConsulComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/ConsulComponentConfiguration.java
@@ -49,6 +49,10 @@ public class ConsulComponentConfiguration {
@NestedConfigurationProperty
private SSLContextParameters sslContextParameters;
/**
+ * Enable usage of global SSL context parameters.
+ */
+ private Boolean useGlobalSslContextParameters = false;
+ /**
* Sets the ACL token to be used with Consul
*/
private String aclToken;
@@ -96,6 +100,15 @@ public class ConsulComponentConfiguration {
this.sslContextParameters = sslContextParameters;
}
+ public Boolean getUseGlobalSslContextParameters() {
+ return useGlobalSslContextParameters;
+ }
+
+ public void setUseGlobalSslContextParameters(
+ Boolean useGlobalSslContextParameters) {
+ this.useGlobalSslContextParameters = useGlobalSslContextParameters;
+ }
+
public String getAclToken() {
return aclToken;
}
@@ -179,10 +192,6 @@ public class ConsulComponentConfiguration {
@NestedConfigurationProperty
private SSLContextParameters sslContextParameters;
/**
- * Enable usage of Camel global SSL configuration
- */
- private Boolean useGlobalSslContextParameters;
- /**
* Sets the ACL token to be used with Consul
*/
private String aclToken;
@@ -313,15 +322,6 @@ public class ConsulComponentConfiguration {
this.sslContextParameters = sslContextParameters;
}
- public Boolean getUseGlobalSslContextParameters() {
- return useGlobalSslContextParameters;
- }
-
- public void setUseGlobalSslContextParameters(
- Boolean useGlobalSslContextParameters) {
- this.useGlobalSslContextParameters = useGlobalSslContextParameters;
- }
-
public String getAclToken() {
return aclToken;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/6cfdf421/platforms/spring-boot/components-starter/camel-cxf-starter/src/main/java/org/apache/camel/component/cxf/jaxrs/springboot/CxfRsComponentConfiguration.java
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/components-starter/camel-cxf-starter/src/main/java/org/apache/camel/component/cxf/jaxrs/springboot/CxfRsComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-cxf-starter/src/main/java/org/apache/camel/component/cxf/jaxrs/springboot/CxfRsComponentConfiguration.java
index 3305416..3667f87 100644
--- a/platforms/spring-boot/components-starter/camel-cxf-starter/src/main/java/org/apache/camel/component/cxf/jaxrs/springboot/CxfRsComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-cxf-starter/src/main/java/org/apache/camel/component/cxf/jaxrs/springboot/CxfRsComponentConfiguration.java
@@ -29,6 +29,10 @@ import org.springframework.boot.context.properties.NestedConfigurationProperty;
public class CxfRsComponentConfiguration {
/**
+ * Enable usage of global SSL context parameters.
+ */
+ private Boolean useGlobalSslContextParameters = false;
+ /**
* To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter
* header to and from Camel message.
*/
@@ -41,6 +45,15 @@ public class CxfRsComponentConfiguration {
*/
private Boolean resolvePropertyPlaceholders = true;
+ public Boolean getUseGlobalSslContextParameters() {
+ return useGlobalSslContextParameters;
+ }
+
+ public void setUseGlobalSslContextParameters(
+ Boolean useGlobalSslContextParameters) {
+ this.useGlobalSslContextParameters = useGlobalSslContextParameters;
+ }
+
public HeaderFilterStrategy getHeaderFilterStrategy() {
return headerFilterStrategy;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/6cfdf421/platforms/spring-boot/components-starter/camel-cxf-starter/src/main/java/org/apache/camel/component/cxf/springboot/CxfComponentConfiguration.java
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/components-starter/camel-cxf-starter/src/main/java/org/apache/camel/component/cxf/springboot/CxfComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-cxf-starter/src/main/java/org/apache/camel/component/cxf/springboot/CxfComponentConfiguration.java
index 3e44ebf..740acf0 100644
--- a/platforms/spring-boot/components-starter/camel-cxf-starter/src/main/java/org/apache/camel/component/cxf/springboot/CxfComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-cxf-starter/src/main/java/org/apache/camel/component/cxf/springboot/CxfComponentConfiguration.java
@@ -36,6 +36,10 @@ public class CxfComponentConfiguration {
*/
private Boolean allowStreaming;
/**
+ * Enable usage of global SSL context parameters.
+ */
+ private Boolean useGlobalSslContextParameters = false;
+ /**
* To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter
* header to and from Camel message.
*/
@@ -56,6 +60,15 @@ public class CxfComponentConfiguration {
this.allowStreaming = allowStreaming;
}
+ public Boolean getUseGlobalSslContextParameters() {
+ return useGlobalSslContextParameters;
+ }
+
+ public void setUseGlobalSslContextParameters(
+ Boolean useGlobalSslContextParameters) {
+ this.useGlobalSslContextParameters = useGlobalSslContextParameters;
+ }
+
public HeaderFilterStrategy getHeaderFilterStrategy() {
return headerFilterStrategy;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/6cfdf421/platforms/spring-boot/components-starter/camel-etcd-starter/src/main/java/org/apache/camel/component/etcd/springboot/EtcdComponentConfiguration.java
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/components-starter/camel-etcd-starter/src/main/java/org/apache/camel/component/etcd/springboot/EtcdComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-etcd-starter/src/main/java/org/apache/camel/component/etcd/springboot/EtcdComponentConfiguration.java
index 6fddc14..0e2cbdb 100644
--- a/platforms/spring-boot/components-starter/camel-etcd-starter/src/main/java/org/apache/camel/component/etcd/springboot/EtcdComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-etcd-starter/src/main/java/org/apache/camel/component/etcd/springboot/EtcdComponentConfiguration.java
@@ -52,6 +52,10 @@ public class EtcdComponentConfiguration {
*/
private EtcdConfigurationNestedConfiguration configuration;
/**
+ * Enable usage of global SSL context parameters.
+ */
+ private Boolean useGlobalSslContextParameters = false;
+ /**
* Whether the component should resolve property placeholders on itself when
* starting. Only properties which are of String type can use property
* placeholders.
@@ -100,6 +104,15 @@ public class EtcdComponentConfiguration {
this.configuration = configuration;
}
+ public Boolean getUseGlobalSslContextParameters() {
+ return useGlobalSslContextParameters;
+ }
+
+ public void setUseGlobalSslContextParameters(
+ Boolean useGlobalSslContextParameters) {
+ this.useGlobalSslContextParameters = useGlobalSslContextParameters;
+ }
+
public Boolean getResolvePropertyPlaceholders() {
return resolvePropertyPlaceholders;
}
@@ -122,10 +135,6 @@ public class EtcdComponentConfiguration {
@NestedConfigurationProperty
private SSLContextParameters sslContextParameters;
/**
- * Enable usage of Camel global SSL parameters.
- */
- private Boolean useGlobalSslContextParameters = false;
- /**
* The user name to use for basic authentication.
*/
private String userName;
@@ -183,15 +192,6 @@ public class EtcdComponentConfiguration {
this.sslContextParameters = sslContextParameters;
}
- public Boolean getUseGlobalSslContextParameters() {
- return useGlobalSslContextParameters;
- }
-
- public void setUseGlobalSslContextParameters(
- Boolean useGlobalSslContextParameters) {
- this.useGlobalSslContextParameters = useGlobalSslContextParameters;
- }
-
public String getUserName() {
return userName;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/6cfdf421/platforms/spring-boot/components-starter/camel-ftp-starter/src/main/java/org/apache/camel/component/file/remote/springboot/FtpsComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/components-starter/camel-ftp-starter/src/main/java/org/apache/camel/component/file/remote/springboot/FtpsComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-ftp-starter/src/main/java/org/apache/camel/component/file/remote/springboot/FtpsComponentAutoConfiguration.java
index 1339272..731b91b 100644
--- a/platforms/spring-boot/components-starter/camel-ftp-starter/src/main/java/org/apache/camel/component/file/remote/springboot/FtpsComponentAutoConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-ftp-starter/src/main/java/org/apache/camel/component/file/remote/springboot/FtpsComponentAutoConfiguration.java
@@ -16,8 +16,11 @@
*/
package org.apache.camel.component.file.remote.springboot;
+import java.util.HashMap;
+import java.util.Map;
import org.apache.camel.CamelContext;
import org.apache.camel.component.file.remote.FtpsComponent;
+import org.apache.camel.util.IntrospectionSupport;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionMessage;
import org.springframework.boot.autoconfigure.condition.ConditionOutcome;
@@ -26,6 +29,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.SpringBootCondition;
import org.springframework.boot.bind.RelaxedPropertyResolver;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ConditionContext;
import org.springframework.context.annotation.Conditional;
@@ -40,16 +44,42 @@ import org.springframework.core.type.AnnotatedTypeMetadata;
@ConditionalOnBean(type = "org.apache.camel.spring.boot.CamelAutoConfiguration")
@Conditional(FtpsComponentAutoConfiguration.Condition.class)
@AutoConfigureAfter(name = "org.apache.camel.spring.boot.CamelAutoConfiguration")
+@EnableConfigurationProperties(FtpsComponentConfiguration.class)
public class FtpsComponentAutoConfiguration {
@Lazy
@Bean(name = "ftps-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(FtpsComponent.class)
- public FtpsComponent configureFtpsComponent(CamelContext camelContext)
- throws Exception {
+ public FtpsComponent configureFtpsComponent(CamelContext camelContext,
+ FtpsComponentConfiguration configuration) throws Exception {
FtpsComponent component = new FtpsComponent();
component.setCamelContext(camelContext);
+ Map<String, Object> parameters = new HashMap<>();
+ IntrospectionSupport.getProperties(configuration, parameters, null,
+ false);
+ for (Map.Entry<String, Object> entry : parameters.entrySet()) {
+ Object value = entry.getValue();
+ Class<?> paramClass = value.getClass();
+ if (paramClass.getName().endsWith("NestedConfiguration")) {
+ Class nestedClass = null;
+ try {
+ nestedClass = (Class) paramClass.getDeclaredField(
+ "CAMEL_NESTED_CLASS").get(null);
+ HashMap<String, Object> nestedParameters = new HashMap<>();
+ IntrospectionSupport.getProperties(value, nestedParameters,
+ null, false);
+ Object nestedProperty = nestedClass.newInstance();
+ IntrospectionSupport.setProperties(camelContext,
+ camelContext.getTypeConverter(), nestedProperty,
+ nestedParameters);
+ entry.setValue(nestedProperty);
+ } catch (NoSuchFieldException e) {
+ }
+ }
+ }
+ IntrospectionSupport.setProperties(camelContext,
+ camelContext.getTypeConverter(), component, parameters);
return component;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/6cfdf421/platforms/spring-boot/components-starter/camel-ftp-starter/src/main/java/org/apache/camel/component/file/remote/springboot/FtpsComponentConfiguration.java
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/components-starter/camel-ftp-starter/src/main/java/org/apache/camel/component/file/remote/springboot/FtpsComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-ftp-starter/src/main/java/org/apache/camel/component/file/remote/springboot/FtpsComponentConfiguration.java
index 3173667..45a36e2 100644
--- a/platforms/spring-boot/components-starter/camel-ftp-starter/src/main/java/org/apache/camel/component/file/remote/springboot/FtpsComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-ftp-starter/src/main/java/org/apache/camel/component/file/remote/springboot/FtpsComponentConfiguration.java
@@ -28,12 +28,25 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
public class FtpsComponentConfiguration {
/**
+ * Enable usage of global SSL context parameters.
+ */
+ private Boolean useGlobalSslContextParameters = false;
+ /**
* Whether the component should resolve property placeholders on itself when
* starting. Only properties which are of String type can use property
* placeholders.
*/
private Boolean resolvePropertyPlaceholders = true;
+ public Boolean getUseGlobalSslContextParameters() {
+ return useGlobalSslContextParameters;
+ }
+
+ public void setUseGlobalSslContextParameters(
+ Boolean useGlobalSslContextParameters) {
+ this.useGlobalSslContextParameters = useGlobalSslContextParameters;
+ }
+
public Boolean getResolvePropertyPlaceholders() {
return resolvePropertyPlaceholders;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/6cfdf421/platforms/spring-boot/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentConfiguration.java
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentConfiguration.java
index e06efc2..02c86e8 100644
--- a/platforms/spring-boot/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentConfiguration.java
@@ -121,11 +121,11 @@ public class HttpComponentConfiguration {
this.allowJavaSerializedObject = allowJavaSerializedObject;
}
- public Boolean getUseGlobalSSLContextParameters() {
+ public Boolean getUseGlobalSslContextParameters() {
return useGlobalSslContextParameters;
}
- public void setUseGlobalSSLContextParameters(
+ public void setUseGlobalSslContextParameters(
Boolean useGlobalSslContextParameters) {
this.useGlobalSslContextParameters = useGlobalSslContextParameters;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/6cfdf421/platforms/spring-boot/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentSSLAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentSSLAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentSSLAutoConfiguration.java
index 40f4bca..2aec22e 100644
--- a/platforms/spring-boot/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentSSLAutoConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentSSLAutoConfiguration.java
@@ -62,7 +62,7 @@ public class HttpComponentSSLAutoConfiguration {
@Override
public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
try {
- if (config != null && config.getUseGlobalSSLContextParameters() != null && config.getUseGlobalSSLContextParameters()) {
+ if (config != null && config.getUseGlobalSslContextParameters() != null && config.getUseGlobalSslContextParameters()) {
SSLContextParameters globalSSLParams = context.getSSLContextParameters();
if (globalSSLParams != null) {
http://git-wip-us.apache.org/repos/asf/camel/blob/6cfdf421/platforms/spring-boot/components-starter/camel-http4-starter/src/main/java/org/apache/camel/component/http4/springboot/HttpComponentConfiguration.java
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/components-starter/camel-http4-starter/src/main/java/org/apache/camel/component/http4/springboot/HttpComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-http4-starter/src/main/java/org/apache/camel/component/http4/springboot/HttpComponentConfiguration.java
index 5bf2dac..d80edc8 100644
--- a/platforms/spring-boot/components-starter/camel-http4-starter/src/main/java/org/apache/camel/component/http4/springboot/HttpComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-http4-starter/src/main/java/org/apache/camel/component/http4/springboot/HttpComponentConfiguration.java
@@ -64,6 +64,10 @@ public class HttpComponentConfiguration {
@NestedConfigurationProperty
private SSLContextParameters sslContextParameters;
/**
+ * Enable usage of global SSL context parameters.
+ */
+ private Boolean useGlobalSslContextParameters = false;
+ /**
* To use a custom X509HostnameVerifier such as DefaultHostnameVerifier or
* org.apache.http.conn.ssl.NoopHostnameVerifier.
*/
@@ -157,6 +161,15 @@ public class HttpComponentConfiguration {
this.sslContextParameters = sslContextParameters;
}
+ public Boolean getUseGlobalSslContextParameters() {
+ return useGlobalSslContextParameters;
+ }
+
+ public void setUseGlobalSslContextParameters(
+ Boolean useGlobalSslContextParameters) {
+ this.useGlobalSslContextParameters = useGlobalSslContextParameters;
+ }
+
public HostnameVerifier getX509HostnameVerifier() {
return x509HostnameVerifier;
}