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 38c2b90 Regen
38c2b90 is described below
commit 38c2b9008135f23ae11a7812d7af4b833efef916
Author: Claus Ibsen <[email protected]>
AuthorDate: Fri Dec 11 09:33:09 2020 +0100
Regen
---
.../apache/camel/catalog/docs/properties-component.adoc | 14 ++++++++++----
.../modules/ROOT/pages/properties-component.adoc | 14 ++++++++++----
2 files changed, 20 insertions(+), 8 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/properties-component.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/properties-component.adoc
index cf85ba1..eea8af6 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/properties-component.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/properties-component.adoc
@@ -611,16 +611,22 @@ type.
To bridge Spring and Camel you must define a single bean as shown below:
-*Bridging Spring and Camel property placeholders*
+[source,xml]
+----
+include::{examplesdir}/components/camel-spring/src/test/resources/org/apache/camel/components/properties/CamelSpringPropertyPlaceholderConfigurerTest.xml[tags=e1]
+----
-You *must not* use the spring <context:property-placeholder> namespace
+You *must not* use the spring `<context:property-placeholder>` namespace
at the same time; this is not possible.
After declaring this bean, you can define property placeholders using
-both the Spring style, and the Camel style within the <camelContext> tag
+both the Spring style, and the Camel style within the `<camelContext>` tag
as shown below:
-*Using bridge property placeholders*
+[source,xml]
+----
+include::{examplesdir}/components/camel-spring/src/test/resources/org/apache/camel/components/properties/CamelSpringPropertyPlaceholderConfigurerTest.xml[tags=e2]
+----
Notice how the hello bean is using pure Spring property placeholders
using the `${ }` notation. And in the Camel routes we use the Camel
diff --git a/docs/components/modules/ROOT/pages/properties-component.adoc
b/docs/components/modules/ROOT/pages/properties-component.adoc
index a254e07..7521355 100644
--- a/docs/components/modules/ROOT/pages/properties-component.adoc
+++ b/docs/components/modules/ROOT/pages/properties-component.adoc
@@ -613,16 +613,22 @@ type.
To bridge Spring and Camel you must define a single bean as shown below:
-*Bridging Spring and Camel property placeholders*
+[source,xml]
+----
+include::{examplesdir}/components/camel-spring/src/test/resources/org/apache/camel/components/properties/CamelSpringPropertyPlaceholderConfigurerTest.xml[tags=e1]
+----
-You *must not* use the spring <context:property-placeholder> namespace
+You *must not* use the spring `<context:property-placeholder>` namespace
at the same time; this is not possible.
After declaring this bean, you can define property placeholders using
-both the Spring style, and the Camel style within the <camelContext> tag
+both the Spring style, and the Camel style within the `<camelContext>` tag
as shown below:
-*Using bridge property placeholders*
+[source,xml]
+----
+include::{examplesdir}/components/camel-spring/src/test/resources/org/apache/camel/components/properties/CamelSpringPropertyPlaceholderConfigurerTest.xml[tags=e2]
+----
Notice how the hello bean is using pure Spring property placeholders
using the `${ }` notation. And in the Camel routes we use the Camel
