Updated Branches:
  refs/heads/camel-2.12.x 235847e58 -> 8083d6a61

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

Branch: refs/heads/camel-2.12.x
Commit: 8083d6a61859aac407275f49a22e291326a3b961
Parents: 235847e
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:18 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/8083d6a6/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 0718a2c..d88181e 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;
@@ -438,15 +439,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/8083d6a6/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 e663232..dd61898 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
@@ -63,7 +63,7 @@ public class QuartzPropertiesTest extends CamelTestSupport {
             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/8083d6a6/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 6efbf85..8423650 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;
@@ -182,15 +183,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/8083d6a6/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 3a31efa..15b309c 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
@@ -61,7 +61,7 @@ public class QuartzPropertiesTest extends CamelTestSupport {
             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