[camel-examples] branch master updated: CAMEL-16012: remove prefix 02 (#35)

davsclaus Mon, 15 Feb 2021 21:16:16 -0800

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 9385e34  CAMEL-16012: remove prefix 02 (#35)
9385e34 is described below

commit 9385e343b3bd68667b70b8547e1803f852e8bdff
Author: metters <mett...@users.noreply.github.com>
AuthorDate: Tue Feb 16 06:16:02 2021 +0100

    CAMEL-16012: remove prefix 02 (#35)
    
    * [CAMEL-16012] Remove prefix from cafe and edit README.adoc
    
    * [CAMEL-16012] Fix README.adoc
    
    * [CAMEL-16012] Remove prefix from cafe-endpointdsl
    
    * [CAMEL-16012] Remove prefix from cassandra-kubernetes
    
    * [CAMEL-16012] Remove prefix from cdi and fix one sonar issue
    
    * [CAMEL-16012] Fix root pom.xml
    
    * [CAMEL-16012] Remove prefix and edit README.adoc
    
    * [CAMEL-16012] Remove added sourcecode tag that was wrong
    
    * [CAMEL-16012] Remove prefix
    
    * [CAMEL-16012] Remove prefix
    
    * [CAMEL-16012] Add section for unit test to README.adoc
    
    * [CAMEL-16012] Remove prefix
    
    * [CAMEL-16012] Fix root pom.xml
    
    * [CAMEL-16012] Remove prefix
    
    * [CAMEL-16012] Add section for unit test to README.adoc
    
    * [CAMEL-16012] Remove prefix
    
    * [CAMEL-16012] Remove prefix
    
    * [CAMEL-16012] Remove prefix
    
    * [CAMEL-16012] Fix root pom.xml
    
    * [CAMEL-16012] Add section for unit test to README.adoc
    
    * [CAMEL-16012] Remove prefix
    
    * [CAMEL-16012] Remove prefix
    
    * [CAMEL-16012] Fix readme.adoc by adding missing compile command
    
    * [CAMEL-16012] Remove prefix
    
    * [CAMEL-16012] Fix root pom.xml
    
    * [CAMEL-16012] Fix readme.adoc by adding missing compile command
    
    * [CAMEL-16012] Remove prefix
    
    * [CAMEL-16012] Edit README.adoc
    
    * [CAMEL-16012] Remove prefix
    
    * [CAMEL-16012] Fix root pom.xml
    
    * [CAMEL-16012] Edit README.adoc
    
    * [CAMEL-16012] Edit README.adoc
    
    Co-authored-by: Matthias Streidel <matthias.strei...@senacor.com>
---
 examples/README.adoc                               | 34 +++++++--------
 examples/artemis/README.adoc                       |  1 -
 .../README.adoc                                    | 34 +++++++++------
 .../pom.xml                                        |  0
 .../camel/example/cafe/CafeRouteBuilder.java       |  0
 .../org/apache/camel/example/cafe/Delivery.java    |  0
 .../java/org/apache/camel/example/cafe/Drink.java  |  0
 .../org/apache/camel/example/cafe/DrinkType.java   |  0
 .../java/org/apache/camel/example/cafe/Order.java  |  0
 .../org/apache/camel/example/cafe/OrderItem.java   |  0
 .../apache/camel/example/cafe/stuff/Barista.java   |  0
 .../cafe/stuff/CafeAggregationStrategy.java        |  0
 .../camel/example/cafe/stuff/DrinkRouter.java      |  0
 .../camel/example/cafe/stuff/OrderSplitter.java    |  0
 .../apache/camel/example/cafe/stuff/Waiter.java    |  0
 .../src/main/resources/META-INF/LICENSE.txt        |  0
 .../src/main/resources/META-INF/NOTICE.txt         |  0
 .../src/main/resources/log4j2.properties           |  0
 .../camel/example/cafe/CafeRouteBuilderTest.java   |  0
 .../camel/example/cafe/test/TestDrinkRouter.java   |  0
 .../apache/camel/example/cafe/test/TestWaiter.java |  0
 .../src/test}/resources/META-INF/LICENSE.txt       |  0
 .../src/test}/resources/META-INF/NOTICE.txt        |  0
 .../src/test/resources/log4j2.properties           |  0
 examples/{camel-example-cafe => cafe}/README.adoc  | 33 ++++++++++-----
 examples/{camel-example-cafe => cafe}/pom.xml      |  0
 .../camel/example/cafe/CafeRouteBuilder.java       |  0
 .../org/apache/camel/example/cafe/Customer.java    |  0
 .../org/apache/camel/example/cafe/Delivery.java    |  0
 .../java/org/apache/camel/example/cafe/Drink.java  |  0
 .../org/apache/camel/example/cafe/DrinkType.java   |  0
 .../java/org/apache/camel/example/cafe/Order.java  |  0
 .../org/apache/camel/example/cafe/OrderItem.java   |  0
 .../apache/camel/example/cafe/stuff/Barista.java   |  0
 .../cafe/stuff/CafeAggregationStrategy.java        |  0
 .../camel/example/cafe/stuff/DrinkRouter.java      |  0
 .../camel/example/cafe/stuff/OrderSplitter.java    |  0
 .../apache/camel/example/cafe/stuff/Waiter.java    |  0
 .../src/main/resources/META-INF/LICENSE.txt        |  0
 .../src/main/resources/META-INF/NOTICE.txt         |  0
 .../src/main/resources/META-INF/beans.xml          |  0
 .../src/main/resources/META-INF/camel-routes.xml   |  0
 .../resources/META-INF/spring/camel-context.xml    |  0
 .../src/main/resources/log4j2.properties           |  0
 .../camel/example/cafe/CafeRouteBuilderTest.java   |  0
 .../cafe/CafeRouteSpringIntegrationTest.java       |  0
 .../camel/example/cafe/CafeRouteSpringTest.java    |  0
 .../camel/example/cafe/test/TestDrinkRouter.java   |  0
 .../apache/camel/example/cafe/test/TestWaiter.java |  0
 .../src/test}/resources/META-INF/LICENSE.txt       |  0
 .../src/test}/resources/META-INF/NOTICE.txt        |  0
 .../src/test/resources/META-INF/beans.xml          |  0
 .../src/test/resources/log4j2.properties           |  0
 examples/camel-example-cxf-proxy/README.adoc       | 19 +++++----
 examples/camel-example-cxf-tomcat/README.adoc      | 11 ++---
 .../README.adoc                                    |  7 ----
 .../pom.xml                                        |  0
 .../example/kubernetes/jkube/CqlPopulateBean.java  |  0
 .../example/kubernetes/jkube/RowProcessor.java     |  0
 .../resources/META-INF/spring/camel-context.xml    |  0
 .../main/resources/jkube/cassandra-service.yaml    |  0
 .../resources/jkube/cassandra-statefulset.yaml     |  0
 .../src/main/resources/log4j.properties            |  0
 .../README.adoc                                    |  0
 .../pom.xml                                        |  0
 .../camel/example/cdi/aws/s3/Application.java      |  0
 .../src/main/resources/META-INF/LICENSE.txt        |  0
 .../src/main/resources/META-INF/NOTICE.txt         |  0
 .../src/main/resources/META-INF/beans.xml          |  0
 .../src/main/resources/log4j2.properties           |  0
 .../README.adoc                                    | 48 +++++++++++-----------
 .../pom.xml                                        |  0
 .../camel/example/cdi/cassandraql/Application.java |  0
 .../src/main/resources/META-INF/LICENSE.txt        |  0
 .../src/main/resources/META-INF/NOTICE.txt         |  0
 .../META-INF/apache-deltaspike.properties          |  0
 .../src/main/resources/META-INF/beans.xml          |  0
 .../src/main/resources/log4j2.properties           |  0
 .../README.adoc                                    |  2 +-
 .../pom.xml                                        |  0
 .../camel/example/cdi/kubernetes/Application.java  |  0
 .../src/main/resources/META-INF/LICENSE.txt        |  0
 .../src/main/resources/META-INF/NOTICE.txt         |  0
 .../src/main/resources/META-INF/beans.xml          |  0
 .../src/main/resources/application.properties      |  0
 .../src/main/resources/log4j2.properties           |  0
 .../README.adoc                                    |  9 ++++
 .../pom.xml                                        |  0
 .../camel/example/cdi/metrics/Application.java     |  0
 .../example/cdi/metrics/UnreliableService.java     |  0
 .../src/main/resources/META-INF/LICENSE.txt        |  0
 .../src/main/resources/META-INF/NOTICE.txt         |  0
 .../src/main/resources/META-INF/beans.xml          |  0
 .../src/main/resources/log4j2.properties           |  0
 .../camel/example/cdi/metrics/CdiMetricsTest.java  |  0
 .../README.adoc                                    |  0
 .../{camel-example-cdi-minio => cdi-minio}/pom.xml |  0
 .../camel/example/cdi/minio/Application.java       |  0
 .../camel/example/cdi/minio/MinioExampleUtils.java |  0
 .../src/main/resources/META-INF/LICENSE.txt        |  0
 .../src/main/resources/META-INF/NOTICE.txt         |  0
 .../src/main/resources/META-INF/beans.xml          |  0
 .../src/main/resources/log4j2.properties           |  0
 .../src/main/resources/minio_key.properties        |  0
 .../README.adoc                                    |  9 ++++
 .../pom.xml                                        |  0
 .../camel/example/cdi/properties/Application.java  |  0
 .../src/main/resources/META-INF/LICENSE.txt        |  0
 .../src/main/resources/META-INF/NOTICE.txt         |  0
 .../META-INF/apache-deltaspike.properties          |  0
 .../src/main/resources/META-INF/beans.xml          |  0
 .../src/main/resources/log4j2.properties           |  0
 .../example/cdi/properties/CdiPropertiesTest.java  |  0
 .../README.adoc                                    | 10 +++++
 .../pom.xml                                        |  0
 .../example/cdi/rest/servlet/Application.java      |  0
 .../src/main/resources/META-INF/LICENSE.txt        |  0
 .../src/main/resources/META-INF/NOTICE.txt         |  0
 .../src/main/resources/log4j2.properties           |  0
 .../src/main/webapp/WEB-INF/beans.xml              |  0
 .../src/main/webapp/WEB-INF/web.xml                |  0
 .../cdi/rest/servlet/CdiRestServletTest.java       |  0
 .../README.adoc                                    | 11 ++++-
 .../{camel-example-cdi-test => cdi-test}/pom.xml   |  0
 .../apache/camel/example/cdi/test/Application.java |  0
 .../src/main/resources/META-INF/LICENSE.txt        |  0
 .../src/main/resources/META-INF/NOTICE.txt         |  0
 .../src/main/resources/META-INF/beans.xml          |  0
 .../src/main/resources/log4j2.properties           |  0
 .../camel/example/cdi/test/AlternativeBean.java    |  0
 .../camel/example/cdi/test/AlternativeTest.java    |  0
 .../example/cdi/test/ApplicationScopedTest.java    |  0
 .../camel/example/cdi/test/CustomContextTest.java  |  0
 .../apache/camel/example/cdi/test/OrderTest.java   |  0
 .../apache/camel/example/cdi/test/TestRoute.java   |  0
 .../{camel-example-cdi-xml => cdi-xml}/README.adoc | 11 ++++-
 .../{camel-example-cdi-xml => cdi-xml}/pom.xml     |  0
 .../apache/camel/example/cdi/xml/Application.java  |  0
 .../src/main}/resources/META-INF/LICENSE.txt       |  0
 .../src/main}/resources/META-INF/NOTICE.txt        |  0
 .../src/main/resources/META-INF/beans.xml          |  0
 .../src/main/resources/camel-context.xml           |  0
 .../src/main/resources/config.properties           |  0
 .../src/main/resources/log4j2.properties           |  0
 .../apache/camel/example/cdi/xml/CdiXmlTest.java   |  0
 examples/{camel-example-cdi => cdi}/README.adoc    |  2 +-
 examples/{camel-example-cdi => cdi}/pom.xml        |  0
 .../org/apache/camel/example/cdi/MyRoutes.java     |  0
 .../org/apache/camel/example/cdi/SomeBean.java     |  2 +-
 .../src/main/resources/META-INF/LICENSE.txt        |  0
 .../src/main/resources/META-INF/NOTICE.txt         |  0
 .../src/main/resources/META-INF/beans.xml          |  0
 .../src/main/resources/log4j2.properties           |  0
 .../{camel-example-console => console}/README.adoc | 14 ++++---
 .../{camel-example-console => console}/pom.xml     |  0
 .../camel/example/console/CamelConsoleMain.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
 .../pom.xml                                        |  0
 .../readme.adoc                                    | 17 ++++++--
 .../src/main/data/foo.properties                   |  0
 .../org/apache/camel/example/MyApplication.java    |  0
 .../org/apache/camel/example/MyRouteBuilder.java   |  0
 .../src/main/resources/application.properties      |  0
 .../src/main/resources/logback.xml                 |  0
 .../{camel-example-csimple => csimple}/pom.xml     |  0
 .../{camel-example-csimple => csimple}/readme.adoc | 19 +++++++--
 .../org/apache/camel/example/CSimpleScript1.java   |  0
 .../org/apache/camel/example/CSimpleScript2.java   |  0
 .../org/apache/camel/example/CSimpleScript3.java   |  0
 .../services/org/apache/camel/csimple.properties   |  0
 .../src/main/data/foo.properties                   |  0
 .../org/apache/camel/example/MyApplication.java    |  0
 .../org/apache/camel/example/MyRouteBuilder.java   |  0
 .../src/main/resources/application.properties      |  0
 .../src/main/resources/logback.xml                 |  0
 examples/{camel-example-cxf => cxf}/README.adoc    | 44 +++++++++++++-------
 examples/{camel-example-cxf => cxf}/pom.xml        |  0
 .../camel/transport/CamelTransportExample.java     |  0
 .../camel/example/camel/transport/Client.java      |  0
 .../camel/example/camel/transport/GreeterImpl.java |  0
 .../camel/example/camel/transport/Server.java      |  0
 .../example/cxf/httptojms/CamelCxfExample.java     |  0
 .../apache/camel/example/cxf/httptojms/Client.java |  0
 .../camel/example/cxf/httptojms/GreeterImpl.java   |  0
 .../camel/example/cxf/httptojms/JmsBroker.java     |  0
 .../apache/camel/example/cxf/httptojms/Server.java |  0
 .../example/cxf/jaxrs/CamelRouterBuilder.java      |  0
 .../org/apache/camel/example/cxf/jaxrs/Client.java |  0
 .../camel/example/cxf/jaxrs/JAXRSClient.java       |  0
 .../camel/example/cxf/jaxrs/JAXWSClient.java       |  0
 .../camel/example/cxf/jaxrs/resources/Book.java    |  0
 .../cxf/jaxrs/resources/BookNotFoundDetails.java   |  0
 .../cxf/jaxrs/resources/BookNotFoundFault.java     |  0
 .../example/cxf/jaxrs/resources/BookStore.java     |  0
 .../example/cxf/jaxrs/resources/BookStoreImpl.java |  0
 .../example/cxf/provider/CamelCxfExample.java      |  0
 .../apache/camel/example/cxf/provider/Client.java  |  0
 .../example/cxf/provider/GreeterProvider.java      |  0
 .../apache/camel/example/cxf/provider/Server.java  |  0
 .../camel/example/cxf/provider/TesterBean.java     |  0
 .../src/main/resources/META-INF/LICENSE.txt        |  0
 .../src/main/resources/META-INF/NOTICE.txt         |  0
 .../spring/CamelCXFProviderRouteConfig.xml         |  0
 .../META-INF/spring/CamelTransportSpringConfig.xml |  0
 .../META-INF/spring/CxfRouteCamelContext.xml       |  0
 .../META-INF/spring/HttpToJmsCamelContext.xml      |  0
 .../META-INF/spring/JAXRSCamelContext.xml          |  0
 .../src/main/resources/log4j2.properties           |  0
 .../example/camel/transport/CamelDestination.xml   |  0
 .../src/main/resources/wsdl/hello_world.wsdl       |  0
 .../transport/CamelTransportClientServerTest.java  |  0
 .../cxf/httptojms/CxfHttpJmsClientServerTest.java  |  0
 .../example/cxf/jaxrs/JAXRSClientServerTest.java   |  0
 .../example/provider/ProviderClientServerTest.java |  0
 .../src/test/resources/logging.properties          |  0
 examples/pom.xml                                   | 40 +++++++++---------
 219 files changed, 240 insertions(+), 137 deletions(-)

