Author: samindaw
Date: Wed Jan 16 18:29:34 2013
New Revision: 1434092
URL: http://svn.apache.org/viewvc?rev=1434092&view=rev
Log:
overloading context header builder outputdata handler function to have node id
as well
Modified:
airavata/trunk/modules/commons/workflow-execution-context/src/main/java/org/apache/airavata/common/workflow/execution/context/WorkflowContextHeaderBuilder.java
Modified:
airavata/trunk/modules/commons/workflow-execution-context/src/main/java/org/apache/airavata/common/workflow/execution/context/WorkflowContextHeaderBuilder.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/commons/workflow-execution-context/src/main/java/org/apache/airavata/common/workflow/execution/context/WorkflowContextHeaderBuilder.java?rev=1434092&r1=1434091&r2=1434092&view=diff
==============================================================================
---
airavata/trunk/modules/commons/workflow-execution-context/src/main/java/org/apache/airavata/common/workflow/execution/context/WorkflowContextHeaderBuilder.java
(original)
+++
airavata/trunk/modules/commons/workflow-execution-context/src/main/java/org/apache/airavata/common/workflow/execution/context/WorkflowContextHeaderBuilder.java
Wed Jan 16 18:29:34 2013
@@ -45,8 +45,6 @@ public class WorkflowContextHeaderBuilde
private WorkflowSchedulingContextDocument.WorkflowSchedulingContext
workflowSchedulingContext = null;
- private ThreadLocal threadLocal = null;
-
public static ThreadLocal<ContextHeaderDocument.ContextHeader>
currentContextHeader = new ThreadLocal<ContextHeaderDocument.ContextHeader>();
@@ -281,7 +279,7 @@ public class WorkflowContextHeaderBuilde
return this;
}
- public WorkflowContextHeaderBuilder
addApplicationOutputDataHandling(String outputDir, String outputDataRegistry,
+ public WorkflowContextHeaderBuilder
addApplicationOutputDataHandling(String nodeId, String outputDir, String
outputDataRegistry,
boolean dataPersistence) {
if (this.workflowOutputDataHandling == null) {
this.workflowOutputDataHandling =
WorkflowOutputDataHandlingDocument.WorkflowOutputDataHandling.Factory
@@ -289,11 +287,24 @@ public class WorkflowContextHeaderBuilde
}
ApplicationOutputDataHandlingDocument.ApplicationOutputDataHandling
applicationOutputDataHandling = this.workflowOutputDataHandling
.addNewApplicationOutputDataHandling();
+ applicationOutputDataHandling.setNodeId(nodeId);
applicationOutputDataHandling.setOutputDataDirectory(outputDir);
applicationOutputDataHandling.setDataRegistryUrl(outputDataRegistry);
applicationOutputDataHandling.setDataPersistance(dataPersistence);
return this;
}
+
+ /**
+ * @deprecated - Use
<code>addApplicationOutputDataHandling(String,String,String,boolean)</code>
instead
+ * @param outputDir
+ * @param outputDataRegistry
+ * @param dataPersistence
+ * @return
+ */
+ public WorkflowContextHeaderBuilder
addApplicationOutputDataHandling(String outputDir, String outputDataRegistry,
+ boolean dataPersistence) {
+ return addApplicationOutputDataHandling(null, outputDir,
outputDataRegistry, dataPersistence);
+ }
public WorkflowContextHeaderBuilder addApplicationSchedulingContext(String
workflowNodeId, String serviceId,
String hostName, boolean wsGramPreffered, String gateKeepersEpr,
String jobManager, int cpuCount,