You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2012/12/13 21:21:09 UTC
svn commit: r1421488 - in /airavata/trunk/modules:
airavata-client/src/main/java/org/apache/airavata/client/impl/
registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/
registry/registry-api/src/main/java/org/ap...
Author: chathuri
Date: Thu Dec 13 20:21:08 2012
New Revision: 1421488
URL: http://svn.apache.org/viewvc?rev=1421488&view=rev
Log:
updating workflow instance data to retrieve workflow inputs and outputs
Modified:
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ProvenanceManagerImpl.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/ProvenanceRegistry.java
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/impl/WorkflowInstanceDataImpl.java
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceData.java
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodeData.java
Modified: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ProvenanceManagerImpl.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ProvenanceManagerImpl.java?rev=1421488&r1=1421487&r2=1421488&view=diff
==============================================================================
--- airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ProvenanceManagerImpl.java (original)
+++ airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ProvenanceManagerImpl.java Thu Dec 13 20:21:08 2012
@@ -28,7 +28,9 @@ import java.util.Map;
import org.apache.airavata.client.AiravataClient;
import org.apache.airavata.client.api.AiravataAPIInvocationException;
import org.apache.airavata.client.api.ProvenanceManager;
+import org.apache.airavata.common.exception.AiravataConfigurationException;
import org.apache.airavata.registry.api.AiravataExperiment;
+import org.apache.airavata.registry.api.exception.RegistryException;
import org.apache.airavata.registry.api.workflow.*;
import org.apache.airavata.registry.api.workflow.WorkflowInstanceStatus.ExecutionStatus;
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java?rev=1421488&r1=1421487&r2=1421488&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java Thu Dec 13 20:21:08 2012
@@ -1301,6 +1301,7 @@ public class AiravataJPARegistry extends
WorkflowInstanceNodeData data = new WorkflowInstanceNodeData(new WorkflowInstanceNode(new WorkflowInstance(nodeData.getWorkflowDataResource().getExperimentID(),nodeData.getWorkflowDataResource().getWorkflowInstanceID()),nodeData.getNodeID()));
data.setInput(nodeData.getInputs());
data.setOutput(nodeData.getOutputs());
+ data.setType(WorkflowNodeType.WorkflowNode.valueOf(nodeData.getNodeType()));
//TODO setup status
return data;
}
@@ -1375,7 +1376,10 @@ public class AiravataJPARegistry extends
}
- @Override
+
+
+
+ @Override
public ExperimentData getExperimentMetaInformation(String experimentId)
throws RegistryException {
if (!isExperimentExists(experimentId)){
Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/ProvenanceRegistry.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/ProvenanceRegistry.java?rev=1421488&r1=1421487&r2=1421488&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/ProvenanceRegistry.java (original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/ProvenanceRegistry.java Thu Dec 13 20:21:08 2012
@@ -326,5 +326,4 @@ public interface ProvenanceRegistry exte
public void updateWorkflowNodeType(WorkflowInstanceNode node, WorkflowNodeType type) throws RegistryException;
public void addWorkflowInstanceNode(String workflowInstance, String nodeId) throws RegistryException;
-
}
\ No newline at end of file
Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/impl/WorkflowInstanceDataImpl.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/impl/WorkflowInstanceDataImpl.java?rev=1421488&r1=1421487&r2=1421488&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/impl/WorkflowInstanceDataImpl.java (original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/impl/WorkflowInstanceDataImpl.java Thu Dec 13 20:21:08 2012
@@ -124,4 +124,30 @@ public class WorkflowInstanceDataImpl im
this.experimentData = experimentData;
}
+ @Override
+ public List<WorkflowInstanceNodePortData> getWorkflowInput(String worklfowInstanceID) {
+ List<WorkflowInstanceNodePortData> workflowInstanceNodePortDatas = new ArrayList<WorkflowInstanceNodePortData>();
+ for (WorkflowInstanceNodeData workflowInstanceNodeData : getNodeDataList()){
+ if(getWorkflowNodeType(workflowInstanceNodeData, WorkflowNodeType.WorkflowNode.INPUTNODE)){
+ workflowInstanceNodePortDatas.addAll(workflowInstanceNodeData.getInputData());
+ }
+ }
+ return workflowInstanceNodePortDatas;
+ }
+
+ private boolean getWorkflowNodeType(WorkflowInstanceNodeData workflowInstanceNodeData, WorkflowNodeType.WorkflowNode nodeType ) {
+ return workflowInstanceNodeData.getType().equals(nodeType);
+ }
+
+ @Override
+ public List<WorkflowInstanceNodePortData> getWorkflowOutput(String worklfowInstanceID) {
+ List<WorkflowInstanceNodePortData> workflowInstanceNodePortDatas = new ArrayList<WorkflowInstanceNodePortData>();
+ for (WorkflowInstanceNodeData workflowInstanceNodeData : getNodeDataList()){
+ if(getWorkflowNodeType(workflowInstanceNodeData, WorkflowNodeType.WorkflowNode.OUTPUTNODE)){
+ workflowInstanceNodePortDatas.addAll(workflowInstanceNodeData.getInputData());
+ }
+ }
+ return workflowInstanceNodePortDatas;
+ }
+
}
Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceData.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceData.java?rev=1421488&r1=1421487&r2=1421488&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceData.java (original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceData.java Thu Dec 13 20:21:08 2012
@@ -42,4 +42,6 @@ public interface WorkflowInstanceData {
public Date getStatusUpdateTime() throws ExperimentLazyLoadedException;
public ExperimentDataImpl getExperimentData() throws ExperimentLazyLoadedException;
public void setExperimentData(ExperimentDataImpl experimentData) throws ExperimentLazyLoadedException;
+ public List<WorkflowInstanceNodePortData> getWorkflowInput (String worklfowInstanceID);
+ public List<WorkflowInstanceNodePortData> getWorkflowOutput (String worklfowInstanceID);
}
Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodeData.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodeData.java?rev=1421488&r1=1421487&r2=1421488&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodeData.java (original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodeData.java Thu Dec 13 20:21:08 2012
@@ -37,6 +37,7 @@ public class WorkflowInstanceNodeData{
private String input;
private String output;
private WorkflowInstanceNodeStatus status;
+ private WorkflowNodeType.WorkflowNode type;
public WorkflowInstanceNodeData() {
}
@@ -146,4 +147,12 @@ public class WorkflowInstanceNodeData{
getIOParameterData(input);
}
+
+ public WorkflowNodeType.WorkflowNode getType() {
+ return type;
+ }
+
+ public void setType(WorkflowNodeType.WorkflowNode type) {
+ this.type = type;
+ }
}