diff --git a/examples/README.adoc b/examples/README.adoc
index ea7ddba..15a0b80 100644
--- a/examples/README.adoc
+++ b/examples/README.adoc
@@ -27,17 +27,17 @@ Number of Examples: 87 (0 deprecated)
 
 | link:basic/README.adoc[Basic] (camel-example-basic) | Beginner | Basic 
example
 
-| link:camel-example-cdi/README.adoc[CDI] (camel-example-cdi) | Beginner | An 
example showing how to work with Camel and CDI for dependency injection
+| link:cdi/README.adoc[CDI] (camel-example-cdi) | Beginner | An example 
showing how to work with Camel and CDI for dependency injection
 
-| link:camel-example-cdi-properties/README.adoc[CDI Properties] 
(camel-example-cdi-properties) | Beginner | DeltaSpike configuration properties 
CDI example
+| link:cdi-properties/README.adoc[CDI Properties] 
(camel-example-cdi-properties) | Beginner | DeltaSpike configuration properties 
CDI example
 
-| link:camel-example-cdi-xml/README.adoc[CDI Camel XML] 
(camel-example-cdi-xml) | Beginner | CDI and Camel XML example
+| link:cdi-xml/README.adoc[CDI Camel XML] (camel-example-cdi-xml) | Beginner | 
CDI and Camel XML example
 
-| link:camel-example-console/README.adoc[Console] (camel-example-console) | 
Beginner | An example that reads input from the console
+| link:console/README.adoc[Console] (camel-example-console) | Beginner | An 
example that reads input from the console
 
-| link:camel-example-csimple/readme.adoc[Csimple] (camel-example-csimple) | 
Beginner | Shows using compiled simple language
+| link:csimple/readme.adoc[Csimple] (camel-example-csimple) | Beginner | Shows 
using compiled simple language
 
-| link:camel-example-csimple-joor/readme.adoc[Csimple Joor] 
(camel-example-csimple-joor) | Beginner | Shows using compiled simple language 
with jOOR compiler
+| link:csimple-joor/readme.adoc[Csimple Joor] (camel-example-csimple-joor) | 
Beginner | Shows using compiled simple language with jOOR compiler
 
 | link:camel-example-ftp/README.md[FTP] (camel-example-ftp) | Beginner | An 
example for showing Camel FTP integration
 
@@ -80,19 +80,19 @@ Number of Examples: 87 (0 deprecated)
 
 | 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
 
-| link:camel-example-cassandra-kubernetes/README.adoc[Cassandra Kubernetes] 
(camel-example-cassandra-kubernetes) | Cloud | An example with Camel and 
Cassandra running on Kubernetes
+| link:cassandra-kubernetes/README.adoc[Cassandra Kubernetes] 
(camel-example-cassandra-kubernetes) | Cloud | An example with Camel and 
Cassandra running on Kubernetes
 
-| link:camel-example-cdi-aws-s3/README.adoc[CDI AWS S3] 
(camel-example-cdi-aws-s3) | Cloud | AWS S3 CDI example
+| link:cdi-aws-s3/README.adoc[CDI AWS S3] (camel-example-cdi-aws-s3) | Cloud | 
AWS S3 CDI example
 
-| link:camel-example-cdi-kubernetes/README.adoc[CDI Kubernetes] 
(camel-example-cdi-kubernetes) | Cloud | An example running Camel CDI on 
Kubernetes
+| link:cdi-kubernetes/README.adoc[CDI Kubernetes] 
(camel-example-cdi-kubernetes) | Cloud | An example running Camel CDI on 
Kubernetes
 
-| link:camel-example-cdi-minio/README.adoc[CDI Minio] 
(camel-example-cdi-minio) | Cloud | Minio CDI example
+| link:cdi-minio/README.adoc[CDI Minio] (camel-example-cdi-minio) | Cloud | 
Minio CDI example
 
 | link:camel-example-hazelcast-kubernetes/README.adoc[Hazelcast Kubernetes] 
(camel-example-hazelcast-kubernetes) | Cloud | An example with Camel and 
Hazelcast running on Kubernetes
 
 | link:camel-example-main-endpointdsl-aws2/readme.md[Main Endpointdsl Aws2] 
(camel-example-main-endpointdsl-aws2) | Cloud | An example for showing 
standalone Camel with multiple AWS2 components
 
-| link:camel-example-cdi-cassandraql/README.adoc[CDI Cassandra] 
(camel-example-cdi-cassandraql) | Database | Cassandraql CDI example
+| link:cdi-cassandraql/README.adoc[CDI Cassandra] 
(camel-example-cdi-cassandraql) | Database | Cassandraql CDI example
 
 | link:camel-example-debezium/README.adoc[Debezium] (camel-example-debezium) | 
Database | An example for Debezium Component
 
@@ -114,9 +114,9 @@ Number of Examples: 87 (0 deprecated)
 
 | link:billboard-aggregate/README.adoc[Billboard Aggr] 
(camel-example-billboard-aggr) | EIP | Billboard aggregation example
 
-| link:camel-example-cafe/README.adoc[Cafe] (camel-example-cafe) | EIP | A 
cafe example showing how to work with Camel
+| link:cafe/README.adoc[Cafe] (camel-example-cafe) | EIP | A cafe example 
showing how to work with Camel
 
-| link:camel-example-cafe-endpointdsl/README.adoc[Cafe Endpointdsl] 
(camel-example-cafe-endpointdsl) | EIP | A cafe example showing how to work 
with Camel and the Endpoint DSL
+| link:cafe-endpointdsl/README.adoc[Cafe Endpointdsl] 
(camel-example-cafe-endpointdsl) | EIP | A cafe example showing how to work 
with Camel and the Endpoint DSL
 
 | link:camel-example-loadbalancing/readme.md[Load Balancing] 
(camel-example-loadbalancing) | EIP | An example that demonstrate load 
balancing messaging with mina servers (TCP/IP)
 
@@ -143,7 +143,7 @@ Number of Examples: 87 (0 deprecated)
         Spring DSL
     
 
-| link:camel-example-cdi-metrics/README.adoc[CDI Metrics] 
(camel-example-cdi-metrics) | Management and Monitoring | Dropwizard Metrics 
CDI example
+| link:cdi-metrics/README.adoc[CDI Metrics] (camel-example-cdi-metrics) | 
Management and Monitoring | Dropwizard Metrics CDI example
 
 | link:camel-example-flight-recorder/readme.adoc[Flight Recorder] 
(camel-example-flight-recorder) | Management and Monitoring | Diagnosing Camel 
with Java Flight Recorder
 
@@ -175,7 +175,7 @@ Number of Examples: 87 (0 deprecated)
 
 | 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:camel-example-cdi-rest-servlet/README.adoc[CDI Rest] 
(camel-example-cdi-rest-servlet) | Rest | Rest DSL using Servlet with CDI 
example
+| link:cdi-rest-servlet/README.adoc[CDI Rest] (camel-example-cdi-rest-servlet) 
| Rest | Rest DSL using Servlet with CDI example
 
 | link:camel-example-openapi-cdi/README.adoc[OpenApi CDI] 
(camel-example-openapi-cdi) | Rest | An example using REST DSL and OpenApi Java 
with CDI
 
@@ -189,9 +189,9 @@ Number of Examples: 87 (0 deprecated)
 
 | link:camel-example-twitter-websocket/README.adoc[Twitter Websocket] 
(camel-example-twitter-websocket) | Social | An example that pushes new tweets 
to a web page using web-socket
 
-| link:camel-example-cdi-test/README.adoc[CDI Test] (camel-example-cdi-test) | 
Testing | An example illustrating Camel CDI testing features
+| link:cdi-test/README.adoc[CDI Test] (camel-example-cdi-test) | Testing | An 
example illustrating Camel CDI testing features
 
-| link:camel-example-cxf/README.adoc[CXF] (camel-example-cxf) | WebService | 
An example which demonstrates the use of the Camel CXF component
+| link:cxf/README.adoc[CXF] (camel-example-cxf) | WebService | An example 
which demonstrates the use of the Camel CXF component
 
 | link:camel-example-cxf-proxy/README.adoc[CXF Proxy] 
(camel-example-cxf-proxy) | WebService | An example which uses Camel to proxy a 
web service
 
diff --git a/examples/artemis/README.adoc b/examples/artemis/README.adoc
index 7badb2a..36f0ec1 100644
--- a/examples/artemis/README.adoc
+++ b/examples/artemis/README.adoc
@@ -70,7 +70,6 @@ $ mvn compile exec:java
 When the Camel application runs, you should see 2 orders being processed
 and logged to the console, with an output similar to:
 
-[source,sh]
 ----
 $ 2019-04-26 11:04:27,154 [sumer[newOrder]] INFO  gadget - 
Exchange[ExchangePattern: InOnly, BodyType: String, Body: ...<order>  
<customerId>456</customerId>  <product>gadget</product>  
<amount>3</amount></order>]
 $ 2019-04-26 11:04:27,162 [sumer[newOrder]] INFO  widget - 
Exchange[ExchangePattern: InOnly, BodyType: String, Body: ...<order>  
<customerId>123</customerId>  <product>widget</product>  
<amount>2</amount></order>]
diff --git a/examples/camel-example-cafe-endpointdsl/README.adoc 
b/examples/cafe-endpointdsl/README.adoc
similarity index 58%
rename from examples/camel-example-cafe-endpointdsl/README.adoc
rename to examples/cafe-endpointdsl/README.adoc
index e36c463..a81e097 100644
--- a/examples/camel-example-cafe-endpointdsl/README.adoc
+++ b/examples/cafe-endpointdsl/README.adoc
@@ -3,35 +3,45 @@
 === Introduction
 
 This example uses the Camel Endpoint DSL to configure Camel endpoints
-using a type-safe Java endpoint DSL (eg fluent builder style).
+using a type-safe Java endpoint DSL (e.g. fluent builder style).
 
 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.
+ready, we use an aggregator to gather the drinks for waiter to deliver.
 
 === Build
 
 You will need to compile this example first:
 
-....
-mvn compile
-....
+[source,sh]
+----
+$ mvn compile
+----
 
 === Run
 
-To run the example type
+To run the example execute
 
-....
-mvn camel:run
-....
+[source,sh]
+----
+$ mvn camel:run
+----
 
-You can see the routing rules by looking at the java code in the
-`+src/main/java+` directory.
+You can see the routing rules by looking at the java code in `src/main/java`.
 
-To stop the example hit ctrl+c
+To stop the example hit `ctrl+c`
+
+=== Run unit tests
+
+There are unit tests implemented, which can be run with the following command:
+
+[source,sh]
+----
+$ mvn test
+----
 
 === Help and contributions
 
diff --git a/examples/camel-example-cafe-endpointdsl/pom.xml 
b/examples/cafe-endpointdsl/pom.xml
similarity index 100%
rename from examples/camel-example-cafe-endpointdsl/pom.xml
rename to examples/cafe-endpointdsl/pom.xml
diff --git 
a/examples/camel-example-cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/CafeRouteBuilder.java
 
b/examples/cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/CafeRouteBuilder.java
similarity index 100%
rename from 
examples/camel-example-cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/CafeRouteBuilder.java
rename to 
examples/cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/CafeRouteBuilder.java
diff --git 
a/examples/camel-example-cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/Delivery.java
 
b/examples/cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/Delivery.java
similarity index 100%
rename from 
examples/camel-example-cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/Delivery.java
rename to 
examples/cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/Delivery.java
diff --git 
a/examples/camel-example-cafe/src/main/java/org/apache/camel/example/cafe/Drink.java
 
b/examples/cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/Drink.java
similarity index 100%
rename from 
examples/camel-example-cafe/src/main/java/org/apache/camel/example/cafe/Drink.java
rename to 
examples/cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/Drink.java
diff --git 
a/examples/camel-example-cafe/src/main/java/org/apache/camel/example/cafe/DrinkType.java
 
b/examples/cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/DrinkType.java
similarity index 100%
rename from 
examples/camel-example-cafe/src/main/java/org/apache/camel/example/cafe/DrinkType.java
rename to 
examples/cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/DrinkType.java
diff --git 
a/examples/camel-example-cafe/src/main/java/org/apache/camel/example/cafe/Order.java
 
b/examples/cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/Order.java
similarity index 100%
rename from 
examples/camel-example-cafe/src/main/java/org/apache/camel/example/cafe/Order.java
rename to 
examples/cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/Order.java
diff --git 
a/examples/camel-example-cafe/src/main/java/org/apache/camel/example/cafe/OrderItem.java
 
b/examples/cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/OrderItem.java
similarity index 100%
rename from 
examples/camel-example-cafe/src/main/java/org/apache/camel/example/cafe/OrderItem.java
rename to 
examples/cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/OrderItem.java
diff --git 
a/examples/camel-example-cafe/src/main/java/org/apache/camel/example/cafe/stuff/Barista.java
 
b/examples/cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/stuff/Barista.java
similarity index 100%
rename from 
examples/camel-example-cafe/src/main/java/org/apache/camel/example/cafe/stuff/Barista.java
rename to 
examples/cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/stuff/Barista.java
diff --git 
a/examples/camel-example-cafe/src/main/java/org/apache/camel/example/cafe/stuff/CafeAggregationStrategy.java
 
b/examples/cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/stuff/CafeAggregationStrategy.java
similarity index 100%
rename from 
examples/camel-example-cafe/src/main/java/org/apache/camel/example/cafe/stuff/CafeAggregationStrategy.java
rename to 
examples/cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/stuff/CafeAggregationStrategy.java
diff --git 
a/examples/camel-example-cafe/src/main/java/org/apache/camel/example/cafe/stuff/DrinkRouter.java
 
b/examples/cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/stuff/DrinkRouter.java
similarity index 100%
rename from 
examples/camel-example-cafe/src/main/java/org/apache/camel/example/cafe/stuff/DrinkRouter.java
rename to 
examples/cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/stuff/DrinkRouter.java
diff --git 
a/examples/camel-example-cafe/src/main/java/org/apache/camel/example/cafe/stuff/OrderSplitter.java
 
b/examples/cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/stuff/OrderSplitter.java
similarity index 100%
rename from 
examples/camel-example-cafe/src/main/java/org/apache/camel/example/cafe/stuff/OrderSplitter.java
rename to 
examples/cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/stuff/OrderSplitter.java
diff --git 
a/examples/camel-example-cafe/src/main/java/org/apache/camel/example/cafe/stuff/Waiter.java
 
b/examples/cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/stuff/Waiter.java
similarity index 100%
rename from 
examples/camel-example-cafe/src/main/java/org/apache/camel/example/cafe/stuff/Waiter.java
rename to 
examples/cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/stuff/Waiter.java
diff --git a/examples/camel-example-cxf/src/main/resources/META-INF/LICENSE.txt 
b/examples/cafe-endpointdsl/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from examples/camel-example-cxf/src/main/resources/META-INF/LICENSE.txt
rename to examples/cafe-endpointdsl/src/main/resources/META-INF/LICENSE.txt
diff --git a/examples/camel-example-cxf/src/main/resources/META-INF/NOTICE.txt 
b/examples/cafe-endpointdsl/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from examples/camel-example-cxf/src/main/resources/META-INF/NOTICE.txt
rename to examples/cafe-endpointdsl/src/main/resources/META-INF/NOTICE.txt
diff --git a/examples/camel-example-cxf/src/main/resources/log4j2.properties 
b/examples/cafe-endpointdsl/src/main/resources/log4j2.properties
similarity index 100%
rename from examples/camel-example-cxf/src/main/resources/log4j2.properties
rename to examples/cafe-endpointdsl/src/main/resources/log4j2.properties
diff --git 
a/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteBuilderTest.java
 
