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 2011/03/03 02:57:29 UTC
svn commit: r1076495 - in /oodt/branches/wengine-branch/wengine/src/main:
java/org/apache/oodt/cas/workflow/instance/
java/org/apache/oodt/cas/workflow/processor/
java/org/apache/oodt/cas/workflow/server/action/ resources/policy/
Author: bfoster
Date: Thu Mar 3 01:57:29 2011
New Revision: 1076495
URL: http://svn.apache.org/viewvc?rev=1076495&view=rev
Log:
- now TraceWorkflow has a Combined mode which makes all the workflows appear as if they are one workflow
---------------------------------
Modified:
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/instance/WorkflowConnectTaskInstance.java
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/processor/ParallelProcessor.java
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/processor/SequentialProcessor.java
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/processor/WorkflowProcessor.java
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/action/TraceWorkflow.java
oodt/branches/wengine-branch/wengine/src/main/resources/policy/engine-client-cmd-line-beans.xml
Modified: oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/instance/WorkflowConnectTaskInstance.java
URL: http://svn.apache.org/viewvc/oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/instance/WorkflowConnectTaskInstance.java?rev=1076495&r1=1076494&r2=1076495&view=diff
==============================================================================
--- oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/instance/WorkflowConnectTaskInstance.java (original)
+++ oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/instance/WorkflowConnectTaskInstance.java Thu Mar 3 01:57:29 2011
@@ -8,6 +8,7 @@ import java.util.logging.Logger;
import org.apache.oodt.cas.metadata.Metadata;
import org.apache.oodt.cas.workflow.engine.WorkflowEngineClient;
import org.apache.oodt.cas.workflow.metadata.ControlMetadata;
+import org.apache.oodt.cas.workflow.processor.WorkflowProcessor;
import org.apache.oodt.cas.workflow.state.WorkflowState;
import org.apache.oodt.cas.workflow.state.done.FailureState;
import org.apache.oodt.cas.workflow.state.done.SuccessState;
@@ -24,8 +25,9 @@ public class WorkflowConnectTaskInstance
public static final String N_CALCULATOR_CLASS = "WorkflowConnect/NCalculator/Class";
public static final String N_MET_MOD_CLASS = "WorkflowConnect/NMetadataModifier/Class";
public static final String SPAWN_MODEL_ID = "WorkflowConnect/ModelId";
- public static final String SPAWNED_WORKFLOWS = "WorkflowConnect/SpawnedWorkflows/InstanceIds";
- public static final String SPAWNED_BY_WORKFLOW = "WorkflowConnect/SpawnedByWorkflow/InstanceId";
+
+ public static final String SPAWNED_WORKFLOWS = WorkflowProcessor.LOCAL_KEYS_GROUP + "/WorkflowConnect/SpawnedWorkflows/InstanceIds";
+ public static final String SPAWNED_BY_WORKFLOW = WorkflowProcessor.LOCAL_KEYS_GROUP + "/WorkflowConnect/SpawnedByWorkflow/InstanceId";
private WorkflowEngineClient weClient;
Modified: oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/processor/ParallelProcessor.java
URL: http://svn.apache.org/viewvc/oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/processor/ParallelProcessor.java?rev=1076495&r1=1076494&r2=1076495&view=diff
==============================================================================
--- oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/processor/ParallelProcessor.java (original)
+++ oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/processor/ParallelProcessor.java Thu Mar 3 01:57:29 2011
@@ -38,7 +38,7 @@ public class ParallelProcessor extends W
}
public void handleSubProcessorMetadata(WorkflowProcessor workflowProcessor) {
- this.setDynamicMetadata(WorkflowUtils.mergeMetadata(this.getDynamicMetadata(), workflowProcessor.getDynamicMetadata()));
+ this.setDynamicMetadata(WorkflowUtils.mergeMetadata(this.getDynamicMetadata(), workflowProcessor.getPassThroughDynamicMetadata()));
}
}
Modified: oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/processor/SequentialProcessor.java
URL: http://svn.apache.org/viewvc/oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/processor/SequentialProcessor.java?rev=1076495&r1=1076494&r2=1076495&view=diff
==============================================================================
--- oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/processor/SequentialProcessor.java (original)
+++ oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/processor/SequentialProcessor.java Thu Mar 3 01:57:29 2011
@@ -46,10 +46,10 @@ public class SequentialProcessor extends
@Override
public void handleSubProcessorMetadata(WorkflowProcessor workflowProcessor) {
- this.setDynamicMetadata(workflowProcessor.getDynamicMetadata());
+ this.setDynamicMetadata(workflowProcessor.getPassThroughDynamicMetadata());
WorkflowProcessor nextWP = this.getNext();
if (nextWP != null)
- nextWP.setDynamicMetadataRecur(workflowProcessor.getDynamicMetadata());
+ nextWP.setDynamicMetadataRecur(workflowProcessor.getPassThroughDynamicMetadata());
}
private WorkflowProcessor getNext() {
Modified: oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/processor/WorkflowProcessor.java
URL: http://svn.apache.org/viewvc/oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/processor/WorkflowProcessor.java?rev=1076495&r1=1076494&r2=1076495&view=diff
==============================================================================
--- oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/processor/WorkflowProcessor.java (original)
+++ oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/processor/WorkflowProcessor.java Thu Mar 3 01:57:29 2011
@@ -45,7 +45,6 @@ import org.apache.oodt.cas.workflow.stat
import org.apache.oodt.cas.workflow.state.waiting.BlockedState;
import org.apache.oodt.cas.workflow.state.waiting.QueuedState;
import org.apache.oodt.cas.workflow.state.waiting.WaitingOnResourcesState;
-import org.apache.oodt.cas.workflow.util.WorkflowUtils;
/**
*
@@ -58,6 +57,8 @@ import org.apache.oodt.cas.workflow.util
*/
public abstract class WorkflowProcessor implements WorkflowProcessorListener, Comparable<WorkflowProcessor> {
+ public static final String LOCAL_KEYS_GROUP = "WorkflowProcessor/Local";
+
private String instanceId;
private String modelId;
private String modelName;
@@ -237,6 +238,12 @@ public abstract class WorkflowProcessor
return this.dynamicMetadata;
}
+ public synchronized Metadata getPassThroughDynamicMetadata() {
+ Metadata passThroughMet = new Metadata(this.dynamicMetadata);
+ passThroughMet.removeMetadataGroup(LOCAL_KEYS_GROUP);
+ return passThroughMet;
+ }
+
public void setProcessorInfo(ProcessorInfo processorInfo) {
this.processorInfo = processorInfo;
}
Modified: oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/action/TraceWorkflow.java
URL: http://svn.apache.org/viewvc/oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/action/TraceWorkflow.java?rev=1076495&r1=1076494&r2=1076495&view=diff
==============================================================================
--- oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/action/TraceWorkflow.java (original)
+++ oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/action/TraceWorkflow.java Thu Mar 3 01:57:29 2011
@@ -96,11 +96,12 @@ public class TraceWorkflow extends Workf
private void printTree(WorkflowEngineClient weClient, String instanceId, String parentModelId, String indent) throws EngineException {
ProcessorSkeleton skeleton = weClient.getWorkflow(instanceId);
System.out.println(indent + " - InstanceId = '" + instanceId + "' : ModelId = '" + skeleton.getModelId() + "' : State = '" + skeleton.getState().getName() + "'" + (parentModelId != null ? " : SpawnedBy = '" + parentModelId + "'" : ""));
- Metadata metadata = weClient.getWorkflowMetadata(instanceId);
- List<String> spawnedWorkflows = metadata.getAllMetadata(WorkflowConnectTaskInstance.SPAWNED_WORKFLOWS);
- if (spawnedWorkflows != null)
- for (String child : spawnedWorkflows)
- this.printTree(weClient, child, this.findSpawnedBy(skeleton, child).getModelId(), indent + " ");
+ for (ProcessorSkeleton task : WorkflowUtils.getTasks(skeleton)) {
+ List<String> spawnedWorkflows = task.getDynamicMetadata().getAllMetadata(WorkflowConnectTaskInstance.SPAWNED_WORKFLOWS);
+ if (spawnedWorkflows != null)
+ for (String child : spawnedWorkflows)
+ this.printTree(weClient, child, task.getModelId(), indent + " ");
+ }
}
private ProcessorSkeleton findSpawnedBy(ProcessorSkeleton skeleton, String spawnedInstanceId) {
Modified: oodt/branches/wengine-branch/wengine/src/main/resources/policy/engine-client-cmd-line-beans.xml
URL: http://svn.apache.org/viewvc/oodt/branches/wengine-branch/wengine/src/main/resources/policy/engine-client-cmd-line-beans.xml?rev=1076495&r1=1076494&r2=1076495&view=diff
==============================================================================
--- oodt/branches/wengine-branch/wengine/src/main/resources/policy/engine-client-cmd-line-beans.xml (original)
+++ oodt/branches/wengine-branch/wengine/src/main/resources/policy/engine-client-cmd-line-beans.xml Thu Mar 3 01:57:29 2011
@@ -426,7 +426,7 @@
<property name="longOption" value="mode"/>
<property name="description" value="Mode Name"/>
<property name="hasArgs" value="true"/>
- <property name="optionArgName" value="Complete|Relatives|Children"/>
+ <property name="optionArgName" value="Combined|Complete|Relatives|Children"/>
<property name="requiredOptions">
<list>
<bean class="org.apache.oodt.commons.option.required.RequiredOption">