You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/09/25 07:07:33 UTC

[1/4] camel git commit: CAMEL-11294 cosmetic changes on example README.md/adoc

Repository: camel
Updated Branches:
  refs/heads/master 25ac6f43d -> 522962297


CAMEL-11294 cosmetic changes on example README.md/adoc


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b3f38d6e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b3f38d6e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b3f38d6e

Branch: refs/heads/master
Commit: b3f38d6e6887c00631e387679ec5dade03c24ed3
Parents: d3a7c8c
Author: Tomohisa Igarashi <tm...@gmail.com>
Authored: Fri Sep 22 15:34:29 2017 -0400
Committer: Tomohisa Igarashi <tm...@gmail.com>
Committed: Sun Sep 24 23:38:15 2017 -0400

----------------------------------------------------------------------
 .../ReadMe.md                                   | 27 +++++++++++++----
 .../camel-example-cdi-cassandraql/README.md     |  8 ++---
 examples/camel-example-cdi-kubernetes/README.md |  2 +-
 .../camel-example-grpc-kubernetes/README.adoc   | 15 +++++++++
 .../ReadMe.md                                   | 32 ++++++++++++++------
 examples/camel-example-kafka/README.adoc        | 18 ++++++-----
 .../camel-example-spring-security/README.md     |  4 +--
 examples/camel-example-sql-blueprint/README.md  |  6 ++--
 examples/camel-example-swagger-osgi/README.md   | 20 ++++++------
 .../README.md                                   | 11 ++-----
 examples/camel-example-transformer-cdi/pom.xml  |  8 +++++
 11 files changed, 100 insertions(+), 51 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/b3f38d6e/examples/camel-example-cassandra-kubernetes/ReadMe.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-cassandra-kubernetes/ReadMe.md b/examples/camel-example-cassandra-kubernetes/ReadMe.md
index f67b852..a142acf 100644
--- a/examples/camel-example-cassandra-kubernetes/ReadMe.md
+++ b/examples/camel-example-cassandra-kubernetes/ReadMe.md
@@ -12,21 +12,21 @@ First thing you'll need to do is preparing the environment.
 Don't forget to use a bit more memory for your Minikube for running this example:
 
 ```
-minikube start --memory 5120 --cpus=4
+$ minikube start --memory 5120 --cpus=4
 ```
 
 Once your Minikube node is up and running you'll need to run the following command.
 In your src/main/resource/fabric8/ folder you'll find two yaml file. Run the following command using them:
 
 ```
-kubectl create -f src/main/resources/fabric8/cassandra-service.yaml
-kubectl create -f src/main/resources/fabric8/cassandra-statefulset.yaml
+$ kubectl create -f src/main/resources/fabric8/cassandra-service.yaml
+$ kubectl create -f src/main/resources/fabric8/cassandra-statefulset.yaml
 ```
 
 To check the correct startup of the cluster run the following command:
 
 ```
-kubectl get statefulsets
+$ kubectl get statefulsets
 NAME        DESIRED   CURRENT   AGE
 cassandra   2         2         2h
 ```
@@ -34,7 +34,7 @@ cassandra   2         2         2h
 and check the status of the pods
 
 ```
-kubectl get pods
+$ kubectl get pods
 NAME                                       READY     STATUS    RESTARTS   AGE
 cassandra-0                                1/1       Running   0          2h
 cassandra-1                                1/1       Running   0          2h
@@ -43,7 +43,7 @@ cassandra-1                                1/1       Running   0          2h
 You can also verify the healt of your cluster by running
 
 ```
-kubectl exec <pod_name> -it nodetool status
+$ kubectl exec <pod_name> -it nodetool status
 Datacenter: DC1-K8Demo
 ======================
 Status=Up/Down