b/examples/cafe-endpointdsl/src/test/java/org/apache/camel/example/cafe/CafeRouteBuilderTest.java
similarity index 100%
rename from 
examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteBuilderTest.java
rename to 
examples/cafe-endpointdsl/src/test/java/org/apache/camel/example/cafe/CafeRouteBuilderTest.java
diff --git 
a/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/test/TestDrinkRouter.java
 
b/examples/cafe-endpointdsl/src/test/java/org/apache/camel/example/cafe/test/TestDrinkRouter.java
similarity index 100%
rename from 
examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/test/TestDrinkRouter.java
rename to 
examples/cafe-endpointdsl/src/test/java/org/apache/camel/example/cafe/test/TestDrinkRouter.java
diff --git 
a/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/test/TestWaiter.java
 
b/examples/cafe-endpointdsl/src/test/java/org/apache/camel/example/cafe/test/TestWaiter.java
similarity index 100%
rename from 
examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/test/TestWaiter.java
rename to 
examples/cafe-endpointdsl/src/test/java/org/apache/camel/example/cafe/test/TestWaiter.java
diff --git 
a/examples/camel-example-console/src/main/resources/META-INF/LICENSE.txt 
b/examples/cafe-endpointdsl/src/test/resources/META-INF/LICENSE.txt
similarity index 100%
rename from 
examples/camel-example-console/src/main/resources/META-INF/LICENSE.txt
rename to examples/cafe-endpointdsl/src/test/resources/META-INF/LICENSE.txt
diff --git 
a/examples/camel-example-console/src/main/resources/META-INF/NOTICE.txt 
b/examples/cafe-endpointdsl/src/test/resources/META-INF/NOTICE.txt
similarity index 100%
rename from 
examples/camel-example-console/src/main/resources/META-INF/NOTICE.txt
rename to examples/cafe-endpointdsl/src/test/resources/META-INF/NOTICE.txt
diff --git a/examples/camel-example-cafe/src/test/resources/log4j2.properties 
b/examples/cafe-endpointdsl/src/test/resources/log4j2.properties
similarity index 100%
rename from examples/camel-example-cafe/src/test/resources/log4j2.properties
rename to examples/cafe-endpointdsl/src/test/resources/log4j2.properties
diff --git a/examples/camel-example-cafe/README.adoc b/examples/cafe/README.adoc
similarity index 57%
rename from examples/camel-example-cafe/README.adoc
rename to examples/cafe/README.adoc
index 1cebf75..e12a611 100644
--- a/examples/camel-example-cafe/README.adoc
+++ b/examples/cafe/README.adoc
@@ -7,29 +7,40 @@ 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.
+ready, we use an aggregator to gather the drinks for waiter to deliver.
 
 === Build
 
 You will need to compile this example first:
 
-....
-mvn compile
-....
+[source,sh]
+----
+$ mvn compile
+----
 
 === Run
 
 To run the example type
 
-....
-mvn camel:run
-....
+[source,sh]
+----
+$ 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
-`+src/main/resources/META-INF/spring+`
+You can see the routing rules by looking at the java code in
+`src/main/java`, the Spring XML configuration lives in
+`src/main/resources/META-INF/spring`
 
-To stop the example hit ctrl+c
+To stop the example hit `ctrl+c`
+
+=== Run unit tests
+
+There are unit tests implemented, which can be run with the following command:
+
+[source,sh]
+----
+$ mvn test
+----
 
 === Help and contributions
 
diff --git a/examples/camel-example-cafe/pom.xml b/examples/cafe/pom.xml
similarity index 100%
rename from examples/camel-example-cafe/pom.xml
rename to examples/cafe/pom.xml
diff --git 
a/examples/camel-example-cafe/src/main/java/org/apache/camel/example/cafe/CafeRouteBuilder.java
 
b/examples/cafe/src/main/java/org/apache/camel/example/cafe/CafeRouteBuilder.java
similarity index 100%
rename from 
examples/camel-example-cafe/src/main/java/org/apache/camel/example/cafe/CafeRouteBuilder.java
rename to 
examples/cafe/src/main/java/org/apache/camel/example/cafe/CafeRouteBuilder.java
diff --git 
a/examples/camel-example-cafe/src/main/java/org/apache/camel/example/cafe/Customer.java
 b/examples/cafe/src/main/java/org/apache/camel/example/cafe/Customer.java
similarity index 100%
rename from 
examples/camel-example-cafe/src/main/java/org/apache/camel/example/cafe/Customer.java
rename to 
examples/cafe/src/main/java/org/apache/camel/example/cafe/Customer.java
diff --git 
a/examples/camel-example-cafe/src/main/java/org/apache/camel/example/cafe/Delivery.java
 b/examples/cafe/src/main/java/org/apache/camel/example/cafe/Delivery.java
similarity index 100%
rename from 
examples/camel-example-cafe/src/main/java/org/apache/camel/example/cafe/Delivery.java
rename to 
examples/cafe/src/main/java/org/apache/camel/example/cafe/Delivery.java
diff --git 
a/examples/camel-example-cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/Drink.java
 b/examples/cafe/src/main/java/org/apache/camel/example/cafe/Drink.java
similarity index 100%
rename from 
examples/camel-example-cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/Drink.java
rename to examples/cafe/src/main/java/org/apache/camel/example/cafe/Drink.java
diff --git 
a/examples/camel-example-cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/DrinkType.java
 b/examples/cafe/src/main/java/org/apache/camel/example/cafe/DrinkType.java
similarity index 100%
rename from 
examples/camel-example-cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/DrinkType.java
rename to 
examples/cafe/src/main/java/org/apache/camel/example/cafe/DrinkType.java
diff --git 
a/examples/camel-example-cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/Order.java
 b/examples/cafe/src/main/java/org/apache/camel/example/cafe/Order.java
similarity index 100%
rename from 
examples/camel-example-cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/Order.java
rename to examples/cafe/src/main/java/org/apache/camel/example/cafe/Order.java
diff --git 
a/examples/camel-example-cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/OrderItem.java
 b/examples/cafe/src/main/java/org/apache/camel/example/cafe/OrderItem.java
similarity index 100%
rename from 
examples/camel-example-cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/OrderItem.java
rename to 
examples/cafe/src/main/java/org/apache/camel/example/cafe/OrderItem.java
diff --git 
a/examples/camel-example-cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/stuff/Barista.java
 b/examples/cafe/src/main/java/org/apache/camel/example/cafe/stuff/Barista.java
similarity index 100%
rename from 
examples/camel-example-cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/stuff/Barista.java
rename to 
examples/cafe/src/main/java/org/apache/camel/example/cafe/stuff/Barista.java
diff --git 
a/examples/camel-example-cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/stuff/CafeAggregationStrategy.java
 
b/examples/cafe/src/main/java/org/apache/camel/example/cafe/stuff/CafeAggregationStrategy.java
similarity index 100%
rename from 
examples/camel-example-cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/stuff/CafeAggregationStrategy.java
rename to 
examples/cafe/src/main/java/org/apache/camel/example/cafe/stuff/CafeAggregationStrategy.java
diff --git 
a/examples/camel-example-cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/stuff/DrinkRouter.java
 
b/examples/cafe/src/main/java/org/apache/camel/example/cafe/stuff/DrinkRouter.java
similarity index 100%
rename from 
examples/camel-example-cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/stuff/DrinkRouter.java
rename to 
examples/cafe/src/main/java/org/apache/camel/example/cafe/stuff/DrinkRouter.java
diff --git 
a/examples/camel-example-cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/stuff/OrderSplitter.java
 
b/examples/cafe/src/main/java/org/apache/camel/example/cafe/stuff/OrderSplitter.java
similarity index 100%
rename from 
examples/camel-example-cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/stuff/OrderSplitter.java
rename to 
examples/cafe/src/main/java/org/apache/camel/example/cafe/stuff/OrderSplitter.java
diff --git 
a/examples/camel-example-cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/stuff/Waiter.java
 b/examples/cafe/src/main/java/org/apache/camel/example/cafe/stuff/Waiter.java
similarity index 100%
rename from 
examples/camel-example-cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/stuff/Waiter.java
rename to 
examples/cafe/src/main/java/org/apache/camel/example/cafe/stuff/Waiter.java
diff --git a/examples/camel-example-cdi/src/main/resources/META-INF/LICENSE.txt 
b/examples/cafe/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from examples/camel-example-cdi/src/main/resources/META-INF/LICENSE.txt
rename to examples/cafe/src/main/resources/META-INF/LICENSE.txt
diff --git a/examples/camel-example-cdi/src/main/resources/META-INF/NOTICE.txt 
b/examples/cafe/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from examples/camel-example-cdi/src/main/resources/META-INF/NOTICE.txt
rename to examples/cafe/src/main/resources/META-INF/NOTICE.txt
diff --git a/examples/camel-example-cafe/src/main/resources/META-INF/beans.xml 
b/examples/cafe/src/main/resources/META-INF/beans.xml
similarity index 100%
rename from examples/camel-example-cafe/src/main/resources/META-INF/beans.xml
rename to examples/cafe/src/main/resources/META-INF/beans.xml
diff --git 
a/examples/camel-example-cafe/src/main/resources/META-INF/camel-routes.xml 
b/examples/cafe/src/main/resources/META-INF/camel-routes.xml
similarity index 100%
rename from 
examples/camel-example-cafe/src/main/resources/META-INF/camel-routes.xml
rename to examples/cafe/src/main/resources/META-INF/camel-routes.xml
diff --git 
a/examples/camel-example-cafe/src/main/resources/META-INF/spring/camel-context.xml
 b/examples/cafe/src/main/resources/META-INF/spring/camel-context.xml
similarity index 100%
rename from 
examples/camel-example-cafe/src/main/resources/META-INF/spring/camel-context.xml
rename to examples/cafe/src/main/resources/META-INF/spring/camel-context.xml
diff --git 
a/examples/camel-example-console/src/main/resources/log4j2.properties 
b/examples/cafe/src/main/resources/log4j2.properties
similarity index 100%
rename from examples/camel-example-console/src/main/resources/log4j2.properties
rename to examples/cafe/src/main/resources/log4j2.properties
diff --git 
a/examples/camel-example-cafe-endpointdsl/src/test/java/org/apache/camel/example/cafe/CafeRouteBuilderTest.java
 
b/examples/cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteBuilderTest.java
similarity index 100%
rename from 
examples/camel-example-cafe-endpointdsl/src/test/java/org/apache/camel/example/cafe/CafeRouteBuilderTest.java
rename to 
examples/cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteBuilderTest.java
diff --git 
a/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteSpringIntegrationTest.java
 
b/examples/cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteSpringIntegrationTest.java
similarity index 100%
rename from 
examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteSpringIntegrationTest.java
rename to 
examples/cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteSpringIntegrationTest.java
diff --git 
a/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteSpringTest.java
 
b/examples/cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteSpringTest.java
similarity index 100%
rename from 
examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteSpringTest.java
rename to 
examples/cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteSpringTest.java
diff --git 
a/examples/camel-example-cafe-endpointdsl/src/test/java/org/apache/camel/example/cafe/test/TestDrinkRouter.java
 
b/examples/cafe/src/test/java/org/apache/camel/example/cafe/test/TestDrinkRouter.java
similarity index 100%
rename from 
examples/camel-example-cafe-endpointdsl/src/test/java/org/apache/camel/example/cafe/test/TestDrinkRouter.java
rename to 
examples/cafe/src/test/java/org/apache/camel/example/cafe/test/TestDrinkRouter.java
diff --git 
a/examples/camel-example-cafe-endpointdsl/src/test/java/org/apache/camel/example/cafe/test/TestWaiter.java
 
b/examples/cafe/src/test/java/org/apache/camel/example/cafe/test/TestWaiter.java
similarity index 100%
rename from 
examples/camel-example-cafe-endpointdsl/src/test/java/org/apache/camel/example/cafe/test/TestWaiter.java
rename to 
examples/cafe/src/test/java/org/apache/camel/example/cafe/test/TestWaiter.java
diff --git 
a/examples/camel-example-cdi-xml/src/main/resources/META-INF/LICENSE.txt 
b/examples/cafe/src/test/resources/META-INF/LICENSE.txt
similarity index 100%
rename from 
examples/camel-example-cdi-xml/src/main/resources/META-INF/LICENSE.txt
rename to examples/cafe/src/test/resources/META-INF/LICENSE.txt
diff --git 
a/examples/camel-example-cdi-xml/src/main/resources/META-INF/NOTICE.txt 
b/examples/cafe/src/test/resources/META-INF/NOTICE.txt
similarity index 100%
rename from 
examples/camel-example-cdi-xml/src/main/resources/META-INF/NOTICE.txt
rename to examples/cafe/src/test/resources/META-INF/NOTICE.txt
diff --git a/examples/camel-example-cafe/src/test/resources/META-INF/beans.xml 
b/examples/cafe/src/test/resources/META-INF/beans.xml
similarity index 100%
rename from examples/camel-example-cafe/src/test/resources/META-INF/beans.xml
rename to examples/cafe/src/test/resources/META-INF/beans.xml
diff --git 
a/examples/camel-example-cafe-endpointdsl/src/test/resources/log4j2.properties 
b/examples/cafe/src/test/resources/log4j2.properties
similarity index 100%
rename from 
examples/camel-example-cafe-endpointdsl/src/test/resources/log4j2.properties
rename to examples/cafe/src/test/resources/log4j2.properties
diff --git a/examples/camel-example-cxf-proxy/README.adoc 
b/examples/camel-example-cxf-proxy/README.adoc
index e14f57d..dbc5579 100644
--- a/examples/camel-example-cxf-proxy/README.adoc
+++ b/examples/camel-example-cxf-proxy/README.adoc
@@ -9,17 +9,19 @@ the camel-cxf component
 
 You will need to compile this example first:
 
-....
-mvn compile
-....
+[source,sh]
+----
+$ mvn compile
+----
 
 === Run
 
 To run the example type:
 
-....
-mvn camel:run -Dmaven.test.skip=true
-....
+[source,sh]
+----
+$ mvn camel:run -Dmaven.test.skip=true
+----
 
 The proxied webservice is located at
 
@@ -53,7 +55,8 @@ new project w/WSDL of
 
http://localhost:$%7Bproxy.port%7D/camel-example-cxf-proxy/webservices/incident?wsdl.
 Then make SOAP requests of this format:
 
-....
+[source,xml]
+----
 <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"; 
                   xmlns:rep="http://reportincident.example.camel.apache.org";>
    <soapenv:Header/>
@@ -70,7 +73,7 @@ Then make SOAP requests of this format:
       </rep:inputReportIncident>
    </soapenv:Body>
 </soapenv:Envelope>
-....
+----
 
 === Configuration
 
diff --git a/examples/camel-example-cxf-tomcat/README.adoc 
b/examples/camel-example-cxf-tomcat/README.adoc
index fd5f7a4..980b59a 100644
--- a/examples/camel-example-cxf-tomcat/README.adoc
+++ b/examples/camel-example-cxf-tomcat/README.adoc
@@ -11,9 +11,9 @@ It can be run using Maven.
 
 You will need to first need to build the example:
 
-....
-mvn clean install
-....
+----
+$ mvn clean install
+----
 
 === Run
 
