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-spring-boot.git
commit efae5522ee27164e7561efd59a82b1249e094656
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu Jan 23 09:28:35 2020 +0100
regen
---
.../springboot/catalog/components/iec60870-client.json | 1 +
.../springboot/catalog/components/iec60870-server.json | 1 +
.../camel/springboot/catalog/components/salesforce.json | 1 +
camel-spring-boot/src/main/docs/spring-boot.adoc | 5 +++--
components-starter/camel-corda-starter/pom.xml | 12 ------------
.../client/springboot/ClientComponentConfiguration.java | 13 +++++++++++++
.../springboot/SalesforceComponentConfiguration.java | 12 ++++++++++++
7 files changed, 31 insertions(+), 14 deletions(-)
diff --git
a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/iec60870-client.json
b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/iec60870-client.json
index 644922a..042bbe1 100644
---
a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/iec60870-client.json
+++
b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/iec60870-client.json
@@ -43,6 +43,7 @@
"timeout2": { "kind": "parameter", "displayName": "Timeout2", "group":
"connection", "label": "connection", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "secret": false, "defaultValue": 10000,
"configurationClass":
"org.apache.camel.component.iec60870.client.ClientOptions",
"configurationField": "connectionOptions", "description": "Timeout T2 in
milliseconds." },
"timeout3": { "kind": "parameter", "displayName": "Timeout3", "group":
"connection", "label": "connection", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "secret": false, "defaultValue": 20000,
"configurationClass":
"org.apache.camel.component.iec60870.client.ClientOptions",
"configurationField": "connectionOptions", "description": "Timeout T3 in
milliseconds." },
"causeSourceAddress": { "kind": "parameter", "displayName": "Cause Source
Address", "group": "data", "label": "data", "required": false, "type":
"integer", "javaType": "byte", "deprecated": false, "secret": false,
"configurationClass":
"org.apache.camel.component.iec60870.client.ClientOptions",
"configurationField": "connectionOptions", "description": "Whether to include
the source address" },
+ "connectionTimeout": { "kind": "parameter", "displayName": "Connection
Timeout", "group": "data", "label": "data", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "secret": false,
"defaultValue": 10000, "configurationClass":
"org.apache.camel.component.iec60870.client.ClientOptions",
"configurationField": "connectionOptions", "description": "Timeout in millis to
wait for client to establish a connected connection." },
"ignoreBackgroundScan": { "kind": "parameter", "displayName": "Ignore
Background Scan", "group": "data", "label": "data", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": true, "configurationClass":
"org.apache.camel.component.iec60870.client.ClientOptions",
"configurationField": "connectionOptions", "description": "Whether background
scan transmissions should be ignored." },
"ignoreDaylightSavingTime": { "kind": "parameter", "displayName": "Ignore
Daylight Saving Time", "group": "data", "label": "data", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "configurationClass":
"org.apache.camel.component.iec60870.client.ClientOptions",
"configurationField": "connectionOptions", "description": "Whether to ignore or
respect DST" },
"timeZone": { "kind": "parameter", "displayName": "Time Zone", "group":
"data", "label": "data", "required": false, "type": "object", "javaType":
"java.util.TimeZone", "deprecated": false, "secret": false, "defaultValue":
"UTC", "configurationClass":
"org.apache.camel.component.iec60870.client.ClientOptions",
"configurationField": "connectionOptions", "description": "The timezone to use.
May be any Java time zone string" },
diff --git
a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/iec60870-server.json
b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/iec60870-server.json
index 2868306..6f2da11 100644
---
a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/iec60870-server.json
+++
b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/iec60870-server.json
@@ -44,6 +44,7 @@
"timeout2": { "kind": "parameter", "displayName": "Timeout2", "group":
"connection", "label": "connection", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "secret": false, "defaultValue": 10000,
"configurationClass":
"org.apache.camel.component.iec60870.client.ClientOptions",
"configurationField": "connectionOptions", "description": "Timeout T2 in
milliseconds." },
"timeout3": { "kind": "parameter", "displayName": "Timeout3", "group":
"connection", "label": "connection", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "secret": false, "defaultValue": 20000,
"configurationClass":
"org.apache.camel.component.iec60870.client.ClientOptions",
"configurationField": "connectionOptions", "description": "Timeout T3 in
milliseconds." },
"causeSourceAddress": { "kind": "parameter", "displayName": "Cause Source
Address", "group": "data", "label": "data", "required": false, "type":
"integer", "javaType": "byte", "deprecated": false, "secret": false,
"configurationClass":
"org.apache.camel.component.iec60870.client.ClientOptions",
"configurationField": "connectionOptions", "description": "Whether to include
the source address" },
+ "connectionTimeout": { "kind": "parameter", "displayName": "Connection
Timeout", "group": "data", "label": "data", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "secret": false,
"defaultValue": 10000, "configurationClass":
"org.apache.camel.component.iec60870.client.ClientOptions",
"configurationField": "connectionOptions", "description": "Timeout in millis to
wait for client to establish a connected connection." },
"ignoreBackgroundScan": { "kind": "parameter", "displayName": "Ignore
Background Scan", "group": "data", "label": "data", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": true, "configurationClass":
"org.apache.camel.component.iec60870.client.ClientOptions",
"configurationField": "connectionOptions", "description": "Whether background
scan transmissions should be ignored." },
"ignoreDaylightSavingTime": { "kind": "parameter", "displayName": "Ignore
Daylight Saving Time", "group": "data", "label": "data", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "configurationClass":
"org.apache.camel.component.iec60870.client.ClientOptions",
"configurationField": "connectionOptions", "description": "Whether to ignore or
respect DST" },
"timeZone": { "kind": "parameter", "displayName": "Time Zone", "group":
"data", "label": "data", "required": false, "type": "object", "javaType":
"java.util.TimeZone", "deprecated": false, "secret": false, "defaultValue":
"UTC", "configurationClass":
"org.apache.camel.component.iec60870.client.ClientOptions",
"configurationField": "connectionOptions", "description": "The timezone to use.
May be any Java time zone string" },
diff --git
a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/salesforce.json
b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/salesforce.json
index c758482..a60d79a 100644
---
a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/salesforce.json
+++
b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/salesforce.json
@@ -38,6 +38,7 @@
"useGlobalSslContextParameters": { "kind": "property", "displayName": "Use
Global Ssl Context Parameters", "group": "security", "label": "security",
"required": false, "type": "boolean", "javaType": "boolean", "deprecated":
false, "secret": false, "defaultValue": false, "description": "Enable usage of
global SSL context parameters" },
"httpClientIdleTimeout": { "kind": "property", "displayName": "Http Client
Idle Timeout", "group": "common", "label": "common", "required": false, "type":
"integer", "javaType": "long", "deprecated": false, "secret": false,
"defaultValue": 10000, "description": "Timeout used by the HttpClient when
waiting for response from the Salesforce server." },
"httpClientConnectionTimeout": { "kind": "property", "displayName": "Http
Client Connection Timeout", "group": "common", "label": "common", "required":
false, "type": "integer", "javaType": "long", "deprecated": false, "secret":
false, "defaultValue": 60000, "description": "Connection timeout used by the
HttpClient when connecting to the Salesforce server." },
+ "httpMaxContentLength": { "kind": "property", "displayName": "Http Max
Content Length", "group": "common", "label": "common", "required": false,
"type": "integer", "javaType": "java.lang.Integer", "deprecated": false,
"secret": false, "description": "Max content length of an HTTP response." },
"httpProxyHost": { "kind": "property", "displayName": "Http Proxy Host",
"group": "proxy", "label": "common,proxy", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "secret": false,
"description": "Hostname of the HTTP proxy server to use." },
"httpProxyPort": { "kind": "property", "displayName": "Http Proxy Port",
"group": "proxy", "label": "common,proxy", "required": false, "type":
"integer", "javaType": "java.lang.Integer", "deprecated": false, "secret":
false, "description": "Port number of the HTTP proxy server to use." },
"httpProxyUsername": { "kind": "property", "displayName": "Http Proxy
Username", "group": "security", "label": "common,proxy,security", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"secret": false, "description": "Username to use to authenticate against the
HTTP proxy server." },
diff --git a/camel-spring-boot/src/main/docs/spring-boot.adoc
b/camel-spring-boot/src/main/docs/spring-boot.adoc
index 30402bc..0ff74c6 100644
--- a/camel-spring-boot/src/main/docs/spring-boot.adoc
+++ b/camel-spring-boot/src/main/docs/spring-boot.adoc
@@ -89,7 +89,7 @@ When using Spring Boot make sure to use the following Maven
dependency to have s
----
-The component supports 143 options, which are listed below.
+The component supports 144 options, which are listed below.
@@ -168,6 +168,7 @@ The component supports 143 options, which are listed below.
| *camel.springboot.endpoint-runtime-statistics-enabled* | Sets whether
endpoint runtime statistics is enabled (gathers runtime usage of each incoming
and outgoing endpoints). The default value is false. | false | Boolean
| *camel.springboot.file-configurations* | Directory to load additional
configuration files that contains configuration values that takes precedence
over any other configuration. This can be used to refer to files that may have
secret configuration that has been mounted on the file system for containers.
You must use either file: or classpath: as prefix to load from file system or
classpath. Then you can specify a pattern to load from sub directories and a
name pattern such as file:/var/ [...]
| *camel.springboot.include-non-singletons* | Whether to include non-singleton
beans (prototypes) when scanning for RouteBuilder instances. By default only
singleton beans is included in the context scan. | false | Boolean
+| *camel.springboot.inflight-repository-exchange-enabled* | Sets whether the
inflight repository should track each inflight exchange. This is by default
disabled as there is a very slight performance overhead when enabled. | false |
Boolean
| *camel.springboot.java-routes-exclude-pattern* | Used for exclusive
filtering component scanning of RouteBuilder classes with @Component
annotation. The exclusive filtering takes precedence over inclusive filtering.
The pattern is using Ant-path style pattern. Multiple patterns can be specified
separated by comma. For example to exclude all classes starting with Bar use:
**/Bar* To exclude all routes form a specific package use:
com/mycompany/bar/* To exclude all routes [...]
| *camel.springboot.java-routes-include-pattern* | Used for inclusive
filtering component scanning of RouteBuilder classes with @Component
annotation. The exclusive filtering takes precedence over inclusive filtering.
The pattern is using Ant-path style pattern. Multiple patterns can be specified
separated by comma. For example to include all classes starting with Foo use:
**/Foo* To include all routes form a specific package use:
com/mycompany/foo/* To include all routes for [...]
| *camel.springboot.jmx-create-connector* | Whether JMX connector is created,
allowing clients to connect remotely The default value is false. | false |
Boolean
@@ -186,7 +187,7 @@ The component supports 143 options, which are listed below.
| *camel.springboot.route-filter-exclude-pattern* | Used for filtering routes
routes matching the given pattern, which follows the following rules: - Match
by route id - Match by route input endpoint uri The matching is using exact
match, by wildcard and regular expression. For example to only include routes
which starts with foo in their route id's, use: include=foo* And to exclude
routes which starts from JMS endpoints, use: exclude=jms:* Multiple
patterns can be separated by c [...]
| *camel.springboot.route-filter-include-pattern* | Used for filtering routes
routes matching the given pattern, which follows the following rules: - Match
by route id - Match by route input endpoint uri The matching is using exact
match, by wildcard and regular expression. For example to only include routes
which starts with foo in their route id's, use: include=foo* And to exclude
routes which starts from JMS endpoints, use: exclude=jms:* Multiple
patterns can be separated by c [...]
| *camel.springboot.routes-collector-enabled* | Whether the routes collector
is enabled or not. When enabled Camel will auto-discover routes (RouteBuilder
instances from the registry and also load additional XML routes from the file
system. The routes collector is default enabled. | true | Boolean
-| *camel.springboot.shutdown-log-inflight-exchanges-on-timeout* | Sets whether
to log information about the inflight Exchanges which are still running during
a shutdown which didn't complete without the given timeout. | true | Boolean
+| *camel.springboot.shutdown-log-inflight-exchanges-on-timeout* | Sets whether
to log information about the inflight Exchanges which are still running during
a shutdown which didn't complete without the given timeout. This requires to
enable the option inflightRepositoryExchangeEnabled. | true | Boolean
| *camel.springboot.shutdown-now-on-timeout* | Sets whether to force shutdown
of all consumers when a timeout occurred and thus not all consumers was
shutdown within that period. You should have good reasons to set this option to
false as it means that the routes keep running and is halted abruptly when
CamelContext has been shutdown. | true | Boolean
| *camel.springboot.shutdown-routes-in-reverse-order* | Sets whether routes
should be shutdown in reverse or the same order as they where started. | true |
Boolean
| *camel.springboot.shutdown-suppress-logging-on-timeout* | Whether Camel
should try to suppress logging during shutdown and timeout was triggered,
meaning forced shutdown is happening. And during forced shutdown we want to
avoid logging errors/warnings et all in the logs as a side-effect of the forced
timeout. Notice the suppress is a best effort as there may still be some logs
coming from 3rd party libraries and whatnot, which Camel cannot control. This
option is default false. | false [...]
diff --git a/components-starter/camel-corda-starter/pom.xml
b/components-starter/camel-corda-starter/pom.xml
index d834111..47eae69 100644
--- a/components-starter/camel-corda-starter/pom.xml
+++ b/components-starter/camel-corda-starter/pom.xml
@@ -38,18 +38,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-corda</artifactId>
<version>${camel-version}</version>
- <!--START OF GENERATED CODE-->
- <exclusions>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </exclusion>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
- </exclusion>
- </exclusions>
- <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git
a/components-starter/camel-iec60870-starter/src/main/java/org/apache/camel/component/iec60870/client/springboot/ClientComponentConfiguration.java
b/components-starter/camel-iec60870-starter/src/main/java/org/apache/camel/component/iec60870/client/springboot/ClientComponentConfiguration.java
index dac1dc0..d673e20 100644
---
a/components-starter/camel-iec60870-starter/src/main/java/org/apache/camel/component/iec60870/client/springboot/ClientComponentConfiguration.java
+++
b/components-starter/camel-iec60870-starter/src/main/java/org/apache/camel/component/iec60870/client/springboot/ClientComponentConfiguration.java
@@ -109,6 +109,11 @@ public class ClientComponentConfiguration
*/
private Byte causeSourceAddress;
/**
+ * Timeout in millis to wait for client to establish a connected
+ * connection.
+ */
+ private Integer connectionTimeout = 10000;
+ /**
* Data module options
*/
private DataModuleOptions dataModuleOptions;
@@ -125,6 +130,14 @@ public class ClientComponentConfiguration
this.causeSourceAddress = causeSourceAddress;
}
+ public Integer getConnectionTimeout() {
+ return connectionTimeout;
+ }
+
+ public void setConnectionTimeout(Integer connectionTimeout) {
+ this.connectionTimeout = connectionTimeout;
+ }
+
public DataModuleOptions getDataModuleOptions() {
return dataModuleOptions;
}
diff --git
a/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java
b/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java
index 0b2e3c0..056b98c 100644
---
a/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java
+++
b/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java
@@ -163,6 +163,10 @@ public class SalesforceComponentConfiguration
*/
private Long httpClientConnectionTimeout = 60000L;
/**
+ * Max content length of an HTTP response.
+ */
+ private Integer httpMaxContentLength;
+ /**
* Hostname of the HTTP proxy server to use.
*/
private String httpProxyHost;
@@ -390,6 +394,14 @@ public class SalesforceComponentConfiguration
this.httpClientConnectionTimeout = httpClientConnectionTimeout;
}
+ public Integer getHttpMaxContentLength() {
+ return httpMaxContentLength;
+ }
+
+ public void setHttpMaxContentLength(Integer httpMaxContentLength) {
+ this.httpMaxContentLength = httpMaxContentLength;
+ }
+
public String getHttpProxyHost() {
return httpProxyHost;
}
