camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [1/2] camel git commit: CAMEL-11273: Allow to load routeContext with live reload routes from xml files support. Thanks to Ronny Aerts for the patch. This closes #1693
Date Tue, 16 May 2017 12:54:13 GMT
Repository: camel
Updated Branches:
  refs/heads/camel-2.19.x 4d7d17305 -> ccdfa1a02


CAMEL-11273: Allow to load routeContext with live reload routes from xml files support. Thanks
to Ronny Aerts for the patch. This closes #1693


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

Branch: refs/heads/camel-2.19.x
Commit: ccdfa1a02c60f77be93dafd21488f16da4899baa
Parents: 1572b3d
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Tue May 16 14:52:15 2017 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Tue May 16 14:54:06 2017 +0200

----------------------------------------------------------------------
 .../main/java/org/apache/camel/support/ReloadStrategySupport.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/ccdfa1a0/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 ff985c3..d99bc62 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
@@ -73,7 +73,7 @@ public abstract class ReloadStrategySupport extends ServiceSupport implements
Re
         try {
             xml = camelContext.getTypeConverter().mandatoryConvertTo(String.class, resource);
             // the JAXB model expects the spring namespace (even for blueprint)
-            dom = XmlLineNumberParser.parseXml(new ByteArrayInputStream(xml.getBytes()),
null, "camelContext,routes", "http://camel.apache.org/schema/spring");
+            dom = XmlLineNumberParser.parseXml(new ByteArrayInputStream(xml.getBytes()),
null, "camelContext,routeContext,routes", "http://camel.apache.org/schema/spring");
         } catch (Exception e) {
             failed++;
             log.warn("Cannot load the resource " + name + " as XML");


Mime
View raw message