@@ -35,7 +35,8 @@ 
http://localhost:8080/camel-example-cxf-tomcat/webservices/incident?wsdl
 You can run a sample client using the `mvn exec:java` command, or,
 within soapUI, making sample SOAP requests such as the following:
 
-....
+[source,xml]
+----
 <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/";>
     <soap:Body>
         <ns1:reportIncident 
xmlns:ns1="http://incident.cxf.example.camel.apache.org/";>
@@ -62,7 +63,7 @@ within soapUI, making sample SOAP requests such as the 
following:
         </ns1:statusIncident>
     </soap:Body>
 </soap:Envelope>
-....
+----
 
 === Help and contributions
 
diff --git a/examples/camel-example-cassandra-kubernetes/README.adoc 
b/examples/cassandra-kubernetes/README.adoc
similarity index 98%
rename from examples/camel-example-cassandra-kubernetes/README.adoc
rename to examples/cassandra-kubernetes/README.adoc
index 4b4f3a5..b46bede 100644
--- a/examples/camel-example-cassandra-kubernetes/README.adoc
+++ b/examples/cassandra-kubernetes/README.adoc
@@ -22,7 +22,6 @@ Once your Minikube node is up and running you'll need to run 
the
 following command. In your `src/main/resource/jkube/` folder you'll find
 two yaml files. Run the following commands using them to prepare the Cassandra 
cluster:
 
-[source,sh]
 ----
 $ kubectl create -f src/main/resources/jkube/cassandra-service.yaml
 $ kubectl create -f src/main/resources/jkube/cassandra-statefulset.yaml
@@ -30,7 +29,6 @@ $ kubectl create -f 
src/main/resources/jkube/cassandra-statefulset.yaml
 
 To check the correct startup of the cluster run the following command:
 
-[source,sh]
 ----
 $ kubectl get statefulsets.apps
 NAME        READY   AGE
@@ -39,7 +37,6 @@ cassandra   2/2     3h44m
 
 and check the status of the pods
 
-[source,sh]
 ----
 $ kubectl get pods
 NAME                                       READY     STATUS    RESTARTS   AGE
@@ -49,7 +46,6 @@ cassandra-1                                1/1       Running  
 0          2h
 
 You can also verify the health of your cluster by running
 
-[source,sh]
 ----
 $ kubectl exec <pod_name> -it nodetool status
 Datacenter: DC1-K8Demo
@@ -89,7 +85,6 @@ $ mvn -Pkubernetes-install k8s:log
 
 You should then see an output similar to this:
 
-[source,sh]
 ----
 [INFO] k8s: 2020-08-07 12:34:32,569 [main           ] INFO  GuavaCompatibility 
            - Detected Guava >= 19 in the classpath, using modern compatibility 
layer
 [INFO] k8s: 2020-08-07 12:34:32,834 [main           ] INFO  ClockFactory       
            - Using native clock to generate timestamps.
@@ -120,7 +115,6 @@ You should then see an output similar to this:
 
 Run following to undeploy the application and cassandra nodes
 
-[source,sh]
 ----
 $ mvn -Pkubernetes-install k8s:undeploy
 $ kubectl delete -f src/main/resources/jkube/cassandra-service.yaml
@@ -129,7 +123,6 @@ $ kubectl delete -f 
src/main/resources/jkube/cassandra-statefulset.yaml
 
 Make sure no pod is running
 
-[source,sh]
 ----
 $ kubectl get pods
 No resources found.
diff --git a/examples/camel-example-cassandra-kubernetes/pom.xml 
b/examples/cassandra-kubernetes/pom.xml
similarity index 100%
rename from examples/camel-example-cassandra-kubernetes/pom.xml
rename to examples/cassandra-kubernetes/pom.xml
diff --git 
a/examples/camel-example-cassandra-kubernetes/src/main/java/org/apache/camel/example/kubernetes/jkube/CqlPopulateBean.java
 
b/examples/cassandra-kubernetes/src/main/java/org/apache/camel/example/kubernetes/jkube/CqlPopulateBean.java
similarity index 100%
rename from 
examples/camel-example-cassandra-kubernetes/src/main/java/org/apache/camel/example/kubernetes/jkube/CqlPopulateBean.java
rename to 
examples/cassandra-kubernetes/src/main/java/org/apache/camel/example/kubernetes/jkube/CqlPopulateBean.java
diff --git 
a/examples/camel-example-cassandra-kubernetes/src/main/java/org/apache/camel/example/kubernetes/jkube/RowProcessor.java
 
b/examples/cassandra-kubernetes/src/main/java/org/apache/camel/example/kubernetes/jkube/RowProcessor.java
similarity index 100%
rename from 
examples/camel-example-cassandra-kubernetes/src/main/java/org/apache/camel/example/kubernetes/jkube/RowProcessor.java
rename to 
examples/cassandra-kubernetes/src/main/java/org/apache/camel/example/kubernetes/jkube/RowProcessor.java
diff --git 
a/examples/camel-example-cassandra-kubernetes/src/main/resources/META-INF/spring/camel-context.xml
 
b/examples/cassandra-kubernetes/src/main/resources/META-INF/spring/camel-context.xml
similarity index 100%
rename from 
examples/camel-example-cassandra-kubernetes/src/main/resources/META-INF/spring/camel-context.xml
rename to 
examples/cassandra-kubernetes/src/main/resources/META-INF/spring/camel-context.xml
diff --git 
a/examples/camel-example-cassandra-kubernetes/src/main/resources/jkube/cassandra-service.yaml
 b/examples/cassandra-kubernetes/src/main/resources/jkube/cassandra-service.yaml
similarity index 100%
rename from 
examples/camel-example-cassandra-kubernetes/src/main/resources/jkube/cassandra-service.yaml
rename to 
examples/cassandra-kubernetes/src/main/resources/jkube/cassandra-service.yaml
diff --git 
a/examples/camel-example-cassandra-kubernetes/src/main/resources/jkube/cassandra-statefulset.yaml
 
b/examples/cassandra-kubernetes/src/main/resources/jkube/cassandra-statefulset.yaml
similarity index 100%
rename from 
examples/camel-example-cassandra-kubernetes/src/main/resources/jkube/cassandra-statefulset.yaml
rename to 
examples/cassandra-kubernetes/src/main/resources/jkube/cassandra-statefulset.yaml
diff --git 
a/examples/camel-example-cassandra-kubernetes/src/main/resources/log4j.properties
 b/examples/cassandra-kubernetes/src/main/resources/log4j.properties
similarity index 100%
rename from 
examples/camel-example-cassandra-kubernetes/src/main/resources/log4j.properties
rename to examples/cassandra-kubernetes/src/main/resources/log4j.properties
diff --git a/examples/camel-example-cdi-aws-s3/README.adoc 
b/examples/cdi-aws-s3/README.adoc
similarity index 100%
rename from examples/camel-example-cdi-aws-s3/README.adoc
rename to examples/cdi-aws-s3/README.adoc
diff --git a/examples/camel-example-cdi-aws-s3/pom.xml 
b/examples/cdi-aws-s3/pom.xml
similarity index 100%
rename from examples/camel-example-cdi-aws-s3/pom.xml
rename to examples/cdi-aws-s3/pom.xml
diff --git 
a/examples/camel-example-cdi-aws-s3/src/main/java/org/apache/camel/example/cdi/aws/s3/Application.java
 
b/examples/cdi-aws-s3/src/main/java/org/apache/camel/example/cdi/aws/s3/Application.java
similarity index 100%
rename from 
examples/camel-example-cdi-aws-s3/src/main/java/org/apache/camel/example/cdi/aws/s3/Application.java
rename to 
examples/cdi-aws-s3/src/main/java/org/apache/camel/example/cdi/aws/s3/Application.java
diff --git 
a/examples/camel-example-cdi-test/src/main/resources/META-INF/LICENSE.txt 
b/examples/cdi-aws-s3/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from 
examples/camel-example-cdi-test/src/main/resources/META-INF/LICENSE.txt
rename to examples/cdi-aws-s3/src/main/resources/META-INF/LICENSE.txt
diff --git 
a/examples/camel-example-cdi-test/src/main/resources/META-INF/NOTICE.txt 
b/examples/cdi-aws-s3/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from 
examples/camel-example-cdi-test/src/main/resources/META-INF/NOTICE.txt
rename to examples/cdi-aws-s3/src/main/resources/META-INF/NOTICE.txt
diff --git a/examples/camel-example-cdi/src/main/resources/META-INF/beans.xml 
b/examples/cdi-aws-s3/src/main/resources/META-INF/beans.xml
similarity index 100%
rename from examples/camel-example-cdi/src/main/resources/META-INF/beans.xml
rename to examples/cdi-aws-s3/src/main/resources/META-INF/beans.xml
diff --git 
a/examples/camel-example-cdi-xml/src/main/resources/log4j2.properties 
b/examples/cdi-aws-s3/src/main/resources/log4j2.properties
similarity index 100%
rename from examples/camel-example-cdi-xml/src/main/resources/log4j2.properties
rename to examples/cdi-aws-s3/src/main/resources/log4j2.properties
diff --git a/examples/camel-example-cdi-cassandraql/README.adoc 
b/examples/cdi-cassandraql/README.adoc
similarity index 94%
rename from examples/camel-example-cdi-cassandraql/README.adoc
rename to examples/cdi-cassandraql/README.adoc
index 2fb1634..658436d 100644
--- a/examples/camel-example-cdi-cassandraql/README.adoc
+++ b/examples/cdi-cassandraql/README.adoc
@@ -5,29 +5,29 @@
 This example illustrates the integration between Camel, CDI and
 Cassandra.
 
-The example get the list of pods from a Kubernetes cluster and print
+The example gets the list of pods from a Kubernetes cluster and prints
 name and status of each one of the pods returned.
 
-The `+camel-cdi+`, `+camel-core+` and `+camel-cassandraql+` components
+The components `camel-cdi`, `camel-core` and `camel-cassandraql`
 are used in this example. The example assumes you have a running
 Cassandra Cluster in your environment. We will use Docker to spin up
 this cluster.
 
-By default cluster requires significant amount of RAM memory (approx.
-12GB). You can limit memory of docker container specifying parameter:
-`+--env MAX_HEAP_SIZE+`
+By default, a cluster requires a significant amount of RAM/memory (approx. 
12GB).
+You can limit memory of docker container specifying parameter:
+`--env MAX_HEAP_SIZE`
 
 As first step we will need to run a single node cluster:
 
-....
+----
 $ docker run --name master_node --env MAX_HEAP_SIZE='800M' -dt oscerd/cassandra
 $ docker run --name node1 --env MAX_HEAP_SIZE='800M' -d -e SEED="$(docker 
inspect --format='{{ .NetworkSettings.IPAddress }}' master_node)" 
oscerd/cassandra
 $ docker run --name node2 --env MAX_HEAP_SIZE='800M' -d -e SEED="$(docker 
inspect --format='{{ .NetworkSettings.IPAddress }}' master_node)" 
oscerd/cassandra
-....
+----
 
 We now have three nodes in our cluster.
 
-....
+----
 $ docker exec -ti master_node /opt/cassandra/bin/nodetool status
 Datacenter: datacenter1
 =======================
@@ -37,37 +37,37 @@ Status=Up/Down
 UN  172.17.0.3  102.67 KiB  256          65.9%             
1a985c48-33a1-44aa-b7e9-f1a3620a6482  rack1
 UN  172.17.0.2  107.64 KiB  256          68.2%             
da54ce5e-6433-4ea0-b2c3-fbc6c63ea955  rack1
 UN  172.17.0.4  15.42 KiB  256          65.8%             
0f2ba25a-37b0-4f27-a10a-d9a44655396a  rack1
-....
+----
 
 From your local http://cassandra.apache.org/[Apache Cassandra] directory
-run the `+cqlsh+` command:
+run the `cqlsh` command:
 
-....
+----
 <LOCAL_CASSANDRA_HOME>/bin/cqlsh $(docker inspect --format='{{ 
.NetworkSettings.IPAddress }}' master_node)
-....
+----
 
 You should see the Cqlsh prompt
 
-....
+----
 Connected to Test Cluster at 172.17.0.2:9042.
 [cqlsh 5.0.1 | Cassandra 3.6 | CQL spec 3.4.2 | Native protocol v4]
 Use HELP for help.
 cqlsh>
-....
+----
 
-Let's create a namespace `+test+` with a table `+users+`
+Let's create a namespace `test` with a table `users`
 
-....
+----
 create keyspace test with replication = {'class':'SimpleStrategy', 
'replication_factor':3};
 use test;
 create table users ( id int primary key, name text );
 insert into users (id,name) values (1, 'oscerd');
 quit;
-....
+----
 
 run a simple query to check everything works:
 
-....
+----
 cqlsh> use test;
 cqlsh:test> select * from users;
 
@@ -77,7 +77,7 @@ cqlsh:test> select * from users;
 
 (1 rows)
 cqlsh:test> 
-....
+----
 
 Remember to edit the apache-deltaspike.properties file to add the
 correct addresses of the different nodes running in Docker.
@@ -102,7 +102,7 @@ $ mvn compile camel:run
 
 When the Camel application runs, you should see the following result:
 
-....
+----
 2016-07-24 15:33:50,812 [cdi.Main.main()] INFO  Version                        
- WELD-000900: 2.3.5 (Final)
 Jul 24, 2016 3:33:50 PM 
org.apache.deltaspike.core.impl.config.EnvironmentPropertyConfigSourceProvider 
<init>
 INFO: Custom config found by DeltaSpike. Name: 
'META-INF/apache-deltaspike.properties', URL: 
'file:/home/oscerd/workspace/apache-camel/camel/examples/camel-example-cdi-cassandraql/target/classes/META-INF/apache-deltaspike.properties'
@@ -136,13 +136,13 @@ INFO: Computed the following DeltaSpike ProjectStage: 
Production
 2016-07-24 15:33:52,987 [cdi.Main.main()] INFO  DefaultCamelContext            
- Apache Camel 2.18.0 (CamelContext: camel-example-cassandraql-cdi) started in 
0.742 seconds
 2016-07-24 15:33:53,018 [cdi.Main.main()] INFO  Bootstrap                      
