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/02/15 13:36:28 UTC
[1/3] camel git commit: Polished
Repository: camel
Updated Branches:
refs/heads/master 62778b3ec -> 60fc57c7e
Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a5513e79
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a5513e79
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a5513e79
Branch: refs/heads/master
Commit: a5513e79da705870dffd488abd2803294a9e2a7c
Parents: 62778b3
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Feb 15 14:16:58 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Feb 15 14:16:58 2017 +0100
----------------------------------------------------------------------
.../camel-example-activemq-tomcat/README.md | 7 +++---
examples/camel-example-aggregate/README.md | 17 ++++++++++-----
examples/camel-example-bam/README.md | 6 -----
examples/camel-example-cafe/README.md | 9 +++-----
examples/camel-example-console/README.md | 11 ++++++----
examples/camel-example-cxf-blueprint/README.md | 3 ---
examples/camel-example-cxf-osgi/README.md | 4 ----
examples/camel-example-cxf-proxy/README.md | 3 ---
examples/camel-example-cxf-tomcat/README.md | 6 -----
examples/camel-example-cxf/README.md | 7 +++---
examples/camel-example-etl/README.md | 12 ++++------
.../java/org/apache/camel/example/etl/Main.java | 1 +
examples/camel-example-ftp/README.md | 17 ++++++++++-----
examples/camel-example-guice-jms/README.md | 3 ---
examples/camel-example-jms-file/README.md | 4 ----
examples/camel-example-jmx/README.md | 3 ---
examples/camel-example-kotlin/ReadMe.md | 22 +++++++++++++++----
examples/camel-example-loadbalancing/README.md | 5 -----
.../camel-example-loan-broker-cxf/README.md | 4 ----
.../camel-example-loan-broker-jms/README.md | 4 ----
examples/camel-example-management/README.md | 5 -----
examples/camel-example-mybatis/README.md | 6 -----
examples/camel-example-netty-http/README.md | 8 -------
examples/camel-example-osgi-rmi/pom.xml | 2 +-
examples/camel-example-pojo-messaging/README.md | 4 ----
.../README.md | 5 -----
examples/camel-example-reportincident/README.md | 5 -----
.../camel-example-route-throttling/README.md | 23 +++++++++++---------
examples/camel-example-scala/ReadMe.md | 19 ++++++++++++----
29 files changed, 93 insertions(+), 132 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a5513e79/examples/camel-example-activemq-tomcat/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-activemq-tomcat/README.md b/examples/camel-example-activemq-tomcat/README.md
index cab5e47..05e8e80 100644
--- a/examples/camel-example-activemq-tomcat/README.md
+++ b/examples/camel-example-activemq-tomcat/README.md
@@ -3,6 +3,9 @@
### Introduction
This example shows how you can embed Apache ActiveMQ Broker and Camel in a web application, which can run on Apache Tomcat or other web containers.
+This example embeds ActiveMQ Broker and a Camel application which will continuously send a message per second to an inbox queue.
+Then another Camel route will route messages from the inbox to the outbox queue.
+
#### Camel component used in this example
* camel-core
@@ -32,10 +35,6 @@ to the outbox queue.
The ActiveMQ broker is configured in the `src/main/resources/broker.xml` file.
And the Camel application in the `src/main/resources/camel-context.xml` file.
-### Documentation
-
-This example is documented at
- [http://camel.apache.org/activemq-camel-tomcat.html](http://camel.apache.org/activemq-camel-tomcat.html)
### Forum, Help, etc
http://git-wip-us.apache.org/repos/asf/camel/blob/a5513e79/examples/camel-example-aggregate/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-aggregate/README.md b/examples/camel-example-aggregate/README.md
index 67b5a98..b17f421 100644
--- a/examples/camel-example-aggregate/README.md
+++ b/examples/camel-example-aggregate/README.md
@@ -6,9 +6,20 @@ This example shows how to use Camel Aggregator EIP which offers (since Camel 2.3
database persistence.
It's an interactive example where you can type in some numbers which then are aggregated
-(summed, per this sample's aggregation strategy) whenever the user types STOP.
+(summed, per this sample's aggregation strategy) whenever the user types `STOP`.
The user can then enter more numbers to do another aggregation.
+#### How it works
+
+The example is an interactive example where it prompt on the console for you to enter a number and press `ENTER`.
+The numbers you enter will then be aggregated and persisted. That means you can at any time hit `ctrl + c` to shutdown Camel.
+
+Then you should be able to start the example again and resume where you left.
+When you want to complete the aggregation you can enter `STOP` as input and Camel will show you the result,
+which is the sum of all the numbers entered.
+
+The persistent datastore is located in the `data/hawtdb.dat` file. Its automatic created the first time.
+
#### Camel component used in this example
* camel-core
@@ -34,10 +45,6 @@ To stop the example hit <kbd>ctrl</kbd>+<kbd>c</kbd>. If you restart it and res
entering numbers you should see that it remembered previously entered values, as it
uses a persistent store.
-### Documentation
-
-This example is documented at
- [http://camel.apache.org/aggregate-example.html](http://camel.apache.org/aggregate-example.html)
### Forum, Help, etc
http://git-wip-us.apache.org/repos/asf/camel/blob/a5513e79/examples/camel-example-bam/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-bam/README.md b/examples/camel-example-bam/README.md
index 912feee..313954a 100644
--- a/examples/camel-example-bam/README.md
+++ b/examples/camel-example-bam/README.md
@@ -28,12 +28,6 @@ You can see the BAM activies defined in
To stop the example hit <kbd>ctrl</kbd>+<kbd>c</kbd>
-### Documentation
-
-For a background in BAM see <http://camel.apache.org/bam.html>
-
-This example is documented at <http://camel.apache.org/bam-example.html>
-
### Forum, Help, etc
If you hit an problems please let us know on the Camel Forums
http://git-wip-us.apache.org/repos/asf/camel/blob/a5513e79/examples/camel-example-cafe/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-cafe/README.md b/examples/camel-example-cafe/README.md
index 6ff1777..543fac7 100644
--- a/examples/camel-example-cafe/README.md
+++ b/examples/camel-example-cafe/README.md
@@ -1,10 +1,12 @@
# Cafe Example
-
### Introduction
This example shows how to work with splitter and aggregator to implement a Cafe demo.
+First It uses the splitter to dispatch the order, then sends the orders to barista by checking
+if the coffee is hot or cold. When the coffee is ready, we use a aggregate to gather the drinks for waiter to deliver.
+
### Build
You will need to compile this example first:
@@ -23,11 +25,6 @@ You can see the routing rules by looking at the java code in the
To stop the example hit <kbd>ctrl</kbd>+<kbd>c</kbd>
-### Documentation
-
-This example is documented at
- [http://camel.apache.org/cafe-example.html](http://camel.apache.org/cafe-example.html)
-
### Forum, Help, etc
If you hit an problems please let us know on the Camel Forums
http://git-wip-us.apache.org/repos/asf/camel/blob/a5513e79/examples/camel-example-console/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-console/README.md b/examples/camel-example-console/README.md
index 961cfb3..f133591 100644
--- a/examples/camel-example-console/README.md
+++ b/examples/camel-example-console/README.md
@@ -4,6 +4,12 @@
This is a simple example that shows how to get started with Camel.
+This is a beginner's example that demonstrates how to get started with Apache Camel.
+In this example we integrate with the console using the Stream component.
+The example is interactive - it reads input from the console, and then transforms the input to upper case and prints it back to the console.
+
+This is implemented with a Camel route defined in the Spring XML
+
### Build
You will need to compile this example first:
@@ -15,6 +21,7 @@ You will need to compile this example first:
To run the example type
mvn camel:run
+
You can see the routing rules by looking at the XML in the directory:
`src/main/resources/META-INF/spring`
@@ -24,10 +31,6 @@ You can also run the example from your editor such as Eclipse, IDEA etc,
by opening the org.apache.camel.example.console.CamelConsoleMain class
and then right click, and chose run java application.
-### Documentation
-
-This example is documented at [http://camel.apache.org/console-example.html](http://camel.apache.org/console-example.html)
-
### Forum, Help, etc
If you hit an problems please let us know on the Camel Forums
http://git-wip-us.apache.org/repos/asf/camel/blob/a5513e79/examples/camel-example-cxf-blueprint/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-cxf-blueprint/README.md b/examples/camel-example-cxf-blueprint/README.md
index 7331da1..33c02f3 100644
--- a/examples/camel-example-cxf-blueprint/README.md
+++ b/examples/camel-example-cxf-blueprint/README.md
@@ -76,9 +76,6 @@ Open the request 1 (under camel-example-cxf-blueprint --> ReportIncidentBinding
#### Step 6: Check the file system
Check the folder "target/inbox/" in the Karaf base directory to see that a message has arrived.
-### Documentation
-This example is described in more detail at [http://camel.apache.org/cxf-example-osgi-blueprint.html](http://camel.apache.org/cxf-example-osgi-blueprint.html)
-
### Forum, Help, etc
If you hit an problems please let us know on the Camel Forums
http://git-wip-us.apache.org/repos/asf/camel/blob/a5513e79/examples/camel-example-cxf-osgi/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-cxf-osgi/README.md b/examples/camel-example-cxf-osgi/README.md
index 65938b6..ad0cae7 100644
--- a/examples/camel-example-cxf-osgi/README.md
+++ b/examples/camel-example-cxf-osgi/README.md
@@ -85,10 +85,6 @@ message generated by the unit test, for example:
#### Step 6: Check the file system
Check the folder `target/inbox/` in the Karaf base directory to see that a message has arrived.
-### Documentation
-
-This example is described in more detail at
- [http://camel.apache.org/cxf-example-osgi.html](http://camel.apache.org/cxf-example-osgi.html)
### Forum, Help, etc
http://git-wip-us.apache.org/repos/asf/camel/blob/a5513e79/examples/camel-example-cxf-proxy/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-cxf-proxy/README.md b/examples/camel-example-cxf-proxy/README.md
index 95bccd1..13e42cb 100644
--- a/examples/camel-example-cxf-proxy/README.md
+++ b/examples/camel-example-cxf-proxy/README.md
@@ -61,9 +61,6 @@ Then make SOAP requests of this format:
You can change `${proxy.port}` and `${real.port}` via configuration file `src/main/resources/incident.properties`
-### Documentation
-
-This example is documented at <http://camel.apache.org/cxf-proxy-example.html>
### Forum, Help, etc
http://git-wip-us.apache.org/repos/asf/camel/blob/a5513e79/examples/camel-example-cxf-tomcat/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-cxf-tomcat/README.md b/examples/camel-example-cxf-tomcat/README.md
index ef00c53..7c59bc7 100644
--- a/examples/camel-example-cxf-tomcat/README.md
+++ b/examples/camel-example-cxf-tomcat/README.md
@@ -3,7 +3,6 @@
### Introduction
An example which uses code-first to expose a web service in Camel running on Apache Tomcat.
-
### Build
It can be run using Maven.
@@ -56,11 +55,6 @@ soapUI, making sample SOAP requests such as the following:
</soap:Body>
</soap:Envelope>
-### Documentation
-
-This example is further documented at
- [http://camel.apache.org/cxf-tomcat-example.html](http://camel.apache.org/cxf-tomcat-example.html)
-
### Forum, Help, etc
If you hit an problems please let us know on the Camel Forums
http://git-wip-us.apache.org/repos/asf/camel/blob/a5513e79/examples/camel-example-cxf/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-cxf/README.md b/examples/camel-example-cxf/README.md
index 42cb51d..f0d1f7b 100644
--- a/examples/camel-example-cxf/README.md
+++ b/examples/camel-example-cxf/README.md
@@ -4,6 +4,10 @@
This example shows how to work with CXF and Camel.
+The Camel CXF example is a demo of the camel-cxf component to show how to route messages between CXF endpoints,
+with one endpoint consuming a SOAP over HTTP request while the other providing a SOAP over JMS request for the actual CXF Service endpoint.
+The Camel router just routes the SOAP over HTTP CXF client request to the SOAP over JMS CXF service.
+
### Build
You will need to compile this example first:
@@ -28,9 +32,6 @@ To run the example of showing how to create CXF JAXRS endpoint
mvn exec:java -PJAXRS
-### Documentation
-
-This example is documented at [http://camel.apache.org/cxf-example.html](http://camel.apache.org/cxf-example.html)
### Forum, Help, etc
http://git-wip-us.apache.org/repos/asf/camel/blob/a5513e79/examples/camel-example-etl/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-etl/README.md b/examples/camel-example-etl/README.md
index c6bf63b..72e51f6 100644
--- a/examples/camel-example-etl/README.md
+++ b/examples/camel-example-etl/README.md
@@ -2,7 +2,10 @@
### Introduction
-This example shows how to use Camel as an ETL tool
+This example shows how to use Camel as an ETL tool.
+
+The ETL (Extract, Transform, Load) example shows how to load data into a database using Camel.
+In this example we will poll for files, transform them and then store them in the database via the JPA component.
### Build
@@ -48,13 +51,6 @@ e.g. in case of Karaf start it again using:
karaf clean
-### Documentation
-
-For a full description of this example please see
- <http://camel.apache.org/etl-example.html>
-
-<http://camel.apache.org/etl.html>
-
### Forum, Help, etc
If you hit an problems please let us know on the Camel Forums
http://git-wip-us.apache.org/repos/asf/camel/blob/a5513e79/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/Main.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/Main.java b/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/Main.java
index fcd2d5e..5a537be 100644
--- a/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/Main.java
+++ b/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/Main.java
@@ -22,6 +22,7 @@ package org.apache.camel.example.etl;
* @version
*/
public class Main extends org.apache.camel.spring.Main {
+
public static void main(String... args) throws Exception {
new Main().run(args);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a5513e79/examples/camel-example-ftp/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-ftp/README.md b/examples/camel-example-ftp/README.md
index 71a54d1..45349b1 100644
--- a/examples/camel-example-ftp/README.md
+++ b/examples/camel-example-ftp/README.md
@@ -8,6 +8,18 @@ This example requires that an existing FTP server is available.
You can configure the location of this FTP server in the file:
`src/main/resources/ftp.properties`
+### Implementation
+
+This example is implemented in Java code, and there is a client and a server application.
+The client is used for uploading files from the local file system (from target/upload) to the FTP server.
+The server is used for downloading files from the FTP server to the local file system (to target/download).
+You can see the Java implementation by opening the src/main/java/org/apache/camel/example/ftp/MyFtpClientRouteBuilder.java for the client Java route.
+And the server example is implemented in the src/main/java/org/apache/camel/example/ftp/MyFtpClientRouteBuilder.java file.
+
+### Prerequisites
+
+An existing FTP server should be running.
+
### Build
You will need to compile this example first:
@@ -36,11 +48,6 @@ To run the server you type:
... and instructions will be printed on the console.
-
-### Documentation
-
-This example is documented at [http://camel.apache.org/ftp-example.html](http://camel.apache.org/ftp-example.html)
-
You can enable verbose logging by adjustung the `src/main/resources/log4j.properties` file as documented in the file.
### Forum, Help, etc
http://git-wip-us.apache.org/repos/asf/camel/blob/a5513e79/examples/camel-example-guice-jms/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-guice-jms/README.md b/examples/camel-example-guice-jms/README.md
index 522a7c4..db3a94c 100644
--- a/examples/camel-example-guice-jms/README.md
+++ b/examples/camel-example-guice-jms/README.md
@@ -33,9 +33,6 @@ You can see the routing rules by looking at the java code in the
To stop the example hit <kbd>ctrl</kbd>+<kbd>c</kbd>
-### Documentation
-
-This example is documented at [http://camel.apache.org/guice-jms-example.html](http://camel.apache.org/guice-jms-example.html)
### Forum, Help, etc
http://git-wip-us.apache.org/repos/asf/camel/blob/a5513e79/examples/camel-example-jms-file/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-jms-file/README.md b/examples/camel-example-jms-file/README.md
index b854a9f..afa58b1 100644
--- a/examples/camel-example-jms-file/README.md
+++ b/examples/camel-example-jms-file/README.md
@@ -21,10 +21,6 @@ The example should run if you type
After the example is complete, then there should be 10 files written
in the test directory.
-### Documentation
-
-This example is documented at [http://camel.apache.org/walk-through-an-example.html](http://camel.apache.org/walk-through-an-example.html)
-
### Forum, Help, etc
If you hit an problems please let us know on the Camel Forums
http://git-wip-us.apache.org/repos/asf/camel/blob/a5513e79/examples/camel-example-jmx/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-jmx/README.md b/examples/camel-example-jmx/README.md
index 5b66d96..fdd0a96 100644
--- a/examples/camel-example-jmx/README.md
+++ b/examples/camel-example-jmx/README.md
@@ -26,9 +26,6 @@ You can see the routing rules by looking at the java code in the
To stop the example hit <kbd>ctrl</kbd>+<kbd>c</kbd>
-### Documentation
-
-This example is documented at [http://camel.apache.org/jmx-component-example.html](http://camel.apache.org/jmx-component-example.html)
### Forum, Help, etc
http://git-wip-us.apache.org/repos/asf/camel/blob/a5513e79/examples/camel-example-kotlin/ReadMe.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-kotlin/ReadMe.md b/examples/camel-example-kotlin/ReadMe.md
index 4d30263..f36980e 100644
--- a/examples/camel-example-kotlin/ReadMe.md
+++ b/examples/camel-example-kotlin/ReadMe.md
@@ -1,5 +1,10 @@
-Camel Router with Kotlin Project
-================================
+# Camel Router with Kotlin Project
+
+A simple example that uses Kotlin programming language to define a little Camel route.
+
+The Camel route listen on HTTP port 8080 and return back a constant response.
+
+### How to run
To build this project use
@@ -9,7 +14,16 @@ To run this project
mvn exec:java
-For more help see the Apache Camel documentation
+You can then open the following url from a web browser: <http://localhost:8080>
+
+
+### Forum, Help, etc
+
+If you hit an problems please let us know on the Camel Forums
+ <http://camel.apache.org/discussion-forums.html>
+
+Please help us make Apache Camel better - we appreciate any feedback you may
+have. Enjoy!
- http://camel.apache.org/
+The Camel riders!
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/a5513e79/examples/camel-example-loadbalancing/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-loadbalancing/README.md b/examples/camel-example-loadbalancing/README.md
index 40f66731a..07c866a 100644
--- a/examples/camel-example-loadbalancing/README.md
+++ b/examples/camel-example-loadbalancing/README.md
@@ -42,11 +42,6 @@ To run the example, then execute the following command in the respective folder:
mvn exec:java -Ploadbalancer
-### Documentation
-
-This example is documented at
- <http://camel.apache.org/loadbalancing-mina-example.html>
-
### Forum, Help, etc
If you hit an problems please let us know on the Camel Forums
http://git-wip-us.apache.org/repos/asf/camel/blob/a5513e79/examples/camel-example-loan-broker-cxf/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-loan-broker-cxf/README.md b/examples/camel-example-loan-broker-cxf/README.md
index 6ca423b..719e42b 100644
--- a/examples/camel-example-loan-broker-cxf/README.md
+++ b/examples/camel-example-loan-broker-cxf/README.md
@@ -20,10 +20,6 @@ You will need to compile this example first:
To stop the example hit <kbd>ctrl</kbd>+<kbd>c</kbd>
-### Documentation
-
-This example is documented at
- <http://camel.apache.org/loan-broker-example.html>
### Forum, Help, etc
http://git-wip-us.apache.org/repos/asf/camel/blob/a5513e79/examples/camel-example-loan-broker-jms/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-loan-broker-jms/README.md b/examples/camel-example-loan-broker-jms/README.md
index 8588af2..37cb874 100644
--- a/examples/camel-example-loan-broker-jms/README.md
+++ b/examples/camel-example-loan-broker-jms/README.md
@@ -20,10 +20,6 @@ You will need to compile this example first:
To stop the example hit <kbd>ctrl</kbd>+<kbd>c</kbd>
-### Documentation
-
-This example is documented at
- <http://camel.apache.org/loan-broker-example.html>
### Forum, Help, etc
http://git-wip-us.apache.org/repos/asf/camel/blob/a5513e79/examples/camel-example-management/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-management/README.md b/examples/camel-example-management/README.md
index fde763c..71251d6 100644
--- a/examples/camel-example-management/README.md
+++ b/examples/camel-example-management/README.md
@@ -64,11 +64,6 @@ You can see the routing rules by looking at the java code in the
To stop the example hit <kbd>ctrl</kbd>+<kbd>c</kbd>
-### Documentation
-
-This example is documented at
- <http://camel.apache.org/management-example.html>
-
### Forum, Help, etc
If you hit an problems please let us know on the Camel Forums
http://git-wip-us.apache.org/repos/asf/camel/blob/a5513e79/examples/camel-example-mybatis/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-mybatis/README.md b/examples/camel-example-mybatis/README.md
index ff46185..95dec63 100644
--- a/examples/camel-example-mybatis/README.md
+++ b/examples/camel-example-mybatis/README.md
@@ -41,12 +41,6 @@ This example uses OSGi Blueprint to setup and configure the database,
as well the CamelContext. You can see this in the following file:
In the `src/main/resources/OSGI-INF/blueprint/camel-mybatis.xml`
-
-### Documentation
-
-This example is documented at
- <http://camel.apache.org/mybatis-example.html>
-
### Forum, Help, etc
If you hit an problems please let us know on the Camel Forums
http://git-wip-us.apache.org/repos/asf/camel/blob/a5513e79/examples/camel-example-netty-http/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-netty-http/README.md b/examples/camel-example-netty-http/README.md
index de6cf7f..36d267a 100644
--- a/examples/camel-example-netty-http/README.md
+++ b/examples/camel-example-netty-http/README.md
@@ -112,14 +112,6 @@ The following messages should be displayed:
Hit <kbd>ctrl</kbd>+<kbd>c</kbd> to exit the log command.
-This example is documented at
-<http://camel.apache.org/netty-http-server-example.html>
-
-### Documentation
-
-This example is documented at
-<http://camel.apache.org/netty-http-server-example.htmll>
-
### Forum, Help, etc
If you hit an problems please let us know on the Camel Forums
http://git-wip-us.apache.org/repos/asf/camel/blob/a5513e79/examples/camel-example-osgi-rmi/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-osgi-rmi/pom.xml b/examples/camel-example-osgi-rmi/pom.xml
index 2dfeec0..dce39d2 100644
--- a/examples/camel-example-osgi-rmi/pom.xml
+++ b/examples/camel-example-osgi-rmi/pom.xml
@@ -28,7 +28,7 @@
<artifactId>camel-example-osgi-rmi</artifactId>
<packaging>jar</packaging>
- <name>Camel :: Example :: OSGi RMI</name>
+ <name>Camel :: Example :: OSGi RMI (deprecated)</name>
<description>A OSGi example which exposes a RMI service.</description>
<properties>
http://git-wip-us.apache.org/repos/asf/camel/blob/a5513e79/examples/camel-example-pojo-messaging/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-pojo-messaging/README.md b/examples/camel-example-pojo-messaging/README.md
index 5f49478..90bf8c9 100644
--- a/examples/camel-example-pojo-messaging/README.md
+++ b/examples/camel-example-pojo-messaging/README.md
@@ -20,10 +20,6 @@ To run the example type
To stop the example hit <kbd>ctrl</kbd>+<kbd>c</kbd>
-### Documentation
-
-This example is documented at
- <http://camel.apache.org/pojo-messaging-example.html>
### Forum, Help, etc
http://git-wip-us.apache.org/repos/asf/camel/blob/a5513e79/examples/camel-example-reportincident-wssecurity/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-reportincident-wssecurity/README.md b/examples/camel-example-reportincident-wssecurity/README.md
index 05cf852..78f0d2e 100644
--- a/examples/camel-example-reportincident-wssecurity/README.md
+++ b/examples/camel-example-reportincident-wssecurity/README.md
@@ -121,11 +121,6 @@ To run the example on Apache Karaf 4.x
#### Step 6: Check email
Check through a POP request that a message has been published in the mailbox of someone (email address : incident@mycompany.com)
-### Documentation
-
-This example is documented at
- <http://camel.apache.org/tutorial-osgi-camel-part1.html>
-
### Forum, Help, etc
If you hit an problems please let us know on the Camel Forums
http://git-wip-us.apache.org/repos/asf/camel/blob/a5513e79/examples/camel-example-reportincident/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-reportincident/README.md b/examples/camel-example-reportincident/README.md
index a624c0d..03ccafa 100644
--- a/examples/camel-example-reportincident/README.md
+++ b/examples/camel-example-reportincident/README.md
@@ -30,11 +30,6 @@ The webservice WSDL is exposed at:
To stop the example hit <kbd>ctrl</kbd>+<kbd>c</kbd>
-### Documentation
-
-This example is documented at
- <http://camel.apache.org/tutorial-example-reportincident.html>
-
### Forum, Help, etc
If you hit an problems please let us know on the Camel Forums
http://git-wip-us.apache.org/repos/asf/camel/blob/a5513e79/examples/camel-example-route-throttling/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-route-throttling/README.md b/examples/camel-example-route-throttling/README.md
index dfe4fb9..81116ae 100644
--- a/examples/camel-example-route-throttling/README.md
+++ b/examples/camel-example-route-throttling/README.md
@@ -21,24 +21,27 @@ You will need to compile this example first:
mvn compile
-### Run
+### How to Run
-The example should run if you type:
+The example has 3 maven goals to run the example
- mvn exec:java -PCamelServer
+ mvn compile exec:java -PCamelServer
+
+ Starts the Camel Server which contains the 3 routes and where you should check its log output for how it goes.
+ mvn compile exec:java -PCamelClient
+
+ Is a client that sends 10000 JMS messages to the JMS broker which is consumed by route1. The Server must be started beforehand.
- mvn exec:java -PCamelClient
+ mvn compile exec:java -PCamelFileClient
+
+ Is a client that creates 5000 files that are consumed by route2. The server may be started beforehand, but its not required.
-
- mvn exec:java -PCamelFileClient
+So at first you start the server. Then at any time you can run a client at will. For example you can run the JMS client and let it run to completion at the server. You can see at the server console logging that it reports the progress. And at sometime it will reach 10000 messages processed. You can then start the client again if you like.
+You can also start the other client to create the files which then let the example be a bit more complicated as we have concurrent processing of JMS messages and files at the same time. And where as both of these should be dynamic throttled so we wont go too fast.
To stop the example hit <kbd>ctrl</kbd>+<kbd>c</kbd>
-### Documentation
-
-This example is documented at
- <http://camel.apache.org/route-throttling-example.html>
### Forum, Help, etc
http://git-wip-us.apache.org/repos/asf/camel/blob/a5513e79/examples/camel-example-scala/ReadMe.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-scala/ReadMe.md b/examples/camel-example-scala/ReadMe.md
index 5806db3..36295d0 100644
--- a/examples/camel-example-scala/ReadMe.md
+++ b/examples/camel-example-scala/ReadMe.md
@@ -1,5 +1,10 @@
-Camel Router with Scala DSL Project
-===================================
+# Camel Router with Scala Project
+
+A simple example that uses Scala programming language to define a little Camel route.
+
+The Camel route triggers every 5th second and logs a message to the console
+
+### How to run
To build this project use
@@ -9,7 +14,13 @@ To run this project
mvn exec:java
-For more help see the Apache Camel documentation
+### Forum, Help, etc
+
+If you hit an problems please let us know on the Camel Forums
+ <http://camel.apache.org/discussion-forums.html>
+
+Please help us make Apache Camel better - we appreciate any feedback you may
+have. Enjoy!
- http://camel.apache.org/
+The Camel riders!
\ No newline at end of file
[2/3] camel git commit: Polished
Posted by da...@apache.org.
Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/dc46f50d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/dc46f50d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/dc46f50d
Branch: refs/heads/master
Commit: dc46f50d84d22792277fe3eb480c4071e15506a7
Parents: a5513e7
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Feb 15 14:28:50 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Feb 15 14:28:50 2017 +0100
----------------------------------------------------------------------
examples/README.adoc | 6 +++---
.../camel-example-servlet-tomcat-no-spring/README.md | 8 ++------
examples/camel-example-servlet-tomcat/README.md | 5 -----
examples/camel-example-simplejirabot/README.md | 4 ----
.../readme.adoc | 2 +-
examples/camel-example-spring-boot/readme.adoc | 14 ++++++++++----
examples/camel-example-spring-javaconfig/README.md | 3 ---
examples/camel-example-spring-jms/README.md | 4 ----
examples/camel-example-spring-security/README.md | 3 ---
examples/camel-example-spring-ws/README.md | 8 +++-----
examples/camel-example-spring-xquery/README.md | 3 ---
examples/camel-example-spring/README.md | 4 ----
examples/camel-example-sql-blueprint/README.md | 3 ---
examples/camel-example-sql/README.md | 3 ---
examples/camel-example-tracer/README.md | 8 --------
examples/camel-example-tracer/pom.xml | 2 +-
.../README.md | 7 -------
examples/camel-example-twitter-websocket/README.md | 5 -----
examples/camel-example-widget-gadget-cdi/README.md | 5 -----
examples/camel-example-widget-gadget-java/README.md | 5 -----
examples/camel-example-widget-gadget-xml/README.md | 5 -----
examples/camel-example-zipkin/README.md | 15 +++++++++++++++
22 files changed, 35 insertions(+), 87 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/dc46f50d/examples/README.adoc
----------------------------------------------------------------------
diff --git a/examples/README.adoc b/examples/README.adoc
index 554dfe4..8af837d 100644
--- a/examples/README.adoc
+++ b/examples/README.adoc
@@ -105,7 +105,7 @@ Number of Examples: 83
| link:camel-example-spring-boot-metrics/README.md[Spring Boot Metrics] (camel-example-spring-boot-metrics) | Management and Monitoring | An example showing how to work with Camel and Spring Boot and report metrics to Graphite
-| link:camel-example-tracer/README.md[Tracer] (camel-example-tracer) | Management and Monitoring | An example showing how to persist Camel trace event messages using JPA
+| link:camel-example-tracer/README.md[Tracer] (camel-example-tracer) | Management and Monitoring | *deprecated* An example showing how to persist Camel trace event messages using JPA
| link:camel-example-zipkin/README.md[Zipkin] (camel-example-zipkin) | Management and Monitoring | An example showing how to trace incoming and outgoing messages from Camel with Zipkin
@@ -115,7 +115,7 @@ Number of Examples: 83
| link:camel-example-jms-file/README.md[JMS-File] (camel-example-jms-file) | Messaging | An example that persists messages from JMS to files
-| link:camel-example-kafka/README.md[Kafka] (camel-example-kafka) | Messaging | An example for Kafka
+| link:camel-example-kafka/README.adoc[Kafka] (camel-example-kafka) | Messaging | An example for Kafka
| link:camel-example-spring-jms/README.md[Spring JMS] (camel-example-spring-jms) | Messaging | An example using Spring XML to talk to the JMS server from different kind of client techniques
@@ -129,7 +129,7 @@ Number of Examples: 83
| link:camel-example-netty-http/README.md[Netty HTTP] (camel-example-netty-http) | OSGi | An example showing how to use a shared Netty HTTP server with multiple Camel applications in OSGi container
-| link:camel-example-osgi-rmi/README.md[OSGi RMI] (camel-example-osgi-rmi) | OSGi | A OSGi example which exposes a RMI service.
+| link:camel-example-osgi-rmi/README.md[OSGi RMI] (camel-example-osgi-rmi) | OSGi | *deprecated* A OSGi example which exposes a RMI service.
| link:camel-example-servlet-rest-blueprint/README.md[Servlet REST Blueprint] (camel-example-servlet-rest-blueprint) | OSGi | An example using Servlet REST with OSGi Blueprint
http://git-wip-us.apache.org/repos/asf/camel/blob/dc46f50d/examples/camel-example-servlet-tomcat-no-spring/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-servlet-tomcat-no-spring/README.md b/examples/camel-example-servlet-tomcat-no-spring/README.md
index ae97571..e81021e 100644
--- a/examples/camel-example-servlet-tomcat-no-spring/README.md
+++ b/examples/camel-example-servlet-tomcat-no-spring/README.md
@@ -6,7 +6,8 @@ without using the Spring Framework.
### Build
You will need to package this example first:
- mvn package
+
+ mvn package
### Run
To run the example deploy it in Apache Tomcat by copying the `.war` to the
@@ -22,11 +23,6 @@ The servlet is located at
http://localhost:8080/camel-example-servlet-tomcat-no-spring/camel
<http://localhost:8080/camel-example-servlet-tomcat-no-spring/camel>
-### Documentation
-
-This example is documented at
- <http://camel.apache.org/servlet-tomcat-example-no-spring.html>
-
### Forum, Help, etc
If you hit an problems please let us know on the Camel Forums
http://git-wip-us.apache.org/repos/asf/camel/blob/dc46f50d/examples/camel-example-servlet-tomcat/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-servlet-tomcat/README.md b/examples/camel-example-servlet-tomcat/README.md
index e35557b..00f469e 100644
--- a/examples/camel-example-servlet-tomcat/README.md
+++ b/examples/camel-example-servlet-tomcat/README.md
@@ -25,11 +25,6 @@ The servlet is located at
http://localhost:8080/camel-example-servlet-tomcat/camel/hello
<http://localhost:8080/camel-example-servlet-tomcat/camel/hello>
-### Documentation
-
-This example is documented at
- <http://camel.apache.org/servlet-tomcat-example.html>
-
### Forum, Help, etc
If you hit an problems please let us know on the Camel Forums
http://git-wip-us.apache.org/repos/asf/camel/blob/dc46f50d/examples/camel-example-simplejirabot/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-simplejirabot/README.md b/examples/camel-example-simplejirabot/README.md
index a5d2c89..d66d30d 100644
--- a/examples/camel-example-simplejirabot/README.md
+++ b/examples/camel-example-simplejirabot/README.md
@@ -31,10 +31,6 @@ You can see the routing rules by looking at the java code in the
To stop the example hit <kbd>ctrl</kbd>+<kbd>c</kbd>
-### Documentation
-
-This example is documented at <http://camel.apache.org/simple-jira-bot.html>
-
### Forum, Help, etc
If you hit an problems please let us know on the Camel Forums
http://git-wip-us.apache.org/repos/asf/camel/blob/dc46f50d/examples/camel-example-spring-boot-live-reload/readme.adoc
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-boot-live-reload/readme.adoc b/examples/camel-example-spring-boot-live-reload/readme.adoc
index 3498a68..98b93c8 100644
--- a/examples/camel-example-spring-boot-live-reload/readme.adoc
+++ b/examples/camel-example-spring-boot-live-reload/readme.adoc
@@ -8,7 +8,7 @@ LiveReload browser extensions are freely available for the most popular browsers
The example should be launched with the following maven command:
- mvn clean install spring-boot:run
+ mvn spring-boot:run
Once the application is started, you can visit http://localhost:8080/ with a browser and activate the LiveReload feature
(usually, by clicking on the extension's icon).
http://git-wip-us.apache.org/repos/asf/camel/blob/dc46f50d/examples/camel-example-spring-boot/readme.adoc
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-boot/readme.adoc b/examples/camel-example-spring-boot/readme.adoc
index 242fc01..8520753 100644
--- a/examples/camel-example-spring-boot/readme.adoc
+++ b/examples/camel-example-spring-boot/readme.adoc
@@ -1,20 +1,26 @@
-= Camel Example Spring Boot
+# Camel Example Spring Boot
This example shows how to work with a simple Apache Camel application using Spring Boot.
The example generates messages using timer trigger, writes them to standard output.
-== Camel routes
+## Camel routes
The Camel route is located in the `SampleCamelRouter` class. In this class the route
starts from a timer, that triggers every 2nd second and calls a Spring Bean `SampleBean`
which returns a message, that is routed to a stream endpoint which writes to standard output.
-== Using Camel components
+## Using Camel components
Apache Camel provides 200+ components which you can use to integrate and route messages between many systems
and data formats. To use any of these Camel components, add the component as a dependency to your project.
-== More information
+## How to run
+
+You can run this example using
+
+ mvn spring-boot:run
+
+## More information
You can find more information about Apache Camel at the website: http://camel.apache.org/
http://git-wip-us.apache.org/repos/asf/camel/blob/dc46f50d/examples/camel-example-spring-javaconfig/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-javaconfig/README.md b/examples/camel-example-spring-javaconfig/README.md
index eec374f..712b26a 100644
--- a/examples/camel-example-spring-javaconfig/README.md
+++ b/examples/camel-example-spring-javaconfig/README.md
@@ -25,9 +25,6 @@ To stop the example hit <kbd>ctrl</kbd>+<kbd>c</kbd>
You can see the routing rules by looking at the java code in the
`src/main/java directory`
-### Documentation
-This example is documented at <http://camel.apache.org/spring-java-config-example.html>
-
### Forum, Help, etc
If you hit an problems please let us know on the Camel Forums
http://git-wip-us.apache.org/repos/asf/camel/blob/dc46f50d/examples/camel-example-spring-jms/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-jms/README.md b/examples/camel-example-spring-jms/README.md
index 32fc41e..9a5f324 100644
--- a/examples/camel-example-spring-jms/README.md
+++ b/examples/camel-example-spring-jms/README.md
@@ -31,10 +31,6 @@ The example should run if you type:
To stop the example hit <kbd>ctrl</kbd>+<kbd>c</kbd>
-### Documentation
-
-This example is documented at <http://camel.apache.org/tutorial-jmsremoting.html>
-
### Forum, Help, etc
If you hit an problems please let us know on the Camel Forums
http://git-wip-us.apache.org/repos/asf/camel/blob/dc46f50d/examples/camel-example-spring-security/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-security/README.md b/examples/camel-example-spring-security/README.md
index eb6d828..d75e322 100644
--- a/examples/camel-example-spring-security/README.md
+++ b/examples/camel-example-spring-security/README.md
@@ -23,9 +23,6 @@ Then you can use the script in the client directory to send the request and chec
or use browser to access upper urls with the user/password
(`jim/jimspassword` with the admin and user role or `bob/bobspassword` with user role).
-### Documentation
-This example is documented at <http://camel.apache.org/spring-security-example.html>
-
### Forum, Help, etc
If you hit an problems please let us know on the Camel Forums
http://git-wip-us.apache.org/repos/asf/camel/blob/dc46f50d/examples/camel-example-spring-ws/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-ws/README.md b/examples/camel-example-spring-ws/README.md
index 44f88f4..5a5e587 100644
--- a/examples/camel-example-spring-ws/README.md
+++ b/examples/camel-example-spring-ws/README.md
@@ -5,12 +5,13 @@ This example shows how to expose a SOAP-based web service using Camel and Spring
### Build
You will need to compile this example first:
- mvn clean install
+
+ mvn clean install
### Run
To run the example, you need to start up the server by typing
- mvn jetty:run
+ mvn jetty:run
To stop the server hit <kbd>ctrl</kbd>+<kbd>c</kbd>
@@ -25,9 +26,6 @@ The WSDL is available at:
You can test the web service using for example SOAP-UI. This excellent tool is freely available from http://www.soapui.org.
There's a ready to use SOAP-UI project available in the `client` directory.
-### Documentation
-This example is documented at <http://camel.apache.org/spring-ws-example.html>
-
### Forum, Help, etc
If you hit an problems please let us know on the Camel Forums
http://git-wip-us.apache.org/repos/asf/camel/blob/dc46f50d/examples/camel-example-spring-xquery/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-xquery/README.md b/examples/camel-example-spring-xquery/README.md
index 743c39a..99ae037 100644
--- a/examples/camel-example-spring-xquery/README.md
+++ b/examples/camel-example-spring-xquery/README.md
@@ -25,9 +25,6 @@ at `src/main/resources/META-INF/spring`
To stop the example hit <kbd>ctrl</kbd>+<kbd>c</kbd>
-### Documentation
-This example is documented at <http://camel.apache.org/spring-xquery-example.html>
-
### Forum, Help, etc
http://git-wip-us.apache.org/repos/asf/camel/blob/dc46f50d/examples/camel-example-spring/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring/README.md b/examples/camel-example-spring/README.md
index c3686c3..4747026 100644
--- a/examples/camel-example-spring/README.md
+++ b/examples/camel-example-spring/README.md
@@ -24,10 +24,6 @@ You can see the routing rules by looking at the java code in the
To stop the example hit <kbd>ctrl</kbd>+<kbd>c</kbd>
-### Documentation
-
-This example is documented at <http://camel.apache.org/spring-example.html>
-
### Forum, Help, etc
If you hit an problems please let us know on the Camel Forums
http://git-wip-us.apache.org/repos/asf/camel/blob/dc46f50d/examples/camel-example-sql-blueprint/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-sql-blueprint/README.md b/examples/camel-example-sql-blueprint/README.md
index b7aa857..826c360 100644
--- a/examples/camel-example-sql-blueprint/README.md
+++ b/examples/camel-example-sql-blueprint/README.md
@@ -56,9 +56,6 @@ And you can see the application running by tailing the logs
And you can use <kbd>ctrl</kbd>+<kbd>c</kbd> to stop tailing the log.
-### Documentation
-This example is documented at <http://camel.apache.org/sql-example-blueprint.html>
-
### Forum, Help, etc
If you hit an problems please let us know on the Camel Forums
http://git-wip-us.apache.org/repos/asf/camel/blob/dc46f50d/examples/camel-example-sql/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-sql/README.md b/examples/camel-example-sql/README.md
index f2d0bd4..455868d 100644
--- a/examples/camel-example-sql/README.md
+++ b/examples/camel-example-sql/README.md
@@ -56,9 +56,6 @@ And you can see the application running by tailing the logs
And you can use <kbd>ctrl</kbd>+<kbd>c</kbd> to stop tailing the log.
-### Documentation
-This example is documented at <http://camel.apache.org/sql-example.html>
-
### Forum, Help, etc
If you hit an problems please let us know on the Camel Forums
http://git-wip-us.apache.org/repos/asf/camel/blob/dc46f50d/examples/camel-example-tracer/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-tracer/README.md b/examples/camel-example-tracer/README.md
index 8860ee2..0724ff2 100644
--- a/examples/camel-example-tracer/README.md
+++ b/examples/camel-example-tracer/README.md
@@ -25,14 +25,6 @@ to return as response in the console.
To stop the example hit <kbd>ctrl</kbd>+<kbd>c</kbd>
-### Documentation
-
-For a background in tracer and JPA see
- http://camel.apache.org/tracer.html
- http://camel.apache.org/jpa.html
-
-This example is documented at <http://camel.apache.org/tracer-example.html>
-
### Forum, Help, etc
If you hit an problems please let us know on the Camel Forums
http://git-wip-us.apache.org/repos/asf/camel/blob/dc46f50d/examples/camel-example-tracer/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-tracer/pom.xml b/examples/camel-example-tracer/pom.xml
index 978d123..8dfd49a 100644
--- a/examples/camel-example-tracer/pom.xml
+++ b/examples/camel-example-tracer/pom.xml
@@ -28,7 +28,7 @@
<artifactId>camel-example-tracer</artifactId>
<packaging>jar</packaging>
- <name>Camel :: Example :: Tracer</name>
+ <name>Camel :: Example :: Tracer (deprecated)</name>
<description>An example showing how to persist Camel trace event messages using JPA</description>
<properties>
http://git-wip-us.apache.org/repos/asf/camel/blob/dc46f50d/examples/camel-example-twitter-websocket-blueprint/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-twitter-websocket-blueprint/README.md b/examples/camel-example-twitter-websocket-blueprint/README.md
index 57e285e..fd7c05e 100644
--- a/examples/camel-example-twitter-websocket-blueprint/README.md
+++ b/examples/camel-example-twitter-websocket-blueprint/README.md
@@ -44,13 +44,6 @@ To stop the example run from Karaf/ServiceMix shell:
eg if the bundle id is 99 then type:
stop 99
-### Documentation
-We have described this in more details at the Camel twitter documentation: <http://camel.apache.org/twitter>
-
-This example is documented at <http://camel.apache.org/twitter-websocket-blueprint-example.html>
-
-There is a regular (non OSGi Blueprint) example as well documented at: <http://camel.apache.org/twitter-websocket-example.html>
-
### Forum, Help, etc
If you hit an problems please let us know on the Camel Forums
http://git-wip-us.apache.org/repos/asf/camel/blob/dc46f50d/examples/camel-example-twitter-websocket/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-twitter-websocket/README.md b/examples/camel-example-twitter-websocket/README.md
index 5fe7269..ef6db6b 100644
--- a/examples/camel-example-twitter-websocket/README.md
+++ b/examples/camel-example-twitter-websocket/README.md
@@ -28,11 +28,6 @@ Then open a browser to see live twitter updates in the web page
To stop the example hit <kbd>ctrl</kbd>+<kbd>c</kbd>
-### Documentation
-We have described this in more details at the Camel twitter documentation: <http://camel.apache.org/twitter>
-
-This example is documented at <http://camel.apache.org/twitter-websocket-example.html>
-
### Forum, Help, etc
If you hit an problems please let us know on the Camel Forums
http://git-wip-us.apache.org/repos/asf/camel/blob/dc46f50d/examples/camel-example-widget-gadget-cdi/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-widget-gadget-cdi/README.md b/examples/camel-example-widget-gadget-cdi/README.md
index 0ae4bab..941e8be 100644
--- a/examples/camel-example-widget-gadget-cdi/README.md
+++ b/examples/camel-example-widget-gadget-cdi/README.md
@@ -67,11 +67,6 @@ The Camel application can be stopped pressing <kbd>ctrl</kbd>+<kbd>c</kbd> in th
The Camel application is configured in the `org.apache.camel.example.widget.WidgetApplication.java` file.
-### Documentation
-
-This example is documented at
- <http://camel.apache.org/widget-gadget.html>
-
### Forum, Help, etc
If you hit an problems please let us know on the Camel Forums
http://git-wip-us.apache.org/repos/asf/camel/blob/dc46f50d/examples/camel-example-widget-gadget-java/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-widget-gadget-java/README.md b/examples/camel-example-widget-gadget-java/README.md
index cd04fb9..dcd62a1 100644
--- a/examples/camel-example-widget-gadget-java/README.md
+++ b/examples/camel-example-widget-gadget-java/README.md
@@ -65,11 +65,6 @@ The Camel application can be stopped pressing <kbd>ctrl</kbd>+<kbd>c</kbd> in th
The Camel application is configured in the `src/main/java/org/apache/camel/example/widget/WidgetMain.java` file.
-### Documentation
-
-This example is documented at
- [http://camel.apache.org/widget-gadget.html](http://camel.apache.org/widget-gadget.html)
-
### Forum, Help, etc
If you hit an problems please let us know on the Camel Forums
http://git-wip-us.apache.org/repos/asf/camel/blob/dc46f50d/examples/camel-example-widget-gadget-xml/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-widget-gadget-xml/README.md b/examples/camel-example-widget-gadget-xml/README.md
index 9cbc8d8..77eaf42 100644
--- a/examples/camel-example-widget-gadget-xml/README.md
+++ b/examples/camel-example-widget-gadget-xml/README.md
@@ -66,11 +66,6 @@ The Camel application can be stopped pressing <kbd>ctrl</kbd>+<kbd>c</kbd> in th
The Camel application is configured in the `src/main/resources/META-INF/spring/widget.xml` file.
-### Documentation
-
-This example is documented at
- [http://camel.apache.org/widget-gadget.html](http://camel.apache.org/widget-gadget.html)
-
### Forum, Help, etc
If you hit an problems please let us know on the Camel Forums
http://git-wip-us.apache.org/repos/asf/camel/blob/dc46f50d/examples/camel-example-zipkin/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-zipkin/README.md b/examples/camel-example-zipkin/README.md
index b22e423..8658a6b 100644
--- a/examples/camel-example-zipkin/README.md
+++ b/examples/camel-example-zipkin/README.md
@@ -66,6 +66,21 @@ You can then click on each span and get annotated data from the Camel exchange a
+### Installing Zipkin Server
+
+If you want to try Zipkin locally then you quickly download an uber JAR (standalone-hystrix-dashboard)
+
+ <http://search.maven.org/remotecontent?filepath=com/github/kennedyoliveira/standalone-hystrix-dashboard/1.5.3/standalone-hystrix-dashboard-1.5.3-all.jar>
+
+.. and then run it
+
+ java -jar standalone-hystrix-dashboard-1.5.3-all.jar
+
+And the console is available at:
+
+ http://localhost:7979/hystrix-dashboard/
+
+
### Installing Zipkin Server using Docker
If you want to try Zipkin locally then you quickly try that using Docker.
[3/3] camel git commit: Upgrade weld
Posted by da...@apache.org.
Upgrade weld
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/60fc57c7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/60fc57c7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/60fc57c7
Branch: refs/heads/master
Commit: 60fc57c7e3d1318c7b28561564c6c923399e6c08
Parents: dc46f50
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Feb 15 14:29:35 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Feb 15 14:29:35 2017 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/60fc57c7/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 16dcef4..25a1e31 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -634,7 +634,7 @@
<vertx-version>3.3.3</vertx-version>
<vysper-version>0.7</vysper-version>
<weld1-version>1.1.28.Final</weld1-version>
- <weld2-version>2.4.1.Final</weld2-version>
+ <weld2-version>2.4.2.Final</weld2-version>
<weld3-version>3.0.0.Beta1</weld3-version>
<werken-xpath-bundle-version>0.9.4_5</werken-xpath-bundle-version>
<wiremock-version>2.5.1</wiremock-version>