@@ -97,3 +97,18 @@ and you should see something like this:
 2017-08-06 10:44:04,575 [2 - timer://foo] INFO  cassandra-route                - Query result set [Row[1, oscerd]]
 2017-08-06 10:44:09,577 [2 - timer://foo] INFO  cassandra-route                - Query result set [Row[1, oscerd]]
 ```
+
+### Cleanup
+
+Run following to undeploy the application and cassandra nodes
+```
+$ mvn -Pkubernetes-install fabric8:undeploy
+$ kubectl create -f src/main/resources/fabric8/cassandra-service.yaml
+$ kubectl create -f src/main/resources/fabric8/cassandra-statefulset.yaml
+```
+
+Make sure no pod is running
+```
+$ kubectl get pods
+No resources found.
+```

http://git-wip-us.apache.org/repos/asf/camel/blob/b3f38d6e/examples/camel-example-cdi-cassandraql/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-cdi-cassandraql/README.md b/examples/camel-example-cdi-cassandraql/README.md
index 13da242..e925e44 100644
--- a/examples/camel-example-cdi-cassandraql/README.md
+++ b/examples/camel-example-cdi-cassandraql/README.md
@@ -11,15 +11,15 @@ The example assumes you have a running Cassandra Cluster in your environment. We
 As first step we will need to run a single node cluster:
 
 ```
-docker run --name master_node -dt oscerd/cassandra
-docker run --name node1 -d -e SEED="$(docker inspect --format='{{ .NetworkSettings.IPAddress }}' master_node)" oscerd/cassandra
-docker run --name node2 -d -e SEED="$(docker inspect --format='{{ .NetworkSettings.IPAddress }}' master_node)" oscerd/cassandra
+$ docker run --name master_node -dt oscerd/cassandra
+$ docker run --name node1 -d -e SEED="$(docker inspect --format='{{ .NetworkSettings.IPAddress }}' master_node)" oscerd/cassandra
+$ docker run --name node2 -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
+$ docker exec -ti master_node /opt/cassandra/bin/nodetool status
 Datacenter: datacenter1
 =======================
 Status=Up/Down

http://git-wip-us.apache.org/repos/asf/camel/blob/b3f38d6e/examples/camel-example-cdi-kubernetes/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-cdi-kubernetes/README.md b/examples/camel-example-cdi-kubernetes/README.md
index df84924..1fba7f9 100644
--- a/examples/camel-example-cdi-kubernetes/README.md
+++ b/examples/camel-example-cdi-kubernetes/README.md
@@ -42,7 +42,7 @@ $ mvn package
 You can run this example using:
 
 ```sh
-$ mvn camel:run
+$ KUBERNETES_MASTER="https://$(minikube ip):8443/" mvn camel:run
 ```
 
 When the Camel application runs, you should see the pods list being logged

http://git-wip-us.apache.org/repos/asf/camel/blob/b3f38d6e/examples/camel-example-grpc-kubernetes/README.adoc
----------------------------------------------------------------------
diff --git a/examples/camel-example-grpc-kubernetes/README.adoc b/examples/camel-example-grpc-kubernetes/README.adoc
index be041fa..b496e56 100644
--- a/examples/camel-example-grpc-kubernetes/README.adoc
+++ b/examples/camel-example-grpc-kubernetes/README.adoc
@@ -106,6 +106,21 @@ And you should see this output in the console.
 
 ----
 
+### Cleanup
+
+Undeploy server and client
+```
+$ cd hello-camel-grpc-client-kubernetes
+$ mvn -Pkubernetes-install fabric8:undeploy
+$ cd ../hello-camel-grpc-server-kubernetes
+$ mvn -Pkubernetes-install fabric8:undeploy
+```
+Make sure no pod is running
+```
+$ kubectl get pods
+No resources found.
+```
+
 ### Help
 
 If you hit any problems please let us know on the http://camel.apache.org/discussion-forums.html[Camel Forums].

http://git-wip-us.apache.org/repos/asf/camel/blob/b3f38d6e/examples/camel-example-hazelcast-kubernetes/ReadMe.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-hazelcast-kubernetes/ReadMe.md b/examples/camel-example-hazelcast-kubernetes/ReadMe.md
index 353eaf1..67f87ed 100644
--- a/examples/camel-example-hazelcast-kubernetes/ReadMe.md
+++ b/examples/camel-example-hazelcast-kubernetes/ReadMe.md
@@ -15,14 +15,14 @@ Once your Minikube node is up and running you'll need to run the following comma
 In your src/main/resources/fabric8/ folder you'll find two yaml file. Run the following command using them:
 
 ```
-kubectl create -f src/main/resources/fabric8/hazelcast-service.yaml
-kubectl create -f src/main/resources/fabric8/hazelcast-deployment.yaml
+$ kubectl create -f src/main/resources/fabric8/hazelcast-service.yaml
+$ kubectl create -f src/main/resources/fabric8/hazelcast-deployment.yaml
 ```
 
 To check the correct startup of the Hazelcast instance run the following command:
 
 ```
-kubectl get deployment
+$ kubectl get deployment
 NAME        DESIRED   CURRENT   UP-TO-DATE   AVAILABLE   AGE
 hazelcast   1         1         1            1           1m
 ```
@@ -30,7 +30,7 @@ hazelcast   1         1         1            1           1m
 and check the status of the pod
 
 ```
-kubectl get pods
+$ kubectl get pods
 NAME                                        READY     STATUS             RESTARTS   AGE
 hazelcast-414548760-fb5bh                   1/1       Running            0          29s
 ```
@@ -38,13 +38,13 @@ hazelcast-414548760-fb5bh                   1/1       Running            0
 Now you can decide to scale-up your Hazelcast cluster
 
 ```
-kubectl scale deployment hazelcast --replicas 4
+$ kubectl scale deployment hazelcast --replicas 4
 ```
 
 and again check the status of your pods
 
 ```
-kubectl get pods
+$ kubectl get pods
 NAME                                                  READY     STATUS    RESTARTS   AGE
 hazelcast-414548760-37ktz                             1/1       Running   0          23m
 hazelcast-414548760-fb5bh                             1/1       Running   0          1d
@@ -111,17 +111,17 @@ Members [4] {
 
 Navigate to the project folder and the example can be built with
 
-    mvn clean -Pkubernetes-install fabric8:deploy
+    $ mvn clean -Pkubernetes-install fabric8:deploy
 
 When the example runs in fabric8, you can use the Kubectl command tool to inspect the status
 
 To list all the running pods:
 
-    kubectl get pods
+    $ kubectl get pods
 
 Then find the name of the pod that runs this quickstart, and output the logs from the running pods with:
 
-    kubectl logs <name of pod>
+    $ kubectl logs <name of pod>
 
 and you should see something like this:
 
@@ -156,3 +156,17 @@ INFO: hz.client_0 [someGroup] [3.8.5] Authenticated with server [172.17.0.4]:570
 2017-09-12 12:42:51,261 [lient_0.event-3] INFO  route2                         - Consumer side: Detected following action: received
 
 ```
+
+### Cleanup
+
+Run following to undeploy
+```
+$ mvn -Pkubernetes-install fabric8:undeploy
+$ kubectl delete -f src/main/resources/fabric8/hazelcast-deployment.yaml
+$ kubectl delete -f src/main/resources/fabric8/hazelcast-service.yaml
+```
+Make sure no pod is running
+```
+$ kubectl get pods
+No resources found.
+```

http://git-wip-us.apache.org/repos/asf/camel/blob/b3f38d6e/examples/camel-example-kafka/README.adoc
----------------------------------------------------------------------
diff --git a/examples/camel-example-kafka/README.adoc b/examples/camel-example-kafka/README.adoc
index 83e79d8..25e32e3 100644
--- a/examples/camel-example-kafka/README.adoc
+++ b/examples/camel-example-kafka/README.adoc
@@ -15,39 +15,43 @@ This project consists of the following examples:
 
 This example requires that Kafka Server is up and running.
 
+    $ ${KAFKA}/bin/zookeeper-server-start.sh ${KAFKA}/config/zookeeper.properties
+
+    $ ${KAFKA}/bin/kafka-server-start.sh ${KAFKA}/config/server.properties
+
 You will need to create following topics before you run the examples.
 
 On windows run
 
-    kafka-topics.bat --create --zookeeper <zookeeper host ip>:<port> --replication-factor 1 --partitions 2 --topic TestLog
+    $ ${KAFKA}/bin/kafka-topics.bat --create --zookeeper <zookeeper host ip>:<port> --replication-factor 1 --partitions 2 --topic TestLog
     
-    kafka-topics.bat --create --zookeeper <zookeeper host ip>:<port> --replication-factor 1 --partitions 1 --topic AccessLog
+    $ ${KAFKA}/bin/kafka-topics.bat --create --zookeeper <zookeeper host ip>:<port> --replication-factor 1 --partitions 1 --topic AccessLog
 
 On linux run
     
-    kafka-topics.sh --create --zookeeper <zookeeper host ip>:<port> --replication-factor 1 --partitions 2 --topic TestLog
+    $ ${KAFKA}/bin/kafka-topics.sh --create --zookeeper <zookeeper host ip>:<port> --replication-factor 1 --partitions 2 --topic TestLog
     
-    kafka-topics.sh --create --zookeeper <zookeeper host ip>:<port> --replication-factor 1 --partitions 1 --topic AccessLog
+    $ ${KAFKA}/bin/kafka-topics.sh --create --zookeeper <zookeeper host ip>:<port> --replication-factor 1 --partitions 1 --topic AccessLog
 
 
 ### Build
 
 You will need to compile this example first:
 
-    mvn compile
+    $ mvn compile
 
 ### Run
 
 Run the consumer first in separate shell 
 
     
-    mvn compile exec:java -Pkafka-consumer
+    $ mvn compile exec:java -Pkafka-consumer
 
 
 Run the message producer in the seperate shell
 
     
-    mvn compile exec:java -Pkafka-producer
+    $ mvn compile exec:java -Pkafka-producer
 
 Initially, some messages are sent programmatically. 
 On the command prompt, type the messages. Each line is sent as one message to kafka

http://git-wip-us.apache.org/repos/asf/camel/blob/b3f38d6e/examples/camel-example-spring-security/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-security/README.md b/examples/camel-example-spring-security/README.md
index d75e322..451662a 100644
--- a/examples/camel-example-spring-security/README.md
+++ b/examples/camel-example-spring-security/README.md
@@ -15,8 +15,8 @@ To run the example, you need to start up the server and copy the .war to the app
 
 The example consumes messages from a servlet endpoint which is secured by Spring Security
 with http basic authentication, there are two service:
- <http://localhost:8080/camel/user> is for the authenticated user whose role is ROLE_USER
- <http://localhost:8080/camel/admin> is for the authenticated user whose role is ROLE_ADMIN
+ <http://localhost:8080/camel-spring-security-${version}/camel/user> is for the authenticated user whose role is ROLE_USER
+ <http://localhost:8080/camel-spring-security-${version}/camel/admin> is for the authenticated user whose role is ROLE_ADMIN
 
 
 Then you can use the script in the client directory to send the request and check the response,

http://git-wip-us.apache.org/repos/asf/camel/blob/b3f38d6e/examples/camel-example-sql-blueprint/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-sql-blueprint/README.md b/examples/camel-example-sql-blueprint/README.md
index f093b7f..19b3476 100644
--- a/examples/camel-example-sql-blueprint/README.md
+++ b/examples/camel-example-sql-blueprint/README.md
@@ -34,10 +34,8 @@ You will need to install this example first to your local maven repository with:
 Then you can install this example from the shell using this example's `features.xml`
 for easy provisioning:
 
-	feature:repo-add camel ${project.version}
-	feature:install camel
-  feature:repo-add mvn:org.apache.camel.example/camel-example-sql-blueprint/${version}/xml/features
-  feature:install camel-example-sql-blueprint
+	feature:repo-add mvn:org.apache.camel.example/camel-example-sql-blueprint/${version}/xml/features
+	feature:install camel-example-sql-blueprint
 
 And you can see the application running by tailing the logs:
 

http://git-wip-us.apache.org/repos/asf/camel/blob/b3f38d6e/examples/camel-example-swagger-osgi/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-swagger-osgi/README.md b/examples/camel-example-swagger-osgi/README.md
index f08a025..8c6b89f 100644
--- a/examples/camel-example-swagger-osgi/README.md
+++ b/examples/camel-example-swagger-osgi/README.md
@@ -8,9 +8,9 @@ This is an example that uses the rest-dsl to define a rest services which provid
 - GET user/findAll  - Find all users
 
 ### Build
-You will need to compile this example first:
+You will need to install this example first:
 
-	mvn compile
+	mvn install
 
 ### Run
 This example needs to be deployed on Apache Karaf/SerivceMix first:
@@ -23,28 +23,28 @@ This example needs to be deployed on Apache Karaf/SerivceMix first:
 
 And then install the example
 
-   install -s mvn:org.apache.camel/camel-example-swagger-osgi/${version}
+   install -s mvn:org.apache.camel.example/camel-example-swagger-osgi/${version}
 
 
 The rest service can be accessed from the following url
 
-	curl http://0.0.0.0:8080/camel-example-swagger-osgi/rest/user
+	curl http://127.0.0.1:8080/camel-example-swagger-osgi/rest/user
 
-<http://0.0.0.0:8080/camel-example-swagger-osgi/rest/user>
+<http://127.0.0.1:8080/camel-example-swagger-osgi/rest/user>
 
 For example to get a user with id 123
 
-	curl http://0.0.0.0:8080/camel-example-swagger-osgi/rest/user/123
+	curl http://127.0.0.1:8080/camel-example-swagger-osgi/rest/user/123
 
-<http://0.0.0.0:8080/camel-example-swagger-osgi/rest/user/123>
+<http://127.0.0.1:8080/camel-example-swagger-osgi/rest/user/123>
 
 The rest services provides Swagger API in json or yaml format
 which can be accessed from the following url
 
-    curl http://0.0.0.0:8080/camel-example-swagger-osgi/rest/api-docs/myCamel/swagger.json
-    curl http://0.0.0.0:8080/camel-example-swagger-osgi/rest/api-docs/myCamel/swagger.yaml
+    curl http://127.0.0.1:8080/camel-example-swagger-osgi/rest/api-docs/myCamel/swagger.json
+    curl http://127.0.0.1:8080/camel-example-swagger-osgi/rest/api-docs/myCamel/swagger.yaml
 
-<http://0.0.0.0:8080/camel-example-swagger-osgi/rest/api-docs/myCamel/swagger.json>
+<http://127.0.0.1:8080/camel-example-swagger-osgi/rest/api-docs/myCamel/swagger.json>
 
 
 ### Forum, Help, etc

http://git-wip-us.apache.org/repos/asf/camel/blob/b3f38d6e/examples/camel-example-transformer-blueprint/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-transformer-blueprint/README.md b/examples/camel-example-transformer-blueprint/README.md
index e405352..de95db7 100644
--- a/examples/camel-example-transformer-blueprint/README.md
+++ b/examples/camel-example-transformer-blueprint/README.md
@@ -27,19 +27,14 @@ To run the example on the karaf container
 
     karaf / karaf.bat
 
-#### Step 2: Install Came;
-
-     feature:repo-add camel ${version}
-     feature:install camel
-
-#### Step 3: Deploy
+#### Step 2: Deploy
 
     feature:repo-add mvn:org.apache.camel.example/camel-example-transformer-blueprint/${version}/xml/features
     feature:install camel-example-transformer-blueprint
 
-#### Step 4: Check the output
+#### Step 3: Check the output
 
-You will see the output in ${karaf}/data/karaf.log
+You will see the output by log:tail or in ${karaf}/data/karaf.log
 
 You can see the routing rules by looking at the Blueprint XML configuration lives in
 `src/main/resources/OSGI-INF/blueprint`

http://git-wip-us.apache.org/repos/asf/camel/blob/b3f38d6e/examples/camel-example-transformer-cdi/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-transformer-cdi/pom.xml b/examples/camel-example-transformer-cdi/pom.xml
index 22224b9..ea6ecd5 100644
--- a/examples/camel-example-transformer-cdi/pom.xml
+++ b/examples/camel-example-transformer-cdi/pom.xml
@@ -39,6 +39,14 @@
   </properties>
 
   <dependencies>
+    <!-- CDI API -->
+    <dependency>
+      <groupId>javax.enterprise</groupId>
+      <artifactId>cdi-api</artifactId>
+      <version>${cdi-api-1.2-version}</version>
+      <scope>provided</scope>
+    </dependency>
+
     <!-- START SNIPPET: e1 -->
     <dependency>
       <groupId>org.apache.camel</groupId>


[4/4] camel git commit: Regen docs

Posted by da...@apache.org.
Regen docs


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/52296229
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/52296229
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/52296229

Branch: refs/heads/master
Commit: 5229622971680ff20a45f81420545008027198da
Parents: b3f38d6
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Sep 25 09:07:25 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Sep 25 09:07:25 2017 +0200

----------------------------------------------------------------------
 examples/README.adoc | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/52296229/examples/README.adoc
----------------------------------------------------------------------
diff --git a/examples/README.adoc b/examples/README.adoc
index 06b57db..830409a 100644
--- a/examples/README.adoc
+++ b/examples/README.adoc
@@ -11,10 +11,10 @@ View the individual example READMEs for details.
 ### Examples
 
 // examples: START
-Number of Examples: 98 (8 deprecated)
+Number of Examples: 97 (8 deprecated)
 
 [width="100%",cols="4,2,4",options="header"]
-|=======================================================================
+|===
 | Example | Category | Description
 
 | link:camel-example-cdi/README.md[CDI] (camel-example-cdi) | Beginner | An example showing how to work with Camel and CDI for dependency injection
@@ -44,6 +44,8 @@ Number of Examples: 98 (8 deprecated)
 
 | link:camel-example-spring-boot/readme.adoc[Spring Boot] (camel-example-spring-boot) | Beginner | An example showing how to work with Camel and Spring Boot
 
+| link:camel-example-spring-boot-health-checks/readme.adoc[Spring Boot Health Checks] (camel-example-spring-boot-health-checks) | Beginner | An example showing how to work with Camel's Health Checks and Spring Boot
+
 | link:camel-example-spring-boot-live-reload/readme.adoc[Spring Boot Live Reload] (camel-example-spring-boot-live-reload) | Beginner | An example showing how to use the live reload feature of Spring Boot with Camel
 
 | link:camel-example-spring-boot-pojo/README.adoc[Spring Boot Pojo] (camel-example-spring-boot-pojo) | Beginner | An example showing how to work with Camel POJO routing with Spring Boot
@@ -217,7 +219,7 @@ Number of Examples: 98 (8 deprecated)
 | link:camel-example-cxf-tomcat/README.md[CXF Tomcat] (camel-example-cxf-tomcat) | WebService | An example using Camel CXF (code first) with Apache Tomcat
 
 | link:camel-example-spring-ws/README.md[Spring WebService] (camel-example-spring-ws) | WebService | An example showing how to work with Camel and Spring Web Services
-|=======================================================================
+|===
 // examples: END
 
 


[2/4] camel git commit: CAMEL-11294 Remove camel-example-sql

Posted by da...@apache.org.
CAMEL-11294 Remove camel-example-sql

It no longer works as camel-spring-dm has been removed, and we have a camel-example-sql-blueprint instead


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d3a7c8c5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d3a7c8c5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d3a7c8c5

Branch: refs/heads/master
Commit: d3a7c8c56e7a9485b48b07ce20c573eec64f43da
Parents: c56f12e
Author: Tomohisa Igarashi <tm...@gmail.com>
Authored: Sun Sep 24 21:51:33 2017 -0400
Committer: Tomohisa Igarashi <tm...@gmail.com>
Committed: Sun Sep 24 23:38:15 2017 -0400

----------------------------------------------------------------------
 examples/README.adoc                            |   2 -
 examples/camel-example-sql/README.md            |  61 ------
 examples/camel-example-sql/pom.xml              |  97 ---------
 .../apache/camel/example/sql/DatabaseBean.java  |  74 -------
 .../org/apache/camel/example/sql/OrderBean.java |  52 -----
 .../src/main/resources/META-INF/LICENSE.txt     | 203 -------------------
 .../src/main/resources/META-INF/NOTICE.txt      |  11 -
 .../resources/META-INF/spring/camel-context.xml |  78 -------
 .../src/main/resources/features.xml             |  33 ---
 .../src/main/resources/log4j2.properties        |  23 ---
 .../src/main/resources/sql.properties           |  29 ---
 examples/pom.xml                                |   1 -
 12 files changed, 664 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/d3a7c8c5/examples/README.adoc
----------------------------------------------------------------------
diff --git a/examples/README.adoc b/examples/README.adoc
index c92e181..06b57db 100644
--- a/examples/README.adoc
+++ b/examples/README.adoc
@@ -86,8 +86,6 @@ Number of Examples: 98 (8 deprecated)
 
 | link:camel-example-spring-boot-rest-jpa/README.md[Spring Boot REST JPA] (camel-example-spring-boot-rest-jpa) | Database | An example demonstrating how to use Camel REST DSL with JPA to expose a RESTful API that performs CRUD operations on a database
 
-| link:camel-example-sql/README.md[SQL] (camel-example-sql) | Database | An example for showing Camel using SQL component
-
 | link:camel-example-aggregate/README.md[Aggregate] (camel-example-aggregate) | EIP | Demonstrates the persistent support for the Camel aggregator
 
 | link:camel-example-cafe/README.md[Cafe] (camel-example-cafe) | EIP | A cafe example showing how to work with Camel

http://git-wip-us.apache.org/repos/asf/camel/blob/d3a7c8c5/examples/camel-example-sql/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-sql/README.md b/examples/camel-example-sql/README.md
deleted file mode 100644
index e9a1b2b..0000000
--- a/examples/camel-example-sql/README.md
+++ /dev/null
@@ -1,61 +0,0 @@
-# Camel SQL Example
-
-### Introduction
-This example shows how to exchange data using a shared database table.
-
-The example has two Camel routes. The first route insert new data into the table,
-triggered by a timer to run every 5th second.
-
-The second route pickup the newly inserted rows from the table,
-process the row(s), and mark the row(s) as processed when done;
-to avoid picking up the same rows again.
-
-### Build
-
-You will need to compile this example first:
-
-	mvn install
-
-### Run with maven
-
-To run the example type
-
-	mvn camel:run
-
-To stop the example hit <kbd>ctrl</kbd>+<kbd>c</kbd>
-
-This example uses Spring to setup and configure the database,
-as well the CamelContext. You can see this in the following file:
-In the src/main/resources/META-INF/spring/camel-context.xml
-
-### Run with Karaf
-You will need to install this example first to your local maven repository with:
-
-	mvn install
-
-Then you can install this example from the shell using this example's `features.xml`
-for easy provisioning:
-
-	feature:repo-add camel ${project.version}
-	feature:install camel
-  feature:repo-add mvn:org.apache.camel.example/camel-example-sql/${version}/xml/features
-  feature:install camel-example-sql
-
-And you can see the application running by tailing the logs
-
-	log:tail
-
-And you can use <kbd>ctrl</kbd>+<kbd>c</kbd> to stop tailing the log.
-
-### Forum, Help, etc
-
-If you hit an problems please let us know on the Camel Forums
-	<http://camel.apache.org/discussion-forums.html>
-
-
-Please help us make Apache Camel better - we appreciate any feedback you may
-have.  Enjoy!
-
-
-
-The Camel riders!

http://git-wip-us.apache.org/repos/asf/camel/blob/d3a7c8c5/examples/camel-example-sql/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-sql/pom.xml b/examples/camel-example-sql/pom.xml
deleted file mode 100644
index 1b797bd..0000000
--- a/examples/camel-example-sql/pom.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.camel.example</groupId>
-    <artifactId>examples</artifactId>
-    <version>2.20.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>camel-example-sql</artifactId>
-  <packaging>jar</packaging>
-  <name>Camel :: Example :: SQL</name>
-  <description>An example for showing Camel using SQL component</description>
-
-  <properties>
-    <category>Database</category>
-    <title>SQL</title>
-
-    <camel.osgi.export.pkg>org.apache.camel.example.sql.*</camel.osgi.export.pkg>
-    <!-- dynamic import for the Derby JDBC driver -->
-    <camel.osgi.dynamic>*</camel.osgi.dynamic>
-  </properties>
-
-  <dependencies>
-
-    <!-- Camel -->
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-spring</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-sql</artifactId>
-    </dependency>
-
-    <!-- jdbc -->
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-dbcp2</artifactId>
-    </dependency>
-
-    <!-- logging -->
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-api</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-core</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-slf4j-impl</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-
-  </dependencies>
-
-  <build>
-    <plugins>
-      <!-- Allows the routes to be run via 'mvn camel:run' -->
-      <plugin>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-maven-plugin</artifactId>
-        <version>${project.version}</version>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>

http://git-wip-us.apache.org/repos/asf/camel/blob/d3a7c8c5/examples/camel-example-sql/src/main/java/org/apache/camel/example/sql/DatabaseBean.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-sql/src/main/java/org/apache/camel/example/sql/DatabaseBean.java b/examples/camel-example-sql/src/main/java/org/apache/camel/example/sql/DatabaseBean.java
deleted file mode 100644
index abab97f..0000000
--- a/examples/camel-example-sql/src/main/java/org/apache/camel/example/sql/DatabaseBean.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.example.sql;
-
-import javax.sql.DataSource;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.jdbc.core.JdbcTemplate;
-
-/**
- * Bean that creates the database table
- */
-public class DatabaseBean {
-
-    private static final Logger LOG = LoggerFactory.getLogger(DatabaseBean.class);
-    private DataSource dataSource;
-
-    public DataSource getDataSource() {
-        return dataSource;
-    }
-
-    public void setDataSource(DataSource dataSource) {
-        this.dataSource = dataSource;
-    }
-
-    public void create() throws Exception {
-        JdbcTemplate jdbc = new JdbcTemplate(dataSource);
-
-        String sql = "create table orders (\n"
-              + "  id integer primary key,\n"
-              + "  item varchar(10),\n"
-              + "  amount varchar(5),\n"
-              + "  description varchar(30),\n"
-              + "  processed boolean\n"
-              + ")";
-
-        LOG.info("Creating table orders ...");
-
-        try {
-            jdbc.execute("drop table orders");
-        } catch (Throwable e) {
-            // ignore
-        }
-
-        jdbc.execute(sql);
-
-        LOG.info("... created table orders");
-    }
-
-    public void destroy() throws Exception {
-        JdbcTemplate jdbc = new JdbcTemplate(dataSource);
-
-        try {
-            jdbc.execute("drop table orders");
-        } catch (Throwable e) {
-            // ignore
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/d3a7c8c5/examples/camel-example-sql/src/main/java/org/apache/camel/example/sql/OrderBean.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-sql/src/main/java/org/apache/camel/example/sql/OrderBean.java b/examples/camel-example-sql/src/main/java/org/apache/camel/example/sql/OrderBean.java
deleted file mode 100644
index acd7015..0000000
--- a/examples/camel-example-sql/src/main/java/org/apache/camel/example/sql/OrderBean.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.example.sql;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Random;
-
-/**
- * Bean that generates and process orders.
- */
-public class OrderBean {
-
-    private int counter;
-    private Random ran = new Random();
-
-    /**
-     * Generates a new order structured as a {@link Map}
-     */
-    public Map<String, Object> generateOrder() {
-        Map<String, Object> answer = new HashMap<String, Object>();
-        answer.put("id", counter++);
-        answer.put("item", counter % 2 == 0 ? 111 : 222);
-        answer.put("amount", ran.nextInt(10) + 1);
-        answer.put("description", counter % 2 == 0 ? "Camel in Action" : "ActiveMQ in Action");
-        return answer;
-    }
-
-    /**
-     * Processes the order
-     *
-     * @param data  the order as a {@link Map}
-     * @return the transformed order
-     */
-    public String processOrder(Map<String, Object> data) {
-        return "Processed order id " + data.get("id") + " item " + data.get("item") + " of " + data.get("amount") + " copies of " + data.get("description");
-    }
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/d3a7c8c5/examples/camel-example-sql/src/main/resources/META-INF/LICENSE.txt
----------------------------------------------------------------------
diff --git a/examples/camel-example-sql/src/main/resources/META-INF/LICENSE.txt b/examples/camel-example-sql/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100755
index 6b0b127..0000000
--- a/examples/camel-example-sql/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-

http://git-wip-us.apache.org/repos/asf/camel/blob/d3a7c8c5/examples/camel-example-sql/src/main/resources/META-INF/NOTICE.txt
----------------------------------------------------------------------
diff --git a/examples/camel-example-sql/src/main/resources/META-INF/NOTICE.txt b/examples/camel-example-sql/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index 2e215bf..0000000
--- a/examples/camel-example-sql/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-   =========================================================================
-   ==  NOTICE file corresponding to the section 4 d of                    ==
-   ==  the Apache License, Version 2.0,                                   ==
-   ==  in this case for the Apache Camel distribution.                    ==
-   =========================================================================
-
-   This product includes software developed by
-   The Apache Software Foundation (http://www.apache.org/).
-
-   Please read the different LICENSE files present in the licenses directory of
-   this distribution.

http://git-wip-us.apache.org/repos/asf/camel/blob/d3a7c8c5/examples/camel-example-sql/src/main/resources/META-INF/spring/camel-context.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-sql/src/main/resources/META-INF/spring/camel-context.xml b/examples/camel-example-sql/src/main/resources/META-INF/spring/camel-context.xml
deleted file mode 100644
index f78fd24..0000000
--- a/examples/camel-example-sql/src/main/resources/META-INF/spring/camel-context.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="
-          http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
-          http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-  <!-- START SNIPPET: e1 -->
-  <!-- this is the JDBC data source which uses an in-memory only Apache Derby database -->
-  <bean id="dataSource" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
-    <property name="driverClassName" value="org.apache.derby.jdbc.EmbeddedDriver"/>
-    <property name="url" value="jdbc:derby:memory:orders;create=true"/>
-    <property name="username" value=""/>
-    <property name="password" value=""/>
-  </bean>
-
-  <!-- bean which creates/destroys the database table for this example -->
-  <bean id="initDatabase" class="org.apache.camel.example.sql.DatabaseBean"
-        init-method="create" destroy-method="destroy">
-    <property name="dataSource" ref="dataSource"/>
-  </bean>
-
-  <!-- configure the Camel SQL component to use the JDBC data source -->
-  <bean id="sql" class="org.apache.camel.component.sql.SqlComponent">
-    <property name="dataSource" ref="dataSource"/>
-  </bean>
-  <!-- END SNIPPET: e1 -->
-
-  <!-- START SNIPPET: e2 -->
-  <!-- order bean is our business logic bean that creates new orders -->
-  <bean id="orderBean" class="org.apache.camel.example.sql.OrderBean"/>
-
-  <!-- here is Camel configured with a number of routes -->
-  <camelContext xmlns="http://camel.apache.org/schema/spring">
-
-    <!-- use Camel property placeholder loaded from the given file -->
-    <propertyPlaceholder id="placeholder" location="classpath:sql.properties"/>
-
-    <!-- route that generate new orders and insert them in the database -->
-    <route id="generateOrder-route">
-      <from uri="timer:foo?period=5s"/>
-      <transform>
-        <method ref="orderBean" method="generateOrder"/>
-      </transform>
-      <to uri="sql:{{sql.insertOrder}}"/>
-      <log message="Inserted new order ${body[id]}"/>
-    </route>
-
-    <!-- route that process the orders by picking up new rows from the database
-         and when done processing then update the row to mark it as processed -->
-    <route id="processOrder-route">
-      <from uri="sql:{{sql.selectOrder}}?onConsume={{sql.markOrder}}"/>
-      <to uri="bean:orderBean?method=processOrder"/>
-      <log message="${body}"/>
-    </route>
-
-  </camelContext>
-  <!-- END SNIPPET: e2 -->
-
-</beans>

http://git-wip-us.apache.org/repos/asf/camel/blob/d3a7c8c5/examples/camel-example-sql/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-sql/src/main/resources/features.xml b/examples/camel-example-sql/src/main/resources/features.xml
deleted file mode 100644
index 905ce8e..0000000
--- a/examples/camel-example-sql/src/main/resources/features.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<features>
-    <repository>mvn:org.apache.camel.karaf/apache-camel/${project.version}/xml/features</repository>
-
-    <feature name="camel-example-sql" version="${project.version}">
-        <feature version="${project.version}">camel</feature>
-        <feature version="${project.version}">camel-spring</feature>
-        <feature version="${project.version}">camel-sql</feature>
-        <bundle>mvn:org.apache.derby/derby/${derby-version}</bundle>
-        <bundle>mvn:org.apache.commons/commons-pool2/${commons-pool2-version}</bundle>
-        <bundle>wrap:mvn:org.apache.commons/commons-dbcp2/${commons-dbcp2-version}$overwrite=merge&amp;DynamicImport-Package=*</bundle>
-        <bundle>mvn:org.apache.camel.example/camel-example-sql/${project.version}</bundle>
-    </feature>
-
-</features>

http://git-wip-us.apache.org/repos/asf/camel/blob/d3a7c8c5/examples/camel-example-sql/src/main/resources/log4j2.properties
----------------------------------------------------------------------
diff --git a/examples/camel-example-sql/src/main/resources/log4j2.properties b/examples/camel-example-sql/src/main/resources/log4j2.properties
deleted file mode 100644
index d9f0508..0000000
--- a/examples/camel-example-sql/src/main/resources/log4j2.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-appender.out.type = Console
-appender.out.name = out
-appender.out.layout.type = PatternLayout
-appender.out.layout.pattern = [%30.30t] %-30.30c{1} %-5p %m%n
-rootLogger.level = INFO
-rootLogger.appenderRef.out.ref = out

http://git-wip-us.apache.org/repos/asf/camel/blob/d3a7c8c5/examples/camel-example-sql/src/main/resources/sql.properties
----------------------------------------------------------------------
diff --git a/examples/camel-example-sql/src/main/resources/sql.properties b/examples/camel-example-sql/src/main/resources/sql.properties
deleted file mode 100644
index 2390260..0000000
--- a/examples/camel-example-sql/src/main/resources/sql.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-## START SNIPPET: e1
-## notice we use named parameters in the queries, eg :#name. A named query parameter must start with :#
-## sql that insert new orders
-sql.insertOrder=insert into orders (id, item, amount, description, processed) values (:#id, :#item, :#amount, :#description, false)
-
-## sql that select all unprocessed orders
-sql.selectOrder=select * from orders where processed = false
-
-## sql that update the order as being processed
-sql.markOrder=update orders set processed = true where id = :#id
-
-## END SNIPPET: e1

http://git-wip-us.apache.org/repos/asf/camel/blob/d3a7c8c5/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 114a65d..b673f54 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -116,7 +116,6 @@
     <module>camel-example-spring-security</module>
     <module>camel-example-ssh</module>
     <module>camel-example-ssh-security</module>
-    <module>camel-example-sql</module>
     <module>camel-example-sql-blueprint</module>
     <module>camel-example-swagger-cdi</module>
     <module>camel-example-swagger-osgi</module>


[3/4] camel git commit: CAMEL-11294 Remove camel-example-cxf-osgi

Posted by da...@apache.org.
CAMEL-11294 Remove camel-example-cxf-osgi

It no longer works as camel-spring-dm has been removed, and we have a camel-example-cxf-blueprint instead


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c56f12ef
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c56f12ef
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c56f12ef

Branch: refs/heads/master
Commit: c56f12ef083835b5dd4222505adc9cf27fe06ee7
Parents: 25ac6f4
Author: Tomohisa Igarashi <tm...@gmail.com>
Authored: Fri Sep 22 15:38:36 2017 -0400
Committer: Tomohisa Igarashi <tm...@gmail.com>
Committed: Sun Sep 24 23:38:15 2017 -0400

----------------------------------------------------------------------
 examples/README.adoc                            |   2 -
 examples/camel-example-cxf-osgi/README.md       |  97 ---------
 examples/camel-example-cxf-osgi/pom.xml         | 180 ----------------
 .../reportincident/ReportIncidentRoutes.java    |  44 ----
 .../src/main/resources/META-INF/LICENSE.txt     | 203 -------------------
 .../src/main/resources/META-INF/NOTICE.txt      |  11 -
 .../resources/META-INF/spring/camel-context.xml |  43 ----
 .../META-INF/wsdl/report_incident.wsdl          |  92 ---------
 .../ReportIncidentRoutesClientTest.java         |  87 --------
 .../src/test/resources/camel-context.xml        |  46 -----
 .../src/test/resources/log4j2.properties        |  23 ---
 examples/pom.xml                                |   1 -
 12 files changed, 829 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/c56f12ef/examples/README.adoc
----------------------------------------------------------------------
diff --git a/examples/README.adoc b/examples/README.adoc
index c3891a1..c92e181 100644
--- a/examples/README.adoc
+++ b/examples/README.adoc
@@ -153,8 +153,6 @@ Number of Examples: 98 (8 deprecated)
 
 | link:camel-example-cxf-blueprint/README.md[CXF Blueprint] (camel-example-cxf-blueprint) | OSGi | An example which use a CXF consumer and the OSGI HTTP Service
 
-| link:camel-example-cxf-osgi/README.md[CXF OSGi] (camel-example-cxf-osgi) | OSGi | An example which use a CXF consumer and the OSGI HTTP Service
-
 | link:camel-example-netty-http/README.md[Netty HTTP] (camel-example-netty-http) | OSGi | An example showing how to use a shared Netty HTTP server with multiple Camel applications in OSGi container
 
 | link:camel-example-servlet-rest-blueprint/README.md[Servlet REST Blueprint] (camel-example-servlet-rest-blueprint) | OSGi | An example using Servlet REST with OSGi Blueprint

http://git-wip-us.apache.org/repos/asf/camel/blob/c56f12ef/examples/camel-example-cxf-osgi/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-cxf-osgi/README.md b/examples/camel-example-cxf-osgi/README.md
deleted file mode 100644
index 06de99c..0000000
--- a/examples/camel-example-cxf-osgi/README.md
+++ /dev/null
@@ -1,97 +0,0 @@
-# CXF OSGI Example
-
-### Introduction
-
-A simple example which receives web service calls (via a CXF consumer, using bean binding)
-and writes these requests into the file system. It's not a very useful use case, but the goal
-of this example is to show you how you can use the CXF consumer component in an OSGI
-environment with the OSGI HTTP service. If your target container is Apache Karaf or Apache
-ServiceMix, you can use PAX Web to setup and start an OSGI HTTP service. All Camel
-bundles using a Camel CXF consumer can use this HTTP service without needing to start
-individual Jetty instances. Another advantage is that all provided services can now share
-the same port.
-
-### Build
-
-You will need to compile the example first:
-
-	mvn install
-
-Remarks:
-- During the compilation phase, a unit test will be performed which simulates the
-  client calling the web service exposed by our camel/cxf route.
-- In Eclipse, I have used the following option when starting the junit test case. This option tells
-  CXF that it must use log4j : -Dorg.apache.cxf.Logger=org.apache.cxf.common.logging.Log4jLogger
-
-### Run
-
-To run the example on Apache Karaf 4.x or newer
-
-#### Step 1: launch the server
-
-	karaf / karaf.bat
-
-#### Step 2: Add features required
-
-	feature:repo-add camel ${version}
-	feature:install camel
-	feature:install war
-	feature:install cxf
-	feature:install camel-jaxb
-	feature:install camel-cxf
-
-
-#### Step 3: Deploy the example
-
-	install -s mvn:org.apache.camel.example/camel-example-cxf-osgi/${version}
-
-#### Step 4: Verify that your service is available using the following url in the browser.
-We assume you're using Karaf's default PAX Web configuration which uses
-port `8181` for http. If you would like to use another port or https, change the configuration in
-`${KARAF_HOME}/etc/org.ops4j.pax.web.cfg`. The immediate extension after the hostname and port ("cxf" in
-the below URL) is configured via the org.apache.cxf.osgi.cfg file (Please see
-[http://team.ops4j.org/wiki//display/paxweb/Pax+Web](http://team.ops4j.org/wiki//display/paxweb/Pax+Web) for more information on PAX Web).
-
-	http://localhost:8181/cxf/camel-example-cxf-osgi/webservices/incident?wsdl
-
-[http://localhost:8181/cxf/camel-example-cxf-osgi/webservices/incident?wsdl](http://localhost:8181/cxf/camel-example-cxf-osgi/webservices/incident?wsdl)
-
-
-#### Step 5: Start SOAPUI (2.x or later)
-Create a new project called camel-example-cxf-osgi
-Point to the following url: http://localhost:8181/cxf/camel-example-cxf-osgi/webservices/incident?wsdl
-Open the request 1 (under camel-example-cxf-osgi --> ReportIncidentBinding --> ReportIncident) and copy/paste a SOAP
-message generated by the unit test, for example:
-
-	<xml version="1.0" encoding="UTF-8"?>
-	<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
-	   <soap:Header />
-	   <soap:Body>
-	      <ns2:inputReportIncident xmlns:ns2="http://reportincident.example.camel.apache.org">
-	         <incidentId>111</incidentId>
-	         <incidentDate>2011-03-05</incidentDate>
-	         <givenName>Christian</givenName>
-	         <familyName>Mueller</familyName>
-	         <summary>Bla</summary>
-	         <details>Bla bla</details>
-	         <email>cmueller@apache.org</email>
-	         <phone>0049 69 1234567</phone>
-	      </ns2:inputReportIncident>
-	   </soap:Body>
-	</soap:Envelope>
-
-
-#### Step 6: Check the file system
-Check the folder `target/inbox/` in the Karaf base directory to see that a message has arrived.
-
-
-### Forum, Help, etc
-
-If you hit an problems please let us know on the Camel Forums
-	<http://camel.apache.org/discussion-forums.html>
-
-Please help us make Apache Camel better - we appreciate any feedback you may
-have.  Enjoy!
-
-
-The Camel riders!

http://git-wip-us.apache.org/repos/asf/camel/blob/c56f12ef/examples/camel-example-cxf-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-cxf-osgi/pom.xml b/examples/camel-example-cxf-osgi/pom.xml
deleted file mode 100644
index 96ad1df..0000000
--- a/examples/camel-example-cxf-osgi/pom.xml
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.camel.example</groupId>
-    <artifactId>examples</artifactId>
-    <version>2.20.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>camel-example-cxf-osgi</artifactId>
-  <name>Camel :: Example :: CXF :: OSGI</name>
-  <description>An example which use a CXF consumer and the OSGI HTTP Service</description>
-  <packaging>jar</packaging>
-
-  <properties>
-    <category>OSGi</category>
-    <title>CXF OSGi</title>
-
-    <camel.osgi.import.pkg>
-      org.apache.cxf,
-      org.apache.cxf.binding,
-      org.apache.cxf.binding.corba,
-      org.apache.cxf.binding.soap,
-      org.apache.cxf.binding.soap.spring,
-      org.apache.cxf.bus,
-      org.apache.cxf.bus.resource,
-      org.apache.cxf.bus.spring,
-      org.apache.cxf.buslifecycle,
-      org.apache.cxf.catalog,
-      org.apache.cxf.configuration,
-      org.apache.cxf.configuration.spring,
-      org.apache.cxf.endpoint,
-      org.apache.cxf.headers,
-      org.apache.cxf.management,
-      org.apache.cxf.management.jmx,
-      org.apache.cxf.phase,
-      org.apache.cxf.resource,
-      org.apache.cxf.service.factory,
-      org.apache.cxf.transport,
-      org.apache.cxf.transport.http,
-      org.apache.cxf.transport.http.policy,
-      org.apache.cxf.transport.http_jetty,
-      org.apache.cxf.transport.jms,
-      org.apache.cxf.workqueue,
-      org.apache.cxf.wsdl,
-      org.apache.cxf.wsdl11,
-      *
-    </camel.osgi.import.pkg>
-    <camel.osgi.export.pkg>
-      org.apache.camel.example.reportincident*
-    </camel.osgi.export.pkg>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-cxf</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cxf</groupId>
-      <artifactId>cxf-rt-frontend-jaxws</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cxf</groupId>
-      <artifactId>cxf-rt-transports-http</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cxf</groupId>
-      <artifactId>cxf-rt-transports-http-jetty</artifactId>
-      <scope>test</scope>
-    </dependency>
-    
-    <!-- logging -->
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-api</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-core</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-slf4j-impl</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    
-    <!-- test -->
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-test-spring</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-jaxb</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <!-- CXF wsdl2java generator, will plugin to the compile goal -->
-      <plugin>
-        <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-codegen-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>generate-sources</id>
-            <phase>generate-sources</phase>
-            <configuration>
-              <fork>${cxf.codegenplugin.forkmode}</fork>
-              <additionalJvmArgs>${cxf.codegen.jvmArgs}</additionalJvmArgs>
-              <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
-              <wsdlOptions>
-                <wsdlOption>
-                  <wsdl>${basedir}/src/main/resources/META-INF/wsdl/report_incident.wsdl</wsdl>
-                </wsdlOption>
-              </wsdlOptions>
-            </configuration>
-            <goals>
-              <goal>wsdl2java</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  
-  <profiles>
-    <profile>
-      <id>jdk9-build</id>
-      <activation>
-        <jdk>9</jdk>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <argLine>--add-modules java.activation,java.xml.bind,java.xml.ws,jdk.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind.v2=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind.v2.runtime.reflect=ALL-UNNAMED --add-exports=java.xml.ws/com.sun.xml.internal.messaging.saaj.soap.impl=ALL-UNNAMED --add-exports=java.xml.ws/com.sun.xml.internal.messaging.saaj.soap=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind.v2.runtime=ALL-UNNAMED</argLine>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-</project>

http://git-wip-us.apache.org/repos/asf/camel/blob/c56f12ef/examples/camel-example-cxf-osgi/src/main/java/org/apache/camel/example/reportincident/ReportIncidentRoutes.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-cxf-osgi/src/main/java/org/apache/camel/example/reportincident/ReportIncidentRoutes.java b/examples/camel-example-cxf-osgi/src/main/java/org/apache/camel/example/reportincident/ReportIncidentRoutes.java
deleted file mode 100644
index 1b834b7..0000000
--- a/examples/camel-example-cxf-osgi/src/main/java/org/apache/camel/example/reportincident/ReportIncidentRoutes.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.example.reportincident;
-
-import org.apache.camel.builder.RouteBuilder;
-
-/**
- * Our routes that we can build using Camel DSL as we extend the RouteBuilder class.
- * <p/>
- * In the configure method we have all kind of DSL methods we use for expressing our routes.
- */
-public class ReportIncidentRoutes extends RouteBuilder {
-
-    public void configure() throws Exception {
-        // webservice responses
-        OutputReportIncident ok = new OutputReportIncident();
-        ok.setCode("OK");
-
-        OutputReportIncident accepted = new OutputReportIncident();
-        accepted.setCode("Accepted");
-
-        from("cxf:bean:reportIncident")
-            .convertBodyTo(InputReportIncident.class)
-            .wireTap("file://target/inbox/?fileName=request-${date:now:yyyy-MM-dd-HHmmssSSS}")
-            .choice().when(simple("${body.givenName} == 'Claus'"))
-                .transform(constant(ok))
-            .otherwise()
-                .transform(constant(accepted));
-    }
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/c56f12ef/examples/camel-example-cxf-osgi/src/main/resources/META-INF/LICENSE.txt
----------------------------------------------------------------------
diff --git a/examples/camel-example-cxf-osgi/src/main/resources/META-INF/LICENSE.txt b/examples/camel-example-cxf-osgi/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 6b0b127..0000000
--- a/examples/camel-example-cxf-osgi/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-

http://git-wip-us.apache.org/repos/asf/camel/blob/c56f12ef/examples/camel-example-cxf-osgi/src/main/resources/META-INF/NOTICE.txt
----------------------------------------------------------------------
diff --git a/examples/camel-example-cxf-osgi/src/main/resources/META-INF/NOTICE.txt b/examples/camel-example-cxf-osgi/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index 2e215bf..0000000
--- a/examples/camel-example-cxf-osgi/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-   =========================================================================
-   ==  NOTICE file corresponding to the section 4 d of                    ==
-   ==  the Apache License, Version 2.0,                                   ==
-   ==  in this case for the Apache Camel distribution.                    ==
-   =========================================================================
-
-   This product includes software developed by
-   The Apache Software Foundation (http://www.apache.org/).
-
-   Please read the different LICENSE files present in the licenses directory of
-   this distribution.

http://git-wip-us.apache.org/repos/asf/camel/blob/c56f12ef/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml b/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml
deleted file mode 100644
index ad06030..0000000
--- a/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:camel="http://camel.apache.org/schema/spring"
-       xmlns:cxf="http://camel.apache.org/schema/cxf"
-       xsi:schemaLocation="
-           http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-           http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
-           http://camel.apache.org/schema/cxf http://camel.apache.org/schema/cxf/camel-cxf.xsd">
-
-  <cxf:cxfEndpoint id="reportIncident"
-                   address="/camel-example-cxf-osgi/webservices/incident"
-                   endpointName="s:ReportIncidentEndpoint"
-                   serviceName="s:ReportIncidentEndpointService"
-                   wsdlURL="META-INF/wsdl/report_incident.wsdl"
-                   serviceClass="org.apache.camel.example.reportincident.ReportIncidentEndpoint"
-                   xmlns:s="http://reportincident.example.camel.apache.org"/>
-
-  <bean id="reportIncidentRoutes" class="org.apache.camel.example.reportincident.ReportIncidentRoutes"/>
-
-  <camel:camelContext id="camel">
-    <camel:routeBuilder ref="reportIncidentRoutes"/>
-  </camel:camelContext>
-
-</beans>

http://git-wip-us.apache.org/repos/asf/camel/blob/c56f12ef/examples/camel-example-cxf-osgi/src/main/resources/META-INF/wsdl/report_incident.wsdl
----------------------------------------------------------------------
diff --git a/examples/camel-example-cxf-osgi/src/main/resources/META-INF/wsdl/report_incident.wsdl b/examples/camel-example-cxf-osgi/src/main/resources/META-INF/wsdl/report_incident.wsdl
deleted file mode 100644
index 0d7c677..0000000
--- a/examples/camel-example-cxf-osgi/src/main/resources/META-INF/wsdl/report_incident.wsdl
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:tns="http://reportincident.example.camel.apache.org"
-	xmlns:xs="http://www.w3.org/2001/XMLSchema"
-	xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	targetNamespace="http://reportincident.example.camel.apache.org">
-
-    <!-- Type definitions for input- and output parameters for webservice -->
-    <wsdl:types>
-        <xs:schema targetNamespace="http://reportincident.example.camel.apache.org">
-            <xs:element name="inputReportIncident">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element type="xs:string" name="incidentId"/>
-                        <xs:element type="xs:string" name="incidentDate"/>
-                        <xs:element type="xs:string" name="givenName"/>
-                        <xs:element type="xs:string" name="familyName"/>
-                        <xs:element type="xs:string" name="summary"/>
-                        <xs:element type="xs:string" name="details"/>
-                        <xs:element type="xs:string" name="email"/>
-                        <xs:element type="xs:string" name="phone"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="outputReportIncident">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element type="xs:string" name="code"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-        </xs:schema>
-    </wsdl:types>
-
-    <!-- Message definitions for input and output -->
-    <wsdl:message name="inputReportIncident">
-        <wsdl:part name="in" element="tns:inputReportIncident"/>
-    </wsdl:message>
-    <wsdl:message name="outputReportIncident">
-        <wsdl:part name="out" element="tns:outputReportIncident"/>
-    </wsdl:message>
-
-    <!-- Port (interface) definitions -->
-    <wsdl:portType name="ReportIncidentEndpoint">
-        <wsdl:operation name="ReportIncident">
-            <wsdl:input message="tns:inputReportIncident"/>
-            <wsdl:output message="tns:outputReportIncident"/>
-        </wsdl:operation>
-    </wsdl:portType>
-
-    <!-- Port bindings to transports and encoding - HTTP, document literal encoding is used -->
-    <wsdl:binding name="ReportIncidentBinding" type="tns:ReportIncidentEndpoint">
-        <soap:binding transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="ReportIncident">
-            <soap:operation
-                    soapAction="http://reportincident.example.camel.apache.org/ReportIncident"
-                    style="document"/>
-            <wsdl:input>
-                <soap:body parts="in" use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body parts="out" use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-
-    <!-- Service definition -->
-    <wsdl:service name="ReportIncidentEndpointService">
-        <wsdl:port name="ReportIncidentEndpoint" binding="tns:ReportIncidentBinding">
-            <soap:address location="http://localhost:9080/part-five/webservices/incident"/>
-        </wsdl:port>
-    </wsdl:service>
-
-</wsdl:definitions>

http://git-wip-us.apache.org/repos/asf/camel/blob/c56f12ef/examples/camel-example-cxf-osgi/src/test/java/org/apache/camel/example/reportincident/ReportIncidentRoutesClientTest.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-cxf-osgi/src/test/java/org/apache/camel/example/reportincident/ReportIncidentRoutesClientTest.java b/examples/camel-example-cxf-osgi/src/test/java/org/apache/camel/example/reportincident/ReportIncidentRoutesClientTest.java
deleted file mode 100755
index fca501b..0000000
--- a/examples/camel-example-cxf-osgi/src/test/java/org/apache/camel/example/reportincident/ReportIncidentRoutesClientTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.example.reportincident;
-
-import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.springframework.context.support.AbstractApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-/**
- * Unit test of our routes
- */
-public class ReportIncidentRoutesClientTest extends CamelSpringTestSupport {
-
-    // should be the same address as we have in our route
-    private static final String URL = "http://localhost:%s/cxf/camel-example-cxf-osgi/webservices/incident";
-    private static final int PORT = AvailablePortFinder.getNextAvailable();
-    
-    @BeforeClass
-    public static void setUpBeforeClass() {
-        System.setProperty("port", String.valueOf(PORT));
-    }
-    
-    @AfterClass
-    public static void tearDownBeforeClass() {
-        System.clearProperty("port");
-    }
-
-    protected static ReportIncidentEndpoint createCXFClient(String url) {
-        // we use CXF to create a client for us as its easier than JAXWS and works
-        JaxWsProxyFactoryBean factory = new JaxWsProxyFactoryBean();
-        factory.setServiceClass(ReportIncidentEndpoint.class);
-        factory.setAddress(url);
-        return (ReportIncidentEndpoint) factory.create();
-    }
-
-    @Test
-    public void testReportIncident() throws Exception {
-        // create input parameter
-        InputReportIncident input = new InputReportIncident();
-        input.setIncidentId("123");
-        input.setIncidentDate("2008-08-18");
-        input.setGivenName("Claus");
-        input.setFamilyName("Ibsen");
-        input.setSummary("Bla");
-        input.setDetails("Bla bla");
-        input.setEmail("davsclaus@apache.org");
-        input.setPhone("0045 2962 7576");
-
-        // create the webservice client and send the request
-        ReportIncidentEndpoint client = createCXFClient(String.format(URL, PORT));
-        OutputReportIncident out = client.reportIncident(input);
-
-        // assert we got a OK back
-        assertEquals("OK", out.getCode());
-        
-        // test the input with other users
-        input.setGivenName("Guest");
-        out = client.reportIncident(input);
-        
-        // assert we got a Accept back
-        assertEquals("Accepted", out.getCode());
-    }
-    
-    @Override
-    protected AbstractApplicationContext createApplicationContext() {
-        return new ClassPathXmlApplicationContext(new String[] {"camel-context.xml"});
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/c56f12ef/examples/camel-example-cxf-osgi/src/test/resources/camel-context.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-cxf-osgi/src/test/resources/camel-context.xml b/examples/camel-example-cxf-osgi/src/test/resources/camel-context.xml
deleted file mode 100644
index 40d6195..0000000
--- a/examples/camel-example-cxf-osgi/src/test/resources/camel-context.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:camel="http://camel.apache.org/schema/spring"
-       xmlns:cxf="http://camel.apache.org/schema/cxf"
-       xsi:schemaLocation="
-           http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-           http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
-           http://camel.apache.org/schema/cxf http://camel.apache.org/schema/cxf/camel-cxf.xsd">
-
-    <!-- resolve dynamicly the port number from a system property -->
-    <bean id="propertyPlaceholderConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
-    
-    <cxf:cxfEndpoint id="reportIncident"
-                     address="http://localhost:${port}/cxf/camel-example-cxf-osgi/webservices/incident"
-                     endpointName="s:ReportIncidentEndpoint"
-                     serviceName="s:ReportIncidentEndpointService"
-                     wsdlURL="META-INF/wsdl/report_incident.wsdl"
-                     serviceClass="org.apache.camel.example.reportincident.ReportIncidentEndpoint"
-                     xmlns:s="http://reportincident.example.camel.apache.org">
-    </cxf:cxfEndpoint>
-    
-    <bean id="reportIncidentRoutes" class="org.apache.camel.example.reportincident.ReportIncidentRoutes" />
-
-    <camel:camelContext id="camel">
-    	<camel:routeBuilder ref="reportIncidentRoutes"/>
-    </camel:camelContext>
-</beans>

http://git-wip-us.apache.org/repos/asf/camel/blob/c56f12ef/examples/camel-example-cxf-osgi/src/test/resources/log4j2.properties
----------------------------------------------------------------------
diff --git a/examples/camel-example-cxf-osgi/src/test/resources/log4j2.properties b/examples/camel-example-cxf-osgi/src/test/resources/log4j2.properties
deleted file mode 100644
index 1c71c7c..0000000
--- a/examples/camel-example-cxf-osgi/src/test/resources/log4j2.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-appender.out.type = Console
-appender.out.name = out
-appender.out.layout.type = PatternLayout
-appender.out.layout.pattern = [%10.10t] %-30.30c{1} %-5p %m%n
-rootLogger.level = INFO
-rootLogger.appenderRef.out.ref = out

http://git-wip-us.apache.org/repos/asf/camel/blob/c56f12ef/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 6a37e78..114a65d 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -52,7 +52,6 @@
     <module>camel-example-cdi-xml</module>
     <module>camel-example-cxf</module>
     <module>camel-example-cxf-blueprint</module>
-    <module>camel-example-cxf-osgi</module>
     <module>camel-example-cxf-proxy</module>
     <module>camel-example-cxf-tomcat</module>
     <module>camel-example-console</module>