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 911e489 Regen
911e489 is described below
commit 911e489779ff6341a632e01b8642c7ee596cb008
Author: Claus Ibsen <[email protected]>
AuthorDate: Sun Aug 25 15:58:44 2019 +0200
Regen
---
.../modules/ROOT/pages/microprofile-metrics-component.adoc | 8 ++++----
docs/components/modules/ROOT/pages/properties-component.adoc | 6 ++----
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git
a/docs/components/modules/ROOT/pages/microprofile-metrics-component.adoc
b/docs/components/modules/ROOT/pages/microprofile-metrics-component.adoc
index d03cb35..93eb1aa 100644
--- a/docs/components/modules/ROOT/pages/microprofile-metrics-component.adoc
+++ b/docs/components/modules/ROOT/pages/microprofile-metrics-component.adoc
@@ -45,12 +45,12 @@ The MicroProfile Metrics component supports 2 options,
which are listed below.
The MicroProfile Metrics endpoint is configured using URI syntax:
----
-microprofile-metrics:metricsType:metricsName
+microprofile-metrics:metricType:metricsName
----
with the following path and query parameters:
-=== Path Parameters (3 parameters):
+=== Path Parameters (2 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -58,11 +58,10 @@ with the following path and query parameters:
| Name | Description | Default | Type
| *metricType* | *Required* Metric type | | MetricType
| *metricName* | *Required* Metric name | | String
-| *tags* | Comma delimited list of tags associated with the metric in the
format tagName=tagValue | | List
|===
-=== Query Parameters (12 parameters):
+=== Query Parameters (13 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -77,6 +76,7 @@ with the following path and query parameters:
| *lazyStartProducer* (producer) | Whether the producer should be started lazy
(on the first message). By starting lazy you can use this to allow CamelContext
and routes to startup in situations where a producer may otherwise fail during
starting and cause the route to fail being started. By deferring this startup
to be lazy then the startup failure can be handled during routing messages via
Camel's routing error handlers. Beware that when the first message is processed
then creating and [...]
| *mark* (producer) | The mark value to set when using the Meter metric type |
| Long
| *metricUnit* (producer) | Sets a metric unit within the metric metadata | |
String
+| *tags* (producer) | Comma delimited list of tags associated with the metric
in the format tagName=tagValue | | String
| *value* (producer) | The value to set when using the Histogram metric type |
| Long
| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic
property binding (Camel 2.x) or the newer property binding with additional
capabilities | false | boolean
| *synchronous* (advanced) | Sets whether synchronous processing should be
strictly used, or Camel is allowed to use asynchronous processing (if
supported). | false | boolean
diff --git a/docs/components/modules/ROOT/pages/properties-component.adoc
b/docs/components/modules/ROOT/pages/properties-component.adoc
index 2b9fcdd..8fe3a5f 100644
--- a/docs/components/modules/ROOT/pages/properties-component.adoc
+++ b/docs/components/modules/ROOT/pages/properties-component.adoc
@@ -15,14 +15,13 @@ Where *key* is the key for the property to lookup
== Options
// component options: START
-The Properties component supports 12 options, which are listed below.
+The Properties component supports 11 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *locations* (common) | A list of locations to load properties. This option
will override any default locations and only use the locations from this
option. | | List
| *location* (common) | A list of locations to load properties. You can use
comma to separate multiple locations. This option will override any default
locations and only use the locations from this option. | | String
| *encoding* (common) | Encoding to use when loading properties file from the
file system or classpath. If no encoding has been set, then the properties
files is loaded using ISO-8859-1 encoding (latin-1) as documented by
java.util.Properties#load(java.io.InputStream) | | String
| *propertiesParser* (common) | To use a custom PropertiesParser | |
PropertiesParser
@@ -88,7 +87,7 @@ When using Spring Boot make sure to use the following Maven
dependency to have s
----
-The component supports 13 options, which are listed below.
+The component supports 12 options, which are listed below.
@@ -104,7 +103,6 @@ The component supports 13 options, which are listed below.
| *camel.component.properties.ignore-missing-location* | Whether to silently
ignore if a location cannot be located, such as a properties file not found. |
false | Boolean
| *camel.component.properties.initial-properties* | Sets initial properties
which will be used before any locations are resolved. The option is a
java.util.Properties type. | | String
| *camel.component.properties.location* | A list of locations to load
properties. You can use comma to separate multiple locations. This option will
override any default locations and only use the locations from this option. |
| String
-| *camel.component.properties.locations* | A list of locations to load
properties. This option will override any default locations and only use the
locations from this option. | | List
| *camel.component.properties.override-properties* | Sets a special list of
override properties that take precedence and will use first, if a property
exist. The option is a java.util.Properties type. | | String
| *camel.component.properties.properties-parser* | To use a custom
PropertiesParser. The option is a
org.apache.camel.component.properties.PropertiesParser type. | | String
| *camel.component.properties.system-properties-mode* | Sets the JVM system
property mode (0 = never, 1 = fallback, 2 = override). The default mode
(override) is to use system properties if present, and override any existing
properties. OS environment variable mode is checked before JVM system property
mode | 2 | Integer
