Updated Branches:
  refs/heads/master c620d73cb -> 871b55aa1

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/871b55aa
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/871b55aa
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/871b55aa

Branch: refs/heads/master
Commit: 871b55aa139b1dcb263e03225642b06aa967ea34
Parents: c620d73
Author: Claus Ibsen <[email protected]>
Authored: Fri Jan 17 18:50:53 2014 +0100
Committer: Claus Ibsen <[email protected]>
Committed: Fri Jan 17 18:51:51 2014 +0100

----------------------------------------------------------------------
 .../apache/camel/component/quartz/QuartzComponent.java   | 11 +++++------
 .../camel/component/quartz/QuartzPropertiesTest.java     |  2 +-
 .../apache/camel/component/quartz2/QuartzComponent.java  | 11 +++++------
 .../camel/component/quartz2/QuartzPropertiesTest.java    |  2 +-
 4 files changed, 12 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/871b55aa/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 1ab4c7c..22bf073 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
@@ -33,6 +33,7 @@ import org.apache.camel.impl.DefaultComponent;
 import org.apache.camel.util.IOHelper;
 import org.apache.camel.util.IntrospectionSupport;
 import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.ResourceHelper;
 import org.quartz.CronTrigger;
 import org.quartz.JobDetail;
 import org.quartz.Scheduler;
@@ -447,15 +448,13 @@ public class QuartzComponent extends DefaultComponent 
implements StartupListener
         Properties answer = getProperties();
         if (answer == null && getPropertiesFile() != null) {
             LOG.info("Loading Quartz properties file from classpath: {}", 
getPropertiesFile());
-            InputStream is = 
getCamelContext().getClassResolver().loadResourceAsStream(getPropertiesFile());
-            if (is == null) {
-                throw new SchedulerException("Quartz properties file not found 
in classpath: " + getPropertiesFile());
-            }
-            answer = new Properties();
+            InputStream is = null;
             try {
+                is = 
ResourceHelper.resolveMandatoryResourceAsInputStream(getCamelContext().getClassResolver(),
 getPropertiesFile());
+                answer = new Properties();
                 answer.load(is);
             } catch (IOException e) {
-                throw new SchedulerException("Error loading Quartz properties 
file from classpath: " + getPropertiesFile(), e);
+                throw new SchedulerException("Error loading Quartz properties 
file: " + getPropertiesFile(), e);
             } finally {
                 IOHelper.close(is);
             }

http://git-wip-us.apache.org/repos/asf/camel/blob/871b55aa/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzPropertiesTest.java
----------------------------------------------------------------------
diff --git 
a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzPropertiesTest.java
 
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzPropertiesTest.java
index 4fa0705..5f4ac2d 100644
--- 
a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzPropertiesTest.java
+++ 
b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzPropertiesTest.java
@@ -62,7 +62,7 @@ public class QuartzPropertiesTest extends BaseQuartzTest {
             quartz.start();
             fail("Should have thrown exception");
         } catch (SchedulerException e) {
-            assertEquals("Quartz properties file not found in classpath: 
doesnotexist.properties", e.getMessage());
+            assertEquals("Error loading Quartz properties file: 
doesnotexist.properties", e.getMessage());
         }
     }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/871b55aa/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 3e71e51..c5c6f80 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
@@ -30,6 +30,7 @@ import org.apache.camel.impl.DefaultComponent;
 import org.apache.camel.util.IOHelper;
 import org.apache.camel.util.IntrospectionSupport;
 import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.ResourceHelper;
 import org.quartz.Scheduler;
 import org.quartz.SchedulerContext;
 import org.quartz.SchedulerException;
@@ -210,15 +211,13 @@ public class QuartzComponent extends DefaultComponent 
implements StartupListener
         Properties answer = getProperties();
         if (answer == null && getPropertiesFile() != null) {
             LOG.info("Loading Quartz properties file from classpath: {}", 
getPropertiesFile());
-            InputStream is = 
getCamelContext().getClassResolver().loadResourceAsStream(getPropertiesFile());
-            if (is == null) {
-                throw new SchedulerException("Quartz properties file not found 
in classpath: " + getPropertiesFile());
-            }
-            answer = new Properties();
+            InputStream is = null;
             try {
+                is = 
ResourceHelper.resolveMandatoryResourceAsInputStream(getCamelContext().getClassResolver(),
 getPropertiesFile());
+                answer = new Properties();
                 answer.load(is);
             } catch (IOException e) {
-                throw new SchedulerException("Error loading Quartz properties 
file from classpath: " + getPropertiesFile(), e);
+                throw new SchedulerException("Error loading Quartz properties 
file: " + getPropertiesFile(), e);
             } finally {
                 IOHelper.close(is);
             }

http://git-wip-us.apache.org/repos/asf/camel/blob/871b55aa/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzPropertiesTest.java
----------------------------------------------------------------------
diff --git 
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzPropertiesTest.java
 
b/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzPropertiesTest.java
index d7bfa1c..b7aa99e 100644
--- 
a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzPropertiesTest.java
+++ 
b/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzPropertiesTest.java
@@ -60,7 +60,7 @@ public class QuartzPropertiesTest extends BaseQuartzTest {
             quartz.start();
             fail("Should have thrown exception");
         } catch (SchedulerException e) {
-            assertEquals("Quartz properties file not found in classpath: 
doesnotexist.properties", e.getMessage());
+            assertEquals("Error loading Quartz properties file: 
doesnotexist.properties", e.getMessage());
         }
     }
 

Reply via email to