You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/02/28 13:51:16 UTC
[camel] 06/11: CAMEL-13165 - Regen
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4c9957dd7067bdb43f850907bd527408027570ff
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Feb 28 14:02:24 2019 +0100
CAMEL-13165 - Regen
---
apache-camel/pom.xml | 8 +++----
.../src/main/docs/properties-component.adoc | 5 ++--
components/readme.adoc | 5 +++-
.../modules/ROOT/pages/properties-component.adoc | 27 ++++++++++++++++++----
4 files changed, 33 insertions(+), 12 deletions(-)
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 282838d..1070cac 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -195,12 +195,12 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-aws-msk</artifactId>
+ <artifactId>camel-aws-mq</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-aws-mq</artifactId>
+ <artifactId>camel-aws-msk</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -1679,12 +1679,12 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-aws-msk-starter</artifactId>
+ <artifactId>camel-aws-mq-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-aws-mq-starter</artifactId>
+ <artifactId>camel-aws-msk-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/components/camel-properties/src/main/docs/properties-component.adoc b/components/camel-properties/src/main/docs/properties-component.adoc
index cee28d9..2ec426e 100644
--- a/components/camel-properties/src/main/docs/properties-component.adoc
+++ b/components/camel-properties/src/main/docs/properties-component.adoc
@@ -94,7 +94,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
-The component supports 18 options, which are listed below.
+The component supports 19 options, which are listed below.
@@ -105,6 +105,7 @@ The component supports 18 options, which are listed below.
| *camel.component.properties.default-fallback-enabled* | If false, the component does not attempt to find a default for the key by looking after the colon separator. | true | Boolean
| *camel.component.properties.enabled* | Whether to enable auto configuration of the properties component. This is enabled by default. | | Boolean
| *camel.component.properties.encoding* | 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
+| *camel.component.properties.environment-variable-mode* | Sets the OS environment variables mode. The default mode (fallback) is to check OS environment variables, if the property cannot be resolved from its sources first. This allows environment variables as fallback values. | 1 | Integer
| *camel.component.properties.fallback-to-unaugmented-property* | If true, first attempt resolution of property name augmented with propertyPrefix and propertySuffix before falling back the plain property name specified. If false, only the augmented property name is searched. | true | Boolean
| *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
@@ -118,7 +119,7 @@ The component supports 18 options, which are listed below.
| *camel.component.properties.property-suffix* | Optional suffix appended to property names before resolution. | | String
| *camel.component.properties.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
| *camel.component.properties.suffix-token* | Sets the value of the suffix token used to identify properties to replace. Setting a value of null restores the default token (link DEFAULT_SUFFIX_TOKEN). | }} | String
-| *camel.component.properties.system-properties-mode* | Sets the system property mode. | 2 | Integer
+| *camel.component.properties.system-properties-mode* | Sets the system property (and environment variable) mode. The default mode (override) is to check system properties (and environment variables) first, before trying the specified properties. This allows system properties/environment variables to override any other property source. | 2 | Integer
|===
// spring-boot-auto-configure options: END
diff --git a/components/readme.adoc b/components/readme.adoc
index 86d355d..20a558c 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -1,7 +1,7 @@
==== Components
// components: START
-Number of Components: 291 in 226 JAR artifacts (0 deprecated)
+Number of Components: 292 in 227 JAR artifacts (0 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
@@ -100,6 +100,9 @@ Number of Components: 291 in 226 JAR artifacts (0 deprecated)
| link:camel-aws-mq/src/main/docs/aws-mq-component.adoc[AWS MQ] (camel-aws-mq) +
`aws-mq:label` | 2.21 | The aws-mq is used for managing Amazon MQ instances.
+| link:camel-aws-msk/src/main/docs/aws-msk-component.adoc[AWS MSK] (camel-aws-msk) +
+`aws-msk:label` | 3.0 | The aws-kms is used for managing Amazon KMS
+
| link:camel-aws-s3/src/main/docs/aws-s3-component.adoc[AWS S3 Storage Service] (camel-aws-s3) +
`aws-s3:bucketNameOrArn` | 2.8 | The aws-s3 component is used for storing and retrieving objecct from Amazon S3 Storage Service.
diff --git a/docs/components/modules/ROOT/pages/properties-component.adoc b/docs/components/modules/ROOT/pages/properties-component.adoc
index 497b63e..2ec426e 100644
--- a/docs/components/modules/ROOT/pages/properties-component.adoc
+++ b/docs/components/modules/ROOT/pages/properties-component.adoc
@@ -15,7 +15,7 @@ Where *key* is the key for the property to lookup
=== Options
// component options: START
-The Properties component supports 17 options, which are listed below.
+The Properties component supports 18 options, which are listed below.
@@ -37,7 +37,8 @@ The Properties component supports 17 options, which are listed below.
| *suffixToken* (advanced) | Sets the value of the suffix token used to identify properties to replace. Setting a value of null restores the default token (link DEFAULT_SUFFIX_TOKEN). | }} | String
| *initialProperties* (advanced) | Sets initial properties which will be used before any locations are resolved. | | Properties
| *overrideProperties* (advanced) | Sets a special list of override properties that take precedence and will use first, if a property exist. | | Properties
-| *systemPropertiesMode* (common) | Sets the system property mode. | 2 | int
+| *systemPropertiesMode* (common) | Sets the system property (and environment variable) mode. The default mode (override) is to check system properties (and environment variables) first, before trying the specified properties. This allows system properties/environment variables to override any other property source. | 2 | int
+| *environmentVariableMode* (common) | Sets the OS environment variables mode. The default mode (fallback) is to check OS environment variables, if the property cannot be resolved from its sources first. This allows environment variables as fallback values. | 1 | 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
|===
// component options: END
@@ -93,7 +94,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
-The component supports 18 options, which are listed below.
+The component supports 19 options, which are listed below.
@@ -104,6 +105,7 @@ The component supports 18 options, which are listed below.
| *camel.component.properties.default-fallback-enabled* | If false, the component does not attempt to find a default for the key by looking after the colon separator. | true | Boolean
| *camel.component.properties.enabled* | Whether to enable auto configuration of the properties component. This is enabled by default. | | Boolean
| *camel.component.properties.encoding* | 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
+| *camel.component.properties.environment-variable-mode* | Sets the OS environment variables mode. The default mode (fallback) is to check OS environment variables, if the property cannot be resolved from its sources first. This allows environment variables as fallback values. | 1 | Integer
| *camel.component.properties.fallback-to-unaugmented-property* | If true, first attempt resolution of property name augmented with propertyPrefix and propertySuffix before falling back the plain property name specified. If false, only the augmented property name is searched. | true | Boolean
| *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
@@ -117,7 +119,7 @@ The component supports 18 options, which are listed below.
| *camel.component.properties.property-suffix* | Optional suffix appended to property names before resolution. | | String
| *camel.component.properties.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
| *camel.component.properties.suffix-token* | Sets the value of the suffix token used to identify properties to replace. Setting a value of null restores the default token (link DEFAULT_SUFFIX_TOKEN). | }} | String
-| *camel.component.properties.system-properties-mode* | Sets the system property mode. | 2 | Integer
+| *camel.component.properties.system-properties-mode* | Sets the system property (and environment variable) mode. The default mode (override) is to check system properties (and environment variables) first, before trying the specified properties. This allows system properties/environment variables to override any other property source. | 2 | Integer
|===
// spring-boot-auto-configure options: END
@@ -250,7 +252,7 @@ You can have multiple placeholders in the same location, such as:
location=file:${env:APP_HOME}/etc/${prop.name}.properties
----
-#=== Using system and environment variables to configure property prefixes and suffixes
+=== Using system and environment variables to configure property prefixes and suffixes
*Available as of Camel 2.12.5, 2.13.3, 2.14.0*
@@ -494,6 +496,21 @@ The example below has property placeholder in the `<jmxAgent>` tag:
You can also define property placeholders in the various attributes on
the `<camelContext>` tag such as `trace` as shown here:
+=== Using JVM system properties or Environment variables as override or fallback values
+
+The properties components supports using JVM system properties and also OS environment variables
+as values which can either be used as override or fallback values.
+
+The default mode is that JVM system properties are in override mode, which means they
+are checked first.
+
+And as of Camel 3.0 then OS environment variables are in fallback mode as default mode,
+which means that if a property was not found then as a fallback the OS environment variables
+is checked as last.
+
+You can control these modes using the `systemPropertiesMode` and `environmentVariableMode`
+options on the properties component.
+
=== Overriding a property setting using a JVM System Property
*Available as of Camel 2.5* +