svn commit: r1158102 - /oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/

[ma...@apache.org]

Author: mattmann
Date: Tue Aug 16 04:21:15 2011
New Revision: 1158102

URL: http://svn.apache.org/viewvc?rev=1158102&view=rev
Log:
- OODT-310: refactoring and prep for Port WEngine to trunk

Added:
    oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ConditionProcessor.java
      - copied, changed from r1158032, oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ConditionEvaluator.java
    oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/SequentialProcessor.java
      - copied, changed from r1157889, oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/SequentialWorkflowProcessor.java
Removed:
    oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ConditionEvaluator.java
    oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/NonBlockingIterativeWorkflowProcessorThread.java
    oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/NonBlockingShepardThread.java
    oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/NonBlockingThreadPoolWorkflowEngine.java
    oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/NonBlockingThreadPoolWorkflowEngineFactory.java
    oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/SequentialWorkflowProcessor.java
Modified:
    oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ThreadPoolWorkflowEngine.java

Copied: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ConditionProcessor.java (from r1158032, oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ConditionEvaluator.java)
URL: http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ConditionProcessor.java?p2=oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ConditionProcessor.java&p1=oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ConditionEvaluator.java&r1=1158032&r2=1158102&rev=1158102&view=diff
==============================================================================
--- oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ConditionEvaluator.java (original)
+++ oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ConditionProcessor.java Tue Aug 16 04:21:15 2011
@@ -44,16 +44,16 @@ import org.apache.oodt.commons.util.Date
  * @version $Revision$
  * 
  */
