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 2005/10/03 04:14:01 UTC
svn commit: r293207 - in /cocoon/branches/BRANCH_2_1_X: ./ legal/ lib/
lib/optional/ src/blocks/cron/java/org/apache/cocoon/components/cron/
src/blocks/cron/samples/
Author: antonio
Date: Sun Oct 2 19:13:42 2005
New Revision: 293207
URL: http://svn.apache.org/viewcvs?rev=293207&view=rev
Log:
Update quartz to 1.5.0.
Added:
cocoon/branches/BRANCH_2_1_X/legal/quartz-1.5.0.jar.license.txt (with props)
cocoon/branches/BRANCH_2_1_X/lib/optional/quartz-1.5.0.jar (with props)
Removed:
cocoon/branches/BRANCH_2_1_X/legal/quartz-1.4.5.jar.license.txt
cocoon/branches/BRANCH_2_1_X/lib/optional/quartz-1.4.5.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/src/blocks/cron/samples/docs.xml
cocoon/branches/BRANCH_2_1_X/status.xml
Added: cocoon/branches/BRANCH_2_1_X/legal/quartz-1.5.0.jar.license.txt
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/legal/quartz-1.5.0.jar.license.txt?rev=293207&view=auto
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/legal/quartz-1.5.0.jar.license.txt (added)
+++ cocoon/branches/BRANCH_2_1_X/legal/quartz-1.5.0.jar.license.txt Sun Oct 2 19:13:42 2005
@@ -0,0 +1,23 @@
+
+All source code, binaries, documentation, and other files in this distribution
+are subject to the following copyright and license agreement, unless
+otherwise documented:
+
+
+/*
+ * Copyright 2004-2005 OpenSymphony
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
Propchange: cocoon/branches/BRANCH_2_1_X/legal/quartz-1.5.0.jar.license.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/branches/BRANCH_2_1_X/lib/jars.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/lib/jars.xml?rev=293207&r1=293206&r2=293207&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/lib/jars.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/lib/jars.xml Sun Oct 2 19:13:42 2005
@@ -952,8 +952,8 @@
<title>Quartz</title>
<description>Quartz Scheduler</description>
<used-by>Cron block</used-by>
- <lib>optional/quartz-1.4.5.jar</lib>
- <homepage>http://sourceforge.net/projects/quartz/</homepage>
+ <lib>optional/quartz-1.5.0.jar</lib>
+ <homepage>http://www.opensymphony.com/quartz/</homepage>
</file>
<file>
Added: cocoon/branches/BRANCH_2_1_X/lib/optional/quartz-1.5.0.jar
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/lib/optional/quartz-1.5.0.jar?rev=293207&view=auto
==============================================================================
Binary file - no diff available.
Propchange: cocoon/branches/BRANCH_2_1_X/lib/optional/quartz-1.5.0.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/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/cron/java/org/apache/cocoon/components/cron/QuartzDriverDelegate.java?rev=293207&r1=293206&r2=293207&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 Sun Oct 2 19:13:42 2005
@@ -137,7 +137,7 @@
}
public Trigger[] selectTriggersForRecoveringJobs(Connection conn)
- throws SQLException {
+ throws SQLException, IOException, ClassNotFoundException {
return delegate.selectTriggersForRecoveringJobs(conn);
}
@@ -518,5 +518,9 @@
public List selectSchedulerStateRecords(Connection conn, String instanceId)
throws SQLException {
return delegate.selectSchedulerStateRecords(conn, instanceId);
+ }
+
+ public JobDataMap selectTriggerJobDataMap(Connection conn, String triggerName, String groupName) throws SQLException, ClassNotFoundException, IOException {
+ return delegate.selectTriggerJobDataMap(conn, triggerName, groupName);
}
}
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/cron/samples/docs.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/cron/samples/docs.xml?rev=293207&r1=293206&r2=293207&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/cron/samples/docs.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/cron/samples/docs.xml Sun Oct 2 19:13:42 2005
@@ -24,7 +24,7 @@
This implementation of the Java interface
<link href="/api/java/org/apache/cocoon/components/cron/JobScheduler.html">
<code>JobScheduler</code></link>
- is based on the <link href="http://sourceforge.net/projects/quartz/">Quartz</link>
+ is based on the <link href="http://www.opensymphony.com/quartz/">Quartz</link>
job scheduling project and the
<code>RunnableManager</code> as a ThreadPool implementation for the Quartz Scheduler.
</p>
@@ -38,7 +38,7 @@
<p>
This <link href="/api/java/org/apache/cocoon/components/cron/QuartzJobScheduler.html">
<code>QuartzJobScheduler</code></link> implementation is written as a standard
- <link href="http://avalon.apache.org/">Avalon</link> component. So, its definition you'll find in the
+ <link href="http://excalibur.apache.org/framework/index.html">Avalon</link> component. So, its definition you'll find in the
<code>cocoon.xconf</code> file of Cocoon if you've included the cron-block in your build (see
block.properties or local.block.properties file respectively).
</p>
@@ -169,7 +169,7 @@
<code><cron></code> element will be preferred by the implementation if you use both forms
together in one <code><trigger></code> element. A description of the
expressions used inside the <code><trigger></code> elements is described in the
- <link href="http://quartz.sourceforge.net/javadoc/org/quartz/CronTrigger.html">
+ <link href="http://www.opensymphony.com/quartz/api/org/quartz/CronTrigger.html">
<code>CronTrigger</code></link> class.
</p>
</section>
Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/status.xml?rev=293207&r1=293206&r2=293207&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Sun Oct 2 19:13:42 2005
@@ -197,6 +197,9 @@
<changes>
<release version="@version@" date="@date@">
+ <action dev="AG" type="update">
+ Updated quartz to 1.5.0.
+ </action>
<action dev="JH" type="update" fixes-bug="28056">
Midi Block: Marked as stable.
</action>