Updated Branches: refs/heads/master 90fa27cb0 -> 36791535e
CAMEL-7140: Fixed quartz component to be able to load proeprties file from file system. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/36791535 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/36791535 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/36791535 Branch: refs/heads/master Commit: 36791535e40b2f0fc7e76fb8949b3ca998ca514e Parents: 90fa27c Author: Claus Ibsen <davscl...@apache.org> Authored: Mon Jan 20 08:48:10 2014 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon Jan 20 08:48:19 2014 +0100 ---------------------------------------------------------------------- .../java/org/apache/camel/component/quartz/QuartzComponent.java | 2 +- .../java/org/apache/camel/component/quartz2/QuartzComponent.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/36791535/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java index 22bf073..6c33d1a 100644 --- a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java +++ b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java @@ -447,7 +447,7 @@ public class QuartzComponent extends DefaultComponent implements StartupListener protected Properties loadProperties() throws SchedulerException { Properties answer = getProperties(); if (answer == null && getPropertiesFile() != null) { - LOG.info("Loading Quartz properties file from classpath: {}", getPropertiesFile()); + LOG.info("Loading Quartz properties file from: {}", getPropertiesFile()); InputStream is = null; try { is = ResourceHelper.resolveMandatoryResourceAsInputStream(getCamelContext().getClassResolver(), getPropertiesFile()); http://git-wip-us.apache.org/repos/asf/camel/blob/36791535/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzComponent.java b/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzComponent.java index c5c6f80..1afb476 100644 --- a/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzComponent.java +++ b/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzComponent.java @@ -210,7 +210,7 @@ public class QuartzComponent extends DefaultComponent implements StartupListener private Properties loadProperties() throws SchedulerException { Properties answer = getProperties(); if (answer == null && getPropertiesFile() != null) { - LOG.info("Loading Quartz properties file from classpath: {}", getPropertiesFile()); + LOG.info("Loading Quartz properties file from: {}", getPropertiesFile()); InputStream is = null; try { is = ResourceHelper.resolveMandatoryResourceAsInputStream(getCamelContext().getClassResolver(), getPropertiesFile());
