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.igara...@gmail.com> Authored: Fri Sep 22 15:34:29 2017 -0400 Committer: Tomohisa Igarashi <tm.igara...@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>
