Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 31F7C10544 for ; Mon, 20 Jan 2014 07:45:14 +0000 (UTC) Received: (qmail 85708 invoked by uid 500); 20 Jan 2014 07:45:13 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 85624 invoked by uid 500); 20 Jan 2014 07:45:11 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 85617 invoked by uid 99); 20 Jan 2014 07:45:10 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Jan 2014 07:45:10 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id DA00210F95; Mon, 20 Jan 2014 07:45:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davsclaus@apache.org To: commits@camel.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: CAMEL-7140: Fixed quartz component to be able to load proeprties file from file system. Date: Mon, 20 Jan 2014 07:45:09 +0000 (UTC) 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 Authored: Mon Jan 20 08:48:10 2014 +0100 Committer: Claus Ibsen 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());