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 ab09b7b81b757e8ed2e140fa174cbf166687d2f6
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Mon May 13 09:51:09 2019 +0200
Regen
---
.../src/main/docs/properties-component.adoc | 4 +-
components/readme.adoc | 4 +-
docs/components/modules/ROOT/nav.adoc | 1 -
.../modules/ROOT/pages/jibx-dataformat.adoc | 123 ---------------------
.../modules/ROOT/pages/properties-component.adoc | 13 +--
5 files changed, 9 insertions(+), 136 deletions(-)
diff --git
a/components/camel-properties/src/main/docs/properties-component.adoc
b/components/camel-properties/src/main/docs/properties-component.adoc
index d5cf8a8..ec1cd3b 100644
--- a/components/camel-properties/src/main/docs/properties-component.adoc
+++ b/components/camel-properties/src/main/docs/properties-component.adoc
@@ -105,7 +105,7 @@ The component supports 19 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.environment-variable-mode* | Sets the OS
environment variables mode. The default mode (override) is to use OS
environment variables if present, and override any existing properties. | 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
@@ -119,7 +119,7 @@ The component supports 19 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 (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
+| *camel.component.properties.system-properties-mode* | Sets the system
property mode. The default mode (override) is to use system properties if
present, and override any existing properties. | 2 | Integer
|===
// spring-boot-auto-configure options: END
diff --git a/components/readme.adoc b/components/readme.adoc
index 518296a..927e597 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -899,7 +899,7 @@ Number of Components: 295 in 232 JAR artifacts (0
deprecated)
==== Data Formats
// dataformats: START
-Number of Data Formats: 44 in 36 JAR artifacts (0 deprecated)
+Number of Data Formats: 43 in 35 JAR artifacts (0 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
@@ -943,8 +943,6 @@ Number of Data Formats: 44 in 36 JAR artifacts (0
deprecated)
| link:camel-jaxb/src/main/docs/jaxb-dataformat.adoc[JAXB] (camel-jaxb) | 1.0
| JAXB data format uses the JAXB2 XML marshalling standard to unmarshal an XML
payload into Java objects or to marshal Java objects into an XML payload.
-| link:camel-jibx/src/main/docs/jibx-dataformat.adoc[JiBX] (camel-jibx) | 2.6
| JiBX data format is used for unmarshal a XML payload to POJO or to marshal
POJO back to XML payload.
-
| link:camel-fastjson/src/main/docs/json-fastjson-dataformat.adoc[JSon
Fastjson] (camel-fastjson) | 2.20 | JSon data format is used for unmarshal a
JSon payload to POJO or to marshal POJO back to JSon payload.
| link:camel-gson/src/main/docs/json-gson-dataformat.adoc[JSon GSon]
(camel-gson) | 2.10 | JSon data format is used for unmarshal a JSon payload to
POJO or to marshal POJO back to JSon payload.
diff --git a/docs/components/modules/ROOT/nav.adoc
b/docs/components/modules/ROOT/nav.adoc
index ca2465c..bb597ee 100644
--- a/docs/components/modules/ROOT/nav.adoc
+++ b/docs/components/modules/ROOT/nav.adoc
@@ -173,7 +173,6 @@
* xref:jetty-component.adoc[Jetty Component]
* xref:jgroups-raft-component.adoc[JGroups raft Component]
* xref:jgroups-component.adoc[JGroups Component]
-* xref:jibx-dataformat.adoc[JiBX DataFormat]
* xref:jing-component.adoc[Jing Component]
* xref:jms-component.adoc[JMS Component]
* xref:jmx-component.adoc[JMX Component]
diff --git a/docs/components/modules/ROOT/pages/jibx-dataformat.adoc
b/docs/components/modules/ROOT/pages/jibx-dataformat.adoc
deleted file mode 100644
index 31a9abf..0000000
--- a/docs/components/modules/ROOT/pages/jibx-dataformat.adoc
+++ /dev/null
@@ -1,123 +0,0 @@
-[[jibx-dataformat]]
-== JiBX DataFormat
-
-*Available as of Camel version 2.6*
-
-JiBX is a Data Format which uses the
-http://jibx.sourceforge.net[JiBX library] to marshal and unmarshal Java
-objects to and from XML.
-
-[source,java]
------------------------------------------------------------
-// lets turn Object messages into XML then send to MQSeries
-from("activemq:My.Queue").
- marshal().jibx().
- to("mqseries:Another.Queue");
------------------------------------------------------------
-
-Please note that marshaling process can recognize the message type at
-the runtime. However while unmarshaling message from XML we need to
-specify target class explicitly.
-
-[source,java]
--------------------------------------------
-// lets turn XML into PurchaseOrder message
-from("mqseries:Another.Queue").
- unmarshal().jibx(PurchaseOrder.class).
- to("activemq:My.Queue");
--------------------------------------------
-
-### Options
-
-// dataformat options: START
-The JiBX dataformat supports 3 options, which are listed below.
-
-
-
-[width="100%",cols="2s,1m,1m,6",options="header"]
-|===
-| Name | Default | Java Type | Description
-| unmarshallClass | | String | Class name to use when unmarshalling from XML
to Java.
-| bindingName | | String | To use a custom binding factory
-| contentTypeHeader | false | Boolean | Whether the data format should set the
Content-Type header with the type from the data format if the data format is
capable of doing so. For example application/xml for data formats marshalling
to XML, or application/json for data formats marshalling to JSon etc.
-|===
-// dataformat options: END
-// spring-boot-auto-configure options: START
-=== Spring Boot Auto-Configuration
-
-When using Spring Boot make sure to use the following Maven dependency to have
support for auto configuration:
-
-[source,xml]
-----
-<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-jibx-starter</artifactId>
- <version>x.x.x</version>
- <!-- use the same version as your Camel core version -->
-</dependency>
-----
-
-
-The component supports 4 options, which are listed below.
-
-
-
-[width="100%",cols="2,5,^1,2",options="header"]
-|===
-| Name | Description | Default | Type
-| *camel.dataformat.jibx.binding-name* | To use a custom binding factory | |
String
-| *camel.dataformat.jibx.content-type-header* | Whether the data format should
set the Content-Type header with the type from the data format if the data
format is capable of doing so. For example application/xml for data formats
marshalling to XML, or application/json for data formats marshalling to JSon
etc. | false | Boolean
-| *camel.dataformat.jibx.enabled* | Enable jibx dataformat | true | Boolean
-| *camel.dataformat.jibx.unmarshall-class* | Class name to use when
unmarshalling from XML to Java. | | String
-|===
-// spring-boot-auto-configure options: END
-ND
-
-
-### JiBX Spring DSL
-
-JiBX data format is also supported by Camel Spring DSL.
-
-[source,xml]
---------------------------------------------------------------------------------------
-<camelContext id="camel" xmlns="http://camel.apache.org/schema/spring";>
-
- <!-- Define data formats -->
- <dataFormats>
- <jibx id="jibx"
unmarshallClass="org.apache.camel.dataformat.jibx.PurchaseOrder"/>
- </dataFormats>
-
- <!-- Marshal message to XML -->
- <route>
- <from uri="direct:marshal"/>
- <marshal><custom ref="jibx"/></marshal>
- <to uri="mock:result"/>
- </route>
-
- <!-- Unmarshal message from XML -->
- <route>
- <from uri="direct:unmarshal"/>
- <unmarshal><custom ref="jibx"/></unmarshal>
- <to uri="mock:result"/>
- </route>
-
-</camelContext>
---------------------------------------------------------------------------------------
-
-### Dependencies
-
-To use JiBX in your camel routes you need to add the a dependency on
-*camel-jibx* which implements this data format.
-
-If you use maven you could just add the following to your pom.xml,
-substituting the version number for the latest & greatest release (see
-the download page for the latest versions).
-
-[source,xml]
--------------------------------------
-<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-jibx</artifactId>
- <version>2.6.0</version>
-</dependency>
--------------------------------------
diff --git a/docs/components/modules/ROOT/pages/properties-component.adoc
b/docs/components/modules/ROOT/pages/properties-component.adoc
index b1b55a6..ec1cd3b 100644
--- a/docs/components/modules/ROOT/pages/properties-component.adoc
+++ b/docs/components/modules/ROOT/pages/properties-component.adoc
@@ -37,8 +37,8 @@ The Properties component supports 18 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 (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
+| *systemPropertiesMode* (common) | Sets the system property mode. The default
mode (override) is to use system properties if present, and override any
existing properties. | 2 | int
+| *environmentVariableMode* (common) | Sets the OS environment variables mode.
The default mode (override) is to use OS environment variables if present, and
override any existing properties. | 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
@@ -105,7 +105,7 @@ The component supports 19 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.environment-variable-mode* | Sets the OS
environment variables mode. The default mode (override) is to use OS
environment variables if present, and override any existing properties. | 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
@@ -119,7 +119,7 @@ The component supports 19 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 (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
+| *camel.component.properties.system-properties-mode* | Sets the system
property mode. The default mode (override) is to use system properties if
present, and override any existing properties. | 2 | Integer
|===
// spring-boot-auto-configure options: END
@@ -508,9 +508,8 @@ 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.
+And as of Camel 3.0 then OS environment variables are in override mode as
default mode,
+which means that if a OS environment variable exists, then it will be used.
You can control these modes using the `systemPropertiesMode` and
`environmentVariableMode`
options on the properties component.