- WELD-ENV-002003: Weld SE container STATIC_INSTANCE initialized
 2016-07-24 15:33:54,041 [ timer://stream] INFO  route1                         
- Result from query [Row[1, oscerd]]
-....
+----
 
 The Camel application can be stopped pressing ctrl+c in the shell.
 
-If you run the query again you should see a `+davsclaus+` entry too:
+If you run the query again you should see a `davsclaus` entry too:
 
-....
+----
 cqlsh> use test;
 cqlsh:test> select * from users;
 
@@ -153,7 +153,7 @@ cqlsh:test> select * from users;
 
 (2 rows)
 cqlsh:test> 
-....
+----
 
 === Help and contributions
 
diff --git a/examples/camel-example-cdi-cassandraql/pom.xml 
b/examples/cdi-cassandraql/pom.xml
similarity index 100%
rename from examples/camel-example-cdi-cassandraql/pom.xml
rename to examples/cdi-cassandraql/pom.xml
diff --git 
a/examples/camel-example-cdi-cassandraql/src/main/java/org/apache/camel/example/cdi/cassandraql/Application.java
 
b/examples/cdi-cassandraql/src/main/java/org/apache/camel/example/cdi/cassandraql/Application.java
similarity index 100%
rename from 
examples/camel-example-cdi-cassandraql/src/main/java/org/apache/camel/example/cdi/cassandraql/Application.java
rename to 
examples/cdi-cassandraql/src/main/java/org/apache/camel/example/cdi/cassandraql/Application.java
diff --git 
a/examples/camel-example-cdi-rest-servlet/src/main/resources/META-INF/LICENSE.txt
 b/examples/cdi-cassandraql/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from 
examples/camel-example-cdi-rest-servlet/src/main/resources/META-INF/LICENSE.txt
rename to examples/cdi-cassandraql/src/main/resources/META-INF/LICENSE.txt
diff --git 
a/examples/camel-example-cdi-rest-servlet/src/main/resources/META-INF/NOTICE.txt
 b/examples/cdi-cassandraql/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from 
examples/camel-example-cdi-rest-servlet/src/main/resources/META-INF/NOTICE.txt
rename to examples/cdi-cassandraql/src/main/resources/META-INF/NOTICE.txt
diff --git 
a/examples/camel-example-cdi-cassandraql/src/main/resources/META-INF/apache-deltaspike.properties
 
b/examples/cdi-cassandraql/src/main/resources/META-INF/apache-deltaspike.properties
similarity index 100%
rename from 
examples/camel-example-cdi-cassandraql/src/main/resources/META-INF/apache-deltaspike.properties
rename to 
examples/cdi-cassandraql/src/main/resources/META-INF/apache-deltaspike.properties
diff --git 
a/examples/camel-example-cdi-xml/src/main/resources/META-INF/beans.xml 
b/examples/cdi-cassandraql/src/main/resources/META-INF/beans.xml
similarity index 100%
rename from examples/camel-example-cdi-xml/src/main/resources/META-INF/beans.xml
rename to examples/cdi-cassandraql/src/main/resources/META-INF/beans.xml
diff --git 
a/examples/camel-example-cdi-test/src/main/resources/log4j2.properties 
b/examples/cdi-cassandraql/src/main/resources/log4j2.properties
similarity index 100%
rename from examples/camel-example-cdi-test/src/main/resources/log4j2.properties
rename to examples/cdi-cassandraql/src/main/resources/log4j2.properties
diff --git a/examples/camel-example-cdi-kubernetes/README.adoc 
b/examples/cdi-kubernetes/README.adoc
similarity index 98%
rename from examples/camel-example-cdi-kubernetes/README.adoc
rename to examples/cdi-kubernetes/README.adoc
index 41f87db..895974a 100644
--- a/examples/camel-example-cdi-kubernetes/README.adoc
+++ b/examples/cdi-kubernetes/README.adoc
@@ -10,7 +10,7 @@ the output of the `+kubectl get pods+` command.
 
 The `+camel-cdi+` and `+camel-kubernetes+` components are used in this
 example. The example assumes you have a running Kubernetes cluster in
-your environment. For example you can use
+your environment. For example, you can use
 https://github.com/kubernetes/minikube[minikube] or the
 
https://github.com/fabric8io/fabric8-installer/tree/master/vagrant/openshift[vagrant
 openshift image] from http://fabric8.io/[Fabric8 team].
diff --git a/examples/camel-example-cdi-kubernetes/pom.xml 
b/examples/cdi-kubernetes/pom.xml
similarity index 100%
rename from examples/camel-example-cdi-kubernetes/pom.xml
rename to examples/cdi-kubernetes/pom.xml
diff --git 
a/examples/camel-example-cdi-kubernetes/src/main/java/org/apache/camel/example/cdi/kubernetes/Application.java
 
b/examples/cdi-kubernetes/src/main/java/org/apache/camel/example/cdi/kubernetes/Application.java
similarity index 100%
rename from 
examples/camel-example-cdi-kubernetes/src/main/java/org/apache/camel/example/cdi/kubernetes/Application.java
rename to 
examples/cdi-kubernetes/src/main/java/org/apache/camel/example/cdi/kubernetes/Application.java
diff --git 
a/examples/camel-example-cdi-properties/src/main/resources/META-INF/LICENSE.txt 
b/examples/cdi-kubernetes/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from 
examples/camel-example-cdi-properties/src/main/resources/META-INF/LICENSE.txt
rename to examples/cdi-kubernetes/src/main/resources/META-INF/LICENSE.txt
diff --git 
a/examples/camel-example-cdi-properties/src/main/resources/META-INF/NOTICE.txt 
b/examples/cdi-kubernetes/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from 
examples/camel-example-cdi-properties/src/main/resources/META-INF/NOTICE.txt
rename to examples/cdi-kubernetes/src/main/resources/META-INF/NOTICE.txt
diff --git 
a/examples/camel-example-cdi-minio/src/main/resources/META-INF/beans.xml 
b/examples/cdi-kubernetes/src/main/resources/META-INF/beans.xml
similarity index 100%
rename from 
examples/camel-example-cdi-minio/src/main/resources/META-INF/beans.xml
rename to examples/cdi-kubernetes/src/main/resources/META-INF/beans.xml
diff --git 
a/examples/camel-example-cdi-kubernetes/src/main/resources/application.properties
 b/examples/cdi-kubernetes/src/main/resources/application.properties
similarity index 100%
rename from 
examples/camel-example-cdi-kubernetes/src/main/resources/application.properties
rename to examples/cdi-kubernetes/src/main/resources/application.properties
diff --git 
a/examples/camel-example-cdi-rest-servlet/src/main/resources/log4j2.properties 
b/examples/cdi-kubernetes/src/main/resources/log4j2.properties
similarity index 100%
rename from 
examples/camel-example-cdi-rest-servlet/src/main/resources/log4j2.properties
rename to examples/cdi-kubernetes/src/main/resources/log4j2.properties
diff --git a/examples/camel-example-cdi-metrics/README.adoc 
b/examples/cdi-metrics/README.adoc
similarity index 96%
rename from examples/camel-example-cdi-metrics/README.adoc
rename to examples/cdi-metrics/README.adoc
index 9886f56..bfe3182 100644
--- a/examples/camel-example-cdi-metrics/README.adoc
+++ b/examples/cdi-metrics/README.adoc
@@ -73,6 +73,15 @@ And every 10 seconds, the metrics report, e.g.:
 
 The Camel application can be stopped pressing ctrl+c in the shell.
 
+=== Run unit tests
+
+There are unit tests implemented, which can be run with the following command:
+
+[source,sh]
+----
+$ mvn test
+----
+
 === Help and contributions
 
 If you hit any problem using Camel or have some feedback, then please
diff --git a/examples/camel-example-cdi-metrics/pom.xml 
b/examples/cdi-metrics/pom.xml
similarity index 100%
rename from examples/camel-example-cdi-metrics/pom.xml
rename to examples/cdi-metrics/pom.xml
diff --git 
a/examples/camel-example-cdi-metrics/src/main/java/org/apache/camel/example/cdi/metrics/Application.java
 
b/examples/cdi-metrics/src/main/java/org/apache/camel/example/cdi/metrics/Application.java
similarity index 100%
rename from 
examples/camel-example-cdi-metrics/src/main/java/org/apache/camel/example/cdi/metrics/Application.java
rename to 
examples/cdi-metrics/src/main/java/org/apache/camel/example/cdi/metrics/Application.java
diff --git 
a/examples/camel-example-cdi-metrics/src/main/java/org/apache/camel/example/cdi/metrics/UnreliableService.java
 
b/examples/cdi-metrics/src/main/java/org/apache/camel/example/cdi/metrics/UnreliableService.java
similarity index 100%
rename from 
examples/camel-example-cdi-metrics/src/main/java/org/apache/camel/example/cdi/metrics/UnreliableService.java
rename to 
examples/cdi-metrics/src/main/java/org/apache/camel/example/cdi/metrics/UnreliableService.java
diff --git 
a/examples/camel-example-cdi-minio/src/main/resources/META-INF/LICENSE.txt 
b/examples/cdi-metrics/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from 
examples/camel-example-cdi-minio/src/main/resources/META-INF/LICENSE.txt
rename to examples/cdi-metrics/src/main/resources/META-INF/LICENSE.txt
diff --git 
a/examples/camel-example-cdi-minio/src/main/resources/META-INF/NOTICE.txt 
b/examples/cdi-metrics/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from 
examples/camel-example-cdi-minio/src/main/resources/META-INF/NOTICE.txt
rename to examples/cdi-metrics/src/main/resources/META-INF/NOTICE.txt
diff --git 
a/examples/camel-example-cdi-metrics/src/main/resources/META-INF/beans.xml 
b/examples/cdi-metrics/src/main/resources/META-INF/beans.xml
similarity index 100%
rename from 
examples/camel-example-cdi-metrics/src/main/resources/META-INF/beans.xml
rename to examples/cdi-metrics/src/main/resources/META-INF/beans.xml
diff --git 
a/examples/camel-example-cdi-properties/src/main/resources/log4j2.properties 
b/examples/cdi-metrics/src/main/resources/log4j2.properties
similarity index 100%
rename from 
examples/camel-example-cdi-properties/src/main/resources/log4j2.properties
rename to examples/cdi-metrics/src/main/resources/log4j2.properties
diff --git 
a/examples/camel-example-cdi-metrics/src/test/java/org/apache/camel/example/cdi/metrics/CdiMetricsTest.java
 
b/examples/cdi-metrics/src/test/java/org/apache/camel/example/cdi/metrics/CdiMetricsTest.java
similarity index 100%
rename from 
examples/camel-example-cdi-metrics/src/test/java/org/apache/camel/example/cdi/metrics/CdiMetricsTest.java
rename to 
examples/cdi-metrics/src/test/java/org/apache/camel/example/cdi/metrics/CdiMetricsTest.java
diff --git a/examples/camel-example-cdi-minio/README.adoc 
b/examples/cdi-minio/README.adoc
similarity index 100%
rename from examples/camel-example-cdi-minio/README.adoc
rename to examples/cdi-minio/README.adoc
diff --git a/examples/camel-example-cdi-minio/pom.xml 
b/examples/cdi-minio/pom.xml
similarity index 100%
rename from examples/camel-example-cdi-minio/pom.xml
rename to examples/cdi-minio/pom.xml
diff --git 
a/examples/camel-example-cdi-minio/src/main/java/org/apache/camel/example/cdi/minio/Application.java
 
b/examples/cdi-minio/src/main/java/org/apache/camel/example/cdi/minio/Application.java
similarity index 100%
rename from 
examples/camel-example-cdi-minio/src/main/java/org/apache/camel/example/cdi/minio/Application.java
rename to 
examples/cdi-minio/src/main/java/org/apache/camel/example/cdi/minio/Application.java
diff --git 
a/examples/camel-example-cdi-minio/src/main/java/org/apache/camel/example/cdi/minio/MinioExampleUtils.java
 
b/examples/cdi-minio/src/main/java/org/apache/camel/example/cdi/minio/MinioExampleUtils.java
similarity index 100%
rename from 
examples/camel-example-cdi-minio/src/main/java/org/apache/camel/example/cdi/minio/MinioExampleUtils.java
rename to 
examples/cdi-minio/src/main/java/org/apache/camel/example/cdi/minio/MinioExampleUtils.java
diff --git 
a/examples/camel-example-cdi-metrics/src/main/resources/META-INF/LICENSE.txt 
b/examples/cdi-minio/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from 
examples/camel-example-cdi-metrics/src/main/resources/META-INF/LICENSE.txt
rename to examples/cdi-minio/src/main/resources/META-INF/LICENSE.txt
diff --git 
a/examples/camel-example-cdi-metrics/src/main/resources/META-INF/NOTICE.txt 
b/examples/cdi-minio/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from 
examples/camel-example-cdi-metrics/src/main/resources/META-INF/NOTICE.txt
rename to examples/cdi-minio/src/main/resources/META-INF/NOTICE.txt
diff --git 
a/examples/camel-example-cdi-kubernetes/src/main/resources/META-INF/beans.xml 
b/examples/cdi-minio/src/main/resources/META-INF/beans.xml
similarity index 100%
rename from 
examples/camel-example-cdi-kubernetes/src/main/resources/META-INF/beans.xml
rename to examples/cdi-minio/src/main/resources/META-INF/beans.xml
diff --git 
a/examples/camel-example-cdi-minio/src/main/resources/log4j2.properties 
b/examples/cdi-minio/src/main/resources/log4j2.properties
similarity index 100%
rename from 
examples/camel-example-cdi-minio/src/main/resources/log4j2.properties
rename to examples/cdi-minio/src/main/resources/log4j2.properties
diff --git 
a/examples/camel-example-cdi-minio/src/main/resources/minio_key.properties 
b/examples/cdi-minio/src/main/resources/minio_key.properties
similarity index 100%
rename from 
examples/camel-example-cdi-minio/src/main/resources/minio_key.properties
rename to examples/cdi-minio/src/main/resources/minio_key.properties
diff --git a/examples/camel-example-cdi-properties/README.adoc 
b/examples/cdi-properties/README.adoc
similarity index 94%
rename from examples/camel-example-cdi-properties/README.adoc
rename to examples/cdi-properties/README.adoc
index 56e4b47..84922dd 100644
--- a/examples/camel-example-cdi-properties/README.adoc
+++ b/examples/cdi-properties/README.adoc
@@ -54,6 +54,15 @@ being logged to the console, e.g.:
 
 The Camel application can be stopped pressing ctrl+c in the shell.
 
+=== Run unit tests
+
+There are unit tests implemented, which can be run with the following command:
+
+[source,sh]
+----
+$ mvn test
+----
+
 === Help and contributions
 
 If you hit any problem using Camel or have some feedback, then please
diff --git a/examples/camel-example-cdi-properties/pom.xml 
b/examples/cdi-properties/pom.xml
similarity index 100%
rename from examples/camel-example-cdi-properties/pom.xml
rename to examples/cdi-properties/pom.xml
diff --git 
a/examples/camel-example-cdi-properties/src/main/java/org/apache/camel/example/cdi/properties/Application.java
 
b/examples/cdi-properties/src/main/java/org/apache/camel/example/cdi/properties/Application.java
similarity index 100%
rename from 
examples/camel-example-cdi-properties/src/main/java/org/apache/camel/example/cdi/properties/Application.java
rename to 
examples/cdi-properties/src/main/java/org/apache/camel/example/cdi/properties/Application.java
diff --git 
a/examples/camel-example-cdi-kubernetes/src/main/resources/META-INF/LICENSE.txt 
b/examples/cdi-properties/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from 
examples/camel-example-cdi-kubernetes/src/main/resources/META-INF/LICENSE.txt
rename to examples/cdi-properties/src/main/resources/META-INF/LICENSE.txt
diff --git 
a/examples/camel-example-cdi-kubernetes/src/main/resources/META-INF/NOTICE.txt 
b/examples/cdi-properties/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from 
examples/camel-example-cdi-kubernetes/src/main/resources/META-INF/NOTICE.txt
rename to examples/cdi-properties/src/main/resources/META-INF/NOTICE.txt
diff --git 
a/examples/camel-example-cdi-properties/src/main/resources/META-INF/apache-deltaspike.properties
 
b/examples/cdi-properties/src/main/resources/META-INF/apache-deltaspike.properties
similarity index 100%
rename from 
examples/camel-example-cdi-properties/src/main/resources/META-INF/apache-deltaspike.properties
rename to 
examples/cdi-properties/src/main/resources/META-INF/apache-deltaspike.properties
diff --git 
a/examples/camel-example-cdi-test/src/main/resources/META-INF/beans.xml 
b/examples/cdi-properties/src/main/resources/META-INF/beans.xml
similarity index 100%
rename from 
examples/camel-example-cdi-test/src/main/resources/META-INF/beans.xml
rename to examples/cdi-properties/src/main/resources/META-INF/beans.xml
diff --git 
a/examples/camel-example-cdi-metrics/src/main/resources/log4j2.properties 
b/examples/cdi-properties/src/main/resources/log4j2.properties
similarity index 100%
rename from 
examples/camel-example-cdi-metrics/src/main/resources/log4j2.properties
rename to examples/cdi-properties/src/main/resources/log4j2.properties
diff --git 
a/examples/camel-example-cdi-properties/src/test/java/org/apache/camel/example/cdi/properties/CdiPropertiesTest.java
 
