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 2016/05/02 10:23:45 UTC
camel git commit: Added camel-core docs directory to Gitbook too
Repository: camel
Updated Branches:
refs/heads/master e058d67bc -> b49aca115
Added camel-core docs directory to Gitbook too
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b49aca11
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b49aca11
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b49aca11
Branch: refs/heads/master
Commit: b49aca1152249965d0428be21eadc2295e06b14c
Parents: e058d67
Author: Andrea Cosentino <an...@gmail.com>
Authored: Mon May 2 10:23:09 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Mon May 2 10:23:09 2016 +0200
----------------------------------------------------------------------
camel-core/src/main/docs/properties.adoc | 24 ++++++++++++------------
camel-website/pom.xml | 3 +++
2 files changed, 15 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b49aca11/camel-core/src/main/docs/properties.adoc
----------------------------------------------------------------------
diff --git a/camel-core/src/main/docs/properties.adoc b/camel-core/src/main/docs/properties.adoc
index 86ebd6f..1e1efe7 100644
--- a/camel-core/src/main/docs/properties.adoc
+++ b/camel-core/src/main/docs/properties.adoc
@@ -535,12 +535,12 @@ definition.
====
**About placeholder syntaxes**
-Notice how we can use the Camel syntax for placeholders `{{ }}` in the
+Notice how we can use the Camel syntax for placeholders `{{` and `}}` in the
Camel route, which will lookup the value from OSGi blueprint.
The blueprint syntax for placeholders is `${ }`. So outside the
`<camelContext>` you must use the `${ }` syntax. Where as inside
-`<camelContext>` you must use `{{ }}` syntax.
+`<camelContext>` you must use `{{` and `}}` syntax.
OSGi blueprint allows you to configure the syntax, so you can actually
align those if you want.
@@ -574,7 +574,7 @@ When using Blueprint property placeholder in the Blueprint XML file, you
can declare the properties directly in the XML file as shown below:
Notice that we have a `<bean>` which refers to one of the properties. And
-in the Camel route we refer to the other using the `{{ }}` notation.
+in the Camel route we refer to the other using the `{{` and `}}` notation.
Now if you want to override these Blueprint properties from an unit
test, you can do this as shown below:
@@ -668,7 +668,7 @@ as shown below:
Notice how the hello bean is using pure Spring property placeholders
using the `${ }` notation. And in the Camel routes we use the Camel
-placeholder notation with `{{ }}`.
+placeholder notation with `{{` and `}}`.
[[Properties-ClashingSpringpropertyplaceholderswithCamelslanguage]]
Clashing Spring property placeholders with Camels link:simple.html[Simple] language
@@ -813,8 +813,8 @@ can easily be used as shown below:
<route>
<from uri="direct:start"/>
- <to uri="{{env:SOMENAME}}"/>
- <to uri="{{sys:MyJvmPropertyName}}"/>
+ <to uri="{`{env:SOMENAME}`}"/>
+ <to uri="{`{sys:MyJvmPropertyName}`}"/>
</route>
</camelContext>
----
@@ -829,8 +829,8 @@ is a `log:foo` and `log:bar` value.
<route>
<from uri="direct:start"/>
- <to uri="{{env:SOMENAME:log:foo}}"/>
- <to uri="{{sys:MyJvmPropertyName:log:bar}}"/>
+ <to uri="{`{env:SOMENAME:log:foo}`}"/>
+ <to uri="{`{sys:MyJvmPropertyName:log:bar}`}"/>
</route>
</camelContext>
----
@@ -866,7 +866,7 @@ the�link:http.html[HTTP]�component to make the HTTP call:
<route>
<from uri="direct:start"/>
- <to uri="http://{{service:FOO}}/myapp"/>
+ <to uri="http://{`{service:FOO}`}/myapp"/>
</route>
</camelContext>
----
@@ -882,7 +882,7 @@ example to call a service on localhost, maybe for unit testing etc
<route>
<from uri="direct:start"/>
- <to uri="http://{{service:FOO:localhost:8080}}/myapp"/>
+ <to uri="http://{`{service:FOO:localhost:8080}`}/myapp"/>
</route>
</camelContext>
----
@@ -911,8 +911,8 @@ placeholder. This is best illustrated in the example code below
<route>
<from uri="direct:start"/>
- <to uri="{{beer:FOO}}"/>
- <to uri="{{beer:BAR}}"/>
+ <to uri="{`{beer:FOO}`}"/>
+ <to uri="{`{beer:BAR}`}"/>
</route>
</camelContext>
----
http://git-wip-us.apache.org/repos/asf/camel/blob/b49aca11/camel-website/pom.xml
----------------------------------------------------------------------
diff --git a/camel-website/pom.xml b/camel-website/pom.xml
index 2d4e073..8d6c26f 100644
--- a/camel-website/pom.xml
+++ b/camel-website/pom.xml
@@ -81,6 +81,9 @@
<fileset dir="{basedir}/../../components">
<include name="**/src/main/docs/**"/>
</fileset>
+ <fileset dir="{basedir}/../../camel-core">
+ <include name="**/src/main/docs/**"/>
+ </fileset>
</copy>
<mkdir dir="${basedir}/target/classes/user-manual" />