You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by bf...@apache.org on 2012/08/07 19:53:22 UTC
svn commit: r1370399 - in /oodt/trunk/workflow/src:
main/java/org/apache/oodt/cas/workflow/engine/
main/java/org/apache/oodt/cas/workflow/engine/processor/
main/java/org/apache/oodt/cas/workflow/engine/runner/
main/java/org/apache/oodt/cas/workflow/str...
Author: bfoster
Date: Tue Aug 7 17:53:20 2012
New Revision: 1370399
URL: http://svn.apache.org/viewvc?rev=1370399&view=rev
Log:
- Fixed: Factory out EngineRunner and WorkflowProcessor classes into their own packages
--------------
OODT-485
Added:
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/ConditionProcessor.java (contents, props changed)
- copied, changed from r1369913, oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ConditionProcessor.java
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/ParallelProcessor.java (contents, props changed)
- copied, changed from r1369913, oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ParallelProcessor.java
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/ProcessorDateTimeInfo.java (contents, props changed)
- copied, changed from r1369913, oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ProcessorDateTimeInfo.java
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/SequentialProcessor.java (contents, props changed)
- copied, changed from r1369913, oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/SequentialProcessor.java
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/TaskProcessor.java (contents, props changed)
- copied, changed from r1369913, oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/TaskProcessor.java
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessor.java (contents, props changed)
- copied, changed from r1369913, oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowProcessor.java
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorBuilder.java
- copied, changed from r1369913, oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowProcessorBuilder.java
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorListener.java (contents, props changed)
- copied, changed from r1369913, oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowProcessorListener.java
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java
- copied, changed from r1369913, oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowProcessorQueue.java
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunner.java
- copied, changed from r1369913, oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/AsynchronousLocalEngineRunner.java
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunnerFactory.java (with props)
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/EngineRunner.java
- copied, changed from r1369914, oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/EngineRunner.java
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/EngineRunnerFactory.java (contents, props changed)
- copied, changed from r1369914, oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/EngineRunnerFactory.java
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/ResourceRunner.java
- copied, changed from r1369913, oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ResourceRunner.java
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/ResourceRunnerFactory.java (contents, props changed)
- copied, changed from r1369914, oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ResourceRunnerFactory.java
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/SynchronousLocalEngineRunner.java
- copied, changed from r1369913, oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/SynchronousLocalEngineRunner.java
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/SynchronousLocalEngineRunnerFactory.java (with props)
Removed:
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/AsynchronousLocalEngineRunner.java
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ConditionProcessor.java
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/EngineRunner.java
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/EngineRunnerFactory.java
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ParallelProcessor.java
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ProcessorDateTimeInfo.java
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ResourceRunner.java
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ResourceRunnerFactory.java
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/SequentialProcessor.java
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/SynchronousLocalEngineRunner.java
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/TaskProcessor.java
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowProcessor.java
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowProcessorBuilder.java
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowProcessorListener.java
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowProcessorQueue.java
Modified:
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/PrioritizedQueueBasedWorkflowEngine.java
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/TaskQuerier.java
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/TaskRunner.java
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ThreadPoolWorkflowEngine.java
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngine.java
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/FILOPrioritySorter.java
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/HighestFIFOPrioritySorter.java
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/HighestPrioritySorter.java
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/PrioritySorter.java
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/util/GenericWorkflowObjectFactory.java
oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/util/WorkflowUtils.java
oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/engine/MockProcessorQueue.java
oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/engine/QuerierAndRunnerUtils.java
oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/engine/TestAsynchronousLocalEngineRunner.java
oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/engine/TestTaskQuerier.java
oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/structs/TestFILOPrioritySorter.java
oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/structs/TestHighestFIFOPrioritySorter.java
oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/structs/TestHighestPrioritySorter.java
Modified: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/PrioritizedQueueBasedWorkflowEngine.java
URL: http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/PrioritizedQueueBasedWorkflowEngine.java?rev=1370399&r1=1370398&r2=1370399&view=diff
==============================================================================
--- oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/PrioritizedQueueBasedWorkflowEngine.java (original)
+++ oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/PrioritizedQueueBasedWorkflowEngine.java Tue Aug 7 17:53:20 2012
@@ -28,6 +28,9 @@ import java.util.Vector;
import java.util.logging.Logger;
import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.workflow.engine.processor.WorkflowProcessor;
+import org.apache.oodt.cas.workflow.engine.processor.WorkflowProcessorQueue;
+import org.apache.oodt.cas.workflow.engine.runner.EngineRunner;
import org.apache.oodt.cas.workflow.instrepo.WorkflowInstanceRepository;
import org.apache.oodt.cas.workflow.structs.HighestFIFOPrioritySorter;
import org.apache.oodt.cas.workflow.structs.PrioritySorter;
Modified: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/TaskQuerier.java
URL: http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/TaskQuerier.java?rev=1370399&r1=1370398&r2=1370399&view=diff
==============================================================================
--- oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/TaskQuerier.java (original)
+++ oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/TaskQuerier.java Tue Aug 7 17:53:20 2012
@@ -22,6 +22,9 @@ import java.util.List;
import java.util.Vector;
//OODT imports
+import org.apache.oodt.cas.workflow.engine.processor.TaskProcessor;
+import org.apache.oodt.cas.workflow.engine.processor.WorkflowProcessor;
+import org.apache.oodt.cas.workflow.engine.processor.WorkflowProcessorQueue;
import org.apache.oodt.cas.workflow.lifecycle.WorkflowLifecycle;
import org.apache.oodt.cas.workflow.structs.PrioritySorter;
Modified: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/TaskRunner.java
URL: http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/TaskRunner.java?rev=1370399&r1=1370398&r2=1370399&view=diff
==============================================================================
--- oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/TaskRunner.java (original)
+++ oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/TaskRunner.java Tue Aug 7 17:53:20 2012
@@ -22,44 +22,47 @@ import java.util.logging.Level;
import java.util.logging.Logger;
//OODT imports
+import org.apache.oodt.cas.workflow.engine.processor.TaskProcessor;
+import org.apache.oodt.cas.workflow.engine.runner.EngineRunner;
import org.apache.oodt.cas.workflow.structs.ParentChildWorkflow;
import org.apache.oodt.cas.workflow.structs.WorkflowInstance;
import org.apache.oodt.cas.workflow.structs.WorkflowTask;
/**
- *
+ *
* Implements the TaskRunner framework. Acts as a thread that works with the
* TaskQuerier to take the next sorted (aka ones that have been sorted with the
* Workflow PrioritySorter) task and then leverage the Engine's Runner to
* execute the task.
- *
+ *
* The TaskRunner thread first pops a task off the list using
* {@link TaskQuerier#getNext()} and then so long as the thread's
* {@link #runner} has open slots as returned by
* {@link EngineRunner#hasOpenSlots(WorkflowTask)}, and {@link #isPause()} is
* false and {@link #isRunning()} is true, then the task is handed off to the
* runner for execution.
- *
+ *
* The TaskRunner thread can be paused during which time it waits
* {@link #waitSeconds} seconds, wakes up to see if it's unpaused, and then goes
* back to sleep if not, otherwise, resumes executing if it was unpaused.
- *
+ *
* @since Apache OODT 0.5
- *
+ *
* @author mattmann
* @author bfoster
* @version $Revision$
- *
+ *
*/
+//TODO(bfoster): Rename... Runner is missleading.
public class TaskRunner implements Runnable {
private boolean running;
private boolean pause;
- private TaskQuerier taskQuerier;
+ private final TaskQuerier taskQuerier;
- private EngineRunner runner;
+ private final EngineRunner runner;
private int waitSeconds;
@@ -77,7 +80,7 @@ public class TaskRunner implements Runna
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Runnable#run()
*/
@Override
@@ -88,7 +91,7 @@ public class TaskRunner implements Runna
while (running) {
try {
if (nextTaskProcessor == null){
- nextTaskProcessor = taskQuerier.getNext();
+ nextTaskProcessor = taskQuerier.getNext();
nextTask = extractTaskFromProcessor(nextTaskProcessor);
}
while (running && !pause && nextTask != null
Modified: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ThreadPoolWorkflowEngine.java
URL: http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ThreadPoolWorkflowEngine.java?rev=1370399&r1=1370398&r2=1370399&view=diff
==============================================================================
--- oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ThreadPoolWorkflowEngine.java (original)
+++ oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ThreadPoolWorkflowEngine.java Tue Aug 7 17:53:20 2012
@@ -20,6 +20,9 @@ package org.apache.oodt.cas.workflow.eng
//OODT imports
import org.apache.oodt.cas.metadata.Metadata;
import org.apache.oodt.cas.resource.structs.Job;
+import org.apache.oodt.cas.workflow.engine.processor.ConditionProcessor;
+import org.apache.oodt.cas.workflow.engine.processor.SequentialProcessor;
+import org.apache.oodt.cas.workflow.engine.runner.EngineRunner;
import org.apache.oodt.cas.workflow.instrepo.WorkflowInstanceRepository;
import org.apache.oodt.cas.workflow.lifecycle.WorkflowLifecycleManager;
import org.apache.oodt.cas.workflow.structs.Workflow;
Modified: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngine.java
URL: http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngine.java?rev=1370399&r1=1370398&r2=1370399&view=diff
==============================================================================
--- oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngine.java (original)
+++ oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngine.java Tue Aug 7 17:53:20 2012
@@ -20,6 +20,7 @@ package org.apache.oodt.cas.workflow.eng
import java.net.URL;
//OODT imports
+import org.apache.oodt.cas.workflow.engine.runner.EngineRunner;
import org.apache.oodt.cas.workflow.instrepo.WorkflowInstanceRepository;
import org.apache.oodt.cas.workflow.structs.exceptions.EngineException;
import org.apache.oodt.cas.workflow.structs.Workflow;
Copied: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/ConditionProcessor.java (from r1369913, oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ConditionProcessor.java)
URL: http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/ConditionProcessor.java?p2=oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/ConditionProcessor.java&p1=oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ConditionProcessor.java&r1=1369913&r2=1370399&rev=1370399&view=diff
==============================================================================
--- oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ConditionProcessor.java (original)
+++ oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/ConditionProcessor.java Tue Aug 7 17:53:20 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.oodt.cas.workflow.engine;
+package org.apache.oodt.cas.workflow.engine.processor;
//OODT import
import org.apache.oodt.cas.workflow.lifecycle.WorkflowLifecycleManager;
Propchange: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/ConditionProcessor.java
------------------------------------------------------------------------------
svn:executable = *
Copied: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/ParallelProcessor.java (from r1369913, oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ParallelProcessor.java)
URL: http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/ParallelProcessor.java?p2=oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/ParallelProcessor.java&p1=oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ParallelProcessor.java&r1=1369913&r2=1370399&rev=1370399&view=diff
==============================================================================
--- oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ParallelProcessor.java (original)
+++ oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/ParallelProcessor.java Tue Aug 7 17:53:20 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.oodt.cas.workflow.engine;
+package org.apache.oodt.cas.workflow.engine.processor;
//JDK imports
import java.util.List;
Propchange: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/ParallelProcessor.java
------------------------------------------------------------------------------
svn:executable = *
Copied: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/ProcessorDateTimeInfo.java (from r1369913, oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ProcessorDateTimeInfo.java)
URL: http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/ProcessorDateTimeInfo.java?p2=oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/ProcessorDateTimeInfo.java&p1=oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ProcessorDateTimeInfo.java&r1=1369913&r2=1370399&rev=1370399&view=diff
==============================================================================
--- oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ProcessorDateTimeInfo.java (original)
+++ oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/ProcessorDateTimeInfo.java Tue Aug 7 17:53:20 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.oodt.cas.workflow.engine;
+package org.apache.oodt.cas.workflow.engine.processor;
//JDK imports
import java.util.Date;
Propchange: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/ProcessorDateTimeInfo.java
------------------------------------------------------------------------------
svn:executable = *
Copied: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/SequentialProcessor.java (from r1369913, oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/SequentialProcessor.java)
URL: http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/SequentialProcessor.java?p2=oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/SequentialProcessor.java&p1=oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/SequentialProcessor.java&r1=1369913&r2=1370399&rev=1370399&view=diff
==============================================================================
--- oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/SequentialProcessor.java (original)
+++ oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/SequentialProcessor.java Tue Aug 7 17:53:20 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.oodt.cas.workflow.engine;
+package org.apache.oodt.cas.workflow.engine.processor;
//JDK imports
import java.util.Collections;
Propchange: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/SequentialProcessor.java
------------------------------------------------------------------------------
svn:executable = *
Copied: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/TaskProcessor.java (from r1369913, oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/TaskProcessor.java)
URL: http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/TaskProcessor.java?p2=oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/TaskProcessor.java&p1=oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/TaskProcessor.java&r1=1369913&r2=1370399&rev=1370399&view=diff
==============================================================================
--- oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/TaskProcessor.java (original)
+++ oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/TaskProcessor.java Tue Aug 7 17:53:20 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.oodt.cas.workflow.engine;
+package org.apache.oodt.cas.workflow.engine.processor;
//JDK imports
import java.util.Calendar;
Propchange: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/TaskProcessor.java
------------------------------------------------------------------------------
svn:executable = *
Copied: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessor.java (from r1369913, oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowProcessor.java)
URL: http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessor.java?p2=oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessor.java&p1=oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowProcessor.java&r1=1369913&r2=1370399&rev=1370399&view=diff
==============================================================================
--- oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowProcessor.java (original)
+++ oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessor.java Tue Aug 7 17:53:20 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.oodt.cas.workflow.engine;
+package org.apache.oodt.cas.workflow.engine.processor;
//JDK imports
import java.util.Arrays;
@@ -28,6 +28,7 @@ import java.util.logging.Logger;
//OODT imports
import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.workflow.engine.ChangeType;
import org.apache.oodt.cas.workflow.lifecycle.WorkflowLifecycleManager;
import org.apache.oodt.cas.workflow.lifecycle.WorkflowState;
import org.apache.oodt.cas.workflow.structs.Priority;
Propchange: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessor.java
------------------------------------------------------------------------------
svn:executable = *
Copied: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorBuilder.java (from r1369913, oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowProcessorBuilder.java)
URL: http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorBuilder.java?p2=oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorBuilder.java&p1=oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowProcessorBuilder.java&r1=1369913&r2=1370399&rev=1370399&view=diff
==============================================================================
--- oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowProcessorBuilder.java (original)
+++ oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorBuilder.java Tue Aug 7 17:53:20 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.oodt.cas.workflow.engine;
+package org.apache.oodt.cas.workflow.engine.processor;
//JDK imorts
import java.util.List;
Copied: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorListener.java (from r1369913, oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowProcessorListener.java)
URL: http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorListener.java?p2=oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorListener.java&p1=oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowProcessorListener.java&r1=1369913&r2=1370399&rev=1370399&view=diff
==============================================================================
--- oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowProcessorListener.java (original)
+++ oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorListener.java Tue Aug 7 17:53:20 2012
@@ -14,10 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.oodt.cas.workflow.engine;
+package org.apache.oodt.cas.workflow.engine.processor;
//OODT imports
-import org.apache.oodt.cas.workflow.engine.WorkflowProcessor;
+import org.apache.oodt.cas.workflow.engine.ChangeType;
+import org.apache.oodt.cas.workflow.engine.processor.WorkflowProcessor;
/**
* @author bfoster
Propchange: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorListener.java
------------------------------------------------------------------------------
svn:executable = *
Copied: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java (from r1369913, oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowProcessorQueue.java)
URL: http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java?p2=oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java&p1=oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowProcessorQueue.java&r1=1369913&r2=1370399&rev=1370399&view=diff
==============================================================================
--- oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowProcessorQueue.java (original)
+++ oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java Tue Aug 7 17:53:20 2012
@@ -15,11 +15,13 @@
* limitations under the License.
*/
-package org.apache.oodt.cas.workflow.engine;
+package org.apache.oodt.cas.workflow.engine.processor;
//JDK imports
import java.util.List;
+import org.apache.oodt.cas.workflow.engine.TaskQuerier;
+
/**
*
* The queue of available {@link WorkflowTask}s, that will be fed into the
Copied: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunner.java (from r1369913, oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/AsynchronousLocalEngineRunner.java)
URL: http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunner.java?p2=oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunner.java&p1=oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/AsynchronousLocalEngineRunner.java&r1=1369913&r2=1370399&rev=1370399&view=diff
==============================================================================
--- oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/AsynchronousLocalEngineRunner.java (original)
+++ oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunner.java Tue Aug 7 17:53:20 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.oodt.cas.workflow.engine;
+package org.apache.oodt.cas.workflow.engine.runner;
//JDK imports
import java.util.HashMap;
@@ -35,26 +35,27 @@ import org.apache.oodt.cas.workflow.stru
import org.apache.oodt.cas.workflow.util.GenericWorkflowObjectFactory;
/**
- *
* Runs a local version of a {@link WorkflowTask} asynchronously.
- *
- * @author mattmann
- * @version $Revision$
- *
+ *
+ * @author mattmann (Chris Mattmann)
+ * @author bfoster (Brian Foster)
*/
public class AsynchronousLocalEngineRunner extends EngineRunner {
private static final Logger LOG = Logger
.getLogger(AsynchronousLocalEngineRunner.class.getName());
- private ThreadPoolExecutor executor;
+ public static final int DEFAULT_NUM_THREADS = 25;
- private Map<String, Thread> workerMap;
-
- private final int NUM_THREADS = 25;
+ private final ThreadPoolExecutor executor;
+ private final Map<String, Thread> workerMap;
public AsynchronousLocalEngineRunner() {
- this.executor = new ThreadPoolExecutor(NUM_THREADS, NUM_THREADS, 30,
+ this(DEFAULT_NUM_THREADS);
+ }
+
+ public AsynchronousLocalEngineRunner(int numThreads) {
+ this.executor = new ThreadPoolExecutor(numThreads, numThreads, 30,
TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(),
new RejectedExecutionHandler() {
@@ -70,7 +71,7 @@ public class AsynchronousLocalEngineRunn
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.oodt.cas.workflow.engine.EngineRunner#execute(org.apache.oodt
* .cas.workflow.structs.WorkflowTask, org.apache.oodt.cas.metadata.Metadata)
@@ -97,7 +98,7 @@ public class AsynchronousLocalEngineRunn
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Thread#interrupt()
*/
@SuppressWarnings("deprecation")
@@ -119,7 +120,7 @@ public class AsynchronousLocalEngineRunn
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.oodt.cas.workflow.engine.EngineRunner#shutdown()
*/
@Override
Added: 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=1370399&view=auto
==============================================================================
--- oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunnerFactory.java (added)
+++ oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunnerFactory.java Tue Aug 7 17:53:20 2012
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.oodt.cas.workflow.engine.runner;
+
+/**
+ * A {@link EngineRunnerFactory} which creates {@link AsynchronousLocalEngineRunner}s.
+ *
+ * @author bfoster (Brian Foster)
+ */
+public class AsynchronousLocalEngineRunnerFactory implements
+ EngineRunnerFactory {
+
+ private static final String NUM_THREADS_PROPERTY = "org.apache.oodt.cas.workflow.engine.asynchronous.runner.num.threads";
+
+ private int numThreads;
+
+ public AsynchronousLocalEngineRunnerFactory() {
+ numThreads = Integer.getInteger(NUM_THREADS_PROPERTY,
+ AsynchronousLocalEngineRunner.DEFAULT_NUM_THREADS);
+ }
+
+ @Override
+ public AsynchronousLocalEngineRunner createEngineRunner() {
+ return new AsynchronousLocalEngineRunner(numThreads);
+ }
+
+ public void setNumThreads(int numThreads) {
+ this.numThreads = numThreads;
+ }
+}
Propchange: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunnerFactory.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/EngineRunner.java (from r1369914, oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/EngineRunner.java)
URL: http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/EngineRunner.java?p2=oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/EngineRunner.java&p1=oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/EngineRunner.java&r1=1369914&r2=1370399&rev=1370399&view=diff
==============================================================================
--- oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/EngineRunner.java (original)
+++ oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/EngineRunner.java Tue Aug 7 17:53:20 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.oodt.cas.workflow.engine;
+package org.apache.oodt.cas.workflow.engine.runner;
//OODT imports
import org.apache.oodt.cas.metadata.Metadata;
Copied: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/EngineRunnerFactory.java (from r1369914, oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/EngineRunnerFactory.java)
URL: http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/EngineRunnerFactory.java?p2=oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/EngineRunnerFactory.java&p1=oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/EngineRunnerFactory.java&r1=1369914&r2=1370399&rev=1370399&view=diff
==============================================================================
--- oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/EngineRunnerFactory.java (original)
+++ oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/EngineRunnerFactory.java Tue Aug 7 17:53:20 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.oodt.cas.workflow.engine;
+package org.apache.oodt.cas.workflow.engine.runner;
/**
* Factory which creates {@link EngineRunner}s.
Propchange: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/EngineRunnerFactory.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/ResourceRunner.java (from r1369913, oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ResourceRunner.java)
URL: http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/ResourceRunner.java?p2=oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/ResourceRunner.java&p1=oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ResourceRunner.java&r1=1369913&r2=1370399&rev=1370399&view=diff
==============================================================================
--- oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ResourceRunner.java (original)
+++ oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/ResourceRunner.java Tue Aug 7 17:53:20 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.oodt.cas.workflow.engine;
+package org.apache.oodt.cas.workflow.engine.runner;
//JDK imports
import java.net.URL;
Copied: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/ResourceRunnerFactory.java (from r1369914, oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ResourceRunnerFactory.java)
URL: http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/ResourceRunnerFactory.java?p2=oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/ResourceRunnerFactory.java&p1=oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ResourceRunnerFactory.java&r1=1369914&r2=1370399&rev=1370399&view=diff
==============================================================================
--- oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ResourceRunnerFactory.java (original)
+++ oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/ResourceRunnerFactory.java Tue Aug 7 17:53:20 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.oodt.cas.workflow.engine;
+package org.apache.oodt.cas.workflow.engine.runner;
//JDK imports
import java.net.MalformedURLException;
@@ -25,6 +25,7 @@ import java.util.logging.Logger;
//Google imports
import com.google.common.base.Preconditions;
+
/**
* Factory which creates {@link ResourceRunner}s.
*
Propchange: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/ResourceRunnerFactory.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/SynchronousLocalEngineRunner.java (from r1369913, oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/SynchronousLocalEngineRunner.java)
URL: http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/SynchronousLocalEngineRunner.java?p2=oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/SynchronousLocalEngineRunner.java&p1=oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/SynchronousLocalEngineRunner.java&r1=1369913&r2=1370399&rev=1370399&view=diff
==============================================================================
--- oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/SynchronousLocalEngineRunner.java (original)
+++ oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/SynchronousLocalEngineRunner.java Tue Aug 7 17:53:20 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.oodt.cas.workflow.engine;
+package org.apache.oodt.cas.workflow.engine.runner;
//JDK imports
import java.util.logging.Level;
Added: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/SynchronousLocalEngineRunnerFactory.java
URL: http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/SynchronousLocalEngineRunnerFactory.java?rev=1370399&view=auto
==============================================================================
--- oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/SynchronousLocalEngineRunnerFactory.java (added)
+++ oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/SynchronousLocalEngineRunnerFactory.java Tue Aug 7 17:53:20 2012
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.oodt.cas.workflow.engine.runner;
+
+/**
+ * A {@link EngineRunnerFactory} which creates {@link SynchronousLocalEngineRunner}s.
+ *
+ * @author bfoster (Brian Foster)
+ */
+public class SynchronousLocalEngineRunnerFactory implements
+ EngineRunnerFactory {
+
+ @Override
+ public SynchronousLocalEngineRunner createEngineRunner() {
+ return new SynchronousLocalEngineRunner();
+ }
+}
Propchange: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/SynchronousLocalEngineRunnerFactory.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/FILOPrioritySorter.java
URL: http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/FILOPrioritySorter.java?rev=1370399&r1=1370398&r2=1370399&view=diff
==============================================================================
--- oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/FILOPrioritySorter.java (original)
+++ oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/FILOPrioritySorter.java Tue Aug 7 17:53:20 2012
@@ -24,7 +24,7 @@ import java.util.List;
import java.util.logging.Logger;
//OODT imports
-import org.apache.oodt.cas.workflow.engine.WorkflowProcessor;
+import org.apache.oodt.cas.workflow.engine.processor.WorkflowProcessor;
/**
*
Modified: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/HighestFIFOPrioritySorter.java
URL: http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/HighestFIFOPrioritySorter.java?rev=1370399&r1=1370398&r2=1370399&view=diff
==============================================================================
--- oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/HighestFIFOPrioritySorter.java (original)
+++ oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/HighestFIFOPrioritySorter.java Tue Aug 7 17:53:20 2012
@@ -25,7 +25,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
//OODT imports
-import org.apache.oodt.cas.workflow.engine.WorkflowProcessor;
+import org.apache.oodt.cas.workflow.engine.processor.WorkflowProcessor;
/**
*
Modified: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/HighestPrioritySorter.java
URL: http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/HighestPrioritySorter.java?rev=1370399&r1=1370398&r2=1370399&view=diff
==============================================================================
--- oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/HighestPrioritySorter.java (original)
+++ oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/HighestPrioritySorter.java Tue Aug 7 17:53:20 2012
@@ -23,7 +23,7 @@ import java.util.Comparator;
import java.util.List;
//OODT imports
-import org.apache.oodt.cas.workflow.engine.WorkflowProcessor;
+import org.apache.oodt.cas.workflow.engine.processor.WorkflowProcessor;
/**
*
Modified: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/PrioritySorter.java
URL: http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/PrioritySorter.java?rev=1370399&r1=1370398&r2=1370399&view=diff
==============================================================================
--- oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/PrioritySorter.java (original)
+++ oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/PrioritySorter.java Tue Aug 7 17:53:20 2012
@@ -21,7 +21,7 @@ package org.apache.oodt.cas.workflow.str
import java.util.List;
//OODT imports
-import org.apache.oodt.cas.workflow.engine.WorkflowProcessor;
+import org.apache.oodt.cas.workflow.engine.processor.WorkflowProcessor;
/**
*
Modified: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java
URL: http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java?rev=1370399&r1=1370398&r2=1370399&view=diff
==============================================================================
--- oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java (original)
+++ oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java Tue Aug 7 17:53:20 2012
@@ -26,10 +26,10 @@ import org.apache.xmlrpc.WebServer;
//OODT imports
import org.apache.oodt.cas.workflow.util.XmlRpcStructFactory;
-import org.apache.oodt.cas.workflow.engine.EngineRunner;
-import org.apache.oodt.cas.workflow.engine.SynchronousLocalEngineRunner;
-import org.apache.oodt.cas.workflow.engine.ThreadPoolWorkflowEngine;
+import org.apache.oodt.cas.workflow.engine.ThreadPoolWorkflowEngineFactory;
import org.apache.oodt.cas.workflow.engine.WorkflowEngine;
+import org.apache.oodt.cas.workflow.engine.runner.EngineRunner;
+import org.apache.oodt.cas.workflow.engine.runner.SynchronousLocalEngineRunnerFactory;
import org.apache.oodt.cas.workflow.repository.DataSourceWorkflowRepositoryFactory;
import org.apache.oodt.cas.workflow.repository.WorkflowRepository;
import org.apache.oodt.cas.workflow.structs.Workflow;
@@ -629,13 +629,13 @@ public class XmlRpcWorkflowManager {
private static WorkflowEngine getWorkflowEngineFromProperty() {
return getWorkflowEngineFromClassName(System.getProperty(
WORKFLOW_ENGINE_FACTORY_PROPERTY,
- ThreadPoolWorkflowEngine.class.getCanonicalName()));
+ ThreadPoolWorkflowEngineFactory.class.getCanonicalName()));
}
private static EngineRunner getEngineRunnerFromProperty() {
return getEngineRunnerFromClassName(System.getProperty(
ENGINE_RUNNER_FACTORY_PROPERTY,
- SynchronousLocalEngineRunner.class.getCanonicalName()));
+ SynchronousLocalEngineRunnerFactory.class.getCanonicalName()));
}
private static WorkflowRepository getWorkflowRepositoryFromProperty() {
Modified: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/util/GenericWorkflowObjectFactory.java
URL: http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/util/GenericWorkflowObjectFactory.java?rev=1370399&r1=1370398&r2=1370399&view=diff
==============================================================================
--- oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/util/GenericWorkflowObjectFactory.java (original)
+++ oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/util/GenericWorkflowObjectFactory.java Tue Aug 7 17:53:20 2012
@@ -17,10 +17,10 @@
package org.apache.oodt.cas.workflow.util;
//OODT imports
-import org.apache.oodt.cas.workflow.engine.EngineRunner;
-import org.apache.oodt.cas.workflow.engine.EngineRunnerFactory;
import org.apache.oodt.cas.workflow.engine.WorkflowEngine;
import org.apache.oodt.cas.workflow.engine.WorkflowEngineFactory;
+import org.apache.oodt.cas.workflow.engine.runner.EngineRunner;
+import org.apache.oodt.cas.workflow.engine.runner.EngineRunnerFactory;
import org.apache.oodt.cas.workflow.instrepo.WorkflowInstanceRepository;
import org.apache.oodt.cas.workflow.instrepo.WorkflowInstanceRepositoryFactory;
import org.apache.oodt.cas.workflow.repository.WorkflowRepository;
Modified: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/util/WorkflowUtils.java
URL: http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/util/WorkflowUtils.java?rev=1370399&r1=1370398&r2=1370399&view=diff
==============================================================================
--- oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/util/WorkflowUtils.java (original)
+++ oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/util/WorkflowUtils.java Tue Aug 7 17:53:20 2012
@@ -24,8 +24,8 @@ import org.apache.oodt.cas.workflow.stru
import org.apache.oodt.cas.workflow.structs.WorkflowCondition;
import org.apache.oodt.cas.workflow.structs.ParentChildWorkflow;
import org.apache.oodt.cas.workflow.structs.WorkflowTaskInstance;
-import org.apache.oodt.cas.workflow.engine.WorkflowProcessor;
-import org.apache.oodt.cas.workflow.engine.TaskProcessor;
+import org.apache.oodt.cas.workflow.engine.processor.TaskProcessor;
+import org.apache.oodt.cas.workflow.engine.processor.WorkflowProcessor;
import org.apache.oodt.cas.workflow.lifecycle.WorkflowLifecycle;
import org.apache.oodt.cas.workflow.lifecycle.WorkflowLifecycleManager;
import org.apache.oodt.cas.workflow.lifecycle.WorkflowState;
Modified: oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/engine/MockProcessorQueue.java
URL: http://svn.apache.org/viewvc/oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/engine/MockProcessorQueue.java?rev=1370399&r1=1370398&r2=1370399&view=diff
==============================================================================
--- oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/engine/MockProcessorQueue.java (original)
+++ oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/engine/MockProcessorQueue.java Tue Aug 7 17:53:20 2012
@@ -22,6 +22,9 @@ package org.apache.oodt.cas.workflow.eng
import java.util.List;
import java.util.Vector;
+import org.apache.oodt.cas.workflow.engine.processor.WorkflowProcessor;
+import org.apache.oodt.cas.workflow.engine.processor.WorkflowProcessorQueue;
+
/**
*
* A mock {@link WorkflowProcessorQueue} object for use in testing.
Modified: oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/engine/QuerierAndRunnerUtils.java
URL: http://svn.apache.org/viewvc/oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/engine/QuerierAndRunnerUtils.java?rev=1370399&r1=1370398&r2=1370399&view=diff
==============================================================================
--- oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/engine/QuerierAndRunnerUtils.java (original)
+++ oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/engine/QuerierAndRunnerUtils.java Tue Aug 7 17:53:20 2012
@@ -26,6 +26,10 @@ import java.util.List;
import java.util.Vector;
//OODT imports
+import org.apache.oodt.cas.workflow.engine.processor.SequentialProcessor;
+import org.apache.oodt.cas.workflow.engine.processor.TaskProcessor;
+import org.apache.oodt.cas.workflow.engine.processor.WorkflowProcessor;
+import org.apache.oodt.cas.workflow.engine.processor.WorkflowProcessorBuilder;
import org.apache.oodt.cas.workflow.lifecycle.WorkflowLifecycleManager;
import org.apache.oodt.cas.workflow.structs.Graph;
import org.apache.oodt.cas.workflow.structs.ParentChildWorkflow;
Modified: oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/engine/TestAsynchronousLocalEngineRunner.java
URL: http://svn.apache.org/viewvc/oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/engine/TestAsynchronousLocalEngineRunner.java?rev=1370399&r1=1370398&r2=1370399&view=diff
==============================================================================
--- oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/engine/TestAsynchronousLocalEngineRunner.java (original)
+++ oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/engine/TestAsynchronousLocalEngineRunner.java Tue Aug 7 17:53:20 2012
@@ -28,6 +28,7 @@ import org.apache.commons.io.FileUtils;
//OODT imports
import org.apache.oodt.cas.metadata.Metadata;
+import org.apache.oodt.cas.workflow.engine.runner.AsynchronousLocalEngineRunner;
import org.apache.oodt.cas.workflow.structs.WorkflowTask;
import org.apache.oodt.commons.date.DateUtils;
import org.apache.oodt.commons.util.DateConvert;
Modified: oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/engine/TestTaskQuerier.java
URL: http://svn.apache.org/viewvc/oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/engine/TestTaskQuerier.java?rev=1370399&r1=1370398&r2=1370399&view=diff
==============================================================================
--- oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/engine/TestTaskQuerier.java (original)
+++ oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/engine/TestTaskQuerier.java Tue Aug 7 17:53:20 2012
@@ -18,6 +18,7 @@
package org.apache.oodt.cas.workflow.engine;
//OODT imports
+import org.apache.oodt.cas.workflow.engine.processor.TaskProcessor;
import org.apache.oodt.cas.workflow.structs.FILOPrioritySorter;
//Junit imports
Modified: oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/structs/TestFILOPrioritySorter.java
URL: http://svn.apache.org/viewvc/oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/structs/TestFILOPrioritySorter.java?rev=1370399&r1=1370398&r2=1370399&view=diff
==============================================================================
--- oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/structs/TestFILOPrioritySorter.java (original)
+++ oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/structs/TestFILOPrioritySorter.java Tue Aug 7 17:53:20 2012
@@ -24,8 +24,8 @@ import java.util.List;
import java.util.Vector;
//OODT imports
-import org.apache.oodt.cas.workflow.engine.SequentialProcessor;
-import org.apache.oodt.cas.workflow.engine.WorkflowProcessor;
+import org.apache.oodt.cas.workflow.engine.processor.SequentialProcessor;
+import org.apache.oodt.cas.workflow.engine.processor.WorkflowProcessor;
import org.apache.oodt.cas.workflow.lifecycle.WorkflowLifecycleManager;
//Junit imports
Modified: oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/structs/TestHighestFIFOPrioritySorter.java
URL: http://svn.apache.org/viewvc/oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/structs/TestHighestFIFOPrioritySorter.java?rev=1370399&r1=1370398&r2=1370399&view=diff
==============================================================================
--- oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/structs/TestHighestFIFOPrioritySorter.java (original)
+++ oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/structs/TestHighestFIFOPrioritySorter.java Tue Aug 7 17:53:20 2012
@@ -24,8 +24,8 @@ import java.util.List;
import java.util.Vector;
//OODT imports
-import org.apache.oodt.cas.workflow.engine.SequentialProcessor;
-import org.apache.oodt.cas.workflow.engine.WorkflowProcessor;
+import org.apache.oodt.cas.workflow.engine.processor.SequentialProcessor;
+import org.apache.oodt.cas.workflow.engine.processor.WorkflowProcessor;
import org.apache.oodt.cas.workflow.lifecycle.WorkflowLifecycleManager;
//Junit imports
Modified: oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/structs/TestHighestPrioritySorter.java
URL: http://svn.apache.org/viewvc/oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/structs/TestHighestPrioritySorter.java?rev=1370399&r1=1370398&r2=1370399&view=diff
==============================================================================
--- oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/structs/TestHighestPrioritySorter.java (original)
+++ oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/structs/TestHighestPrioritySorter.java Tue Aug 7 17:53:20 2012
@@ -24,8 +24,8 @@ import java.util.List;
import java.util.Vector;
//OODT imports
-import org.apache.oodt.cas.workflow.engine.SequentialProcessor;
-import org.apache.oodt.cas.workflow.engine.WorkflowProcessor;
+import org.apache.oodt.cas.workflow.engine.processor.SequentialProcessor;
+import org.apache.oodt.cas.workflow.engine.processor.WorkflowProcessor;
import org.apache.oodt.cas.workflow.lifecycle.WorkflowLifecycleManager;
//Junit imports