You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2017/04/13 09:44:23 UTC
camel git commit: Fix copy and paste doc
Repository: camel
Updated Branches:
refs/heads/master 6063f395e -> 76e3eeb08
Fix copy and paste doc
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/76e3eeb0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/76e3eeb0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/76e3eeb0
Branch: refs/heads/master
Commit: 76e3eeb08f5964513bcd73f57a94e02f019c0301
Parents: 6063f39
Author: lburgazzoli <lb...@gmail.com>
Authored: Thu Apr 13 11:44:00 2017 +0200
Committer: lburgazzoli <lb...@gmail.com>
Committed: Thu Apr 13 11:44:17 2017 +0200
----------------------------------------------------------------------
.../src/main/docs/spring-cloud-netflix.adoc | 46 +++++++++++---------
1 file changed, 26 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/76e3eeb0/components/camel-spring-cloud-netflix/src/main/docs/spring-cloud-netflix.adoc
----------------------------------------------------------------------
diff --git a/components/camel-spring-cloud-netflix/src/main/docs/spring-cloud-netflix.adoc b/components/camel-spring-cloud-netflix/src/main/docs/spring-cloud-netflix.adoc
index 61c796f..3cf7713 100644
--- a/components/camel-spring-cloud-netflix/src/main/docs/spring-cloud-netflix.adoc
+++ b/components/camel-spring-cloud-netflix/src/main/docs/spring-cloud-netflix.adoc
@@ -1,40 +1,46 @@
-[[SpringCloud-SpringCloud]]
-Spring Cloud
-~~~~~~~~~~~
+=== Spring Cloud Netflix
*Available as of Camel 2.19*
-Spring Cloud component
+The Spring Cloud Netflix component bridges Camel Cloud and Spring Cloud Netflix so you can leverage Spring Cloud Netflix service discovery and load balance features in Camel and/or you can use Camel Service Discovery implementations as ServerList source for Spring Cloud Netflix's Ribbon load balabncer.
-Maven users will need to add the following dependency to their `pom.xml`
-in order to use this component:
+Maven users will need to add the following dependency to their `pom.xml` in order to use this component:
[source,xml]
-------------------------------------------------------------------------------------------------
+----
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-spring-cloud</artifactId>
- <version>${camel.version}</version> <!-- use the same version as your Camel core version -->
+ <artifactId>camel-spring-cloud-netflix</artifactId>
+ <version>${camel.version}</version>
+ <!-- use the same version as your Camel core version -->
</dependency>
-------------------------------------------------------------------------------------------------
+----
-`camel-spring-cloud` jar comes with the�`spring.factories` file, so as
-soon as you add that dependency into your classpath, Spring Boot will
-automatically auto-configure Camel for you.
+`camel-spring-cloud-netflix` jar comes with the�`spring.factories` file, so as soon as you add that dependency into your classpath, Spring Boot will automatically auto-configure Camel for you.
-[[SpringCloud-CamelSpringCloudStarter]]
-Camel Spring Cloud Starter
-^^^^^^^^^^^^^^^^^^^^^^^^^
+You can disable Camel Spring Cloud Netflix with the following properties:
+
+[source,properties]
+----
+# Enable/Disable the whole integration, default true
+camel.cloud.netflix = true
+
+# Enable/Disable the integration with Ribbon, default true
+camel.cloud.netflix.ribbon = true
+----
+
+=== Spring Cloud Netflix Starter
*Available as of Camel 2.19*
To use the starter, add the following to your spring boot pom.xml file:
[source,xml]
-------------------------------------------------------
+----
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-spring-cloud-starter</artifactId>
- <version>${camel.version}</version> <!-- use the same version as your Camel core version -->
+ <artifactId>camel-spring-cloud-netflix-starter</artifactId>
+ <version>${camel.version}</version>
+ <!-- use the same version as your Camel core version -->
</dependency>
-------------------------------------------------------
+----