Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 70438 invoked from network); 6 Nov 2004 13:36:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 6 Nov 2004 13:36:38 -0000 Received: (qmail 75031 invoked by uid 500); 6 Nov 2004 13:36:37 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 74985 invoked by uid 500); 6 Nov 2004 13:36:36 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 74971 invoked by uid 99); 6 Nov 2004 13:36:36 -0000 X-ASF-Spam-Status: No, hits=-10.0 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Sat, 06 Nov 2004 05:36:36 -0800 Received: (qmail 70403 invoked by uid 65534); 6 Nov 2004 13:36:35 -0000 Date: 6 Nov 2004 13:36:35 -0000 Message-ID: <20041106133635.70401.qmail@minotaur.apache.org> From: jeremy@apache.org To: cvs@cocoon.apache.org Subject: svn commit: rev 56762 - cocoon/trunk/src/blocks/cron/java/org/apache/cocoon/components/cron X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: jeremy Date: Sat Nov 6 05:36:34 2004 New Revision: 56762 Modified: cocoon/trunk/src/blocks/cron/java/org/apache/cocoon/components/cron/CocoonPipelineCronJob.java Log: Adding implementation of ConfigurableCronJob so that this can be parameterised on the fly from FlowScript. Modified: cocoon/trunk/src/blocks/cron/java/org/apache/cocoon/components/cron/CocoonPipelineCronJob.java ============================================================================== --- cocoon/trunk/src/blocks/cron/java/org/apache/cocoon/components/cron/CocoonPipelineCronJob.java (original) +++ cocoon/trunk/src/blocks/cron/java/org/apache/cocoon/components/cron/CocoonPipelineCronJob.java Sat Nov 6 05:36:34 2004 @@ -19,12 +19,14 @@ import org.apache.avalon.framework.configuration.Configurable; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; +import org.apache.avalon.framework.parameters.Parameters; import org.apache.excalibur.source.Source; import org.apache.excalibur.source.SourceResolver; import java.io.InputStream; import java.io.InputStreamReader; +import java.util.Map; /** * A simple CronJob which calls an internal cocoon:// pipeline. @@ -41,9 +43,9 @@ * @since 2.1.5 */ public class CocoonPipelineCronJob extends ServiceableCronJob - implements Configurable { + implements Configurable, ConfigurableCronJob { - private static final String CONFIG_FILE_PARAM = "pipeline"; + public static final String PIPELINE_PARAM = "pipeline"; private String pipeline; @@ -84,9 +86,15 @@ } public void configure(final Configuration config) throws ConfigurationException { - this.pipeline = config.getChild(CONFIG_FILE_PARAM).getValue(null); - if (this.pipeline == null) { - throw new ConfigurationException("CocoonPipelineCronJob has no pipeline configured."); + this.pipeline = config.getChild(PIPELINE_PARAM).getValue("samples/hello-world/hello.xhtml"); + } + + /* (non-Javadoc) + * @see org.apache.cocoon.components.cron.ConfigurableCronJob#setup(org.apache.avalon.framework.parameters.Parameters, java.util.Map) + */ + public void setup(Parameters params, Map objects) { + if (null != params) { + pipeline = params.getParameter(PIPELINE_PARAM, pipeline); } } }