This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new c4e4d9e CAMEL-12702: Improved spring boot docs
c4e4d9e is described below
commit c4e4d9e78ecfd2eb7bc94d1702bc942cb73b4bcf
Author: Claus Ibsen <[email protected]>
AuthorDate: Wed Aug 1 14:44:53 2018 +0200
CAMEL-12702: Improved spring boot docs
---
components/camel-spring-boot/src/main/docs/spring-boot.adoc | 4 ++--
.../org/apache/camel/spring/boot/CamelConfigurationProperties.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/components/camel-spring-boot/src/main/docs/spring-boot.adoc
b/components/camel-spring-boot/src/main/docs/spring-boot.adoc
index 6cbf379..76db3ec 100644
--- a/components/camel-spring-boot/src/main/docs/spring-boot.adoc
+++ b/components/camel-spring-boot/src/main/docs/spring-boot.adoc
@@ -162,7 +162,7 @@ The component supports 139 options, which are listed below.
| *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 [...]
| *camel.springboot.shutdown-timeout* | Timeout in seconds to graceful
shutdown Camel. | 300 | Integer
-| *camel.springboot.stream-caching* | Sets whether stream caching is enabled
or not. Default is false. | false | Boolean
+| *camel.springboot.stream-caching* | Sets whether stream caching is enabled
or not (deprecated use stream-caching-enabled instead). Default is false. |
false | Boolean
| *camel.springboot.stream-caching-any-spool-rules* | Sets whether if just any
of the org.apache.camel.spi.StreamCachingStrategy.SpoolRule rules returns true
then shouldSpoolCache(long) returns true, to allow spooling to disk. If this
option is false, then all the
org.apache.camel.spi.StreamCachingStrategy.SpoolRule must return true. The
default value is false which means that all the rules must return true. | false
| Boolean
| *camel.springboot.stream-caching-buffer-size* | Sets the stream caching
buffer size to use when allocating in-memory buffers used for in-memory stream
caches. The default size is 4096. | 0 | Integer
| *camel.springboot.stream-caching-enabled* | Sets whether stream caching is
enabled or not. Default is false. | false | Boolean
@@ -192,7 +192,7 @@ The component supports 139 options, which are listed below.
| *camel.springboot.type-conversion* | Enables enhanced Camel/Spring type
conversion. | true | Boolean
| *camel.springboot.use-breadcrumb* | Set whether breadcrumb is enabled. The
default value is true. | true | Boolean
| *camel.springboot.use-data-type* | Whether to enable using data type on
Camel messages. Data type are automatic turned on if one ore more routes has
been explicit configured with input and output types. Otherwise data type is
default off. | false | Boolean
-| *camel.springboot.use-m-d-c-logging* | To turn on MDC logging | false |
Boolean
+| *camel.springboot.use-m-d-c-logging* | To turn on MDC logging (deprecated
use use-mdc-logging instead) | false | Boolean
| *camel.springboot.use-mdc-logging* | To turn on MDC logging | false | Boolean
| *camel.springboot.xml-rests* | Directory to scan for adding additional XML
rests. You can turn this off by setting the value to false. |
classpath:camel-rest/*.xml | String
| *camel.springboot.xml-routes* | Directory to scan for adding additional XML
routes. You can turn this off by setting the value to false. |
classpath:camel/*.xml | String
diff --git
a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java
b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java
index a37e4e6..1c0c862 100644
---
a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java
+++
b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java
@@ -192,7 +192,7 @@ public class CamelConfigurationProperties {
private int logDebugMaxChars;
/**
- * Sets whether stream caching is enabled or not.
+ * Sets whether stream caching is enabled or not (deprecated use
stream-caching-enabled instead).
*
* Default is false.
*/
@@ -435,7 +435,7 @@ public class CamelConfigurationProperties {
private Integer tracerFormatterMaxChars = 10000;
/**
- * To turn on MDC logging
+ * To turn on MDC logging (deprecated use use-mdc-logging instead)
*/
@Deprecated
private boolean useMDCLogging;
