You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/04/13 09:22:44 UTC
[1/2] camel git commit: Component docs
Repository: camel
Updated Branches:
refs/heads/master be222a503 -> 6063f395e
Component docs
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e6923508
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e6923508
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e6923508
Branch: refs/heads/master
Commit: e6923508addf4eb79caffc4a58ef92571ef406db
Parents: be222a5
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Apr 13 11:17:04 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Apr 13 11:17:04 2017 +0200
----------------------------------------------------------------------
components/camel-kura/src/main/docs/kura.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e6923508/components/camel-kura/src/main/docs/kura.adoc
----------------------------------------------------------------------
diff --git a/components/camel-kura/src/main/docs/kura.adoc b/components/camel-kura/src/main/docs/kura.adoc
index f8cf9ad..1bf7973 100644
--- a/components/camel-kura/src/main/docs/kura.adoc
+++ b/components/camel-kura/src/main/docs/kura.adoc
@@ -2,7 +2,7 @@
Eclipse Kura component
~~~~~~~~~~~~~~~~~~~~~~
-INFO: Kura component is available starting from Camel *2.15*.
+*Available as of Camel 2.15*
This documentation page covers the integration options of Camel with the
https://eclipse.org/kura/[Eclipse Kura] M2M gateway. The common reason
[2/2] camel git commit: Component docs
Posted by da...@apache.org.
Component docs
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6063f395
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6063f395
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6063f395
Branch: refs/heads/master
Commit: 6063f395e75d6a2128135f2182c149702593eed0
Parents: e692350
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Apr 13 11:22:36 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Apr 13 11:22:36 2017 +0200
----------------------------------------------------------------------
components/camel-rx/src/main/docs/rx.adoc | 7 +++++--
components/camel-scr/src/main/docs/scr.adoc | 5 ++---
2 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/6063f395/components/camel-rx/src/main/docs/rx.adoc
----------------------------------------------------------------------
diff --git a/components/camel-rx/src/main/docs/rx.adoc b/components/camel-rx/src/main/docs/rx.adoc
index 6c37663..2235f61 100644
--- a/components/camel-rx/src/main/docs/rx.adoc
+++ b/components/camel-rx/src/main/docs/rx.adoc
@@ -1,10 +1,13 @@
[[ConfluenceContent]]
[[RX-CamelRX]]
-Camel RX
---------
+Camel RX (deprecated)
+---------------------
*Available as of Camel 2.11*
+This component is deprecated.
+We suggest to use the newer `camel-reactive-streams` component.
+
The camel-rx library provides Camel support for the
https://rx.codeplex.com/[Reactive Extensions]�(RX) using the
https://github.com/Netflix/RxJava/wiki[RxJava] library so that:
http://git-wip-us.apache.org/repos/asf/camel/blob/6063f395/components/camel-scr/src/main/docs/scr.adoc
----------------------------------------------------------------------
diff --git a/components/camel-scr/src/main/docs/scr.adoc b/components/camel-scr/src/main/docs/scr.adoc
index 451af6a..3adca16 100644
--- a/components/camel-scr/src/main/docs/scr.adoc
+++ b/components/camel-scr/src/main/docs/scr.adoc
@@ -1,6 +1,6 @@
-## Working with Camel and SCR
+## Camel SCR (deprecated)
-**deprecated**
+*Available as of Camel 2.15*
SCR stands for Service Component Runtime and is an implementation of
OSGi Declarative Services specification. SCR enables any plain old Java
@@ -19,7 +19,6 @@ of choice knows exactly what is going on in your project.
### Camel SCR support
-INFO: *Available as of Camel 2.15.0*.
Camel-scr bundle is not included in Apache Camel versions prior 2.15.0,
but the artifact itself can be used with any Camel version since 2.12.0.