b/examples/cdi-properties/src/test/java/org/apache/camel/example/cdi/properties/CdiPropertiesTest.java
similarity index 100%
rename from 
examples/camel-example-cdi-properties/src/test/java/org/apache/camel/example/cdi/properties/CdiPropertiesTest.java
rename to 
examples/cdi-properties/src/test/java/org/apache/camel/example/cdi/properties/CdiPropertiesTest.java
diff --git a/examples/camel-example-cdi-rest-servlet/README.adoc 
b/examples/cdi-rest-servlet/README.adoc
similarity index 96%
rename from examples/camel-example-cdi-rest-servlet/README.adoc
rename to examples/cdi-rest-servlet/README.adoc
index edc68bc..c627386 100644
--- a/examples/camel-example-cdi-rest-servlet/README.adoc
+++ b/examples/cdi-rest-servlet/README.adoc
@@ -59,6 +59,7 @@ http://localhost:8080/camel/say/hello/, and being responded 
with
 
 Otherwise, in a separate prompt, by running:
 
+[source,sh]
 ....
 curl http://localhost:8080/camel/say/hello/Antonin
 ....
@@ -77,6 +78,15 @@ And see the following message being logged by the Camel 
application:
 
 The Camel application can be stopped pressing ctrl+c in the shell.
 
+=== Run unit tests
+
+There are unit tests implemented, which can be run with the following command:
+
+[source,sh]
+----
+$ mvn test
+----
+
 === Help and contributions
 
 If you hit any problem using Camel or have some feedback, then please
diff --git a/examples/camel-example-cdi-rest-servlet/pom.xml 
b/examples/cdi-rest-servlet/pom.xml
similarity index 100%
rename from examples/camel-example-cdi-rest-servlet/pom.xml
rename to examples/cdi-rest-servlet/pom.xml
diff --git 
a/examples/camel-example-cdi-rest-servlet/src/main/java/org/apache/camel/example/cdi/rest/servlet/Application.java
 
b/examples/cdi-rest-servlet/src/main/java/org/apache/camel/example/cdi/rest/servlet/Application.java
similarity index 100%
rename from 
examples/camel-example-cdi-rest-servlet/src/main/java/org/apache/camel/example/cdi/rest/servlet/Application.java
rename to 
examples/cdi-rest-servlet/src/main/java/org/apache/camel/example/cdi/rest/servlet/Application.java
diff --git 
a/examples/camel-example-cdi-cassandraql/src/main/resources/META-INF/LICENSE.txt
 b/examples/cdi-rest-servlet/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from 
examples/camel-example-cdi-cassandraql/src/main/resources/META-INF/LICENSE.txt
rename to examples/cdi-rest-servlet/src/main/resources/META-INF/LICENSE.txt
diff --git 
a/examples/camel-example-cdi-cassandraql/src/main/resources/META-INF/NOTICE.txt 
b/examples/cdi-rest-servlet/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from 
examples/camel-example-cdi-cassandraql/src/main/resources/META-INF/NOTICE.txt
rename to examples/cdi-rest-servlet/src/main/resources/META-INF/NOTICE.txt
diff --git 
a/examples/camel-example-cdi-kubernetes/src/main/resources/log4j2.properties 
b/examples/cdi-rest-servlet/src/main/resources/log4j2.properties
similarity index 100%
rename from 
examples/camel-example-cdi-kubernetes/src/main/resources/log4j2.properties
rename to examples/cdi-rest-servlet/src/main/resources/log4j2.properties
diff --git 
a/examples/camel-example-cdi-rest-servlet/src/main/webapp/WEB-INF/beans.xml 
b/examples/cdi-rest-servlet/src/main/webapp/WEB-INF/beans.xml
similarity index 100%
rename from 
examples/camel-example-cdi-rest-servlet/src/main/webapp/WEB-INF/beans.xml
rename to examples/cdi-rest-servlet/src/main/webapp/WEB-INF/beans.xml
diff --git 
a/examples/camel-example-cdi-rest-servlet/src/main/webapp/WEB-INF/web.xml 
b/examples/cdi-rest-servlet/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from 
examples/camel-example-cdi-rest-servlet/src/main/webapp/WEB-INF/web.xml
rename to examples/cdi-rest-servlet/src/main/webapp/WEB-INF/web.xml
diff --git 
a/examples/camel-example-cdi-rest-servlet/src/test/java/org/apache/camel/example/cdi/rest/servlet/CdiRestServletTest.java
 
b/examples/cdi-rest-servlet/src/test/java/org/apache/camel/example/cdi/rest/servlet/CdiRestServletTest.java
similarity index 100%
rename from 
examples/camel-example-cdi-rest-servlet/src/test/java/org/apache/camel/example/cdi/rest/servlet/CdiRestServletTest.java
rename to 
examples/cdi-rest-servlet/src/test/java/org/apache/camel/example/cdi/rest/servlet/CdiRestServletTest.java
diff --git a/examples/camel-example-cdi-test/README.adoc 
b/examples/cdi-test/README.adoc
similarity index 93%
rename from examples/camel-example-cdi-test/README.adoc
rename to examples/cdi-test/README.adoc
index c957253..7dcd244 100644
--- a/examples/camel-example-cdi-test/README.adoc
+++ b/examples/cdi-test/README.adoc
@@ -35,7 +35,7 @@ You can build this example using:
 
 [source,sh]
 ----
-$ mvn package
+$ mvn install
 ----
 
 === Run
@@ -62,6 +62,15 @@ You should see the following message being logged to the 
console:
 2016-03-04 17:54:18,725 [Thread-1       ] INFO  route - Bye from camel-test-cdi
 ....
 
+=== Run unit tests
+
+There are unit tests implemented, which can be run with the following command:
+
+[source,sh]
+----
+$ mvn test
+----
+
 === Help and contributions
 
 If you hit any problem using Camel or have some feedback, then please
diff --git a/examples/camel-example-cdi-test/pom.xml b/examples/cdi-test/pom.xml
similarity index 100%
rename from examples/camel-example-cdi-test/pom.xml
rename to examples/cdi-test/pom.xml
diff --git 
a/examples/camel-example-cdi-test/src/main/java/org/apache/camel/example/cdi/test/Application.java
 
b/examples/cdi-test/src/main/java/org/apache/camel/example/cdi/test/Application.java
similarity index 100%
rename from 
examples/camel-example-cdi-test/src/main/java/org/apache/camel/example/cdi/test/Application.java
rename to 
examples/cdi-test/src/main/java/org/apache/camel/example/cdi/test/Application.java
diff --git 
a/examples/camel-example-cdi-aws-s3/src/main/resources/META-INF/LICENSE.txt 
b/examples/cdi-test/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from 
examples/camel-example-cdi-aws-s3/src/main/resources/META-INF/LICENSE.txt
rename to examples/cdi-test/src/main/resources/META-INF/LICENSE.txt
diff --git 
a/examples/camel-example-cdi-aws-s3/src/main/resources/META-INF/NOTICE.txt 
b/examples/cdi-test/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from 
examples/camel-example-cdi-aws-s3/src/main/resources/META-INF/NOTICE.txt
rename to examples/cdi-test/src/main/resources/META-INF/NOTICE.txt
diff --git 
a/examples/camel-example-cdi-properties/src/main/resources/META-INF/beans.xml 
b/examples/cdi-test/src/main/resources/META-INF/beans.xml
similarity index 100%
rename from 
examples/camel-example-cdi-properties/src/main/resources/META-INF/beans.xml
rename to examples/cdi-test/src/main/resources/META-INF/beans.xml
diff --git 
a/examples/camel-example-cdi-cassandraql/src/main/resources/log4j2.properties 
b/examples/cdi-test/src/main/resources/log4j2.properties
similarity index 100%
rename from 
examples/camel-example-cdi-cassandraql/src/main/resources/log4j2.properties
rename to examples/cdi-test/src/main/resources/log4j2.properties
diff --git 
a/examples/camel-example-cdi-test/src/test/java/org/apache/camel/example/cdi/test/AlternativeBean.java
 
b/examples/cdi-test/src/test/java/org/apache/camel/example/cdi/test/AlternativeBean.java
similarity index 100%
rename from 
examples/camel-example-cdi-test/src/test/java/org/apache/camel/example/cdi/test/AlternativeBean.java
rename to 
examples/cdi-test/src/test/java/org/apache/camel/example/cdi/test/AlternativeBean.java
diff --git 
a/examples/camel-example-cdi-test/src/test/java/org/apache/camel/example/cdi/test/AlternativeTest.java
 
b/examples/cdi-test/src/test/java/org/apache/camel/example/cdi/test/AlternativeTest.java
similarity index 100%
rename from 
examples/camel-example-cdi-test/src/test/java/org/apache/camel/example/cdi/test/AlternativeTest.java
rename to 
examples/cdi-test/src/test/java/org/apache/camel/example/cdi/test/AlternativeTest.java
diff --git 
a/examples/camel-example-cdi-test/src/test/java/org/apache/camel/example/cdi/test/ApplicationScopedTest.java
 
b/examples/cdi-test/src/test/java/org/apache/camel/example/cdi/test/ApplicationScopedTest.java
similarity index 100%
rename from 
examples/camel-example-cdi-test/src/test/java/org/apache/camel/example/cdi/test/ApplicationScopedTest.java
rename to 
examples/cdi-test/src/test/java/org/apache/camel/example/cdi/test/ApplicationScopedTest.java
diff --git 
a/examples/camel-example-cdi-test/src/test/java/org/apache/camel/example/cdi/test/CustomContextTest.java
 
b/examples/cdi-test/src/test/java/org/apache/camel/example/cdi/test/CustomContextTest.java
similarity index 100%
rename from 
examples/camel-example-cdi-test/src/test/java/org/apache/camel/example/cdi/test/CustomContextTest.java
rename to 
examples/cdi-test/src/test/java/org/apache/camel/example/cdi/test/CustomContextTest.java
diff --git 
a/examples/camel-example-cdi-test/src/test/java/org/apache/camel/example/cdi/test/OrderTest.java
 
b/examples/cdi-test/src/test/java/org/apache/camel/example/cdi/test/OrderTest.java
similarity index 100%
rename from 
examples/camel-example-cdi-test/src/test/java/org/apache/camel/example/cdi/test/OrderTest.java
rename to 
examples/cdi-test/src/test/java/org/apache/camel/example/cdi/test/OrderTest.java
diff --git 
a/examples/camel-example-cdi-test/src/test/java/org/apache/camel/example/cdi/test/TestRoute.java
 
b/examples/cdi-test/src/test/java/org/apache/camel/example/cdi/test/TestRoute.java
similarity index 100%
rename from 
examples/camel-example-cdi-test/src/test/java/org/apache/camel/example/cdi/test/TestRoute.java
rename to 
examples/cdi-test/src/test/java/org/apache/camel/example/cdi/test/TestRoute.java
diff --git a/examples/camel-example-cdi-xml/README.adoc 
b/examples/cdi-xml/README.adoc
similarity index 98%
rename from examples/camel-example-cdi-xml/README.adoc
rename to examples/cdi-xml/README.adoc
index fa401d3..a954081 100644
--- a/examples/camel-example-cdi-xml/README.adoc
+++ b/examples/cdi-xml/README.adoc
@@ -31,7 +31,7 @@ You can build this example using:
 
 [source,sh]
 ----
-$ mvn package
+$ mvn install
 ----
 
 === Run
@@ -109,6 +109,15 @@ The Camel application can be stopped pressing ctrl+c in 
the shell:
 2016-04-26 17:16:50,275 [Thread-5       ] INFO  Bootstrap                      
- WELD-ENV-002001: Weld SE container STATIC_INSTANCE shut down
 ....
 
+=== Run unit tests
+
+There are unit tests implemented, which can be run with the following command:
+
+[source,sh]
+----
+$ mvn test
+----
+
 === Help and contributions
 
 If you hit any problem using Camel or have some feedback, then please
diff --git a/examples/camel-example-cdi-xml/pom.xml b/examples/cdi-xml/pom.xml
similarity index 100%
rename from examples/camel-example-cdi-xml/pom.xml
rename to examples/cdi-xml/pom.xml
diff --git 
a/examples/camel-example-cdi-xml/src/main/java/org/apache/camel/example/cdi/xml/Application.java
 
b/examples/cdi-xml/src/main/java/org/apache/camel/example/cdi/xml/Application.java
similarity index 100%
rename from 
examples/camel-example-cdi-xml/src/main/java/org/apache/camel/example/cdi/xml/Application.java
rename to 
examples/cdi-xml/src/main/java/org/apache/camel/example/cdi/xml/Application.java
diff --git 
a/examples/camel-example-cafe/src/test/resources/META-INF/LICENSE.txt 
b/examples/cdi-xml/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from examples/camel-example-cafe/src/test/resources/META-INF/LICENSE.txt
rename to examples/cdi-xml/src/main/resources/META-INF/LICENSE.txt
diff --git a/examples/camel-example-cafe/src/test/resources/META-INF/NOTICE.txt 
b/examples/cdi-xml/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from examples/camel-example-cafe/src/test/resources/META-INF/NOTICE.txt
rename to examples/cdi-xml/src/main/resources/META-INF/NOTICE.txt
diff --git 
a/examples/camel-example-cdi-cassandraql/src/main/resources/META-INF/beans.xml 
b/examples/cdi-xml/src/main/resources/META-INF/beans.xml
similarity index 100%
rename from 
examples/camel-example-cdi-cassandraql/src/main/resources/META-INF/beans.xml
rename to examples/cdi-xml/src/main/resources/META-INF/beans.xml
diff --git 
a/examples/camel-example-cdi-xml/src/main/resources/camel-context.xml 
b/examples/cdi-xml/src/main/resources/camel-context.xml
similarity index 100%
rename from examples/camel-example-cdi-xml/src/main/resources/camel-context.xml
rename to examples/cdi-xml/src/main/resources/camel-context.xml
diff --git 
a/examples/camel-example-cdi-xml/src/main/resources/config.properties 
b/examples/cdi-xml/src/main/resources/config.properties
similarity index 100%
rename from examples/camel-example-cdi-xml/src/main/resources/config.properties
rename to examples/cdi-xml/src/main/resources/config.properties
diff --git 
a/examples/camel-example-cdi-aws-s3/src/main/resources/log4j2.properties 
b/examples/cdi-xml/src/main/resources/log4j2.properties
similarity index 100%
rename from 
examples/camel-example-cdi-aws-s3/src/main/resources/log4j2.properties
rename to examples/cdi-xml/src/main/resources/log4j2.properties
diff --git 
a/examples/camel-example-cdi-xml/src/test/java/org/apache/camel/example/cdi/xml/CdiXmlTest.java
 
b/examples/cdi-xml/src/test/java/org/apache/camel/example/cdi/xml/CdiXmlTest.java
similarity index 100%
rename from 
examples/camel-example-cdi-xml/src/test/java/org/apache/camel/example/cdi/xml/CdiXmlTest.java
rename to 
examples/cdi-xml/src/test/java/org/apache/camel/example/cdi/xml/CdiXmlTest.java
diff --git a/examples/camel-example-cdi/README.adoc b/examples/cdi/README.adoc
similarity index 96%
rename from examples/camel-example-cdi/README.adoc
rename to examples/cdi/README.adoc
index b5cc0ac..86727db 100644
--- a/examples/camel-example-cdi/README.adoc
+++ b/examples/cdi/README.adoc
@@ -27,7 +27,7 @@ $ mvn camel:run
 ----
 
 You can see the routing rules by looking at the java code in the
-`+src/main/java+` directory.
+`src/main/java` directory.
 
 To stop the example hit ctrl+c.
 
diff --git a/examples/camel-example-cdi/pom.xml b/examples/cdi/pom.xml
similarity index 100%
rename from examples/camel-example-cdi/pom.xml
rename to examples/cdi/pom.xml
diff --git 
a/examples/camel-example-cdi/src/main/java/org/apache/camel/example/cdi/MyRoutes.java
 b/examples/cdi/src/main/java/org/apache/camel/example/cdi/MyRoutes.java
