Author: mattmann
Date: Wed Apr 24 13:39:40 2013
New Revision: 1471412
URL: http://svn.apache.org/r1471412
Log:
- fix for OODT-602: Load not settable for WorkflowTaskJobs in
IterativeWorkflowProcessThread
Modified:
oodt/trunk/CHANGES.txt
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/IterativeWorkflowProcessorThread.java
oodt/trunk/workflow/src/main/resources/examples/tasks.xml
Modified: oodt/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/oodt/trunk/CHANGES.txt?rev=1471412&r1=1471411&r2=1471412&view=diff
==============================================================================
--- oodt/trunk/CHANGES.txt (original)
+++ oodt/trunk/CHANGES.txt Wed Apr 24 13:39:40 2013
@@ -5,6 +5,9 @@ Release 0.6 - Current Development
* OODT-470 Enabled RSSProductTransferServlet to be configured using an XML
configuration file (rlaidlaw)
+* OODT-602 Load not settable for WorkflowTaskJobs in
+ IterativeWorkflowProcessThread (mattmann)
+
* OODT-560 XmlStructFactory::getProductTypeMapXmlDocument does not
output virtual product types (Varun Ratnakar via mattmann)
Modified:
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/IterativeWorkflowProcessorThread.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/IterativeWorkflowProcessorThread.java?rev=1471412&r1=1471411&r2=1471412&view=diff
==============================================================================
---
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/IterativeWorkflowProcessorThread.java
(original)
+++
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/IterativeWorkflowProcessorThread.java
Wed Apr 24 13:39:40 2013
@@ -243,7 +243,8 @@ public class IterativeWorkflowProcessorT
.setJobInstanceClassName("org.apache.oodt.cas.workflow.structs.TaskJob");
taskJob
.setJobInputClassName("org.apache.oodt.cas.workflow.structs.TaskJobInput");
- taskJob.setLoadValue(new Integer(2));
+ taskJob.setLoadValue(task.getTaskConfig().getProperty(TASK_LOAD) !=
null ?
+ Integer.parseInt(task.getTaskConfig().getProperty(TASK_LOAD)):new
Integer(2));
taskJob
.setQueueName(task.getTaskConfig().getProperty(QUEUE_NAME) != null
? task
.getTaskConfig().getProperty(QUEUE_NAME) : DEFAULT_QUEUE_NAME);
Modified: oodt/trunk/workflow/src/main/resources/examples/tasks.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/resources/examples/tasks.xml?rev=1471412&r1=1471411&r2=1471412&view=diff
==============================================================================
--- oodt/trunk/workflow/src/main/resources/examples/tasks.xml (original)
+++ oodt/trunk/workflow/src/main/resources/examples/tasks.xml Wed Apr 24
13:39:40 2013
@@ -133,4 +133,16 @@
<metfield name="numSeconds"/>
</requiredMetFields>
</task>
+ <task id="urn:oodt:TaskWithLoad" name="Task with Load"
+ class="org.apache.oodt.cas.workflow.examples.LongTask">
+ <conditions>
+ </conditions>
+ <configuration>
+ <!-- now settable since OODT-602
+ controls the load value of this task when running
+ Workflow Manager with connection to the Resource Manager.
+ -->
+ <property name="TaskLoad" value="2"/>
+ </configuration>
+ </task>
</cas:tasks>
