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 2021/03/02 05:12:09 UTC
[camel-examples] branch master updated: CAMEL-16012: Remove prefix
07 (#40)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-examples.git
The following commit(s) were added to refs/heads/master by this push:
new 7639e09 CAMEL-16012: Remove prefix 07 (#40)
7639e09 is described below
commit 7639e09ac895871a9b681e33375e49a306471d0e
Author: metters <me...@users.noreply.github.com>
AuthorDate: Tue Mar 2 06:11:59 2021 +0100
CAMEL-16012: Remove prefix 07 (#40)
* [CAMEL-16012] Edit README.adoc
* [CAMEL-16012] Remove prefix
* [CAMEL-16012] Fix root pom
* [CAMEL-16012] Edit README.adoc
* [CAMEL-16012] Remove prefix
* [CAMEL-16012] Fix sonar issue
* [CAMEL-16012] Delete duplicate README
* [CAMEL-16012] Edit README.adoc
* [CAMEL-16012] Remove prefix
* [CAMEL-16012] Edit README.adoc
* [CAMEL-16012] Remove prefix
* [CAMEL-16012] Edit README.adoc
* [CAMEL-16012] Remove prefix
* [CAMEL-16012] Edit README.adoc
* [CAMEL-16012] Remove prefix
* [CAMEL-16012] Edit README.adoc
* [CAMEL-16012] Remove prefix
* [CAMEL-16012] Edit README.adoc
* [CAMEL-16012] Remove prefix
* [CAMEL-16012] Edit README.adoc
* [CAMEL-16012] Remove prefix
* [CAMEL-16012] Fix root pom
* [CAMEL-16012] Edit README.adoc
* [CAMEL-16012] Remove prefix
---
examples/README.adoc | 20 ++++----
examples/camel-example-route-throttling/README.md | 53 ----------------------
.../README.adoc | 12 ++---
.../pom.xml | 0
.../src/data/message1.xml | 0
.../src/data/message2.xml | 0
.../src/data/message3.xml | 0
.../camel/example/pojo/DistributeRecordsBean.java | 0
.../example/pojo/SendFileRecordsToQueueBean.java | 0
.../src/main/resources/META-INF/LICENSE.txt | 0
.../src/main/resources/META-INF/NOTICE.txt | 0
.../resources/META-INF/spring/camel-context.xml | 0
.../src/main/resources/log4j2.properties | 0
.../camel/example/pojo/CamelContextTest.java | 0
examples/pom.xml | 20 ++++----
.../README.adoc} | 4 +-
.../pom.xml | 0
.../org/apache/camel/example/MyApplication.java | 4 +-
.../org/apache/camel/example/MyRouteBuilder.java | 0
.../src/main/resources/application.properties | 0
.../src/main/resources/log4j2.properties | 0
.../README.adoc | 24 +++++-----
.../pom.xml | 0
.../apache/camel/example/client/CamelClient.java | 0
.../camel/example/client/CamelFileClient.java | 0
.../src/main/resources/META-INF/LICENSE.txt | 0
.../src/main/resources/META-INF/NOTICE.txt | 0
.../resources/META-INF/spring/camel-server.xml | 0
.../src/main/resources/camel-client.xml | 0
.../src/main/resources/camel-file-client.xml | 0
.../src/main/resources/log4j2.properties | 0
.../readme.adoc => routeloader/README.adoc} | 4 +-
.../pom.xml | 0
.../org/apache/camel/example/MyApplication.java | 0
.../src/main/resources/application.properties | 0
.../src/main/resources/logback.xml | 0
.../main/resources/myroutes/MyRouteBuilder.java | 0
.../src/main/resources/myroutes/cheese-route.xml | 0
.../readme.adoc => routetemplate/README.adoc} | 4 +-
.../pom.xml | 0
.../src/main/data/foo.properties | 0
.../org/apache/camel/example/MyApplication.java | 0
.../org/apache/camel/example/MyRouteTemplates.java | 0
.../apache/camel/example/MyTemplateBuilder.java | 0
.../src/main/resources/application.properties | 0
.../src/main/resources/logback.xml | 0
.../README.adoc | 6 ++-
.../pom.xml | 0
.../camel/example/salesforce/Application.java | 0
.../example/salesforce/SalesforceRouteBuilder.java | 0
.../src/main/resources/application.properties | 0
.../src/main/resources/simplelogger.properties | 0
.../README.adoc | 14 +++---
.../pom.xml | 0
.../src/main/resources/META-INF/LICENSE.txt | 0
.../src/main/resources/META-INF/NOTICE.txt | 0
.../src/main/resources/camel-config.xml | 0
.../src/main/resources/log4j2.properties | 0
.../src/main/webapp/WEB-INF/web.xml | 0
.../src/main/webapp/index.html | 0
.../{camel-example-splunk => splunk}/README.adoc | 35 +++++++-------
examples/{camel-example-splunk => splunk}/pom.xml | 0
.../camel/example/splunk/SplunkEventProcessor.java | 0
.../example/splunk/SplunkPublishEventClient.java | 0
.../splunk/SplunkPublishEventRouteBuilder.java | 0
.../example/splunk/SplunkSavedSearchClient.java | 0
.../splunk/SplunkSavedSearchRouteBuilder.java | 0
.../camel/example/splunk/SplunkSearchClient.java | 0
.../example/splunk/SplunkSearchRouteBuilder.java | 0
.../src/main/resources/META-INF/LICENSE.txt | 0
.../src/main/resources/META-INF/NOTICE.txt | 0
.../src/main/resources/application.properties | 0
.../src/main/resources/log4j2.properties | 0
.../README.adoc | 12 ++---
.../pom.xml | 0
.../src/data/message1.xml | 0
.../src/data/message2.xml | 0
.../example/spring/javaconfig/MyApplication.java | 0
.../camel/example/spring/javaconfig/MyRoute.java | 0
.../camel/example/spring/javaconfig/SomeBean.java | 0
.../src/main/resources/META-INF/LICENSE.txt | 0
.../src/main/resources/META-INF/NOTICE.txt | 0
.../src/main/resources/log4j2.properties | 0
.../example/spring/javaconfig/IntegrationTest.java | 0
.../{camel-example-spring => spring}/README.adoc | 12 ++---
examples/{camel-example-spring => spring}/pom.xml | 0
.../src/data/message1.xml | 0
.../src/data/message2.xml | 0
.../camel/example/spring/MyRouteBuilder.java | 0
.../src/main/resources/META-INF/LICENSE.txt | 0
.../src/main/resources/META-INF/NOTICE.txt | 0
.../resources/META-INF/spring/camel-context.xml | 0
.../src/main/resources/log4j2.properties | 0
.../camel/example/spring/IntegrationTest.java | 0
94 files changed, 90 insertions(+), 134 deletions(-)
diff --git a/examples/README.adoc b/examples/README.adoc
index 3f35a38..adbd9cc 100644
--- a/examples/README.adoc
+++ b/examples/README.adoc
@@ -39,18 +39,18 @@ Number of Examples: 40 (0 deprecated)
| link:oaipmh/README.adoc[OAIPMH example] (camel-example-oaipmh) | Beginner | An example with OAIPMH component
-| link:camel-example-pojo-messaging/README.adoc[POJO Routing] (camel-example-pojo-messaging) | Beginner | An example showing how to produce and consume messages from Camel endpoints using annotated POJOs
+| link:pojo-messaging/README.adoc[POJO Routing] (camel-example-pojo-messaging) | Beginner | An example showing how to produce and consume messages from Camel endpoints using annotated POJOs
-| link:camel-example-routeloader/readme.adoc[Routeloader] (camel-example-routeloader) | Beginner | Example loading and compiling Java routes on startup
+| link:routeloader/README.adoc[Routeloader] (camel-example-routeloader) | Beginner | Example loading and compiling Java routes on startup
-| link:camel-example-routetemplate/readme.adoc[Routetemplate] (camel-example-routetemplate) | Beginner | How to use route templates (parameterized routes)
+| link:routetemplate/README.adoc[Routetemplate] (camel-example-routetemplate) | Beginner | How to use route templates (parameterized routes)
-| link:camel-example-servlet-tomcat/README.adoc[Servlet Tomcat] (camel-example-servlet-tomcat) | Beginner | An example using Camel Servlet with Apache Tomcat
+| link:servlet-tomcat/README.adoc[Servlet Tomcat] (camel-example-servlet-tomcat) | Beginner | An example using Camel Servlet with Apache Tomcat
-| link:camel-example-spring/README.adoc[Spring] (camel-example-spring) | Beginner | An example showing how to work with Camel and Spring
+| link:spring/README.adoc[Spring] (camel-example-spring) | Beginner | An example showing how to work with Camel and Spring
-| link:camel-example-spring-javaconfig/README.adoc[Spring Java Config] (camel-example-spring-javaconfig) | Beginner | An example showing how to work with Camel and Spring Java Config
+| link:spring-javaconfig/README.adoc[Spring Java Config] (camel-example-spring-javaconfig) | Beginner | An example showing how to work with Camel and Spring Java Config
| link:camel-example-spring-xquery/README.adoc[Spring XQuery] (camel-example-spring-xquery) | Beginner | An example using Spring XML to transform a message using XQuery
@@ -58,7 +58,7 @@ Number of Examples: 40 (0 deprecated)
| link:mongodb/README.adoc[Mongodb] (camel-example-mongodb) | Database | An example that uses Camel MongoDB component
-| link:camel-example-route-throttling/readme.md[Route Throttling] (camel-example-route-throttling) | EIP | A client-server example using JMS transport where we on the server side can throttle the Camel
+| link:route-throttling/readme.md[Route Throttling] (camel-example-route-throttling) | EIP | A client-server example using JMS transport where we on the server side can throttle the Camel
route dynamically based on the flow of messages
@@ -77,7 +77,7 @@ Number of Examples: 40 (0 deprecated)
| link:management/README.adoc[Management] (camel-example-management) | Management and Monitoring | An example for showing Camel JMX management
-| link:camel-example-splunk/README.adoc[Splunk] (camel-example-splunk) | Management and Monitoring | An example using Splunk
+| link:splunk/README.adoc[Splunk] (camel-example-splunk) | Management and Monitoring | An example using Splunk
| link:main-artemis/README.adoc[Main Artemis] (camel-example-main-artemis) | Messaging | An example for showing standalone Camel with ActiveMQ Artemis
@@ -87,7 +87,7 @@ Number of Examples: 40 (0 deprecated)
| link:camel-example-vertx-kafka/README.adoc[Vertx Kafka] (camel-example-vertx-kafka) | Messaging | An example for Vertx Kafka
-| link:camel-example-reactive-executor-vertx/readme.adoc[Reactive Executor Vertx] (camel-example-reactive-executor-vertx) | Reactive | An example for showing using VertX as reactive executor with standalone Camel
+| link:reactive-executor-vertx/README.adoc[Reactive Executor Vertx] (camel-example-reactive-executor-vertx) | Reactive | An example for showing using VertX as reactive executor with standalone Camel
| link:openapi-cdi/README.adoc[OpenApi CDI] (camel-example-openapi-cdi) | Rest | An example using REST DSL and OpenApi Java with CDI
@@ -95,7 +95,7 @@ Number of Examples: 40 (0 deprecated)
| link:camel-example-spring-security/README.adoc[Spring Security] (camel-example-spring-security) | Security | An example showing how to work with Camel and Spring Security
-| link:camel-example-salesforce-consumer/README.adoc[Salesforce Consumer] (camel-example-salesforce-consumer) | Social | An example that uses Salesforce Rest Streaming API
+| link:salesforce-consumer/README.adoc[Salesforce Consumer] (camel-example-salesforce-consumer) | Social | An example that uses Salesforce Rest Streaming API
| link:camel-example-telegram/README.adoc[Telegram] (camel-example-telegram) | Social | An example that uses Telegram API
diff --git a/examples/camel-example-route-throttling/README.md b/examples/camel-example-route-throttling/README.md
deleted file mode 100644
index 3588a48..0000000
--- a/examples/camel-example-route-throttling/README.md
+++ /dev/null
@@ -1,53 +0,0 @@
-# Camel Route Throttling
-
-### Introduction
-
-This example shows how to use the new feature in Camel 2.1 which is RoutePolicy.
-A route policy allows you to associate a route with a policy. Camel provides a
-throttling policy which allows Camel to dynamic throttle the route consumer
-depending on the number of concurrent messages current in flight.
-
-The Server is required to be running when you start the client.
-You can see on the server it should log in the console how it adjust the
-throttling dynamically.
-
-The goal of this example is to illustrate that Camel throttles the JMS queue
-to be on same pace with the rest of the Camel routing. When running the example
-you should observe that the JMS route and the SEDA route completes nearly in sync.
-
-### Build
-
-You will need to compile this example first:
-
- mvn compile
-
-### How to Run
-
-The example has 3 maven goals to run the example
-
- 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 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.
-
-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>
-
-### Help and contributions
-
-If you hit any problem using Camel or have some feedback,
-then please [let us know](https://camel.apache.org/support.html).
-
-We also love contributors,
-so [get involved](https://camel.apache.org/contributing.html) :-)
-
-The Camel riders!
diff --git a/examples/camel-example-pojo-messaging/README.adoc b/examples/pojo-messaging/README.adoc
similarity index 92%
rename from examples/camel-example-pojo-messaging/README.adoc
rename to examples/pojo-messaging/README.adoc
index 57f9e16..1682bd7 100644
--- a/examples/camel-example-pojo-messaging/README.adoc
+++ b/examples/pojo-messaging/README.adoc
@@ -10,17 +10,17 @@ produce, consume or route messages to endpoints.
You will need to compile this example first:
-....
-mvn compile
-....
+----
+$ mvn compile
+----
=== Run
To run the example type
-....
-mvn camel:run
-....
+----
+$ mvn camel:run
+----
To stop the example hit ctrl+c
diff --git a/examples/camel-example-pojo-messaging/pom.xml b/examples/pojo-messaging/pom.xml
similarity index 100%
rename from examples/camel-example-pojo-messaging/pom.xml
rename to examples/pojo-messaging/pom.xml
diff --git a/examples/camel-example-spring/src/data/message1.xml b/examples/pojo-messaging/src/data/message1.xml
similarity index 100%
rename from examples/camel-example-spring/src/data/message1.xml
rename to examples/pojo-messaging/src/data/message1.xml
diff --git a/examples/camel-example-spring/src/data/message2.xml b/examples/pojo-messaging/src/data/message2.xml
similarity index 100%
rename from examples/camel-example-spring/src/data/message2.xml
rename to examples/pojo-messaging/src/data/message2.xml
diff --git a/examples/camel-example-pojo-messaging/src/data/message3.xml b/examples/pojo-messaging/src/data/message3.xml
similarity index 100%
rename from examples/camel-example-pojo-messaging/src/data/message3.xml
rename to examples/pojo-messaging/src/data/message3.xml
diff --git a/examples/camel-example-pojo-messaging/src/main/java/org/apache/camel/example/pojo/DistributeRecordsBean.java b/examples/pojo-messaging/src/main/java/org/apache/camel/example/pojo/DistributeRecordsBean.java
similarity index 100%
rename from examples/camel-example-pojo-messaging/src/main/java/org/apache/camel/example/pojo/DistributeRecordsBean.java
rename to examples/pojo-messaging/src/main/java/org/apache/camel/example/pojo/DistributeRecordsBean.java
diff --git a/examples/camel-example-pojo-messaging/src/main/java/org/apache/camel/example/pojo/SendFileRecordsToQueueBean.java b/examples/pojo-messaging/src/main/java/org/apache/camel/example/pojo/SendFileRecordsToQueueBean.java
similarity index 100%
rename from examples/camel-example-pojo-messaging/src/main/java/org/apache/camel/example/pojo/SendFileRecordsToQueueBean.java
rename to examples/pojo-messaging/src/main/java/org/apache/camel/example/pojo/SendFileRecordsToQueueBean.java
diff --git a/examples/camel-example-spring/src/main/resources/META-INF/LICENSE.txt b/examples/pojo-messaging/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from examples/camel-example-spring/src/main/resources/META-INF/LICENSE.txt
rename to examples/pojo-messaging/src/main/resources/META-INF/LICENSE.txt
diff --git a/examples/camel-example-spring/src/main/resources/META-INF/NOTICE.txt b/examples/pojo-messaging/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from examples/camel-example-spring/src/main/resources/META-INF/NOTICE.txt
rename to examples/pojo-messaging/src/main/resources/META-INF/NOTICE.txt
diff --git a/examples/camel-example-pojo-messaging/src/main/resources/META-INF/spring/camel-context.xml b/examples/pojo-messaging/src/main/resources/META-INF/spring/camel-context.xml
similarity index 100%
rename from examples/camel-example-pojo-messaging/src/main/resources/META-INF/spring/camel-context.xml
rename to examples/pojo-messaging/src/main/resources/META-INF/spring/camel-context.xml
diff --git a/examples/camel-example-spring/src/main/resources/log4j2.properties b/examples/pojo-messaging/src/main/resources/log4j2.properties
similarity index 100%
rename from examples/camel-example-spring/src/main/resources/log4j2.properties
rename to examples/pojo-messaging/src/main/resources/log4j2.properties
diff --git a/examples/camel-example-pojo-messaging/src/test/java/org/apache/camel/example/pojo/CamelContextTest.java b/examples/pojo-messaging/src/test/java/org/apache/camel/example/pojo/CamelContextTest.java
similarity index 100%
rename from examples/camel-example-pojo-messaging/src/test/java/org/apache/camel/example/pojo/CamelContextTest.java
rename to examples/pojo-messaging/src/test/java/org/apache/camel/example/pojo/CamelContextTest.java
diff --git a/examples/pom.xml b/examples/pom.xml
index 83a0db5..1681ecd 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -142,16 +142,16 @@
<module>netty-custom-correlation</module>
<module>oaipmh</module>
<module>openapi-cdi</module>
- <module>camel-example-pojo-messaging</module>
- <module>camel-example-reactive-executor-vertx</module>
- <module>camel-example-route-throttling</module>
- <module>camel-example-routeloader</module>
- <module>camel-example-routetemplate</module>
- <module>camel-example-salesforce-consumer</module>
- <module>camel-example-servlet-tomcat</module>
- <module>camel-example-splunk</module>
- <module>camel-example-spring</module>
- <module>camel-example-spring-javaconfig</module>
+ <module>pojo-messaging</module>
+ <module>reactive-executor-vertx</module>
+ <module>route-throttling</module>
+ <module>routeloader</module>
+ <module>routetemplate</module>
+ <module>salesforce-consumer</module>
+ <module>servlet-tomcat</module>
+ <module>splunk</module>
+ <module>spring</module>
+ <module>spring-javaconfig</module>
<module>camel-example-spring-pulsar</module>
<module>camel-example-spring-ws</module>
<module>camel-example-spring-xquery</module>
diff --git a/examples/camel-example-reactive-executor-vertx/readme.adoc b/examples/reactive-executor-vertx/README.adoc
similarity index 96%
rename from examples/camel-example-reactive-executor-vertx/readme.adoc
rename to examples/reactive-executor-vertx/README.adoc
index f5ebcbf..bdad380 100644
--- a/examples/camel-example-reactive-executor-vertx/readme.adoc
+++ b/examples/reactive-executor-vertx/README.adoc
@@ -8,7 +8,9 @@ different engines via a SPI interface. This example uses VertX as the engine.
You can run this example using
- mvn camel:run
+----
+$ mvn camel:run
+----
=== More information
diff --git a/examples/camel-example-reactive-executor-vertx/pom.xml b/examples/reactive-executor-vertx/pom.xml
similarity index 100%
rename from examples/camel-example-reactive-executor-vertx/pom.xml
rename to examples/reactive-executor-vertx/pom.xml
diff --git a/examples/camel-example-reactive-executor-vertx/src/main/java/org/apache/camel/example/MyApplication.java b/examples/reactive-executor-vertx/src/main/java/org/apache/camel/example/MyApplication.java
similarity index 96%
rename from examples/camel-example-reactive-executor-vertx/src/main/java/org/apache/camel/example/MyApplication.java
rename to examples/reactive-executor-vertx/src/main/java/org/apache/camel/example/MyApplication.java
index 1c4d27c..51190af 100644
--- a/examples/camel-example-reactive-executor-vertx/src/main/java/org/apache/camel/example/MyApplication.java
+++ b/examples/reactive-executor-vertx/src/main/java/org/apache/camel/example/MyApplication.java
@@ -24,13 +24,11 @@ import org.apache.camel.main.Main;
*/
public final class MyApplication {
- private static Vertx vertx;
-
private MyApplication() {
}
public static void main(String[] args) throws Exception {
- vertx = Vertx.vertx();
+ Vertx vertx = Vertx.vertx();
// use Camels Main class
Main main = new Main();
diff --git a/examples/camel-example-reactive-executor-vertx/src/main/java/org/apache/camel/example/MyRouteBuilder.java b/examples/reactive-executor-vertx/src/main/java/org/apache/camel/example/MyRouteBuilder.java
similarity index 100%
rename from examples/camel-example-reactive-executor-vertx/src/main/java/org/apache/camel/example/MyRouteBuilder.java
rename to examples/reactive-executor-vertx/src/main/java/org/apache/camel/example/MyRouteBuilder.java
diff --git a/examples/camel-example-reactive-executor-vertx/src/main/resources/application.properties b/examples/reactive-executor-vertx/src/main/resources/application.properties
similarity index 100%
rename from examples/camel-example-reactive-executor-vertx/src/main/resources/application.properties
rename to examples/reactive-executor-vertx/src/main/resources/application.properties
diff --git a/examples/camel-example-splunk/src/main/resources/log4j2.properties b/examples/reactive-executor-vertx/src/main/resources/log4j2.properties
similarity index 100%
rename from examples/camel-example-splunk/src/main/resources/log4j2.properties
rename to examples/reactive-executor-vertx/src/main/resources/log4j2.properties
diff --git a/examples/camel-example-route-throttling/README.adoc b/examples/route-throttling/README.adoc
similarity index 92%
rename from examples/camel-example-route-throttling/README.adoc
rename to examples/route-throttling/README.adoc
index 5acaa25..5d7bc38 100644
--- a/examples/camel-example-route-throttling/README.adoc
+++ b/examples/route-throttling/README.adoc
@@ -21,31 +21,31 @@ route completes nearly in sync.
You will need to compile this example first:
-....
-mvn compile
-....
+----
+$ mvn compile
+----
=== How to Run
The example has 3 maven goals to run the example
-....
-mvn compile 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
-....
+----
+$ 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 compile exec:java -PCamelFileClient
-....
+----
+$ 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.
diff --git a/examples/camel-example-route-throttling/pom.xml b/examples/route-throttling/pom.xml
similarity index 100%
rename from examples/camel-example-route-throttling/pom.xml
rename to examples/route-throttling/pom.xml
diff --git a/examples/camel-example-route-throttling/src/main/java/org/apache/camel/example/client/CamelClient.java b/examples/route-throttling/src/main/java/org/apache/camel/example/client/CamelClient.java
similarity index 100%
rename from examples/camel-example-route-throttling/src/main/java/org/apache/camel/example/client/CamelClient.java
rename to examples/route-throttling/src/main/java/org/apache/camel/example/client/CamelClient.java
diff --git a/examples/camel-example-route-throttling/src/main/java/org/apache/camel/example/client/CamelFileClient.java b/examples/route-throttling/src/main/java/org/apache/camel/example/client/CamelFileClient.java
similarity index 100%
rename from examples/camel-example-route-throttling/src/main/java/org/apache/camel/example/client/CamelFileClient.java
rename to examples/route-throttling/src/main/java/org/apache/camel/example/client/CamelFileClient.java
diff --git a/examples/camel-example-spring-javaconfig/src/main/resources/META-INF/LICENSE.txt b/examples/route-throttling/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from examples/camel-example-spring-javaconfig/src/main/resources/META-INF/LICENSE.txt
rename to examples/route-throttling/src/main/resources/META-INF/LICENSE.txt
diff --git a/examples/camel-example-spring-javaconfig/src/main/resources/META-INF/NOTICE.txt b/examples/route-throttling/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from examples/camel-example-spring-javaconfig/src/main/resources/META-INF/NOTICE.txt
rename to examples/route-throttling/src/main/resources/META-INF/NOTICE.txt
diff --git a/examples/camel-example-route-throttling/src/main/resources/META-INF/spring/camel-server.xml b/examples/route-throttling/src/main/resources/META-INF/spring/camel-server.xml
similarity index 100%
rename from examples/camel-example-route-throttling/src/main/resources/META-INF/spring/camel-server.xml
rename to examples/route-throttling/src/main/resources/META-INF/spring/camel-server.xml
diff --git a/examples/camel-example-route-throttling/src/main/resources/camel-client.xml b/examples/route-throttling/src/main/resources/camel-client.xml
similarity index 100%
rename from examples/camel-example-route-throttling/src/main/resources/camel-client.xml
rename to examples/route-throttling/src/main/resources/camel-client.xml
diff --git a/examples/camel-example-route-throttling/src/main/resources/camel-file-client.xml b/examples/route-throttling/src/main/resources/camel-file-client.xml
similarity index 100%
rename from examples/camel-example-route-throttling/src/main/resources/camel-file-client.xml
rename to examples/route-throttling/src/main/resources/camel-file-client.xml
diff --git a/examples/camel-example-spring-javaconfig/src/main/resources/log4j2.properties b/examples/route-throttling/src/main/resources/log4j2.properties
similarity index 100%
rename from examples/camel-example-spring-javaconfig/src/main/resources/log4j2.properties
rename to examples/route-throttling/src/main/resources/log4j2.properties
diff --git a/examples/camel-example-routeloader/readme.adoc b/examples/routeloader/README.adoc
similarity index 97%
rename from examples/camel-example-routeloader/readme.adoc
rename to examples/routeloader/README.adoc
index c62aed1..0f72be3 100644
--- a/examples/camel-example-routeloader/readme.adoc
+++ b/examples/routeloader/README.adoc
@@ -16,7 +16,9 @@ The route is loaded by Camels route loader and dynamic compiled via `camel-joor`
You can run this example using
- mvn camel:run
+----
+$ mvn camel:run
+----
=== Help and contributions
diff --git a/examples/camel-example-routeloader/pom.xml b/examples/routeloader/pom.xml
similarity index 100%
rename from examples/camel-example-routeloader/pom.xml
rename to examples/routeloader/pom.xml
diff --git a/examples/camel-example-routeloader/src/main/java/org/apache/camel/example/MyApplication.java b/examples/routeloader/src/main/java/org/apache/camel/example/MyApplication.java
similarity index 100%
rename from examples/camel-example-routeloader/src/main/java/org/apache/camel/example/MyApplication.java
rename to examples/routeloader/src/main/java/org/apache/camel/example/MyApplication.java
diff --git a/examples/camel-example-routeloader/src/main/resources/application.properties b/examples/routeloader/src/main/resources/application.properties
similarity index 100%
rename from examples/camel-example-routeloader/src/main/resources/application.properties
rename to examples/routeloader/src/main/resources/application.properties
diff --git a/examples/camel-example-routetemplate/src/main/resources/logback.xml b/examples/routeloader/src/main/resources/logback.xml
similarity index 100%
rename from examples/camel-example-routetemplate/src/main/resources/logback.xml
rename to examples/routeloader/src/main/resources/logback.xml
diff --git a/examples/camel-example-routeloader/src/main/resources/myroutes/MyRouteBuilder.java b/examples/routeloader/src/main/resources/myroutes/MyRouteBuilder.java
similarity index 100%
rename from examples/camel-example-routeloader/src/main/resources/myroutes/MyRouteBuilder.java
rename to examples/routeloader/src/main/resources/myroutes/MyRouteBuilder.java
diff --git a/examples/camel-example-routeloader/src/main/resources/myroutes/cheese-route.xml b/examples/routeloader/src/main/resources/myroutes/cheese-route.xml
similarity index 100%
rename from examples/camel-example-routeloader/src/main/resources/myroutes/cheese-route.xml
rename to examples/routeloader/src/main/resources/myroutes/cheese-route.xml
diff --git a/examples/camel-example-routetemplate/readme.adoc b/examples/routetemplate/README.adoc
similarity index 97%
rename from examples/camel-example-routetemplate/readme.adoc
rename to examples/routetemplate/README.adoc
index b4e757f..fc8faa0 100644
--- a/examples/camel-example-routetemplate/readme.adoc
+++ b/examples/routetemplate/README.adoc
@@ -16,7 +16,9 @@ The example runs standalone via Camel Main in the `MyApplication.java` source fi
You can run this example using
- mvn camel:run
+----
+$ mvn camel:run
+----
=== Help and contributions
diff --git a/examples/camel-example-routetemplate/pom.xml b/examples/routetemplate/pom.xml
similarity index 100%
rename from examples/camel-example-routetemplate/pom.xml
rename to examples/routetemplate/pom.xml
diff --git a/examples/camel-example-routetemplate/src/main/data/foo.properties b/examples/routetemplate/src/main/data/foo.properties
similarity index 100%
rename from examples/camel-example-routetemplate/src/main/data/foo.properties
rename to examples/routetemplate/src/main/data/foo.properties
diff --git a/examples/camel-example-routetemplate/src/main/java/org/apache/camel/example/MyApplication.java b/examples/routetemplate/src/main/java/org/apache/camel/example/MyApplication.java
similarity index 100%
rename from examples/camel-example-routetemplate/src/main/java/org/apache/camel/example/MyApplication.java
rename to examples/routetemplate/src/main/java/org/apache/camel/example/MyApplication.java
diff --git a/examples/camel-example-routetemplate/src/main/java/org/apache/camel/example/MyRouteTemplates.java b/examples/routetemplate/src/main/java/org/apache/camel/example/MyRouteTemplates.java
similarity index 100%
rename from examples/camel-example-routetemplate/src/main/java/org/apache/camel/example/MyRouteTemplates.java
rename to examples/routetemplate/src/main/java/org/apache/camel/example/MyRouteTemplates.java
diff --git a/examples/camel-example-routetemplate/src/main/java/org/apache/camel/example/MyTemplateBuilder.java b/examples/routetemplate/src/main/java/org/apache/camel/example/MyTemplateBuilder.java
similarity index 100%
rename from examples/camel-example-routetemplate/src/main/java/org/apache/camel/example/MyTemplateBuilder.java
rename to examples/routetemplate/src/main/java/org/apache/camel/example/MyTemplateBuilder.java
diff --git a/examples/camel-example-routetemplate/src/main/resources/application.properties b/examples/routetemplate/src/main/resources/application.properties
similarity index 100%
rename from examples/camel-example-routetemplate/src/main/resources/application.properties
rename to examples/routetemplate/src/main/resources/application.properties
diff --git a/examples/camel-example-routeloader/src/main/resources/logback.xml b/examples/routetemplate/src/main/resources/logback.xml
similarity index 100%
rename from examples/camel-example-routeloader/src/main/resources/logback.xml
rename to examples/routetemplate/src/main/resources/logback.xml
diff --git a/examples/camel-example-salesforce-consumer/README.adoc b/examples/salesforce-consumer/README.adoc
similarity index 97%
rename from examples/camel-example-salesforce-consumer/README.adoc
rename to examples/salesforce-consumer/README.adoc
index 1e2b728..46ebd5f 100644
--- a/examples/camel-example-salesforce-consumer/README.adoc
+++ b/examples/salesforce-consumer/README.adoc
@@ -5,7 +5,7 @@ This example shows how to use Salesforce Streaming API.
=== Configuring Salesforce
This examples uses OAuth 2.0 Refresh Token Flow, which requires 3 credentials collected from Salesforce - `Client ID`, `Client Secret` and `Refresh Token`. You will need to put your own credentials in `src/main/resources/application.properties` file.
-NOTE: you might want to sign up with your own Developer account at developer.salesforce.com. After you have done that, you’ll need to create a Connected Application for your integration.
+NOTE: You might want to sign up with your own Developer account at developer.salesforce.com. After you have done that, you’ll need to create a Connected Application for your integration.
NOTE: This was written with Salesforce Lightening user interface. Classic user interface might have slightly different menu and/or workflow.
@@ -47,7 +47,9 @@ https://login.salesforce.com/services/oauth2/success#access_token=..&refresh_tok
You can run this example using
- mvn compile camel:run
+----
+$ mvn compile camel:run
+----
=== Custom topic name and operation flags
diff --git a/examples/camel-example-salesforce-consumer/pom.xml b/examples/salesforce-consumer/pom.xml
similarity index 100%
rename from examples/camel-example-salesforce-consumer/pom.xml
rename to examples/salesforce-consumer/pom.xml
diff --git a/examples/camel-example-salesforce-consumer/src/main/java/org/apache/camel/example/salesforce/Application.java b/examples/salesforce-consumer/src/main/java/org/apache/camel/example/salesforce/Application.java
similarity index 100%
rename from examples/camel-example-salesforce-consumer/src/main/java/org/apache/camel/example/salesforce/Application.java
rename to examples/salesforce-consumer/src/main/java/org/apache/camel/example/salesforce/Application.java
diff --git a/examples/camel-example-salesforce-consumer/src/main/java/org/apache/camel/example/salesforce/SalesforceRouteBuilder.java b/examples/salesforce-consumer/src/main/java/org/apache/camel/example/salesforce/SalesforceRouteBuilder.java
similarity index 100%
rename from examples/camel-example-salesforce-consumer/src/main/java/org/apache/camel/example/salesforce/SalesforceRouteBuilder.java
rename to examples/salesforce-consumer/src/main/java/org/apache/camel/example/salesforce/SalesforceRouteBuilder.java
diff --git a/examples/camel-example-salesforce-consumer/src/main/resources/application.properties b/examples/salesforce-consumer/src/main/resources/application.properties
similarity index 100%
rename from examples/camel-example-salesforce-consumer/src/main/resources/application.properties
rename to examples/salesforce-consumer/src/main/resources/application.properties
diff --git a/examples/camel-example-salesforce-consumer/src/main/resources/simplelogger.properties b/examples/salesforce-consumer/src/main/resources/simplelogger.properties
similarity index 100%
rename from examples/camel-example-salesforce-consumer/src/main/resources/simplelogger.properties
rename to examples/salesforce-consumer/src/main/resources/simplelogger.properties
diff --git a/examples/camel-example-servlet-tomcat/README.adoc b/examples/servlet-tomcat/README.adoc
similarity index 95%
rename from examples/camel-example-servlet-tomcat/README.adoc
rename to examples/servlet-tomcat/README.adoc
index e740aa8..4ccfbcf 100644
--- a/examples/camel-example-servlet-tomcat/README.adoc
+++ b/examples/servlet-tomcat/README.adoc
@@ -8,9 +8,9 @@ An example which shows how to use the Camel Servlet with Apache Tomcat.
You will need to package this example first:
-....
-mvn package
-....
+----
+$ mvn package
+----
=== Run
@@ -19,17 +19,17 @@ the deploy folder of Apache Tomcat.
And then hit this url from a webbrowser which has further instructions
-....
+----
http://localhost:8080/camel-example-servlet-tomcat
-....
+----
http://localhost:8080/camel-example-servlet-tomcat
The servlet is located at
-....
+----
http://localhost:8080/camel-example-servlet-tomcat/camel/hello
-....
+----
http://localhost:8080/camel-example-servlet-tomcat/camel/hello
diff --git a/examples/camel-example-servlet-tomcat/pom.xml b/examples/servlet-tomcat/pom.xml
similarity index 100%
rename from examples/camel-example-servlet-tomcat/pom.xml
rename to examples/servlet-tomcat/pom.xml
diff --git a/examples/camel-example-splunk/src/main/resources/META-INF/LICENSE.txt b/examples/servlet-tomcat/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from examples/camel-example-splunk/src/main/resources/META-INF/LICENSE.txt
rename to examples/servlet-tomcat/src/main/resources/META-INF/LICENSE.txt
diff --git a/examples/camel-example-splunk/src/main/resources/META-INF/NOTICE.txt b/examples/servlet-tomcat/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from examples/camel-example-splunk/src/main/resources/META-INF/NOTICE.txt
rename to examples/servlet-tomcat/src/main/resources/META-INF/NOTICE.txt
diff --git a/examples/camel-example-servlet-tomcat/src/main/resources/camel-config.xml b/examples/servlet-tomcat/src/main/resources/camel-config.xml
similarity index 100%
rename from examples/camel-example-servlet-tomcat/src/main/resources/camel-config.xml
rename to examples/servlet-tomcat/src/main/resources/camel-config.xml
diff --git a/examples/camel-example-servlet-tomcat/src/main/resources/log4j2.properties b/examples/servlet-tomcat/src/main/resources/log4j2.properties
similarity index 100%
rename from examples/camel-example-servlet-tomcat/src/main/resources/log4j2.properties
rename to examples/servlet-tomcat/src/main/resources/log4j2.properties
diff --git a/examples/camel-example-servlet-tomcat/src/main/webapp/WEB-INF/web.xml b/examples/servlet-tomcat/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from examples/camel-example-servlet-tomcat/src/main/webapp/WEB-INF/web.xml
rename to examples/servlet-tomcat/src/main/webapp/WEB-INF/web.xml
diff --git a/examples/camel-example-servlet-tomcat/src/main/webapp/index.html b/examples/servlet-tomcat/src/main/webapp/index.html
similarity index 100%
rename from examples/camel-example-servlet-tomcat/src/main/webapp/index.html
rename to examples/servlet-tomcat/src/main/webapp/index.html
diff --git a/examples/camel-example-splunk/README.adoc b/examples/splunk/README.adoc
similarity index 70%
rename from examples/camel-example-splunk/README.adoc
rename to examples/splunk/README.adoc
index 66bd74c..36ee97c 100644
--- a/examples/camel-example-splunk/README.adoc
+++ b/examples/splunk/README.adoc
@@ -6,43 +6,46 @@ An example which shows how to integrate Camel with Splunk.
This example requires that an Splunk Server is up and running. (For this
example, sample data provide by Splunk was used. Steps for loading this
-data into splunk are documented here:
-http://docs.splunk.com/Documentation/Splunk/latest/SearchTutorial/GetthetutorialdataintoSplunk)
+data into splunk are documented http://docs.splunk.com/Documentation/Splunk/latest/SearchTutorial/GetthetutorialdataintoSplunk[here])
-This project consists of the following examples: -Random search query on
-Splunk -Saved search query on Splunk -Publish an event to Splunk
+This project consists of the following examples:
+
+* Random search query on
+Splunk
+* Saved search query on Splunk
+* Publish an event to Splunk
=== Build
You will need to compile this example first:
-....
-mvn compile
-....
+----
+$ mvn compile
+----
=== Run
To run the random search client you type:
-....
-mvn compile exec:java -Psearch-client
-....
+----
+$ mvn compile exec:java -Psearch-client
+----
… and response data will be printed on the console.
To run the saved search client you type:
-....
-mvn compile exec:java -Psaved-search-client
-....
+----
+$ mvn compile exec:java -Psaved-search-client
+----
… and response data will be printed on the console.
To run the saved search client you type:
-....
-mvn compile exec:java -Ppublish-event-client
-....
+----
+$ mvn compile exec:java -Ppublish-event-client
+----
… and logs will be printed on the console.
diff --git a/examples/camel-example-splunk/pom.xml b/examples/splunk/pom.xml
similarity index 100%
rename from examples/camel-example-splunk/pom.xml
rename to examples/splunk/pom.xml
diff --git a/examples/camel-example-splunk/src/main/java/org/apache/camel/example/splunk/SplunkEventProcessor.java b/examples/splunk/src/main/java/org/apache/camel/example/splunk/SplunkEventProcessor.java
similarity index 100%
rename from examples/camel-example-splunk/src/main/java/org/apache/camel/example/splunk/SplunkEventProcessor.java
rename to examples/splunk/src/main/java/org/apache/camel/example/splunk/SplunkEventProcessor.java
diff --git a/examples/camel-example-splunk/src/main/java/org/apache/camel/example/splunk/SplunkPublishEventClient.java b/examples/splunk/src/main/java/org/apache/camel/example/splunk/SplunkPublishEventClient.java
similarity index 100%
rename from examples/camel-example-splunk/src/main/java/org/apache/camel/example/splunk/SplunkPublishEventClient.java
rename to examples/splunk/src/main/java/org/apache/camel/example/splunk/SplunkPublishEventClient.java
diff --git a/examples/camel-example-splunk/src/main/java/org/apache/camel/example/splunk/SplunkPublishEventRouteBuilder.java b/examples/splunk/src/main/java/org/apache/camel/example/splunk/SplunkPublishEventRouteBuilder.java
similarity index 100%
rename from examples/camel-example-splunk/src/main/java/org/apache/camel/example/splunk/SplunkPublishEventRouteBuilder.java
rename to examples/splunk/src/main/java/org/apache/camel/example/splunk/SplunkPublishEventRouteBuilder.java
diff --git a/examples/camel-example-splunk/src/main/java/org/apache/camel/example/splunk/SplunkSavedSearchClient.java b/examples/splunk/src/main/java/org/apache/camel/example/splunk/SplunkSavedSearchClient.java
similarity index 100%
rename from examples/camel-example-splunk/src/main/java/org/apache/camel/example/splunk/SplunkSavedSearchClient.java
rename to examples/splunk/src/main/java/org/apache/camel/example/splunk/SplunkSavedSearchClient.java
diff --git a/examples/camel-example-splunk/src/main/java/org/apache/camel/example/splunk/SplunkSavedSearchRouteBuilder.java b/examples/splunk/src/main/java/org/apache/camel/example/splunk/SplunkSavedSearchRouteBuilder.java
similarity index 100%
rename from examples/camel-example-splunk/src/main/java/org/apache/camel/example/splunk/SplunkSavedSearchRouteBuilder.java
rename to examples/splunk/src/main/java/org/apache/camel/example/splunk/SplunkSavedSearchRouteBuilder.java
diff --git a/examples/camel-example-splunk/src/main/java/org/apache/camel/example/splunk/SplunkSearchClient.java b/examples/splunk/src/main/java/org/apache/camel/example/splunk/SplunkSearchClient.java
similarity index 100%
rename from examples/camel-example-splunk/src/main/java/org/apache/camel/example/splunk/SplunkSearchClient.java
rename to examples/splunk/src/main/java/org/apache/camel/example/splunk/SplunkSearchClient.java
diff --git a/examples/camel-example-splunk/src/main/java/org/apache/camel/example/splunk/SplunkSearchRouteBuilder.java b/examples/splunk/src/main/java/org/apache/camel/example/splunk/SplunkSearchRouteBuilder.java
similarity index 100%
rename from examples/camel-example-splunk/src/main/java/org/apache/camel/example/splunk/SplunkSearchRouteBuilder.java
rename to examples/splunk/src/main/java/org/apache/camel/example/splunk/SplunkSearchRouteBuilder.java
diff --git a/examples/camel-example-servlet-tomcat/src/main/resources/META-INF/LICENSE.txt b/examples/splunk/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from examples/camel-example-servlet-tomcat/src/main/resources/META-INF/LICENSE.txt
rename to examples/splunk/src/main/resources/META-INF/LICENSE.txt
diff --git a/examples/camel-example-servlet-tomcat/src/main/resources/META-INF/NOTICE.txt b/examples/splunk/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from examples/camel-example-servlet-tomcat/src/main/resources/META-INF/NOTICE.txt
rename to examples/splunk/src/main/resources/META-INF/NOTICE.txt
diff --git a/examples/camel-example-splunk/src/main/resources/application.properties b/examples/splunk/src/main/resources/application.properties
similarity index 100%
rename from examples/camel-example-splunk/src/main/resources/application.properties
rename to examples/splunk/src/main/resources/application.properties
diff --git a/examples/camel-example-reactive-executor-vertx/src/main/resources/log4j2.properties b/examples/splunk/src/main/resources/log4j2.properties
similarity index 100%
rename from examples/camel-example-reactive-executor-vertx/src/main/resources/log4j2.properties
rename to examples/splunk/src/main/resources/log4j2.properties
diff --git a/examples/camel-example-spring-javaconfig/README.adoc b/examples/spring-javaconfig/README.adoc
similarity index 93%
rename from examples/camel-example-spring-javaconfig/README.adoc
rename to examples/spring-javaconfig/README.adoc
index 27b44f9..2cc9e14 100644
--- a/examples/camel-example-spring-javaconfig/README.adoc
+++ b/examples/spring-javaconfig/README.adoc
@@ -12,17 +12,17 @@ system.
You will need to compile this example first:
-....
-mvn compile
-....
+----
+$ mvn compile
+----
=== Run
To run the example type
-....
-mvn exec:java
-....
+----
+$ mvn exec:java
+----
To stop the example hit ctrl+c
diff --git a/examples/camel-example-spring-javaconfig/pom.xml b/examples/spring-javaconfig/pom.xml
similarity index 100%
rename from examples/camel-example-spring-javaconfig/pom.xml
rename to examples/spring-javaconfig/pom.xml
diff --git a/examples/camel-example-spring-javaconfig/src/data/message1.xml b/examples/spring-javaconfig/src/data/message1.xml
similarity index 100%
rename from examples/camel-example-spring-javaconfig/src/data/message1.xml
rename to examples/spring-javaconfig/src/data/message1.xml
diff --git a/examples/camel-example-spring-javaconfig/src/data/message2.xml b/examples/spring-javaconfig/src/data/message2.xml
similarity index 100%
rename from examples/camel-example-spring-javaconfig/src/data/message2.xml
rename to examples/spring-javaconfig/src/data/message2.xml
diff --git a/examples/camel-example-spring-javaconfig/src/main/java/org/apache/camel/example/spring/javaconfig/MyApplication.java b/examples/spring-javaconfig/src/main/java/org/apache/camel/example/spring/javaconfig/MyApplication.java
similarity index 100%
rename from examples/camel-example-spring-javaconfig/src/main/java/org/apache/camel/example/spring/javaconfig/MyApplication.java
rename to examples/spring-javaconfig/src/main/java/org/apache/camel/example/spring/javaconfig/MyApplication.java
diff --git a/examples/camel-example-spring-javaconfig/src/main/java/org/apache/camel/example/spring/javaconfig/MyRoute.java b/examples/spring-javaconfig/src/main/java/org/apache/camel/example/spring/javaconfig/MyRoute.java
similarity index 100%
rename from examples/camel-example-spring-javaconfig/src/main/java/org/apache/camel/example/spring/javaconfig/MyRoute.java
rename to examples/spring-javaconfig/src/main/java/org/apache/camel/example/spring/javaconfig/MyRoute.java
diff --git a/examples/camel-example-spring-javaconfig/src/main/java/org/apache/camel/example/spring/javaconfig/SomeBean.java b/examples/spring-javaconfig/src/main/java/org/apache/camel/example/spring/javaconfig/SomeBean.java
similarity index 100%
rename from examples/camel-example-spring-javaconfig/src/main/java/org/apache/camel/example/spring/javaconfig/SomeBean.java
rename to examples/spring-javaconfig/src/main/java/org/apache/camel/example/spring/javaconfig/SomeBean.java
diff --git a/examples/camel-example-route-throttling/src/main/resources/META-INF/LICENSE.txt b/examples/spring-javaconfig/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from examples/camel-example-route-throttling/src/main/resources/META-INF/LICENSE.txt
rename to examples/spring-javaconfig/src/main/resources/META-INF/LICENSE.txt
diff --git a/examples/camel-example-route-throttling/src/main/resources/META-INF/NOTICE.txt b/examples/spring-javaconfig/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from examples/camel-example-route-throttling/src/main/resources/META-INF/NOTICE.txt
rename to examples/spring-javaconfig/src/main/resources/META-INF/NOTICE.txt
diff --git a/examples/camel-example-route-throttling/src/main/resources/log4j2.properties b/examples/spring-javaconfig/src/main/resources/log4j2.properties
similarity index 100%
rename from examples/camel-example-route-throttling/src/main/resources/log4j2.properties
rename to examples/spring-javaconfig/src/main/resources/log4j2.properties
diff --git a/examples/camel-example-spring-javaconfig/src/test/java/org/apache/camel/example/spring/javaconfig/IntegrationTest.java b/examples/spring-javaconfig/src/test/java/org/apache/camel/example/spring/javaconfig/IntegrationTest.java
similarity index 100%
rename from examples/camel-example-spring-javaconfig/src/test/java/org/apache/camel/example/spring/javaconfig/IntegrationTest.java
rename to examples/spring-javaconfig/src/test/java/org/apache/camel/example/spring/javaconfig/IntegrationTest.java
diff --git a/examples/camel-example-spring/README.adoc b/examples/spring/README.adoc
similarity index 94%
rename from examples/camel-example-spring/README.adoc
rename to examples/spring/README.adoc
index 66f59f8..75e585f 100644
--- a/examples/camel-example-spring/README.adoc
+++ b/examples/spring/README.adoc
@@ -12,17 +12,17 @@ system.
You will need to compile this example first:
-....
-mvn compile
-....
+----
+$ mvn compile
+----
=== Run
To run the example type
-....
-mvn camel:run
-....
+----
+$ mvn camel:run
+----
You can see the routing rules by looking at the java code in the
`+src/main/java directory+` and the Spring XML configuration lives in
diff --git a/examples/camel-example-spring/pom.xml b/examples/spring/pom.xml
similarity index 100%
rename from examples/camel-example-spring/pom.xml
rename to examples/spring/pom.xml
diff --git a/examples/camel-example-pojo-messaging/src/data/message1.xml b/examples/spring/src/data/message1.xml
similarity index 100%
rename from examples/camel-example-pojo-messaging/src/data/message1.xml
rename to examples/spring/src/data/message1.xml
diff --git a/examples/camel-example-pojo-messaging/src/data/message2.xml b/examples/spring/src/data/message2.xml
similarity index 100%
rename from examples/camel-example-pojo-messaging/src/data/message2.xml
rename to examples/spring/src/data/message2.xml
diff --git a/examples/camel-example-spring/src/main/java/org/apache/camel/example/spring/MyRouteBuilder.java b/examples/spring/src/main/java/org/apache/camel/example/spring/MyRouteBuilder.java
similarity index 100%
rename from examples/camel-example-spring/src/main/java/org/apache/camel/example/spring/MyRouteBuilder.java
rename to examples/spring/src/main/java/org/apache/camel/example/spring/MyRouteBuilder.java
diff --git a/examples/camel-example-pojo-messaging/src/main/resources/META-INF/LICENSE.txt b/examples/spring/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from examples/camel-example-pojo-messaging/src/main/resources/META-INF/LICENSE.txt
rename to examples/spring/src/main/resources/META-INF/LICENSE.txt
diff --git a/examples/camel-example-pojo-messaging/src/main/resources/META-INF/NOTICE.txt b/examples/spring/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from examples/camel-example-pojo-messaging/src/main/resources/META-INF/NOTICE.txt
rename to examples/spring/src/main/resources/META-INF/NOTICE.txt
diff --git a/examples/camel-example-spring/src/main/resources/META-INF/spring/camel-context.xml b/examples/spring/src/main/resources/META-INF/spring/camel-context.xml
similarity index 100%
rename from examples/camel-example-spring/src/main/resources/META-INF/spring/camel-context.xml
rename to examples/spring/src/main/resources/META-INF/spring/camel-context.xml
diff --git a/examples/camel-example-pojo-messaging/src/main/resources/log4j2.properties b/examples/spring/src/main/resources/log4j2.properties
similarity index 100%
rename from examples/camel-example-pojo-messaging/src/main/resources/log4j2.properties
rename to examples/spring/src/main/resources/log4j2.properties
diff --git a/examples/camel-example-spring/src/test/java/org/apache/camel/example/spring/IntegrationTest.java b/examples/spring/src/test/java/org/apache/camel/example/spring/IntegrationTest.java
similarity index 100%
rename from examples/camel-example-spring/src/test/java/org/apache/camel/example/spring/IntegrationTest.java
rename to examples/spring/src/test/java/org/apache/camel/example/spring/IntegrationTest.java