antonio 2004/02/27 20:23:56
Modified: src/blocks/cron/java/org/apache/cocoon/components/cron
QuartzJobScheduler.java QuartzJobExecutor.java
. status.xml gump.xml
lib jars.xml
legal LICENSE.quartz
Added: src/blocks/qdox/lib qdox-1.3.jar
src/blocks/cron/lib quartz-1.3.2.jar
Removed: src/blocks/qdox/lib qdox-1.2.jar
src/blocks/cron/lib quartz-1.2.3.jar
Log:
Update quartz to 1.3.2 and qdox to 1.3
Revision Changes Path
1.8 +4 -3
cocoon-2.1/src/blocks/cron/java/org/apache/cocoon/components/cron/QuartzJobScheduler.java
Index: QuartzJobScheduler.java
===================================================================
RCS file:
/home/cvs//cocoon-2.1/src/blocks/cron/java/org/apache/cocoon/components/cron/QuartzJobScheduler.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- QuartzJobScheduler.java 19 Dec 2003 09:01:43 -0000 1.7
+++ QuartzJobScheduler.java 28 Feb 2004 04:23:56 -0000 1.8
@@ -272,7 +272,8 @@
final ThreadPool pool =
createThreadPool(config.getChild("thread-pool"));
DirectSchedulerFactory.getInstance().createScheduler(DEFAULT_QUARTZ_SCHEDULER_NAME,
runID, pool,
new
RAMJobStore());
- m_scheduler =
DirectSchedulerFactory.getInstance().getScheduler(DEFAULT_QUARTZ_SCHEDULER_NAME,
runID);
+ // m_scheduler =
DirectSchedulerFactory.getInstance().getScheduler(DEFAULT_QUARTZ_SCHEDULER_NAME,
runID);
+ m_scheduler =
DirectSchedulerFactory.getInstance().getScheduler(DEFAULT_QUARTZ_SCHEDULER_NAME);
} catch (final SchedulerException se) {
throw new ConfigurationException("cannot create a quartz
scheduler", se);
}
1.4 +3 -3
cocoon-2.1/src/blocks/cron/java/org/apache/cocoon/components/cron/QuartzJobExecutor.java
Index: QuartzJobExecutor.java
===================================================================
RCS file:
/home/cvs//cocoon-2.1/src/blocks/cron/java/org/apache/cocoon/components/cron/QuartzJobExecutor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- QuartzJobExecutor.java 4 Sep 2003 16:04:10 -0000 1.3
+++ QuartzJobExecutor.java 28 Feb 2004 04:23:56 -0000 1.4
@@ -122,7 +122,7 @@
((ConfigurableCronJob)job).setup(params, objects);
}
- data.put(DATA_MAP_KEY_ISRUNNING, new Boolean(true));
+ data.put(DATA_MAP_KEY_ISRUNNING, Boolean.TRUE);
if (job instanceof Job) {
((Job)job).execute(context);
@@ -140,7 +140,7 @@
throw (JobExecutionException)t;
}
} finally {
- data.put(DATA_MAP_KEY_ISRUNNING, new Boolean(false));
+ data.put(DATA_MAP_KEY_ISRUNNING, Boolean.FALSE);
if (null != manager) {
manager.release(job);
1.250 +2 -2 cocoon-2.1/status.xml
Index: status.xml
===================================================================
RCS file: /home/cvs//cocoon-2.1/status.xml,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -r1.249 -r1.250
--- status.xml 28 Feb 2004 00:28:58 -0000 1.249
+++ status.xml 28 Feb 2004 04:23:56 -0000 1.250
@@ -197,7 +197,7 @@
<release version="@version@" date="@date@">
<action dev="AG" type="update">
- Updated joost to 20031219
+ Updated joost to 20031219, qdox to 1.3 and quartz to 1.3.2
</action>
<action dev="AG" type="update">
Updated xerces to 2.6.2
1.112 +2 -2 cocoon-2.1/gump.xml
Index: gump.xml
===================================================================
RCS file: /home/cvs//cocoon-2.1/gump.xml,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- gump.xml 28 Feb 2004 00:28:58 -0000 1.111
+++ gump.xml 28 Feb 2004 04:23:56 -0000 1.112
@@ -1220,7 +1220,7 @@
definitions from java source files.
</description>
<home nested="src/blocks/qdox/lib"/>
- <jar name="qdox-1.2.jar"/>
+ <jar name="qdox-1.3.jar"/>
</project>
<project name="joost">
1.1 cocoon-2.1/src/blocks/qdox/lib/qdox-1.3.jar
<<Binary file>>
1.1 cocoon-2.1/src/blocks/cron/lib/quartz-1.3.2.jar
<<Binary file>>
1.173 +4 -4 cocoon-2.1/lib/jars.xml
Index: jars.xml
===================================================================
RCS file: /home/cvs//cocoon-2.1/lib/jars.xml,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- jars.xml 28 Feb 2004 00:28:58 -0000 1.172
+++ jars.xml 28 Feb 2004 04:23:56 -0000 1.173
@@ -854,7 +854,7 @@
definitions from source files complete with JavaDoc @tags.
</description>
<used-by>QDoxSource (qdox block)</used-by>
- <lib>qdox/lib/qdox-1.2.jar</lib>
+ <lib>qdox/lib/qdox-1.3.jar</lib>
<homepage>http://qdox.codehaus.org</homepage>
</file>
@@ -862,8 +862,8 @@
<title>Quartz</title>
<description>Quartz Scheduler</description>
<used-by>Cron block</used-by>
- <lib>cron/lib/quartz-1.2.3.jar</lib>
- <homepage>http://www.part.net/quartz.html</homepage>
+ <lib>cron/lib/quartz-1.3.2.jar</lib>
+ <homepage>http://www.quartzscheduler.org/quartz/</homepage>
</file>
<file>
1.4 +41 -41 cocoon-2.1/legal/LICENSE.quartz
Index: LICENSE.quartz
===================================================================
RCS file: /home/cvs//cocoon-2.1/legal/LICENSE.quartz,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LICENSE.quartz 16 Feb 2004 23:43:41 -0000 1.3
+++ LICENSE.quartz 28 Feb 2004 04:23:56 -0000 1.4
@@ -1,41 +1,41 @@
-/*
- * All source code, binaries, documentation and other files distributed
- * with Quartz Enterprise Job Scheduler are subject to the following
- * license terms, and are held under the following copyright notice,
- * unless otherwise noted within the individual files.
- *
- */
-
-
-/*
- * Copyright James House (c) 2001-2003
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *
- * This product uses and includes within its distribution,
- * software developed by the Apache Software Foundation
- * (http://www.apache.org/)
- *
- */
+/*
+ * All source code, binaries, documentation and other files distributed
+ * with Quartz Enterprise Job Scheduler are subject to the following
+ * license terms, and are held under the following copyright,
+ * unless otherwise noted within the individual files.
+ *
+ */
+
+
+/*
+ * Copyright James House (c) 2001-2004
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *
+ * This product uses and includes within its distribution,
+ * software developed by the Apache Software Foundation
+ * (http://www.apache.org/)
+ *
+ */
