svn commit: r1331679 - in /oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine: ParallelProcessor.java SequentialProcessor.java

[ma...@apache.org]

Author: mattmann
Date: Sat Apr 28 04:12:45 2012
New Revision: 1331679

URL: http://svn.apache.org/viewvc?rev=1331679&view=rev
Log:
- OODT-310 and OODT-215 WIP: Sequential and Parallel processor cleanup.

Added:
    oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/SequentialProcessor.java   (with props)
Modified:
    oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/ParallelProcessor.java

Modified: 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/ParallelProcessor.java?rev=1331679&r1=1331678&r2=1331679&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/ParallelProcessor.java Sat Apr 28 04:12:45 2012
@@ -34,10 +34,7 @@ import org.apache.oodt.cas.workflow.util
  */
 public class ParallelProcessor extends WorkflowProcessor {
 
-  private WorkflowUtils wutils;
-
-  public ParallelProcessor(WorkflowLifecycleManager lifecycle) {
-    this.wutils = new WorkflowUtils(lifecycle);
+  public ParallelProcessor() {
   }
 
   public List<WorkflowProcessor> getRunnableSubProcessors() {

Added: 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/SequentialProcessor.java?rev=1331679&view=auto
==============================================================================
--- oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/SequentialProcessor.java (added)
+++ oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/SequentialProcessor.java Sat Apr 28 04:12:45 2012
@@ -0,0 +1,59 @@
+/*
+ * 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;
+
+//JDK imports
+import java.util.Collections;
+import java.util.List;
+import java.util.Vector;
+
+/**
+ * 
+ * WorkflowProcessor which handles running sub-processors in sequence.
+ * 
+ * @author bfoster
+ * @author mattmann
+ * @version $Revision$
+ */
+public class SequentialProcessor extends WorkflowProcessor {
+
+  @Override
+  public List<WorkflowProcessor> getRunnableSubProcessors() {
+    WorkflowProcessor nextWP = this.getNext();
+    if (nextWP != null)
+      return Collections.singletonList(nextWP);
+    else
+      return new Vector<WorkflowProcessor>();
+  }
+
+  @Override
+  public void handleSubProcessorMetadata(WorkflowProcessor workflowProcessor) {
+    this.setDynamicMetadata(workflowProcessor.getPassThroughDynamicMetadata());
+    WorkflowProcessor nextWP = this.getNext();
+    if (nextWP != null)
+      nextWP.setDynamicMetadataRecur(workflowProcessor
+          .getPassThroughDynamicMetadata());
+  }
+
+  private WorkflowProcessor getNext() {
+    for (WorkflowProcessor wp : this.getSubProcessors())
+      if (!wp.getState().getCategory().getName().equals("done"))
+        return wp;
+    return null;
+  }
+
+}

Propchange: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/SequentialProcessor.java
------------------------------------------------------------------------------
    svn:executable = *