Updated Branches: refs/heads/camel-2.12.x 8f22bb89e -> 1b453ee96
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/1b453ee9 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1b453ee9 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1b453ee9 Branch: refs/heads/camel-2.12.x Commit: 1b453ee9626a99d0da9e9adf054f12a780d27275 Parents: 8f22bb8 Author: Claus Ibsen <[email protected]> Authored: Mon Jan 20 08:48:10 2014 +0100 Committer: Claus Ibsen <[email protected]> Committed: Mon Jan 20 08:51:15 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/1b453ee9/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 d88181e..faacab7 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 @@ -438,7 +438,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/1b453ee9/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 8423650..98f0762 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 @@ -182,7 +182,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());
