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 2018/04/20 06:07:07 UTC
[camel] branch master updated (be5547d -> 113a4a7)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from be5547d CAMEL-12451 Make sure the camel-cxf component release UoW in oneway invocation
new ff5477c Remove example that is not really relevent to Camel. We have plenty of SB examples already.
new 113a4a7 CAMEL-12383: Migrate to spring boot 2
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
examples/README.adoc | 4 +-
.../src/main/resources/application.properties | 2 +-
.../camel-example-spring-boot-live-reload/pom.xml | 112 ---------------------
.../readme.adoc | 23 -----
.../livereload/LiveReloadApplication.java | 37 -------
.../springboot/livereload/LiveReloadRouter.java | 46 ---------
.../src/main/resources/application.properties | 25 -----
examples/camel-example-spring-boot/readme.adoc | 12 ++-
.../src/main/resources/application.properties | 8 +-
examples/pom.xml | 1 -
10 files changed, 17 insertions(+), 253 deletions(-)
delete mode 100644 examples/camel-example-spring-boot-live-reload/pom.xml
delete mode 100644 examples/camel-example-spring-boot-live-reload/readme.adoc
delete mode 100644 examples/camel-example-spring-boot-live-reload/src/main/java/org/apache/camel/example/springboot/livereload/LiveReloadApplication.java
delete mode 100644 examples/camel-example-spring-boot-live-reload/src/main/java/org/apache/camel/example/springboot/livereload/LiveReloadRouter.java
delete mode 100644 examples/camel-example-spring-boot-live-reload/src/main/resources/application.properties
--
To stop receiving notification emails like this one, please contact
davsclaus@apache.org.
[camel] 01/02: Remove example that is not really relevent to Camel.
We have plenty of SB examples already.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ff5477c7294d5224eff2d654e957dce85d6ec15f
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Apr 19 13:53:59 2018 +0200
Remove example that is not really relevent to Camel. We have plenty of SB examples already.
---
examples/README.adoc | 4 +-
.../src/main/resources/application.properties | 2 +-
.../camel-example-spring-boot-live-reload/pom.xml | 112 ---------------------
.../readme.adoc | 23 -----
.../livereload/LiveReloadApplication.java | 37 -------
.../springboot/livereload/LiveReloadRouter.java | 46 ---------
.../src/main/resources/application.properties | 25 -----
examples/pom.xml | 1 -
8 files changed, 3 insertions(+), 247 deletions(-)
diff --git a/examples/README.adoc b/examples/README.adoc
index 04b6ee3..e19ce95 100644
--- a/examples/README.adoc
+++ b/examples/README.adoc
@@ -46,8 +46,6 @@ Number of Examples: 102 (8 deprecated)
| 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
| link:camel-example-spring-boot-xml/readme.adoc[Spring Boot Xml] (camel-example-spring-boot-xml) | Beginner | An example showing how to work with Camel routes in XML files and Spring Boot
@@ -153,6 +151,8 @@ Number of Examples: 102 (8 deprecated)
| link:camel-example-kafka/README.adoc[Kafka] (camel-example-kafka) | Messaging | An example for Kafka
+| link:camel-example-netty-custom-correlation/readme.adoc[Netty Custom Correlation] (camel-example-netty-custom-correlation) | Messaging | An example for showing Camel Netty with custom codec and correlation id
+
| link:camel-example-rabbitmq/readme.adoc[Rabbitmq] (camel-example-rabbitmq) | Messaging | An example showing how to work with Camel and RabbitMQ
| link:camel-example-spring-boot-activemq/readme.adoc[Spring Boot Activemq] (camel-example-spring-boot-activemq) | Messaging | An example showing how to work with Camel, ActiveMQ and Spring Boot
diff --git a/examples/camel-example-spring-boot-health-checks/application/src/main/resources/application.properties b/examples/camel-example-spring-boot-health-checks/application/src/main/resources/application.properties
index ae3be62..0bb93d3 100644
--- a/examples/camel-example-spring-boot-health-checks/application/src/main/resources/application.properties
+++ b/examples/camel-example-spring-boot-health-checks/application/src/main/resources/application.properties
@@ -26,7 +26,7 @@ logging.level.sample.camel = DEBUG
management.endpoints.enabled-by-default = false
management.endpoint.mappings.enabled = true
management.endpoint.health.enabled = true
-management.endpoint.camelhealthchecks.enabled = true
+management.endpoint.ccamelhealthchecks.enabled = true
management.security.enabled = false
diff --git a/examples/camel-example-spring-boot-live-reload/pom.xml b/examples/camel-example-spring-boot-live-reload/pom.xml
deleted file mode 100644
index 4a14836..0000000
--- a/examples/camel-example-spring-boot-live-reload/pom.xml
+++ /dev/null
@@ -1,112 +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.22.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>camel-example-spring-boot-live-reload</artifactId>
- <name>Camel :: Example :: Spring Boot Live Reload</name>
- <description>An example showing how to use the live reload feature of Spring Boot with Camel</description>
-
- <properties>
- <category>Beginner</category>
-
- <spring.boot-version>${spring-boot-version}</spring.boot-version>
- </properties>
-
- <!-- import Spring-Boot and Camel BOM -->
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-dependencies</artifactId>
- <version>${spring.boot-version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring-boot-dependencies</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
-
- <!-- Spring-Boot -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
- </dependency>
- <!-- devtools enables the live reload functionality -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-devtools</artifactId>
- <optional>true</optional>
- </dependency>
-
- <!-- Camel -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring-boot-starter</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-jetty-starter</artifactId>
- </dependency>
-
- <!-- Test -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <version>${spring-boot-version}</version>
- <configuration>
- <fork>true</fork>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/examples/camel-example-spring-boot-live-reload/readme.adoc b/examples/camel-example-spring-boot-live-reload/readme.adoc
deleted file mode 100644
index 98b93c8..0000000
--- a/examples/camel-example-spring-boot-live-reload/readme.adoc
+++ /dev/null
@@ -1,23 +0,0 @@
-= Spring Boot Camel LiveReload Sample
-
-This example shows how to use the live reload feature of Spring Boot with Apache Camel.
-
-The example exposes a rest endpoint on http://localhost:8080/.
-The route can be tested with a browser having the LiveReload extension installed.
-LiveReload browser extensions are freely available for the most popular browsers from http://livereload.com[livereload.com].
-
-The example should be launched with the following maven command:
-
- mvn spring-boot:run
-
-Once the application is started, you can visit http://localhost:8080/ with a browser and activate the LiveReload feature
-(usually, by clicking on the extension's icon).
-
-Changing the source code (eg. changing the default message returned by the route) will produce a refresh in the browser.
-When using IntelliJ Idea, after doing the changes, you should compile the project (eg. by clicking on the _"Make Project"_ button)
-in order to see the changes in the browser.
-
-== More information
-
-You can find more information about Apache Camel at the website: http://camel.apache.org/.
-For information about the LiveReload feature, check the http://docs.spring.io/spring-boot/docs/current/reference/html/using-boot-devtools.html[dev tools documentation].
diff --git a/examples/camel-example-spring-boot-live-reload/src/main/java/org/apache/camel/example/springboot/livereload/LiveReloadApplication.java b/examples/camel-example-spring-boot-live-reload/src/main/java/org/apache/camel/example/springboot/livereload/LiveReloadApplication.java
deleted file mode 100644
index 20547c7..0000000
--- a/examples/camel-example-spring-boot-live-reload/src/main/java/org/apache/camel/example/springboot/livereload/LiveReloadApplication.java
+++ /dev/null
@@ -1,37 +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.springboot.livereload;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-//CHECKSTYLE:OFF
-/**
- * A sample Spring Boot application that starts the Camel routes.
- */
-@SpringBootApplication
-public class LiveReloadApplication {
-
- /**
- * A main method to start this application.
- */
- public static void main(String[] args) {
- SpringApplication.run(LiveReloadApplication.class, args);
- }
-
-}
-//CHECKSTYLE:ON
diff --git a/examples/camel-example-spring-boot-live-reload/src/main/java/org/apache/camel/example/springboot/livereload/LiveReloadRouter.java b/examples/camel-example-spring-boot-live-reload/src/main/java/org/apache/camel/example/springboot/livereload/LiveReloadRouter.java
deleted file mode 100644
index 7fc38cb..0000000
--- a/examples/camel-example-spring-boot-live-reload/src/main/java/org/apache/camel/example/springboot/livereload/LiveReloadRouter.java
+++ /dev/null
@@ -1,46 +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.springboot.livereload;
-
-import org.apache.camel.builder.RouteBuilder;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-/**
- * A simple Camel route that exposes a text/plain REST endpoint returning a simple message.
- * <p/>
- * Use <tt>@Component</tt> to make Camel auto detect this route when starting.
- */
-@Component
-public class LiveReloadRouter extends RouteBuilder {
-
- @Value("${port}")
- private Integer port;
-
- @Override
- public void configure() throws Exception {
-
- restConfiguration().port(port);
-
- rest()
- .get("/").produces("text/plain")
- .route()
- .transform().constant("Change me");
-
- }
-
-}
diff --git a/examples/camel-example-spring-boot-live-reload/src/main/resources/application.properties b/examples/camel-example-spring-boot-live-reload/src/main/resources/application.properties
deleted file mode 100644
index d02807e..0000000
--- a/examples/camel-example-spring-boot-live-reload/src/main/resources/application.properties
+++ /dev/null
@@ -1,25 +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.
-## ---------------------------------------------------------------------------
-
-# Name of the Camel app
-camel.springboot.name = SampleCamelLiveReload
-
-# The server port
-port=8080
-
-# Enable live reload
-spring.devtools.livereload.enabled=true
diff --git a/examples/pom.xml b/examples/pom.xml
index 4d1bd3f..a1ec0f8 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -105,7 +105,6 @@
<module>camel-example-spring-boot-grpc</module>
<module>camel-example-spring-boot-health-checks</module>
<module>camel-example-spring-boot-infinispan</module>
- <module>camel-example-spring-boot-live-reload</module>
<module>camel-example-spring-boot-master</module>
<module>camel-example-spring-boot-metrics</module>
<module>camel-example-spring-boot-pojo</module>
--
To stop receiving notification emails like this one, please contact
davsclaus@apache.org.
[camel] 02/02: CAMEL-12383: Migrate to spring boot 2
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 113a4a7f86cfea8983a4fbfd7f07f3af086aee39
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Apr 19 14:15:59 2018 +0200
CAMEL-12383: Migrate to spring boot 2
---
examples/camel-example-spring-boot/readme.adoc | 12 ++++++++++--
.../src/main/resources/application.properties | 8 ++++----
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/examples/camel-example-spring-boot/readme.adoc b/examples/camel-example-spring-boot/readme.adoc
index 310c8fb..ca38462 100644
--- a/examples/camel-example-spring-boot/readme.adoc
+++ b/examples/camel-example-spring-boot/readme.adoc
@@ -21,18 +21,26 @@ You can run this example using
mvn spring-boot:run
+=== To get health check
+
+To show a summary of spring boot health check
+
+----
+curl -XGET -s http://localhost:8080/actuator/health
+----
+
=== To get info about the routes
To show a summary of all the routes
----
-curl -XGET -s http://localhost:8080/camel/routes
+curl -XGET -s http://localhost:8080/actuator/camel/routes
----
To show detailed information for a specific route
----
-curl -XGET -s http://localhost:8080/camel/routes/{id}/info
+curl -XGET -s http://localhost:8080/actuator/camel/routes/{id}/info
----
diff --git a/examples/camel-example-spring-boot/src/main/resources/application.properties b/examples/camel-example-spring-boot/src/main/resources/application.properties
index 0260864..cefe0da 100644
--- a/examples/camel-example-spring-boot/src/main/resources/application.properties
+++ b/examples/camel-example-spring-boot/src/main/resources/application.properties
@@ -31,16 +31,16 @@ timer.period = 2000
# add for example: &repeatCount=5 to the timer endpoint to make Camel idle
#camel.springboot.duration-max-idle-seconds=15
-# show verbose /health/health details so you can see Camel information also
+# show verbose health details (/actuator/info) so you can see Camel information also
management.endpoint.health.show-details=always
+# to turn off Camel info in (/actuator/info)
+management.info.camel.enabled=false
+
# allow to obtain basic information about Camel routes (read only mode)
management.endpoint.camelroutes.enabled = true
management.endpoint.camelroutes.read-only = true
-# to turn off Camel info in: /health/info
-#management.info.camel.enabled=false
-
# to configure logging levels
#logging.level.org.springframework = INFO
#logging.level.org.apache.camel.spring.boot = INFO
--
To stop receiving notification emails like this one, please contact
davsclaus@apache.org.