You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by sy...@apache.org on 2005/09/26 18:05:36 UTC
svn commit: r291649 - in
/cocoon/branches/BRANCH_2_1_X/src/blocks/cron/java/org/apache/cocoon/components/cron:
CocoonPipelineCronJob.java CocoonQuartzJobExecutor.java
Author: sylvain
Date: Mon Sep 26 09:05:33 2005
New Revision: 291649
URL: http://svn.apache.org/viewcvs?rev=291649&view=rev
Log:
Propagate parameters and objectmap passed to FireJob as request parameters in the job environment
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/cron/java/org/apache/cocoon/components/cron/CocoonPipelineCronJob.java
cocoon/branches/BRANCH_2_1_X/src/blocks/cron/java/org/apache/cocoon/components/cron/CocoonQuartzJobExecutor.java
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/cron/java/org/apache/cocoon/components/cron/CocoonPipelineCronJob.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/cron/java/org/apache/cocoon/components/cron/CocoonPipelineCronJob.java?rev=291649&r1=291648&r2=291649&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/cron/java/org/apache/cocoon/components/cron/CocoonPipelineCronJob.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/cron/java/org/apache/cocoon/components/cron/CocoonPipelineCronJob.java Mon Sep 26 09:05:33 2005
@@ -45,11 +45,13 @@
public class CocoonPipelineCronJob extends ServiceableCronJob
implements Configurable, ConfigurableCronJob {
- public static final String PIPELINE_PARAM = "pipeline";
+ public static final String PIPELINE_PARAM = "pipeline";
- private String pipeline;
+ private String configuredPipeline;
+ private String pipeline;
public void execute(String name) {
+
if (getLogger ().isDebugEnabled ()) {
getLogger().debug ("CocoonPipelineCronJob: " + name + ", calling pipeline: " + pipeline);
}
@@ -86,7 +88,7 @@
}
public void configure(final Configuration config) throws ConfigurationException {
- this.pipeline = config.getChild(PIPELINE_PARAM).getValue("samples/hello-world/hello.xhtml");
+ this.configuredPipeline = config.getChild(PIPELINE_PARAM).getValue(null);
}
/* (non-Javadoc)
@@ -94,7 +96,9 @@
*/
public void setup(Parameters params, Map objects) {
if (null != params) {
- pipeline = params.getParameter(PIPELINE_PARAM, pipeline);
- }
+ pipeline = params.getParameter(PIPELINE_PARAM, configuredPipeline);
+ } else {
+ pipeline = configuredPipeline;
+ }
}
}
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/cron/java/org/apache/cocoon/components/cron/CocoonQuartzJobExecutor.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/cron/java/org/apache/cocoon/components/cron/CocoonQuartzJobExecutor.java?rev=291649&r1=291648&r2=291649&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/cron/java/org/apache/cocoon/components/cron/CocoonQuartzJobExecutor.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/cron/java/org/apache/cocoon/components/cron/CocoonQuartzJobExecutor.java Mon Sep 26 09:05:33 2005
@@ -16,13 +16,17 @@
package org.apache.cocoon.components.cron;
import java.net.MalformedURLException;
+import java.util.Map;
import org.apache.avalon.framework.component.WrapperComponentManager;
import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.cocoon.Constants;
import org.apache.cocoon.Processor;
import org.apache.cocoon.components.CocoonComponentManager;
+import org.apache.cocoon.environment.ObjectModelHelper;
+import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.background.BackgroundEnvironment;
import org.quartz.JobDataMap;
import org.quartz.JobExecutionException;
@@ -58,6 +62,17 @@
throw new JobExecutionException(e);
}
+ Request req = ObjectModelHelper.getRequest(m_env.getObjectModel());
+ Map objects = (Map)data.get(QuartzJobScheduler.DATA_MAP_OBJECTMAP);
+ if (objects != null) {
+ req.setAttribute("cron-objectmap", objects);
+ }
+
+ Parameters params = (Parameters)data.get(QuartzJobScheduler.DATA_MAP_PARAMETERS);
+ if (params != null) {
+ req.setAttribute("cron-parameters", params);
+ }
+
try {
m_processor = (Processor) m_manager.lookup(Processor.ROLE);
} catch (ServiceException e) {