You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2013/01/16 18:46:22 UTC

svn commit: r1434063 - in /airavata/trunk/modules/commons/workflow-execution-context/src/main: java/org/apache/airavata/common/workflow/execution/context/WorkflowContextHeaderBuilder.java resources/workflow_execution_context.xsd

Author: lahiru
Date: Wed Jan 16 17:46:22 2013
New Revision: 1434063

URL: http://svn.apache.org/viewvc?rev=1434063&view=rev
Log:
fixing https://issues.apache.org/jira/browse/AIRAVATA-635.

Modified:
    airavata/trunk/modules/commons/workflow-execution-context/src/main/java/org/apache/airavata/common/workflow/execution/context/WorkflowContextHeaderBuilder.java
    airavata/trunk/modules/commons/workflow-execution-context/src/main/resources/workflow_execution_context.xsd

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=1434063&r1=1434062&r2=1434063&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 17:46:22 2013
@@ -335,6 +335,21 @@ public class WorkflowContextHeaderBuilde
                     }
                 }
             }
+
+            ApplicationOutputDataHandlingDocument.ApplicationOutputDataHandling[] pdh =
+                    header.getWorkflowOutputDataHandling().getApplicationOutputDataHandlingArray();
+            index = 0;
+            if(applicationSchedulingContextArray != null){
+                for(ApplicationOutputDataHandlingDocument.ApplicationOutputDataHandling aODH:pdh){
+                       if(nodeID.equals(aODH.getNodeId())){
+                           index++;
+                           header.getWorkflowOutputDataHandling().setApplicationOutputDataHandlingArray(new ApplicationOutputDataHandlingDocument.ApplicationOutputDataHandling[]{aODH});
+                           break;
+                       }else {
+                           header.getWorkflowOutputDataHandling().removeApplicationOutputDataHandling(index);
+                       }
+                }
+            }
         } catch (NullPointerException e) {
             return header;
         }

Modified: airavata/trunk/modules/commons/workflow-execution-context/src/main/resources/workflow_execution_context.xsd
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/workflow-execution-context/src/main/resources/workflow_execution_context.xsd?rev=1434063&r1=1434062&r2=1434063&view=diff
==============================================================================
--- airavata/trunk/modules/commons/workflow-execution-context/src/main/resources/workflow_execution_context.xsd (original)
+++ airavata/trunk/modules/commons/workflow-execution-context/src/main/resources/workflow_execution_context.xsd Wed Jan 16 17:46:22 2013
@@ -353,6 +353,15 @@
 	<element name="application-output-data-handling">
 		<complexType>
 			<sequence>
+                <element name="node-id" type="string">
+					<annotation>
+						<documentation xml:lang="en">(Optional) If the workflow
+							outputs are to be staged to a pre-specified
+							location, then the
+							output data staging directory should be provided.
+						</documentation>
+					</annotation>
+				</element>
 				<element name="data-registry-url" type="anyURI">
 					<annotation>
 						<documentation xml:lang="en"> (Optional) If a seperate