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 2018/11/05 10:34:42 UTC
[camel] branch master updated (6d03f40 -> 453dd41)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 6d03f40 Changed the version range of Atmosphere Websocket
new 2b3f416 Removed ServiceMix reference
new be74b81 Fixed using OSGI blueprint with camel docs
new 453dd41 Added using OSGi blueprint link to adoc
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
docs/user-manual/en/SUMMARY.md | 3 +--
docs/user-manual/en/using-osgi-blueprint-with-camel.adoc | 11 ++++-------
2 files changed, 5 insertions(+), 9 deletions(-)
[camel] 02/03: Fixed using OSGI blueprint with camel docs
Posted by ac...@apache.org.
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 be74b817b7ad33b9839873cdb118931056ce18b4
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Nov 5 11:33:37 2018 +0100
Fixed using OSGI blueprint with camel docs
---
docs/user-manual/en/using-osgi-blueprint-with-camel.adoc | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/docs/user-manual/en/using-osgi-blueprint-with-camel.adoc b/docs/user-manual/en/using-osgi-blueprint-with-camel.adoc
index 605d384..d3d9864 100644
--- a/docs/user-manual/en/using-osgi-blueprint-with-camel.adoc
+++ b/docs/user-manual/en/using-osgi-blueprint-with-camel.adoc
@@ -1,6 +1,5 @@
[[UsingOSGiblueprintwithCamel-UsingOSGiblueprintwithCamel]]
-Using OSGi blueprint with Camel
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+=== Using OSGi blueprint with Camel
*Available as of Camel 2.4*
@@ -12,8 +11,7 @@ implementation, which is the one used by http://karaf.apache.org[Apache
Karaf].
[[UsingOSGiblueprintwithCamel-Overview]]
-Overview
-^^^^^^^^
+==== Overview
The XML schema is mostly the same as the one for Spring, so all the xml
snippets throughout the documentation referring to Spring XML also apply
@@ -49,11 +47,10 @@ packages that are imported by your bundle
* no startup ordering issue with respect to the custom namespaces and
your bundles
* you can use Blueprint property placeholders, see more at
-Using PropertyPlaceholder
+link:using-propertyplaceholder.html[Using PropertyPlaceholder]
[[UsingOSGiblueprintwithCamel-Usingcamel-blueprint]]
-Using camel-blueprint
-^^^^^^^^^^^^^^^^^^^^^
+==== Using camel-blueprint
To leverage camel-blueprint in OSGi, you only need the Aries Blueprint
bundle and the camel-blueprint bundle, in addition to camel-core and its
[camel] 01/03: Removed ServiceMix reference
Posted by ac...@apache.org.
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 2b3f41689d05d66afac689c7a70ce3d364202e5d
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Nov 5 11:28:48 2018 +0100
Removed ServiceMix reference
---
docs/user-manual/en/SUMMARY.md | 1 -
1 file changed, 1 deletion(-)
diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md
index 65550d6..e5b3ca7 100644
--- a/docs/user-manual/en/SUMMARY.md
+++ b/docs/user-manual/en/SUMMARY.md
@@ -59,7 +59,6 @@
* [Camel Maven Archetypes]
* [Creating a new Spring based Camel Route]
* [Camel JMX]
-* [How to run Camel in an OSGi container]
* [Using OSGi blueprint with Camel]
* [Working with Camel and SCR]
* Working with REST and [Rest DSL]
[camel] 03/03: Added using OSGi blueprint link to adoc
Posted by ac...@apache.org.
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 453dd41137ed89ae10bcc2fcb922711d52e4ea52
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Nov 5 11:34:13 2018 +0100
Added using OSGi blueprint link to adoc
---
docs/user-manual/en/SUMMARY.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md
index e5b3ca7..7f0b599 100644
--- a/docs/user-manual/en/SUMMARY.md
+++ b/docs/user-manual/en/SUMMARY.md
@@ -59,7 +59,7 @@
* [Camel Maven Archetypes]
* [Creating a new Spring based Camel Route]
* [Camel JMX]
-* [Using OSGi blueprint with Camel]
+* [Using OSGi blueprint with Camel](using-osgi-blueprint-with-camel.adoc)
* [Working with Camel and SCR]
* Working with REST and [Rest DSL]