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 2016/12/20 14:36:02 UTC
[1/2] camel git commit: CAMEL-10599: Add ReloadStrategy to allow
watching for file changes and reload routes on the fly.
Repository: camel
Updated Branches:
refs/heads/master 03997ffd7 -> 3680b4c73
CAMEL-10599: Add ReloadStrategy to allow watching for file changes and reload routes on the fly.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4df22395
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4df22395
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4df22395
Branch: refs/heads/master
Commit: 4df2239554158d6b94fa2791de303483d6538a47
Parents: 03997ff
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Dec 20 15:24:32 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Dec 20 15:24:32 2016 +0100
----------------------------------------------------------------------
.../camel/support/ReloadStrategySupport.java | 8 +-
.../spring/boot/CamelAutoConfiguration.java | 7 +
.../boot/CamelConfigurationProperties.java | 17 ++
examples/README.md | 1 +
examples/camel-example-reload/Readme.md | 52 +----
.../camel-example-spring-boot-reload/pom.xml | 90 ++++++++
.../example/reload/MySpringBootApplication.java | 32 +++
.../src/main/resources/META-INF/LICENSE.txt | 203 +++++++++++++++++++
.../src/main/resources/META-INF/NOTICE.txt | 11 +
.../src/main/resources/application.properties | 22 ++
10 files changed, 395 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4df22395/camel-core/src/main/java/org/apache/camel/support/ReloadStrategySupport.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/support/ReloadStrategySupport.java b/camel-core/src/main/java/org/apache/camel/support/ReloadStrategySupport.java
index 219e89f..3513cbd 100644
--- a/camel-core/src/main/java/org/apache/camel/support/ReloadStrategySupport.java
+++ b/camel-core/src/main/java/org/apache/camel/support/ReloadStrategySupport.java
@@ -104,12 +104,8 @@ public abstract class ReloadStrategySupport extends ServiceSupport implements Re
String oldXml = state.getXml();
List<Integer> changed = StringHelper.changedLines(oldXml, xml);
- // find the <routes> root
- NodeList list = dom.getElementsByTagName("routes");
- if (list == null || list.getLength() == 0) {
- // fallback to <route>
- list = dom.getElementsByTagName("route");
- }
+ // find all <route> which are the routes
+ NodeList list = dom.getElementsByTagName("route");
// collect which routes are updated
CollectionStringBuffer csb = new CollectionStringBuffer(",");
http://git-wip-us.apache.org/repos/asf/camel/blob/4df22395/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
index 579a384..fd6275f 100644
--- a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
+++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
@@ -29,6 +29,7 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.TypeConverters;
import org.apache.camel.component.properties.PropertiesComponent;
import org.apache.camel.component.properties.PropertiesParser;
+import org.apache.camel.impl.FileWatcherReloadStrategy;
import org.apache.camel.processor.interceptor.BacklogTracer;
import org.apache.camel.processor.interceptor.DefaultTraceFormatter;
import org.apache.camel.processor.interceptor.HandleFault;
@@ -43,6 +44,7 @@ import org.apache.camel.spi.InterceptStrategy;
import org.apache.camel.spi.LifecycleStrategy;
import org.apache.camel.spi.ManagementNamingStrategy;
import org.apache.camel.spi.ManagementStrategy;
+import org.apache.camel.spi.ReloadStrategy;
import org.apache.camel.spi.RoutePolicyFactory;
import org.apache.camel.spi.RuntimeEndpointRegistry;
import org.apache.camel.spi.ShutdownStrategy;
@@ -185,6 +187,11 @@ public class CamelAutoConfiguration {
}
}
+ if (config.getXmlRoutesReloadDirectory() != null) {
+ ReloadStrategy reload = new FileWatcherReloadStrategy(config.getXmlRoutesReloadDirectory());
+ camelContext.setReloadStrategy(reload);
+ }
+
// additional advanced configuration which is not configured using CamelConfigurationProperties
afterPropertiesSet(applicationContext, camelContext);
http://git-wip-us.apache.org/repos/asf/camel/blob/4df22395/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java
index 7ae05a4..02557bc 100644
--- a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java
+++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java
@@ -100,6 +100,15 @@ public class CamelConfigurationProperties {
private String xmlRests = "classpath:camel-rest/*.xml";
/**
+ * To watch the directory for file changes which triggers
+ * a live reload of the Camel routes on-the-fly.
+ * <p/>
+ * For example configure this to point to the source code where the Camel XML files are located
+ * such as: src/main/resources/camel/
+ */
+ private String xmlRoutesReloadDirectory;
+
+ /**
* Directory to load additional configuration files that contains
* configuration values that takes precedence over any other configuration.
* This can be used to refer to files that may have secret configuration that
@@ -457,6 +466,14 @@ public class CamelConfigurationProperties {
this.xmlRests = xmlRests;
}
+ public String getXmlRoutesReloadDirectory() {
+ return xmlRoutesReloadDirectory;
+ }
+
+ public void setXmlRoutesReloadDirectory(String xmlRoutesReloadDirectory) {
+ this.xmlRoutesReloadDirectory = xmlRoutesReloadDirectory;
+ }
+
public boolean isMainRunController() {
return mainRunController;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/4df22395/examples/README.md
----------------------------------------------------------------------
diff --git a/examples/README.md b/examples/README.md
index 53815db..a7c3615 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -20,6 +20,7 @@ All examples have been sort by type/category
* [camel-example-jmx](camel-example-jmx/README.md)
* [camel-example-ftp](camel-example-ftp/README.md)
* [camel-example-reload](camel-example-reload/Readme.md)
+* [camel-example-spring-boot-reload](camel-example-spring-boot-reload/Readme.md)
* [camel-example-ssh](camel-example-ssh/README.md)
* [camel-example-ssh-security](camel-example-ssh-security/README.md)
http://git-wip-us.apache.org/repos/asf/camel/blob/4df22395/examples/camel-example-reload/Readme.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-reload/Readme.md b/examples/camel-example-reload/Readme.md
index 1a8cec4..f2e8011 100644
--- a/examples/camel-example-reload/Readme.md
+++ b/examples/camel-example-reload/Readme.md
@@ -1,8 +1,8 @@
-Camel Example Reload
-====================
+Camel Example Spring Boot Reload
+================================
-This example runs a standalone Camel Spring application where the routes are defined in
-the Spring XML located in `src/main/resources/META-INF/spring/camel-context.xml`.
+This example runs a Camel Spring Boot application where the routes are defined in
+Camel XML files located in `src/main/resources/camel/myroutes.xml`.
At runtime you can modify this file in the source code and then Camel will automatic reload
the route on-the-fly.
@@ -10,8 +10,7 @@ the route on-the-fly.
The reload only applies to Camel routes, eg the `<route>` elements inside `<camelContext>`.
For changes to Spring or OSGi Blueprint `<bean>`s or Java code, then alternative reload strategies
can be used. For example Spring Boot has a live reload tool, which you can try with the `camel-example-spring-boot-live-reload` example. OSGi Blueprint can be reloaded using Karaf container where you can run the `dev:watch *` command and
-then rebuild your code with `mvn install` which triggers Karaf to redeploy the bundle when the SNAPSHOT jar is updated
-in the local Maven repository.
+then rebuild your code with `mvn install` which triggers Karaf to redeploy the bundle when the SNAPSHOT jar is updated in the local Maven repository.
### How to try
@@ -21,12 +20,8 @@ You need to build the example first with
Then you can run it from Maven
- mvn camel:run
-
-Or you can run it from your Java IDE editor by running the following Main class
-
- org.apache.camel.example.reload.CamelReloadMain
-
+ mvn spring-boot:run
+
### Reload changes
When the example is running then try to modify the XML file such as changing the message to be `Bye World`
@@ -35,37 +30,10 @@ When the example is running then try to modify the XML file such as changing the
<constant>Bye World</constant>
</transform>
-You modify the source file directory in the `src/main/resources/META-INF/spring/` directory
+You modify the source file directory in the `src/main/resources/camel/` directory
### Enabling live reload
-Live reload can be enabled on the 'camel:run' maven plugin as shown below:
-
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-maven-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
- <!-- turn on reload when the XML file is updated in the source code -->
- <fileWatcherDirectory>src/main/resources/META-INF/spring</fileWatcherDirectory>
- </configuration>
- </plugin>
-
-The option `fileWatcherDirectory` is used to setup which directory to watch for file changes.
-Notice how we point directly to the source code directory, so whenever you save the source file
-its live reloaded.
-
-If you are using a Camel `Main` class, then you can enabled live reload as follows:
-
- public static void main(String[] args) throws Exception {
- // Main makes it easier to run a Spring application
- Main main = new Main();
- // configure the location of the Spring XML file
- main.setApplicationContextUri("META-INF/spring/camel-context.xml");
- // turn on reload when the XML file is updated in the source code
- main.setFileWatchDirectory("src/main/resources/META-INF/spring");
- // run and block until Camel is stopped (or JVM terminated)
- main.run();
- }
+Live reload can be enabled in the `application.properties` file as shown below:
-The main class has the `setFileWatchDirectory` where you can specify the directory to use.
\ No newline at end of file
+ TODO:
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/4df22395/examples/camel-example-spring-boot-reload/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-boot-reload/pom.xml b/examples/camel-example-spring-boot-reload/pom.xml
new file mode 100644
index 0000000..485f5b9
--- /dev/null
+++ b/examples/camel-example-spring-boot-reload/pom.xml
@@ -0,0 +1,90 @@
+<?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</groupId>
+ <artifactId>examples</artifactId>
+ <version>2.19.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>camel-example-spring-boot-reload</artifactId>
+ <packaging>jar</packaging>
+ <name>Camel :: Example :: Spring Boot Reload</name>
+ <description>An example that live reloads routes when the XML file is updated</description>
+
+ <properties>
+ <spring.boot-version>${spring-boot-version}</spring.boot-version>
+ </properties>
+
+ <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>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring-boot-starter</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+
+ <!-- we do not want version in the JAR name -->
+ <finalName>${project.artifactId}</finalName>
+
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <version>${spring.boot-version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>repackage</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/4df22395/examples/camel-example-spring-boot-reload/src/main/java/org/apache/camel/example/reload/MySpringBootApplication.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-boot-reload/src/main/java/org/apache/camel/example/reload/MySpringBootApplication.java b/examples/camel-example-spring-boot-reload/src/main/java/org/apache/camel/example/reload/MySpringBootApplication.java
new file mode 100644
index 0000000..0f16fca
--- /dev/null
+++ b/examples/camel-example-spring-boot-reload/src/main/java/org/apache/camel/example/reload/MySpringBootApplication.java
@@ -0,0 +1,32 @@
+/**
+ * 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.reload;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class MySpringBootApplication {
+
+ /**
+ * A main method to start this application.
+ */
+ public static void main(String[] args) {
+ SpringApplication.run(MySpringBootApplication.class, args);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/4df22395/examples/camel-example-spring-boot-reload/src/main/resources/META-INF/LICENSE.txt
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-boot-reload/src/main/resources/META-INF/LICENSE.txt b/examples/camel-example-spring-boot-reload/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 0000000..6b0b127
--- /dev/null
+++ b/examples/camel-example-spring-boot-reload/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+ 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/4df22395/examples/camel-example-spring-boot-reload/src/main/resources/META-INF/NOTICE.txt
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-boot-reload/src/main/resources/META-INF/NOTICE.txt b/examples/camel-example-spring-boot-reload/src/main/resources/META-INF/NOTICE.txt
new file mode 100644
index 0000000..2e215bf
--- /dev/null
+++ b/examples/camel-example-spring-boot-reload/src/main/resources/META-INF/NOTICE.txt
@@ -0,0 +1,11 @@
+ =========================================================================
+ == 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/4df22395/examples/camel-example-spring-boot-reload/src/main/resources/application.properties
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-boot-reload/src/main/resources/application.properties b/examples/camel-example-spring-boot-reload/src/main/resources/application.properties
new file mode 100644
index 0000000..1037788
--- /dev/null
+++ b/examples/camel-example-spring-boot-reload/src/main/resources/application.properties
@@ -0,0 +1,22 @@
+## ------------------------------------------------------------------------
+## 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.
+## ------------------------------------------------------------------------
+
+# reload XML files from this directory
+camel.springboot.xml-routes-reload-directory=src/main/resources/camel
+
+# to turn on DEBUG or TRACE logging of the file watcher for reload
+# logging.level.org.apache.camel.impl.FileWatcherReloadStrategy=TRACE
[2/2] camel git commit: CAMEL-10599: Add ReloadStrategy to allow
watching for file changes and reload routes on the fly.
Posted by da...@apache.org.
CAMEL-10599: Add ReloadStrategy to allow watching for file changes and reload routes on the fly.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3680b4c7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3680b4c7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3680b4c7
Branch: refs/heads/master
Commit: 3680b4c73d540af36bfbedec66685fb889e839a7
Parents: 4df2239
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Dec 20 15:30:15 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Dec 20 15:33:19 2016 +0100
----------------------------------------------------------------------
.../camel/support/ReloadStrategySupport.java | 38 +++++++++++++------
.../src/main/resources/camel/myroutes.xml | 39 ++++++++++++++++++++
2 files changed, 65 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3680b4c7/camel-core/src/main/java/org/apache/camel/support/ReloadStrategySupport.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/support/ReloadStrategySupport.java b/camel-core/src/main/java/org/apache/camel/support/ReloadStrategySupport.java
index 3513cbd..8290a92 100644
--- a/camel-core/src/main/java/org/apache/camel/support/ReloadStrategySupport.java
+++ b/camel-core/src/main/java/org/apache/camel/support/ReloadStrategySupport.java
@@ -18,6 +18,7 @@ package org.apache.camel.support;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -107,8 +108,8 @@ public abstract class ReloadStrategySupport extends ServiceSupport implements Re
// find all <route> which are the routes
NodeList list = dom.getElementsByTagName("route");
- // collect which routes are updated
- CollectionStringBuffer csb = new CollectionStringBuffer(",");
+ // collect which routes are updated/skpped
+ List<RouteDefinition> routes = new ArrayList<>();
if (list != null && list.getLength() > 0) {
for (int i = 0; i < list.getLength(); i++) {
@@ -131,14 +132,10 @@ public abstract class ReloadStrategySupport extends ServiceSupport implements Re
}
try {
- RoutesDefinition routes = ModelHelper.loadRoutesDefinition(camelContext, node);
- if (!routes.getRoutes().isEmpty()) {
- // collect route ids and force assign ids if not in use
- for (RouteDefinition route : routes.getRoutes()) {
- String id = route.idOrCreate(camelContext.getNodeIdFactory());
- csb.append(id);
- }
- camelContext.addRouteDefinitions(routes.getRoutes());
+ // load from XML -> JAXB model and store as routes to be updated
+ RoutesDefinition loaded = ModelHelper.loadRoutesDefinition(camelContext, node);
+ if (!loaded.getRoutes().isEmpty()) {
+ routes.addAll(loaded.getRoutes());
}
} catch (Exception e) {
failed++;
@@ -147,8 +144,25 @@ public abstract class ReloadStrategySupport extends ServiceSupport implements Re
}
}
- if (!csb.isEmpty()) {
- log.info("Reloaded routes: [{}] from XML resource: {}", csb, name);
+ if (!routes.isEmpty()) {
+ try {
+ CollectionStringBuffer csb = new CollectionStringBuffer(",");
+ // collect route ids and force assign ids if not in use
+ for (RouteDefinition route : routes) {
+ String id = route.idOrCreate(camelContext.getNodeIdFactory());
+ csb.append(id);
+ }
+ log.debug("Reloading routes: [{}] from XML resource: {}", csb, name);
+
+ // update the routes (add will remove and shutdown first)
+ camelContext.addRouteDefinitions(routes);
+
+ log.info("Reloaded routes: [{}] from XML resource: {}", csb, name);
+ } catch (Exception e) {
+ failed++;
+ throw ObjectHelper.wrapRuntimeCamelException(e);
+ }
+
}
// update cache
http://git-wip-us.apache.org/repos/asf/camel/blob/3680b4c7/examples/camel-example-spring-boot-reload/src/main/resources/camel/myroutes.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-boot-reload/src/main/resources/camel/myroutes.xml b/examples/camel-example-spring-boot-reload/src/main/resources/camel/myroutes.xml
new file mode 100644
index 0000000..035887b
--- /dev/null
+++ b/examples/camel-example-spring-boot-reload/src/main/resources/camel/myroutes.xml
@@ -0,0 +1,39 @@
+<?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.
+-->
+
+<!-- notice Camel will only update the routes that has been changed, so you can edit either either route or both
+ and save the file, and Camel will update only what is required -->
+
+<routes xmlns="http://camel.apache.org/schema/spring">
+
+ <route id="timer">
+ <from uri="timer:foo"/>
+ <to uri="direct:foo"/>
+ <!-- you can try changing me -->
+ <log message="You said: ${body}"/>
+ </route>
+
+ <route id="foo">
+ <from uri="direct:foo"/>
+ <transform>
+ <!-- and I can be changed too -->
+ <constant>Hello World</constant>
+ </transform>
+ </route>
+
+</routes>