Author: epugh
Date: Thu Oct 20 08:39:57 2005
New Revision: 326927
URL: http://svn.apache.org/viewcvs?rev=326927&view=rev
Log:
Update to Quartz 1.5! Change to the <cronTrigger> format, it's not quite
backwards compatible with Quartz 1.4.
Modified:
jakarta/turbine/fulcrum/trunk/quartz/project.xml
jakarta/turbine/fulcrum/trunk/quartz/src/test/TestComponentConfig.xml
jakarta/turbine/fulcrum/trunk/quartz/xdocs/changes.xml
jakarta/turbine/fulcrum/trunk/quartz/xdocs/index.xml
Modified: jakarta/turbine/fulcrum/trunk/quartz/project.xml
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/fulcrum/trunk/quartz/project.xml?rev=326927&r1=326926&r2=326927&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/quartz/project.xml (original)
+++ jakarta/turbine/fulcrum/trunk/quartz/project.xml Thu Oct 20 08:39:57 2005
@@ -3,7 +3,7 @@
<extend>${basedir}/../project.xml</extend>
<id>fulcrum-quartz</id>
<name>Fulcrum Quartz Component</name>
- <currentVersion>1.0</currentVersion>
+ <currentVersion>1.1-dev</currentVersion>
<versions>
<version>
<id>1.0</id>
@@ -12,7 +12,11 @@
</version>
</versions>
<dependencies>
-
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.1</version>
+ </dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
@@ -22,12 +26,12 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.3</version>
- </dependency>
-
+ </dependency>
+
<dependency>
<groupId>xstream</groupId>
<artifactId>xstream</artifactId>
- <version>1.0.2</version>
+ <version>1.1.2</version>
<url>http://xstream.codehaus.org/</url>
</dependency>
@@ -35,7 +39,7 @@
<dependency>
<groupId>opensymphony</groupId>
<artifactId>quartz</artifactId>
- <version>1.4.0</version>
+ <version>1.5.0</version>
</dependency>
<!-- Needed only for testing -->
Modified: jakarta/turbine/fulcrum/trunk/quartz/src/test/TestComponentConfig.xml
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/fulcrum/trunk/quartz/src/test/TestComponentConfig.xml?rev=326927&r1=326926&r2=326927&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/quartz/src/test/TestComponentConfig.xml
(original)
+++ jakarta/turbine/fulcrum/trunk/quartz/src/test/TestComponentConfig.xml Thu
Oct 20 08:39:57 2005
@@ -27,14 +27,26 @@
</jobDetails>
<triggers>
<list>
- <org.quartz.CronTrigger>
- <name>cron</name>
- <group>OTHER_GROUP</group>
- <cronExpression>0 0 12 * * ?</cronExpression>
- <description>test</description>
- <jobName>notSoSimpleJob</jobName>
- <jobGroup>DEFAULT_GROUP</jobGroup>
- </org.quartz.CronTrigger>
+ <org.quartz.CronTrigger serialization="custom">
+ <org.quartz.Trigger>
+ <default>
+ <misfireInstruction>0</misfireInstruction>
+ <volatility>false</volatility>
+ <group>OTHER_GROUP</group>
+ <jobGroup>DEFAULT_GROUP</jobGroup>
+ <jobName>notSoSimpleJob</jobName>
+ <name>cron</name>
+ <triggerListeners/>
+ </default>
+ </org.quartz.Trigger>
+ <org.quartz.CronTrigger>
+ <default>
+ <cronExpression>0 0 12 * * ?</cronExpression>
+ <startTime>2005-10-20 11:10:45.0 EDT</startTime>
+
+ </default>
+ </org.quartz.CronTrigger>
+ </org.quartz.CronTrigger>
<org.quartz.SimpleTrigger>
<name>simpleTrigger</name>
<group>DEFAULT_GROUP</group>
Modified: jakarta/turbine/fulcrum/trunk/quartz/xdocs/changes.xml
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/fulcrum/trunk/quartz/xdocs/changes.xml?rev=326927&r1=326926&r2=326927&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/quartz/xdocs/changes.xml (original)
+++ jakarta/turbine/fulcrum/trunk/quartz/xdocs/changes.xml Thu Oct 20 08:39:57
2005
@@ -6,6 +6,11 @@
</properties>
<body>
+ <release version="1.1" date="">
+ <action dev="epugh" type="update">
+ Upgrade to Quartz 1.5, update for the new xstream xml format for
CronTrigger.
+ </action>
+ </release>
<release version="1.0" date="2004-11-24">
<action dev="epugh" type="add">
If you provide a jobName and jobGroup for a trigger it will
autoschedule
Modified: jakarta/turbine/fulcrum/trunk/quartz/xdocs/index.xml
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/fulcrum/trunk/quartz/xdocs/index.xml?rev=326927&r1=326926&r2=326927&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/quartz/xdocs/index.xml (original)
+++ jakarta/turbine/fulcrum/trunk/quartz/xdocs/index.xml Thu Oct 20 08:39:57
2005
@@ -66,19 +66,38 @@
</jobDetails>
<triggers>
<list>
- <org.quartz.SimpleTrigger>
+ <org.quartz.CronTrigger serialization="custom">
+ <org.quartz.Trigger>
+ <default>
+ <misfireInstruction>0</misfireInstruction>
+ <volatility>false</volatility>
+ <group>OTHER_GROUP</group>
+ <jobGroup>DEFAULT_GROUP</jobGroup>
+ <jobName>notSoSimpleJob</jobName>
+ <name>cron</name>
+ <triggerListeners/>
+ </default>
+ </org.quartz.Trigger>
+ <org.quartz.CronTrigger>
+ <default>
+ <cronExpression>0 0 12 * * ?</cronExpression>
+ <startTime>2005-10-20 11:10:45.0 EDT</startTime>
+
+ </default>
+ </org.quartz.CronTrigger>
+ </org.quartz.CronTrigger>
+ <org.quartz.SimpleTrigger>
<name>simpleTrigger</name>
<group>DEFAULT_GROUP</group>
- </org.quartz.SimpleTrigger>
- <org.quartz.CronTrigger>
- <name>cron</name>
- <group>OTHER_GROUP</group>
- </org.quartz.CronTrigger>
+ <description>test</description>
+
+ </org.quartz.SimpleTrigger>
</list>
</triggers>
</quartz>
]]>
</source>
+ <b>Note:</b> The section for CronTrigger is Quartz 1.5 specific. For
Quartz 1.4, you may need to tweak the cronTrigger pattern.
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
