You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by an...@apache.org on 2006/06/23 08:38:33 UTC
svn commit: r416583 - in /cocoon/branches/BRANCH_2_1_X: ./ legal/ lib/
lib/optional/ src/blocks/cron/java/org/apache/cocoon/components/cron/
Author: antonio
Date: Thu Jun 22 23:38:32 2006
New Revision: 416583
URL: http://svn.apache.org/viewvc?rev=416583&view=rev
Log:
<action dev="AG" type="update">
Updated quartz to 1.5.2.
</action>
Added:
cocoon/branches/BRANCH_2_1_X/legal/quartz-1.5.2.jar.license.txt
- copied unchanged from r416551, cocoon/branches/BRANCH_2_1_X/legal/quartz-1.5.1.jar.license.txt
cocoon/branches/BRANCH_2_1_X/lib/optional/quartz-1.5.2.jar (with props)
Removed:
cocoon/branches/BRANCH_2_1_X/legal/quartz-1.5.1.jar.license.txt
cocoon/branches/BRANCH_2_1_X/lib/optional/quartz-1.5.1.jar
Modified:
cocoon/branches/BRANCH_2_1_X/lib/jars.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/cron/java/org/apache/cocoon/components/cron/QuartzDriverDelegate.java
cocoon/branches/BRANCH_2_1_X/status.xml
Modified: cocoon/branches/BRANCH_2_1_X/lib/jars.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/lib/jars.xml?rev=416583&r1=416582&r2=416583&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/lib/jars.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/lib/jars.xml Thu Jun 22 23:38:32 2006
@@ -928,7 +928,7 @@
<title>Quartz</title>
<description>Quartz Scheduler</description>
<used-by>Cron block</used-by>
- <lib>optional/quartz-1.5.1.jar</lib>
+ <lib>optional/quartz-1.5.2.jar</lib>
<homepage>http://www.opensymphony.com/quartz/</homepage>
</file>
Added: cocoon/branches/BRANCH_2_1_X/lib/optional/quartz-1.5.2.jar
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/lib/optional/quartz-1.5.2.jar?rev=416583&view=auto
==============================================================================
Binary file - no diff available.
Propchange: cocoon/branches/BRANCH_2_1_X/lib/optional/quartz-1.5.2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/cron/java/org/apache/cocoon/components/cron/QuartzDriverDelegate.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/cron/java/org/apache/cocoon/components/cron/QuartzDriverDelegate.java?rev=416583&r1=416582&r2=416583&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/cron/java/org/apache/cocoon/components/cron/QuartzDriverDelegate.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/cron/java/org/apache/cocoon/components/cron/QuartzDriverDelegate.java Thu Jun 22 23:38:32 2006
@@ -524,7 +524,8 @@
return delegate.selectTriggerJobDataMap(conn, triggerName, groupName);
}
- public int updateSchedulerState(Connection arg0, String arg1, long arg2) throws SQLException {
- return delegate.updateSchedulerState(arg0, arg1, arg2);
+ public int updateSchedulerState(Connection conn, String instanceId,
+ long checkInTime, String recoverer) throws SQLException {
+ return delegate.updateSchedulerState(conn, instanceId, checkInTime, recoverer);
}
}
Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/status.xml?rev=416583&r1=416582&r2=416583&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Thu Jun 22 23:38:32 2006
@@ -182,6 +182,9 @@
<release version="@version@" date="@date@">
-->
<release version="2.1.10" date="TBD">
+ <action dev="AG" type="update">
+ Updated quartz to 1.5.2.
+ </action>
<action dev="AG" type="add" due-to="Ard Schrijvers" due-to-emal="a.schrijvers@hippo.nl">
EHDefaultStore: Allow users to configure disk-persistent parameter. In earlier cocoon
versions this ehcache parameter was always true. It defines whether or not the disk