[jboss-svn-commits] JBL Code SVN: r14659 - in labs/jbossesb/trunk/product: rosetta and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: tfennelly
Date: 2007-08-27 14:29:56 -0400 (Mon, 27 Aug 2007)
New Revision: 14659

Added:
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/schedule/quartz.properties
Modified:
   labs/jbossesb/trunk/product/docs/ProgrammersGuide.odt
   labs/jbossesb/trunk/product/rosetta/build.xml
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/schedule/ScheduleProvider.java
Log:
http://jira.jboss.com/jira/browse/JBESB-914

Modified: labs/jbossesb/trunk/product/docs/ProgrammersGuide.odt
===================================================================
(Binary files differ)

Modified: labs/jbossesb/trunk/product/rosetta/build.xml
===================================================================
--- labs/jbossesb/trunk/product/rosetta/build.xml	2007-08-27 18:08:57 UTC (rev 14658)
+++ labs/jbossesb/trunk/product/rosetta/build.xml	2007-08-27 18:29:56 UTC (rev 14659)
@@ -60,12 +60,12 @@
     	<delete file="${org.jboss.esb.rosetta.distrib.dir}/lib/${org.jboss.esb.rosetta.jar.name}.jar" />
         <jar    destfile="${org.jboss.esb.rosetta.distrib.dir}/lib/${org.jboss.esb.rosetta.jar.name}.jar" 
                 basedir="${org.jboss.esb.rosetta.classes.dir}" 
-                includes="**/*.class"  
+                includes="**/*.class"
 		excludes="test/**"
                 >
-        	<fileset dir="${org.jboss.esb.rosetta.src.dir}"
-        		includes="**/*.groovy"/>
-        	</jar>
+        	<fileset dir="${org.jboss.esb.rosetta.src.dir}" includes="**/*.groovy"/>
+            <fileset dir="${org.jboss.esb.rosetta.src.dir}" includes="**/*.properties"/>
+       	</jar>
     	<jar    destfile="${org.jboss.esb.rosetta.distrib.dir}/lib/test-util.jar">
 		<fileset dir="${org.jboss.esb.internal.dest}/tests/"
 			includes="org/jboss/soa/esb/testutils/**/*.class"/>

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/schedule/ScheduleProvider.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/schedule/ScheduleProvider.java	2007-08-27 18:08:57 UTC (rev 14658)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/schedule/ScheduleProvider.java	2007-08-27 18:29:56 UTC (rev 14659)
@@ -20,6 +20,7 @@
 package org.jboss.soa.esb.schedule;
 
 import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.util.ClassUtil;
 import org.quartz.*;
 import org.quartz.impl.StdSchedulerFactory;
 import org.apache.log4j.Logger;
@@ -28,6 +29,8 @@
 import java.util.List;
 import java.util.Date;
 import java.text.ParseException;
+import java.io.IOException;
+import java.io.InputStream;
 
 /**
  * Schedule Provider.
@@ -47,13 +50,25 @@
 
     public ScheduleProvider(Properties properties, List<Schedule> schedules) throws ConfigurationException {
         try {
+            Properties defaultProperties = new Properties();
+            InputStream quartzProperties = ClassUtil.getResourceAsStream("quartz.properties", ScheduleProvider.class);
+
+            if(quartzProperties != null) {
+                defaultProperties.load(quartzProperties);
+            }
             if(properties != null && !properties.isEmpty()) {
-                scheduler = new StdSchedulerFactory(properties).getScheduler();
+                // Overlay the defaults with the configs on the schedule config...
+                defaultProperties.putAll(properties);
+            }
+            if(!defaultProperties.isEmpty()) {
+                scheduler = new StdSchedulerFactory(defaultProperties).getScheduler();
             } else {
                 scheduler = new StdSchedulerFactory().getScheduler();
             }
         } catch (SchedulerException e) {
             throw new ConfigurationException("Unable to create Scheduler instance.", e);
+        } catch (IOException e) {
+            throw new ConfigurationException("Unable to create Scheduler instance. Failed to read", e);
         }
         this.schedules = schedules;
     }

Added: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/schedule/quartz.properties
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/schedule/quartz.properties	                        (rev 0)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/schedule/quartz.properties	2007-08-27 18:29:56 UTC (rev 14659)
@@ -0,0 +1,17 @@
+# Default ESB Quartz Properties file.
+#
+
+org.quartz.scheduler.instanceName = DefaultQuartzScheduler
+org.quartz.scheduler.rmi.export = false
+org.quartz.scheduler.rmi.proxy = false
+org.quartz.scheduler.wrapJobExecutionInUserTransaction = false
+
+org.quartz.threadPool.class = org.quartz.simpl.SimpleThreadPool
+org.quartz.threadPool.threadCount = 2
+org.quartz.threadPool.threadPriority = 5
+org.quartz.threadPool.threadsInheritContextClassLoaderOfInitializingThread = true
+
+org.quartz.jobStore.misfireThreshold = 60000
+
+org.quartz.jobStore.class = org.quartz.simpl.RAMJobStore
+


Property changes on: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/schedule/quartz.properties
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native