similarity index 100%
rename from 
examples/camel-example-cdi/src/main/java/org/apache/camel/example/cdi/MyRoutes.java
rename to examples/cdi/src/main/java/org/apache/camel/example/cdi/MyRoutes.java
diff --git 
a/examples/camel-example-cdi/src/main/java/org/apache/camel/example/cdi/SomeBean.java
 b/examples/cdi/src/main/java/org/apache/camel/example/cdi/SomeBean.java
similarity index 95%
rename from 
examples/camel-example-cdi/src/main/java/org/apache/camel/example/cdi/SomeBean.java
rename to examples/cdi/src/main/java/org/apache/camel/example/cdi/SomeBean.java
index 7a63104..2e78616 100644
--- 
a/examples/camel-example-cdi/src/main/java/org/apache/camel/example/cdi/SomeBean.java
+++ b/examples/cdi/src/main/java/org/apache/camel/example/cdi/SomeBean.java
@@ -25,7 +25,7 @@ public class SomeBean {
 
     private int counter;
 
-    public String someMethod(String body) {
+    public String someMethod() {
         return "Saying Hello World " + ++counter + " times";
     }
 
diff --git 
a/examples/camel-example-cafe/src/main/resources/META-INF/LICENSE.txt 
b/examples/cdi/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from examples/camel-example-cafe/src/main/resources/META-INF/LICENSE.txt
rename to examples/cdi/src/main/resources/META-INF/LICENSE.txt
diff --git a/examples/camel-example-cafe/src/main/resources/META-INF/NOTICE.txt 
b/examples/cdi/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from examples/camel-example-cafe/src/main/resources/META-INF/NOTICE.txt
rename to examples/cdi/src/main/resources/META-INF/NOTICE.txt
diff --git 
a/examples/camel-example-cdi-aws-s3/src/main/resources/META-INF/beans.xml 
b/examples/cdi/src/main/resources/META-INF/beans.xml
similarity index 100%
rename from 
examples/camel-example-cdi-aws-s3/src/main/resources/META-INF/beans.xml
rename to examples/cdi/src/main/resources/META-INF/beans.xml
diff --git a/examples/camel-example-cdi/src/main/resources/log4j2.properties 
b/examples/cdi/src/main/resources/log4j2.properties
similarity index 100%
rename from examples/camel-example-cdi/src/main/resources/log4j2.properties
rename to examples/cdi/src/main/resources/log4j2.properties
diff --git a/examples/camel-example-console/README.adoc 
b/examples/console/README.adoc
similarity index 94%
rename from examples/camel-example-console/README.adoc
rename to examples/console/README.adoc
index 69f26a9..161a9ab 100644
--- a/examples/camel-example-console/README.adoc
+++ b/examples/console/README.adoc
@@ -16,17 +16,19 @@ This is implemented with a Camel route defined in the 
Spring XML
 
 You will need to compile this example first:
 
-....
-mvn compile
-....
+[source,sh]
+----
+$ mvn compile
+----
 
 === Run
 
 To run the example type
 
-....
-mvn camel:run
-....
+[source,sh]
+----
+$ mvn camel:run
+----
 
 You can see the routing rules by looking at the XML in the directory:
 `+src/main/resources/META-INF/spring+`
diff --git a/examples/camel-example-console/pom.xml b/examples/console/pom.xml
similarity index 100%
rename from examples/camel-example-console/pom.xml
rename to examples/console/pom.xml
diff --git 
a/examples/camel-example-console/src/main/java/org/apache/camel/example/console/CamelConsoleMain.java
 
b/examples/console/src/main/java/org/apache/camel/example/console/CamelConsoleMain.java
similarity index 100%
rename from 
examples/camel-example-console/src/main/java/org/apache/camel/example/console/CamelConsoleMain.java
rename to 
examples/console/src/main/java/org/apache/camel/example/console/CamelConsoleMain.java
diff --git 
a/examples/camel-example-cafe-endpointdsl/src/test/resources/META-INF/LICENSE.txt
 b/examples/console/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from 
examples/camel-example-cafe-endpointdsl/src/test/resources/META-INF/LICENSE.txt
rename to examples/console/src/main/resources/META-INF/LICENSE.txt
diff --git 
a/examples/camel-example-cafe-endpointdsl/src/test/resources/META-INF/NOTICE.txt
 b/examples/console/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from 
examples/camel-example-cafe-endpointdsl/src/test/resources/META-INF/NOTICE.txt
rename to examples/console/src/main/resources/META-INF/NOTICE.txt
diff --git 
a/examples/camel-example-console/src/main/resources/META-INF/spring/camel-context.xml
 b/examples/console/src/main/resources/META-INF/spring/camel-context.xml
similarity index 100%
rename from 
examples/camel-example-console/src/main/resources/META-INF/spring/camel-context.xml
rename to examples/console/src/main/resources/META-INF/spring/camel-context.xml
diff --git a/examples/camel-example-cafe/src/main/resources/log4j2.properties 
b/examples/console/src/main/resources/log4j2.properties
similarity index 100%
rename from examples/camel-example-cafe/src/main/resources/log4j2.properties
rename to examples/console/src/main/resources/log4j2.properties
diff --git a/examples/camel-example-csimple-joor/pom.xml 
b/examples/csimple-joor/pom.xml
similarity index 100%
rename from examples/camel-example-csimple-joor/pom.xml
rename to examples/csimple-joor/pom.xml
diff --git a/examples/camel-example-csimple-joor/readme.adoc 
b/examples/csimple-joor/readme.adoc
similarity index 85%
rename from examples/camel-example-csimple-joor/readme.adoc
rename to examples/csimple-joor/readme.adoc
index cf9095b..114c3a7 100644
--- a/examples/camel-example-csimple-joor/readme.adoc
+++ b/examples/csimple-joor/readme.adoc
@@ -7,12 +7,23 @@ When Camel bootstrap then each csimple scripts is compiled 
using the JVM compile
 This makes the csimple language native Java compiled, with no runtime overhead.
 The generated source code are in memory only and compiled at runtime. This 
means debugging the generated source code is not possible. See the other 
csimple example which uses a Maven plugin to detect csimple scripts from the 
source code, to genereate Java source code at build time; which can be debugged.
 
+=== Build
 
-=== How to run
+You will need to compile this example first:
 
-You can run this example using
+[source,sh]
+----
+$ mvn compile
+----
 
-    mvn camel:run   
+=== Run
+
+To run the example execute
+
+[source,sh]
+----
+$ mvn camel:run
+----
 
 === Help and contributions
 
diff --git a/examples/camel-example-csimple/src/main/data/foo.properties 
b/examples/csimple-joor/src/main/data/foo.properties
similarity index 100%
rename from examples/camel-example-csimple/src/main/data/foo.properties
rename to examples/csimple-joor/src/main/data/foo.properties
diff --git 
a/examples/camel-example-csimple/src/main/java/org/apache/camel/example/MyApplication.java
 
b/examples/csimple-joor/src/main/java/org/apache/camel/example/MyApplication.java
similarity index 100%
rename from 
examples/camel-example-csimple/src/main/java/org/apache/camel/example/MyApplication.java
rename to 
examples/csimple-joor/src/main/java/org/apache/camel/example/MyApplication.java
diff --git 
a/examples/camel-example-csimple/src/main/java/org/apache/camel/example/MyRouteBuilder.java
 
b/examples/csimple-joor/src/main/java/org/apache/camel/example/MyRouteBuilder.java
similarity index 100%
rename from 
examples/camel-example-csimple/src/main/java/org/apache/camel/example/MyRouteBuilder.java
rename to 
examples/csimple-joor/src/main/java/org/apache/camel/example/MyRouteBuilder.java
diff --git 
a/examples/camel-example-csimple/src/main/resources/application.properties 
b/examples/csimple-joor/src/main/resources/application.properties
similarity index 100%
rename from 
examples/camel-example-csimple/src/main/resources/application.properties
rename to examples/csimple-joor/src/main/resources/application.properties
diff --git a/examples/camel-example-csimple/src/main/resources/logback.xml 
b/examples/csimple-joor/src/main/resources/logback.xml
similarity index 100%
rename from examples/camel-example-csimple/src/main/resources/logback.xml
rename to examples/csimple-joor/src/main/resources/logback.xml
diff --git a/examples/camel-example-csimple/pom.xml b/examples/csimple/pom.xml
similarity index 100%
rename from examples/camel-example-csimple/pom.xml
rename to examples/csimple/pom.xml
diff --git a/examples/camel-example-csimple/readme.adoc 
b/examples/csimple/readme.adoc
similarity index 86%
rename from examples/camel-example-csimple/readme.adoc
rename to examples/csimple/readme.adoc
index 3a59275..8b8c236 100644
--- a/examples/camel-example-csimple/readme.adoc
+++ b/examples/csimple/readme.adoc
@@ -7,11 +7,24 @@ A maven plugin (configured in pom.xml) detects the csimple 
scripts from the proj
 This makes the csimple language native Java compiled, with no runtime overhead.
 The generated source code in `src/generated/java` is just regular Java source 
code and you can therefore debug the code. You can try this by loading the 
project into a Java IDE, and then launch the application in debug mode from the 
`MyApplication` class. You can then set breakpoints in the generated source 
code in the `src/generated/java` folder.
 
-=== How to run
 
-You can run this example using
+=== Build
 
-    mvn camel:run   
+You will need to compile this example first:
+
+[source,sh]
+----
+$ mvn compile
+----
+
+=== Run
+
+To run the example execute
+
+[source,sh]
+----
+$ mvn camel:run
+----
 
 === Help and contributions
 
diff --git 
a/examples/camel-example-csimple/src/generated/java/org/apache/camel/example/CSimpleScript1.java
 
b/examples/csimple/src/generated/java/org/apache/camel/example/CSimpleScript1.java
similarity index 100%
rename from 
examples/camel-example-csimple/src/generated/java/org/apache/camel/example/CSimpleScript1.java
rename to 
examples/csimple/src/generated/java/org/apache/camel/example/CSimpleScript1.java
diff --git 
a/examples/camel-example-csimple/src/generated/java/org/apache/camel/example/CSimpleScript2.java
 
b/examples/csimple/src/generated/java/org/apache/camel/example/CSimpleScript2.java
similarity index 100%
rename from 
examples/camel-example-csimple/src/generated/java/org/apache/camel/example/CSimpleScript2.java
rename to 
examples/csimple/src/generated/java/org/apache/camel/example/CSimpleScript2.java
diff --git 
a/examples/camel-example-csimple/src/generated/java/org/apache/camel/example/CSimpleScript3.java
 
b/examples/csimple/src/generated/java/org/apache/camel/example/CSimpleScript3.java
similarity index 100%
rename from 
examples/camel-example-csimple/src/generated/java/org/apache/camel/example/CSimpleScript3.java
rename to 
examples/csimple/src/generated/java/org/apache/camel/example/CSimpleScript3.java
diff --git 
a/examples/camel-example-csimple/src/generated/resources/META-INF/services/org/apache/camel/csimple.properties
 
b/examples/csimple/src/generated/resources/META-INF/services/org/apache/camel/csimple.properties
similarity index 100%
rename from 
examples/camel-example-csimple/src/generated/resources/META-INF/services/org/apache/camel/csimple.properties
rename to 
examples/csimple/src/generated/resources/META-INF/services/org/apache/camel/csimple.properties
diff --git a/examples/camel-example-csimple-joor/src/main/data/foo.properties 
b/examples/csimple/src/main/data/foo.properties
similarity index 100%
rename from examples/camel-example-csimple-joor/src/main/data/foo.properties
rename to examples/csimple/src/main/data/foo.properties
diff --git 
a/examples/camel-example-csimple-joor/src/main/java/org/apache/camel/example/MyApplication.java
 b/examples/csimple/src/main/java/org/apache/camel/example/MyApplication.java
similarity index 100%
rename from 
examples/camel-example-csimple-joor/src/main/java/org/apache/camel/example/MyApplication.java
rename to 
examples/csimple/src/main/java/org/apache/camel/example/MyApplication.java
diff --git 
a/examples/camel-example-csimple-joor/src/main/java/org/apache/camel/example/MyRouteBuilder.java
 b/examples/csimple/src/main/java/org/apache/camel/example/MyRouteBuilder.java
similarity index 100%
rename from 
examples/camel-example-csimple-joor/src/main/java/org/apache/camel/example/MyRouteBuilder.java
rename to 
examples/csimple/src/main/java/org/apache/camel/example/MyRouteBuilder.java
diff --git 
a/examples/camel-example-csimple-joor/src/main/resources/application.properties 
b/examples/csimple/src/main/resources/application.properties
similarity index 100%
rename from 
examples/camel-example-csimple-joor/src/main/resources/application.properties
rename to examples/csimple/src/main/resources/application.properties
diff --git a/examples/camel-example-csimple-joor/src/main/resources/logback.xml 
b/examples/csimple/src/main/resources/logback.xml
similarity index 100%
rename from examples/camel-example-csimple-joor/src/main/resources/logback.xml
rename to examples/csimple/src/main/resources/logback.xml
diff --git a/examples/camel-example-cxf/README.adoc b/examples/cxf/README.adoc
similarity index 72%
rename from examples/camel-example-cxf/README.adoc
rename to examples/cxf/README.adoc
index 4e046a5..e1c175b 100644
--- a/examples/camel-example-cxf/README.adoc
+++ b/examples/cxf/README.adoc
@@ -14,35 +14,49 @@ SOAP over HTTP CXF client request to the SOAP over JMS CXF 
service.
 
 You will need to compile this example first:
 
-....
-mvn compile
-....
+[source,sh]
+----
+$ mvn compile
+----
 
 === Run
 
 To run the example of routing between different transport type
 
-....
-mvn exec:java -PHttpToJMS
-....
+[source,sh]
+----
+$ mvn exec:java -PHttpToJMS
+----
 
 To run the example of Camel transport type
 
-....
-mvn exec:java -PCamelTransport
-....
+[source,sh]
+----
+$ mvn exec:java -PCamelTransport
+----
 
 To run the example of using WebServiceProvider API
 
-....
-mvn exec:java -PWebServiceProvider
-....
+[source,sh]
+----
+$ mvn exec:java -PWebServiceProvider
+----
 
 To run the example of showing how to create CXF JAXRS endpoint
 
-....
-mvn exec:java -PJAXRS
-....
+[source,sh]
+----
+$ mvn exec:java -PJAXRS
+----
+
+=== Run unit tests
+
+There are unit tests implemented, which can be run with the following command:
+
+[source,sh]
+----
+$ mvn test
+----
 
 === Help and contributions
 
diff --git a/examples/camel-example-cxf/pom.xml b/examples/cxf/pom.xml
similarity index 100%
rename from examples/camel-example-cxf/pom.xml
rename to examples/cxf/pom.xml
diff --git 
a/examples/camel-example-cxf/src/main/java/org/apache/camel/example/camel/transport/CamelTransportExample.java
 
b/examples/cxf/src/main/java/org/apache/camel/example/camel/transport/CamelTransportExample.java
similarity index 100%
rename from 
examples/camel-example-cxf/src/main/java/org/apache/camel/example/camel/transport/CamelTransportExample.java
rename to 
examples/cxf/src/main/java/org/apache/camel/example/camel/transport/CamelTransportExample.java
diff --git 
a/examples/camel-example-cxf/src/main/java/org/apache/camel/example/camel/transport/Client.java
 
b/examples/cxf/src/main/java/org/apache/camel/example/camel/transport/Client.java
similarity index 100%
rename from 
examples/camel-example-cxf/src/main/java/org/apache/camel/example/camel/transport/Client.java
rename to 
examples/cxf/src/main/java/org/apache/camel/example/camel/transport/Client.java
diff --git 
a/examples/camel-example-cxf/src/main/java/org/apache/camel/example/camel/transport/GreeterImpl.java
 
b/examples/cxf/src/main/java/org/apache/camel/example/camel/transport/GreeterImpl.java
similarity index 100%
rename from 
examples/camel-example-cxf/src/main/java/org/apache/camel/example/camel/transport/GreeterImpl.java
rename to 
examples/cxf/src/main/java/org/apache/camel/example/camel/transport/GreeterImpl.java
diff --git 
a/examples/camel-example-cxf/src/main/java/org/apache/camel/example/camel/transport/Server.java
 
b/examples/cxf/src/main/java/org/apache/camel/example/camel/transport/Server.java
similarity index 100%
rename from 
examples/camel-example-cxf/src/main/java/org/apache/camel/example/camel/transport/Server.java
rename to 
examples/cxf/src/main/java/org/apache/camel/example/camel/transport/Server.java
diff --git 
a/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/httptojms/CamelCxfExample.java
 
b/examples/cxf/src/main/java/org/apache/camel/example/cxf/httptojms/CamelCxfExample.java
similarity index 100%
rename from 
examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/httptojms/CamelCxfExample.java
rename to 
examples/cxf/src/main/java/org/apache/camel/example/cxf/httptojms/CamelCxfExample.java
diff --git 
a/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/httptojms/Client.java
 b/examples/cxf/src/main/java/org/apache/camel/example/cxf/httptojms/Client.java
similarity index 100%
rename from 
examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/httptojms/Client.java
rename to 
examples/cxf/src/main/java/org/apache/camel/example/cxf/httptojms/Client.java
diff --git 
a/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/httptojms/GreeterImpl.java
 
b/examples/cxf/src/main/java/org/apache/camel/example/cxf/httptojms/GreeterImpl.java
similarity index 100%
rename from 
examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/httptojms/GreeterImpl.java
rename to 
examples/cxf/src/main/java/org/apache/camel/example/cxf/httptojms/GreeterImpl.java
diff --git 
a/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/httptojms/JmsBroker.java
 
b/examples/cxf/src/main/java/org/apache/camel/example/cxf/httptojms/JmsBroker.java
similarity index 100%
rename from 
examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/httptojms/JmsBroker.java
rename to 
examples/cxf/src/main/java/org/apache/camel/example/cxf/httptojms/JmsBroker.java
diff --git 
a/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/httptojms/Server.java
 b/examples/cxf/src/main/java/org/apache/camel/example/cxf/httptojms/Server.java
similarity index 100%
rename from 
examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/httptojms/Server.java
rename to 
examples/cxf/src/main/java/org/apache/camel/example/cxf/httptojms/Server.java
diff --git 
a/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/CamelRouterBuilder.java
 
b/examples/cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/CamelRouterBuilder.java
similarity index 100%
rename from 
examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/CamelRouterBuilder.java
rename to 
examples/cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/CamelRouterBuilder.java
diff --git 
a/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/Client.java
 b/examples/cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/Client.java
similarity index 100%
rename from 
examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/Client.java
rename to 
examples/cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/Client.java
diff --git 
a/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/JAXRSClient.java
 
b/examples/cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/JAXRSClient.java
similarity index 100%
rename from 
examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/JAXRSClient.java
rename to 
examples/cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/JAXRSClient.java
diff --git 
a/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/JAXWSClient.java
 
b/examples/cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/JAXWSClient.java
similarity index 100%
rename from 
examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/JAXWSClient.java
rename to 
examples/cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/JAXWSClient.java
diff --git 
a/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/resources/Book.java
 
b/examples/cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/resources/Book.java
similarity index 100%
rename from 
examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/resources/Book.java
rename to 
examples/cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/resources/Book.java
diff --git 
a/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/resources/BookNotFoundDetails.java
 
b/examples/cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/resources/BookNotFoundDetails.java
similarity index 100%
rename from 
examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/resources/BookNotFoundDetails.java
rename to 
examples/cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/resources/BookNotFoundDetails.java
diff --git 
a/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/resources/BookNotFoundFault.java
 
b/examples/cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/resources/BookNotFoundFault.java
similarity index 100%
rename from 
examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/resources/BookNotFoundFault.java
rename to 
examples/cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/resources/BookNotFoundFault.java
diff --git 
a/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/resources/BookStore.java
 
b/examples/cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/resources/BookStore.java
similarity index 100%
rename from 
examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/resources/BookStore.java
rename to 
examples/cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/resources/BookStore.java
diff --git 
a/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/resources/BookStoreImpl.java
 
b/examples/cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/resources/BookStoreImpl.java
similarity index 100%
rename from 
examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/resources/BookStoreImpl.java
rename to 
examples/cxf/src/main/java/org/apache/camel/example/cxf/jaxrs/resources/BookStoreImpl.java
diff --git 
a/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/CamelCxfExample.java
 
b/examples/cxf/src/main/java/org/apache/camel/example/cxf/provider/CamelCxfExample.java
similarity index 100%
rename from 
examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/CamelCxfExample.java
rename to 
examples/cxf/src/main/java/org/apache/camel/example/cxf/provider/CamelCxfExample.java
diff --git 
a/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/Client.java
 b/examples/cxf/src/main/java/org/apache/camel/example/cxf/provider/Client.java
similarity index 100%
rename from 
examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/Client.java
rename to 
examples/cxf/src/main/java/org/apache/camel/example/cxf/provider/Client.java
diff --git 
a/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/GreeterProvider.java
 
b/examples/cxf/src/main/java/org/apache/camel/example/cxf/provider/GreeterProvider.java
similarity index 100%
rename from 
examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/GreeterProvider.java
rename to 
examples/cxf/src/main/java/org/apache/camel/example/cxf/provider/GreeterProvider.java
diff --git 
a/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/Server.java
 b/examples/cxf/src/main/java/org/apache/camel/example/cxf/provider/Server.java
similarity index 100%
rename from 
examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/Server.java
rename to 
examples/cxf/src/main/java/org/apache/camel/example/cxf/provider/Server.java
diff --git 
a/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/TesterBean.java
 
b/examples/cxf/src/main/java/org/apache/camel/example/cxf/provider/TesterBean.java
similarity index 100%
rename from 
examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/TesterBean.java
rename to 
examples/cxf/src/main/java/org/apache/camel/example/cxf/provider/TesterBean.java
diff --git 
a/examples/camel-example-cafe-endpointdsl/src/main/resources/META-INF/LICENSE.txt
 b/examples/cxf/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from 
examples/camel-example-cafe-endpointdsl/src/main/resources/META-INF/LICENSE.txt
rename to examples/cxf/src/main/resources/META-INF/LICENSE.txt
diff --git 
a/examples/camel-example-cafe-endpointdsl/src/main/resources/META-INF/NOTICE.txt
 b/examples/cxf/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from 
examples/camel-example-cafe-endpointdsl/src/main/resources/META-INF/NOTICE.txt
rename to examples/cxf/src/main/resources/META-INF/NOTICE.txt
diff --git 
a/examples/camel-example-cxf/src/main/resources/META-INF/spring/CamelCXFProviderRouteConfig.xml
 
b/examples/cxf/src/main/resources/META-INF/spring/CamelCXFProviderRouteConfig.xml
similarity index 100%
rename from 
examples/camel-example-cxf/src/main/resources/META-INF/spring/CamelCXFProviderRouteConfig.xml
rename to 
examples/cxf/src/main/resources/META-INF/spring/CamelCXFProviderRouteConfig.xml
diff --git 
a/examples/camel-example-cxf/src/main/resources/META-INF/spring/CamelTransportSpringConfig.xml
 
b/examples/cxf/src/main/resources/META-INF/spring/CamelTransportSpringConfig.xml
similarity index 100%
rename from 
examples/camel-example-cxf/src/main/resources/META-INF/spring/CamelTransportSpringConfig.xml
rename to 
examples/cxf/src/main/resources/META-INF/spring/CamelTransportSpringConfig.xml
diff --git 
a/examples/camel-example-cxf/src/main/resources/META-INF/spring/CxfRouteCamelContext.xml
 b/examples/cxf/src/main/resources/META-INF/spring/CxfRouteCamelContext.xml
similarity index 100%
rename from 
examples/camel-example-cxf/src/main/resources/META-INF/spring/CxfRouteCamelContext.xml
rename to 
examples/cxf/src/main/resources/META-INF/spring/CxfRouteCamelContext.xml
diff --git 
a/examples/camel-example-cxf/src/main/resources/META-INF/spring/HttpToJmsCamelContext.xml
 b/examples/cxf/src/main/resources/META-INF/spring/HttpToJmsCamelContext.xml
similarity index 100%
rename from 
examples/camel-example-cxf/src/main/resources/META-INF/spring/HttpToJmsCamelContext.xml
rename to 
examples/cxf/src/main/resources/META-INF/spring/HttpToJmsCamelContext.xml
diff --git 
a/examples/camel-example-cxf/src/main/resources/META-INF/spring/JAXRSCamelContext.xml
 b/examples/cxf/src/main/resources/META-INF/spring/JAXRSCamelContext.xml
similarity index 100%
rename from 
examples/camel-example-cxf/src/main/resources/META-INF/spring/JAXRSCamelContext.xml
rename to examples/cxf/src/main/resources/META-INF/spring/JAXRSCamelContext.xml
diff --git 
a/examples/camel-example-cafe-endpointdsl/src/main/resources/log4j2.properties 
b/examples/cxf/src/main/resources/log4j2.properties
similarity index 100%
rename from 
examples/camel-example-cafe-endpointdsl/src/main/resources/log4j2.properties
rename to examples/cxf/src/main/resources/log4j2.properties
diff --git 
a/examples/camel-example-cxf/src/main/resources/org/apache/camel/example/camel/transport/CamelDestination.xml
 
b/examples/cxf/src/main/resources/org/apache/camel/example/camel/transport/CamelDestination.xml
similarity index 100%
rename from 
examples/camel-example-cxf/src/main/resources/org/apache/camel/example/camel/transport/CamelDestination.xml
rename to 
examples/cxf/src/main/resources/org/apache/camel/example/camel/transport/CamelDestination.xml
diff --git 
a/examples/camel-example-cxf/src/main/resources/wsdl/hello_world.wsdl 
b/examples/cxf/src/main/resources/wsdl/hello_world.wsdl
similarity index 100%
rename from examples/camel-example-cxf/src/main/resources/wsdl/hello_world.wsdl
rename to examples/cxf/src/main/resources/wsdl/hello_world.wsdl
diff --git 
a/examples/camel-example-cxf/src/test/java/org/apache/camel/example/camel/transport/CamelTransportClientServerTest.java
 
b/examples/cxf/src/test/java/org/apache/camel/example/camel/transport/CamelTransportClientServerTest.java
similarity index 100%
rename from 
examples/camel-example-cxf/src/test/java/org/apache/camel/example/camel/transport/CamelTransportClientServerTest.java
rename to 
examples/cxf/src/test/java/org/apache/camel/example/camel/transport/CamelTransportClientServerTest.java
diff --git 
a/examples/camel-example-cxf/src/test/java/org/apache/camel/example/cxf/httptojms/CxfHttpJmsClientServerTest.java
 
b/examples/cxf/src/test/java/org/apache/camel/example/cxf/httptojms/CxfHttpJmsClientServerTest.java
similarity index 100%
rename from 
examples/camel-example-cxf/src/test/java/org/apache/camel/example/cxf/httptojms/CxfHttpJmsClientServerTest.java
rename to 
examples/cxf/src/test/java/org/apache/camel/example/cxf/httptojms/CxfHttpJmsClientServerTest.java
diff --git 
a/examples/camel-example-cxf/src/test/java/org/apache/camel/example/cxf/jaxrs/JAXRSClientServerTest.java
 
b/examples/cxf/src/test/java/org/apache/camel/example/cxf/jaxrs/JAXRSClientServerTest.java
similarity index 100%
rename from 
examples/camel-example-cxf/src/test/java/org/apache/camel/example/cxf/jaxrs/JAXRSClientServerTest.java
rename to 
examples/cxf/src/test/java/org/apache/camel/example/cxf/jaxrs/JAXRSClientServerTest.java
diff --git 
a/examples/camel-example-cxf/src/test/java/org/apache/camel/example/provider/ProviderClientServerTest.java
 
b/examples/cxf/src/test/java/org/apache/camel/example/provider/ProviderClientServerTest.java
similarity index 100%
rename from 
examples/camel-example-cxf/src/test/java/org/apache/camel/example/provider/ProviderClientServerTest.java
rename to 
examples/cxf/src/test/java/org/apache/camel/example/provider/ProviderClientServerTest.java
diff --git a/examples/camel-example-cxf/src/test/resources/logging.properties 
b/examples/cxf/src/test/resources/logging.properties
similarity index 100%
rename from examples/camel-example-cxf/src/test/resources/logging.properties
rename to examples/cxf/src/test/resources/logging.properties
diff --git a/examples/pom.xml b/examples/pom.xml
index 9f2381b..7174efd 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -90,29 +90,29 @@
         <module>basic</module>
         <module>billboard-aggregate</module>
         <module>bigxml-split</module>
-        <module>camel-example-cafe</module>
-        <module>camel-example-cafe-endpointdsl</module>
-        <module>camel-example-cassandra-kubernetes</module>
-        <module>camel-example-cdi</module>
-        <module>camel-example-cdi-aws-s3</module>
-        <module>camel-example-cdi-cassandraql</module>
-        <module>camel-example-fhir</module>
-        <module>camel-example-flight-recorder</module>
-        <module>camel-example-cdi-kubernetes</module>
-        <module>camel-example-cdi-metrics</module>
-        <module>camel-example-cdi-minio</module>
-        <module>camel-example-cdi-properties</module>
-        <module>camel-example-cdi-rest-servlet</module>
-        <module>camel-example-cdi-test</module>
-        <module>camel-example-cdi-xml</module>
-        <module>camel-example-cxf</module>
+        <module>cafe</module>
+        <module>cafe-endpointdsl</module>
+        <module>cassandra-kubernetes</module>
+        <module>cdi</module>
+        <module>cdi-aws-s3</module>
+        <module>cdi-cassandraql</module>
+        <module>cdi-kubernetes</module>
+        <module>cdi-metrics</module>
+        <module>cdi-minio</module>
+        <module>cdi-properties</module>
+        <module>cdi-rest-servlet</module>
+        <module>cdi-test</module>
+        <module>cdi-xml</module>
+        <module>console</module>
+        <module>csimple</module>
+        <module>csimple-joor</module>
+        <module>cxf</module>
         <module>camel-example-cxf-proxy</module>
         <module>camel-example-cxf-tomcat</module>
-        <module>camel-example-console</module>
-        <module>camel-example-csimple</module>
-        <module>camel-example-csimple-joor</module>
         <module>camel-example-debezium</module>
         <module>camel-example-debezium-eventhubs-blob</module>
+        <module>camel-example-fhir</module>
+        <module>camel-example-flight-recorder</module>
         <module>camel-example-ftp</module>
         <module>camel-example-hazelcast-kubernetes</module>
         <module>camel-example-java8</module>
@@ -142,6 +142,7 @@
         <module>camel-example-mongodb</module>
         <module>camel-example-netty-custom-correlation</module>
         <module>camel-example-oaipmh</module>
+        <module>camel-example-openapi-cdi</module>
         <module>camel-example-pojo-messaging</module>
         <module>camel-example-reactive-executor-vertx</module>
         <module>camel-example-route-throttling</module>
@@ -157,7 +158,6 @@
         <module>camel-example-spring-xquery</module>
         <module>camel-example-spring-security</module>
         <module>camel-example-swagger-cdi</module>
-        <module>camel-example-openapi-cdi</module>
         <module>camel-example-telegram</module>
         <module>camel-example-transformer-cdi</module>
         <module>camel-example-transformer-demo</module>

[camel-examples] branch master updated: CAMEL-16012: remove prefix 02 (#35)

Reply via email to