-public class ConditionEvaluator {
+public class ConditionProcessor {
 
   protected Map<String, String> COND_TIMEOUTS;
 
   protected Map<String, HashMap<String, WorkflowConditionInstance>> CONDITION_CACHE;
 
-  private static final Logger LOG = Logger.getLogger(ConditionEvaluator.class
+  private static final Logger LOG = Logger.getLogger(ConditionProcessor.class
       .getName());
 
-  public ConditionEvaluator() {
+  public ConditionProcessor() {
     this.COND_TIMEOUTS = new HashMap<String, String>();
     this.CONDITION_CACHE = new HashMap<String, HashMap<String, WorkflowConditionInstance>>();
   }

Copied: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/SequentialProcessor.java (from r1157889, oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/SequentialWorkflowProcessor.java)
URL: http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/SequentialProcessor.java?p2=oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/SequentialProcessor.java&p1=oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/SequentialWorkflowProcessor.java&r1=1157889&r2=1158102&rev=1158102&view=diff
==============================================================================
--- oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/SequentialWorkflowProcessor.java (original)
+++ oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/SequentialProcessor.java Tue Aug 16 04:21:15 2011
@@ -52,22 +52,22 @@ import java.util.logging.Logger;
  * 
  */
 
-public class SequentialWorkflowProcessor extends WorkflowProcessor implements
+public class SequentialProcessor extends WorkflowProcessor implements
     WorkflowStatus, CoreMetKeys {
 
   private Iterator<WorkflowTask> taskIterator;
 
   /* our log stream */
   private static Logger LOG = Logger
-      .getLogger(SequentialWorkflowProcessor.class.getName());
+      .getLogger(SequentialProcessor.class.getName());
   
-  private ConditionEvaluator conditionEvaluator;
+  private ConditionProcessor conditionEvaluator;
 
-  public SequentialWorkflowProcessor(WorkflowInstance wInst,
+  public SequentialProcessor(WorkflowInstance wInst,
       WorkflowInstanceRepository instRep, URL wParentUrl, long conditionWait) {
     super(wInst, instRep, wParentUrl, conditionWait);
     taskIterator = this.workflowInstance.getWorkflow().getTasks().iterator();
-    this.conditionEvaluator = new ConditionEvaluator();
+    this.conditionEvaluator = new ConditionProcessor();
   }
 
   /* (non-Javadoc)

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=1158102&r1=1158101&r2=1158102&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 16 04:21:15 2011
@@ -26,7 +26,7 @@ import org.apache.oodt.cas.workflow.stru
 import org.apache.oodt.cas.workflow.structs.WorkflowTask;
 import org.apache.oodt.cas.workflow.structs.exceptions.EngineException;
 import org.apache.oodt.cas.workflow.structs.exceptions.InstanceRepositoryException;
-import org.apache.oodt.cas.workflow.engine.SequentialWorkflowProcessor;
+import org.apache.oodt.cas.workflow.engine.SequentialProcessor;
 import org.apache.oodt.cas.workflow.instrepo.WorkflowInstanceRepository;
 import org.apache.oodt.commons.util.DateConvert;
 
@@ -137,7 +137,7 @@ public class ThreadPoolWorkflowEngine im
    */
   public synchronized void pauseWorkflowInstance(String workflowInstId) {
     // okay, try and look up that worker thread in our hash map
-    SequentialWorkflowProcessor worker = ((ThreadedProcessor) workerMap
+    SequentialProcessor worker = ((ThreadedProcessor) workerMap
         .get(workflowInstId)).getProcessor();
     if (worker == null) {
       LOG.log(Level.WARNING,
@@ -161,7 +161,7 @@ public class ThreadPoolWorkflowEngine im
    */
   public synchronized void resumeWorkflowInstance(String workflowInstId) {
     // okay, try and look up that worker thread in our hash map
-    SequentialWorkflowProcessor worker = ((ThreadedProcessor) workerMap
+    SequentialProcessor worker = ((ThreadedProcessor) workerMap
         .get(workflowInstId)).getProcessor();
     if (worker == null) {
       LOG.log(Level.WARNING,
@@ -208,7 +208,7 @@ public class ThreadPoolWorkflowEngine im
     wInst.setStatus(CREATED);
     persistWorkflowInstance(wInst);
 
-    SequentialWorkflowProcessor worker = new SequentialWorkflowProcessor(wInst,
+    SequentialProcessor worker = new SequentialProcessor(wInst,
         instRep, this.wmgrUrl, this.conditionWait);
     worker.setRClient(rClient);
     workerMap.put(wInst.getId(), worker);
@@ -245,7 +245,7 @@ public class ThreadPoolWorkflowEngine im
    */
   public synchronized boolean updateMetadata(String workflowInstId, Metadata met) {
     // okay, try and look up that worker thread in our hash map
-    SequentialWorkflowProcessor worker = ((ThreadedProcessor) workerMap
+    SequentialProcessor worker = ((ThreadedProcessor) workerMap
         .get(workflowInstId)).getProcessor();
     if (worker == null) {
       LOG.log(Level.WARNING,
@@ -290,7 +290,7 @@ public class ThreadPoolWorkflowEngine im
    */
   public synchronized void stopWorkflow(String workflowInstId) {
     // okay, try and look up that worker thread in our hash map
-    SequentialWorkflowProcessor worker = ((ThreadedProcessor) workerMap
+    SequentialProcessor worker = ((ThreadedProcessor) workerMap
         .get(workflowInstId)).getProcessor();
     if (worker == null) {
       LOG.log(Level.WARNING,
@@ -324,7 +324,7 @@ public class ThreadPoolWorkflowEngine im
    */
   public Metadata getWorkflowInstanceMetadata(String workflowInstId) {
     // okay, try and look up that worker thread in our hash map
-    SequentialWorkflowProcessor worker = ((ThreadedProcessor) workerMap
+    SequentialProcessor worker = ((ThreadedProcessor) workerMap
         .get(workflowInstId)).getProcessor();
     if (worker == null) {
       // try and get the metadata
@@ -479,9 +479,9 @@ public class ThreadPoolWorkflowEngine im
 
   class ThreadedProcessor implements Runnable {
 
-    private SequentialWorkflowProcessor processor;
+    private SequentialProcessor processor;
 
-    public ThreadedProcessor(SequentialWorkflowProcessor processor) {
+    public ThreadedProcessor(SequentialProcessor processor) {
       this.processor = processor;
     }
 
@@ -498,7 +498,7 @@ public class ThreadPoolWorkflowEngine im
     /**
      * @return the processor
      */
-    public SequentialWorkflowProcessor getProcessor() {
+    public SequentialProcessor getProcessor() {
       return processor;
     }
 
@@ -506,7 +506,7 @@ public class ThreadPoolWorkflowEngine im
      * @param processor
      *          the processor to set
      */
-    public void setProcessor(SequentialWorkflowProcessor processor) {
+    public void setProcessor(SequentialProcessor processor) {
       this.processor = processor;
     }