Author: mattmann
Date: Sun Sep 16 20:47:29 2012
New Revision: 1385369
URL: http://svn.apache.org/viewvc?rev=1385369&view=rev
Log:
- fix for OODT-500: Rename property for max threads in AsyncLocalEngineRunner
Modified:
oodt/trunk/CHANGES.txt
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunnerFactory.java
oodt/trunk/workflow/src/main/resources/workflow.properties
Modified: oodt/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/oodt/trunk/CHANGES.txt?rev=1385369&r1=1385368&r2=1385369&view=diff
==============================================================================
--- oodt/trunk/CHANGES.txt (original)
+++ oodt/trunk/CHANGES.txt Sun Sep 16 20:47:29 2012
@@ -4,6 +4,8 @@ Apache OODT Change Log
Release 0.5
--------------------------------------------
+* OODT-500: Rename property for max threads in AsyncLocalEngineRunner
(mattmann)
+
* OODT-497: Make WorkflowProcessor PrioritySorters thread-safe (mattmann)
* OODT-492: Refactor Workflow Instance repo to store/retrieve that state
Modified:
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunnerFactory.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunnerFactory.java?rev=1385369&r1=1385368&r2=1385369&view=diff
==============================================================================
---
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunnerFactory.java
(original)
+++
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunnerFactory.java
Sun Sep 16 20:47:29 2012
@@ -24,7 +24,7 @@ package org.apache.oodt.cas.workflow.eng
public class AsynchronousLocalEngineRunnerFactory implements
EngineRunnerFactory {
- private static final String NUM_THREADS_PROPERTY =
"org.apache.oodt.cas.workflow.engine.asynchronous.runner.num.threads";
+ private static final String NUM_THREADS_PROPERTY =
"org.apache.oodt.cas.workflow.wengine.asynchronous.runner.num.threads";
private int numThreads;
Modified: oodt/trunk/workflow/src/main/resources/workflow.properties
URL:
http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/resources/workflow.properties?rev=1385369&r1=1385368&r2=1385369&view=diff
==============================================================================
--- oodt/trunk/workflow/src/main/resources/workflow.properties (original)
+++ oodt/trunk/workflow/src/main/resources/workflow.properties Sun Sep 16
20:47:29 2012
@@ -35,13 +35,6 @@ org.apache.oodt.cas.workflow.engine.thre
org.apache.oodt.cas.workflow.engine.unlimitedQueue=true
org.apache.oodt.cas.workflow.engine.preConditionWaitTime=10
-# wengine properties
-# define workflow prioritizer class to use for sorting workflow tasks
-org.apache.oodt.cas.workflow.wengine.prioritizer=org.apache.oodt.cas.workflow.structs.FILOPrioritySorter
-
-# the maximum number of threads to be used by the asynchronous engine runner
-org.apache.oodt.cas.workflow.engine.asynchronous.runner.num.threads=25
-
# set this if you want the workflow manager to submit jobs through the
resource mgr
org.apache.oodt.cas.workflow.engine.resourcemgr.url=
@@ -49,6 +42,13 @@ org.apache.oodt.cas.workflow.engine.reso
# workflow manager should wait inbetween checking to see if a job is complete
org.apache.oodt.cas.workflow.engine.resourcemgr.pollingWaitTime=10
+# wengine properties
+# define workflow prioritizer class to use for sorting workflow tasks
+org.apache.oodt.cas.workflow.wengine.prioritizer=org.apache.oodt.cas.workflow.structs.FILOPrioritySorter
+
+# the maximum number of threads to be used by the asynchronous engine runner
+org.apache.oodt.cas.workflow.wengine.asynchronous.runner.num.threads=25
+
# workflow instance repository general properties
# default page size to page through WorkflowInstances with
org.apache.oodt.cas.workflow.instanceRep.pageSize=20
@@ -79,6 +79,5 @@ org.apache.oodt.cas.workflow.repo.dataso
org.apache.oodt.cas.cli.action.spring.config=src/main/resources/cmd-line-actions.xml
org.apache.oodt.cas.cli.option.spring.config=src/main/resources/cmd-line-options.xml
-# Workflow Lifecycle Manager
+# workflow lifecycle Manager
org.apache.oodt.cas.workflow.lifecycle.filePath=/path/to/workflow-lifecycle.xml
-
