Author: samindaw
Date: Fri Dec 14 19:15:32 2012
New Revision: 1422043
URL: http://svn.apache.org/viewvc?rev=1422043&view=rev
Log:
setting interface for WorkflowExecutionData & NodeExecutionData instead of
their impls
Added:
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/NodeExecutionData.java
(with props)
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/NodeExecutionDataImpl.java
- copied, changed from r1421951,
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/NodeExecutionData.java
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/NodeExecutionStatus.java
(contents, props changed)
- copied, changed from r1421951,
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodeStatus.java
Removed:
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodeStatus.java
Modified:
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ProvenanceManager.java
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ProvenanceManagerImpl.java
airavata/trunk/modules/integration-tests/derby-stop.txt
airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/TestMonitorListener.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataRetriever.java
airavata/trunk/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/AiravataRegistryAPITest.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/ExperimentDataImpl.java
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/impl/WorkflowExecutionDataImpl.java
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowExecutionData.java
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/RegistryClient.java
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProvenanceRegistryResource.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflow.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowNodeElement.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceReader.java
Modified:
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ProvenanceManager.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ProvenanceManager.java?rev=1422043&r1=1422042&r2=1422043&view=diff
==============================================================================
---
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ProvenanceManager.java
(original)
+++
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ProvenanceManager.java
Fri Dec 14 19:15:32 2012
@@ -322,11 +322,11 @@ public interface ProvenanceManager {
public void setWorkflowInstanceNodeStatus(String experimentId, String
workflowInstaceId, String nodeId, State status) throws
AiravataAPIInvocationException;
- public void setWorkflowInstanceNodeStatus(WorkflowInstanceNodeStatus
status) throws AiravataAPIInvocationException;
+ public void setWorkflowInstanceNodeStatus(NodeExecutionStatus status)
throws AiravataAPIInvocationException;
- public WorkflowInstanceNodeStatus getWorkflowInstanceNodeStatus(String
experimentId, String workflowInstaceId, String nodeId) throws
AiravataAPIInvocationException;
+ public NodeExecutionStatus getWorkflowInstanceNodeStatus(String
experimentId, String workflowInstaceId, String nodeId) throws
AiravataAPIInvocationException;
- public WorkflowInstanceNodeStatus
getWorkflowInstanceNodeStatus(WorkflowInstanceNode node) throws
AiravataAPIInvocationException;
+ public NodeExecutionStatus
getWorkflowInstanceNodeStatus(WorkflowInstanceNode node) throws
AiravataAPIInvocationException;
public void addExperiment(String projectName, String experimentId,
String experimentName) throws AiravataAPIInvocationException;
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=1422043&r1=1422042&r2=1422043&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
Fri Dec 14 19:15:32 2012
@@ -348,7 +348,7 @@ public class ProvenanceManagerImpl imple
}
@Override
- public void setWorkflowInstanceNodeStatus(WorkflowInstanceNodeStatus
status)
+ public void setWorkflowInstanceNodeStatus(NodeExecutionStatus status)
throws AiravataAPIInvocationException {
try {
getClient().getRegistryClient().updateWorkflowNodeStatus(status);
@@ -358,14 +358,14 @@ public class ProvenanceManagerImpl imple
}
@Override
- public WorkflowInstanceNodeStatus getWorkflowInstanceNodeStatus(
+ public NodeExecutionStatus getWorkflowInstanceNodeStatus(
String experimentId, String workflowInstaceId, String
nodeId)
throws AiravataAPIInvocationException {
return getWorkflowInstanceNodeStatus(new
WorkflowInstanceNode(new
WorkflowExecution(experimentId,workflowInstaceId),nodeId));
}
@Override
- public WorkflowInstanceNodeStatus getWorkflowInstanceNodeStatus(
+ public NodeExecutionStatus getWorkflowInstanceNodeStatus(
WorkflowInstanceNode node) throws
AiravataAPIInvocationException {
try {
return
getClient().getRegistryClient().getWorkflowNodeStatus(node);
Modified: airavata/trunk/modules/integration-tests/derby-stop.txt
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/integration-tests/derby-stop.txt?rev=1422043&r1=1422042&r2=1422043&view=diff
==============================================================================
--- airavata/trunk/modules/integration-tests/derby-stop.txt (original)
+++ airavata/trunk/modules/integration-tests/derby-stop.txt Fri Dec 14 19:15:32
2012
@@ -1,2 +1,2 @@
-./stop-derby.sh: 7: [[: not found
Does not exist
+./stop-derby.sh: 7: [[: not found
Modified:
airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/TestMonitorListener.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/TestMonitorListener.java?rev=1422043&r1=1422042&r2=1422043&view=diff
==============================================================================
---
airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/TestMonitorListener.java
(original)
+++
airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/TestMonitorListener.java
Fri Dec 14 19:15:32 2012
@@ -4,8 +4,9 @@ import junit.framework.Assert;
import org.apache.airavata.client.api.AiravataAPI;
import org.apache.airavata.registry.api.workflow.ExperimentData;
import org.apache.airavata.registry.api.impl.WorkflowExecutionDataImpl;
-import org.apache.airavata.registry.api.workflow.WorkflowExecutionData;
import org.apache.airavata.registry.api.workflow.NodeExecutionData;
+import org.apache.airavata.registry.api.workflow.WorkflowExecutionData;
+import org.apache.airavata.registry.api.workflow.NodeExecutionDataImpl;
import org.apache.airavata.ws.monitor.MonitorEvent;
import org.apache.airavata.ws.monitor.MonitorEventData;
import org.apache.airavata.ws.monitor.MonitorEventListener;
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=1422043&r1=1422042&r2=1422043&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
Fri Dec 14 19:15:32 2012
@@ -1172,7 +1172,7 @@ public class AiravataJPARegistry extends
@Override
public void updateWorkflowNodeStatus(
- WorkflowInstanceNodeStatus workflowStatusNode)
+ NodeExecutionStatus workflowStatusNode)
throws RegistryException {
WorkflowExecution workflowInstance =
workflowStatusNode.getWorkflowInstanceNode().getWorkflowInstance();
String nodeId =
workflowStatusNode.getWorkflowInstanceNode().getNodeId();
@@ -1203,12 +1203,12 @@ public class AiravataJPARegistry extends
@Override
public void updateWorkflowNodeStatus(WorkflowInstanceNode workflowNode,
State status) throws RegistryException {
- updateWorkflowNodeStatus(new
WorkflowInstanceNodeStatus(workflowNode, status,
Calendar.getInstance().getTime()));
+ updateWorkflowNodeStatus(new NodeExecutionStatus(workflowNode,
status, Calendar.getInstance().getTime()));
}
@Override
- public WorkflowInstanceNodeStatus getWorkflowNodeStatus(
+ public NodeExecutionStatus getWorkflowNodeStatus(
WorkflowInstanceNode workflowNode) throws
RegistryException {
String id =
workflowNode.getWorkflowInstance().getWorkflowExecutionId();
String nodeId = workflowNode.getNodeId();
@@ -1217,7 +1217,7 @@ public class AiravataJPARegistry extends
}
WorkflowDataResource workflowInstance =
jpa.getWorker().getWorkflowInstance(id);
NodeDataResource nodeData =
workflowInstance.getNodeData(nodeId);
- return new WorkflowInstanceNodeStatus(new
WorkflowInstanceNode(new WorkflowExecution(workflowInstance.getExperimentID(),
workflowInstance.getWorkflowInstanceID()), nodeData.getNodeID()),
nodeData.getStatus()==null?null:State.valueOf(nodeData.getStatus()),nodeData.getLastUpdateTime());
+ return new NodeExecutionStatus(new WorkflowInstanceNode(new
WorkflowExecution(workflowInstance.getExperimentID(),
workflowInstance.getWorkflowInstanceID()), nodeData.getNodeID()),
nodeData.getStatus()==null?null:State.valueOf(nodeData.getStatus()),nodeData.getLastUpdateTime());
}
@@ -1292,13 +1292,13 @@ public class AiravataJPARegistry extends
@Override
- public NodeExecutionData getWorkflowInstanceNodeData(
+ public NodeExecutionDataImpl getWorkflowInstanceNodeData(
String workflowInstanceId, String nodeId) throws
RegistryException {
if (!isWorkflowInstanceNodePresent(workflowInstanceId, nodeId)){
throw new
WorkflowInstanceNodeDoesNotExistsException(workflowInstanceId,nodeId);
}
NodeDataResource nodeData =
jpa.getWorker().getWorkflowInstance(workflowInstanceId).getNodeData(nodeId);
- NodeExecutionData data = new NodeExecutionData(new
WorkflowInstanceNode(new
WorkflowExecution(nodeData.getWorkflowDataResource().getExperimentID(),nodeData.getWorkflowDataResource().getWorkflowInstanceID()),nodeData.getNodeID()));
+ NodeExecutionDataImpl data = new NodeExecutionDataImpl(new
WorkflowInstanceNode(new
WorkflowExecution(nodeData.getWorkflowDataResource().getExperimentID(),nodeData.getWorkflowDataResource().getWorkflowInstanceID()),nodeData.getNodeID()));
data.setInput(nodeData.getInputs());
data.setOutput(nodeData.getOutputs());
data.setType(WorkflowNodeType.getType(nodeData.getNodeType()).getNodeType());
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataRetriever.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataRetriever.java?rev=1422043&r1=1422042&r2=1422043&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataRetriever.java
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataRetriever.java
Fri Dec 14 19:15:32 2012
@@ -120,7 +120,7 @@ public class ExperimentDataRetriever {
experimentData.getWorkflowExecutionDataList().add(workflowInstanceData);
}
WorkflowInstanceNode workflowInstanceNode = new
WorkflowInstanceNode(workflowInstanceData.getWorkflowExecution(),
rs.getString(10));
- NodeExecutionData workflowInstanceNodeData = new
NodeExecutionData(workflowInstanceNode);
+ NodeExecutionDataImpl workflowInstanceNodeData = new
NodeExecutionDataImpl(workflowInstanceNode);
String inputData = getStringValue(11, rs);
String outputData = getStringValue(12, rs);
Modified:
airavata/trunk/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/AiravataRegistryAPITest.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/AiravataRegistryAPITest.java?rev=1422043&r1=1422042&r2=1422043&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/AiravataRegistryAPITest.java
(original)
+++
airavata/trunk/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/AiravataRegistryAPITest.java
Fri Dec 14 19:15:32 2012
@@ -1354,10 +1354,10 @@ public class AiravataRegistryAPITest ext
WorkflowInstanceNode workflowInstanceNode = new
WorkflowInstanceNode(new WorkflowExecution("testExp", "testWorkflow7"),
"testNode");
WorkflowNodeType nodeType = new
WorkflowNodeType(WorkflowNodeType.WorkflowNode.INPUTNODE);
registry.updateWorkflowNodeType(workflowInstanceNode, nodeType);
- registry.updateWorkflowNodeInput(workflowInstanceNode, "testData");
+ registry.updateWorkflowNodeInput(workflowInstanceNode,
"testParameter=testData");
- NodeExecutionData nodeData =
registry.getWorkflowInstanceNodeData("testWorkflow7", "testNode");
- assertTrue("workflow instance node input saved successfully",
nodeData.getInput().equals("testData"));
+ NodeExecutionDataImpl nodeData =
registry.getWorkflowInstanceNodeData("testWorkflow7", "testNode");
+ assertTrue("workflow instance node input saved successfully",
nodeData.getInput().equals("testParameter=testData"));
registry.removeExperiment("testExp");
registry.deleteWorkspaceProject("testProject1");
@@ -1383,7 +1383,7 @@ public class AiravataRegistryAPITest ext
WorkflowInstanceNode workflowInstanceNode = new
WorkflowInstanceNode(new WorkflowExecution("testExp", "testWorkflow8"),
"testNode");
registry.updateWorkflowNodeOutput(workflowInstanceNode, "testData");
- NodeExecutionData nodeData =
registry.getWorkflowInstanceNodeData("testWorkflow8", "testNode");
+ NodeExecutionDataImpl nodeData =
registry.getWorkflowInstanceNodeData("testWorkflow8", "testNode");
assertTrue("workflow instance node output saved successfully",
nodeData.getOutput().equals("testData"));
registry.removeExperiment("testExp");
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=1422043&r1=1422042&r2=1422043&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
Fri Dec 14 19:15:32 2012
@@ -294,13 +294,13 @@ public interface ProvenanceRegistry exte
* @param workflowStatusNode
* @return
*/
- public abstract void updateWorkflowNodeStatus(WorkflowInstanceNodeStatus
workflowStatusNode)throws RegistryException;
+ public abstract void updateWorkflowNodeStatus(NodeExecutionStatus
workflowStatusNode)throws RegistryException;
public abstract void updateWorkflowNodeStatus(String workflowInstanceId,
String nodeId, State status)throws RegistryException;
public abstract void updateWorkflowNodeStatus(WorkflowInstanceNode
workflowNode, State status)throws RegistryException;
- public WorkflowInstanceNodeStatus
getWorkflowNodeStatus(WorkflowInstanceNode workflowNode)throws
RegistryException;
+ public NodeExecutionStatus getWorkflowNodeStatus(WorkflowInstanceNode
workflowNode)throws RegistryException;
public Date getWorkflowNodeStartTime(WorkflowInstanceNode
workflowNode)throws RegistryException;
@@ -319,7 +319,7 @@ public interface ProvenanceRegistry exte
public boolean isWorkflowInstanceNodePresent(String workflowInstanceId,
String nodeId, boolean createIfNotPresent)throws RegistryException;
- public NodeExecutionData getWorkflowInstanceNodeData(String
workflowInstanceId, String nodeId)throws RegistryException;
+ public NodeExecutionDataImpl getWorkflowInstanceNodeData(String
workflowInstanceId, String nodeId)throws RegistryException;
public void addWorkflowInstance(String experimentId, String
workflowInstanceId, String templateName) throws RegistryException;
Modified:
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/impl/ExperimentDataImpl.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/impl/ExperimentDataImpl.java?rev=1422043&r1=1422042&r2=1422043&view=diff
==============================================================================
---
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/impl/ExperimentDataImpl.java
(original)
+++
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/impl/ExperimentDataImpl.java
Fri Dec 14 19:15:32 2012
@@ -31,12 +31,12 @@ import javax.xml.bind.annotation.XmlRoot
import
org.apache.airavata.registry.api.exception.worker.ExperimentLazyLoadedException;
import org.apache.airavata.registry.api.workflow.ExperimentData;
+import org.apache.airavata.registry.api.workflow.NodeExecutionData;
import org.apache.airavata.registry.api.workflow.InputData;
import org.apache.airavata.registry.api.workflow.OutputData;
import org.apache.airavata.registry.api.workflow.WorkflowIOData;
import org.apache.airavata.registry.api.workflow.WorkflowExecution;
import org.apache.airavata.registry.api.workflow.WorkflowExecutionData;
-import org.apache.airavata.registry.api.workflow.NodeExecutionData;
import org.apache.airavata.registry.api.workflow.WorkflowExecutionStatus;
import org.apache.airavata.registry.api.workflow.WorkflowNodeIOData;
import org.apache.airavata.registry.api.workflow.WorkflowNodeType.WorkflowNode;
@@ -87,7 +87,7 @@ public class ExperimentDataImpl implemen
}
@Override
- public ExperimentDataImpl getExperimentData() throws
ExperimentLazyLoadedException {
+ public ExperimentData getExperimentData() throws
ExperimentLazyLoadedException {
return getWorkflowExecutionDataList().get(0).getExperimentData();
}
Modified:
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/impl/WorkflowExecutionDataImpl.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/impl/WorkflowExecutionDataImpl.java?rev=1422043&r1=1422042&r2=1422043&view=diff
==============================================================================
---
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/impl/WorkflowExecutionDataImpl.java
(original)
+++
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/impl/WorkflowExecutionDataImpl.java
Fri Dec 14 19:15:32 2012
@@ -123,7 +123,7 @@ public class WorkflowExecutionDataImpl i
return null;
}
- public ExperimentDataImpl getExperimentData() {
+ public ExperimentData getExperimentData() {
return experimentData;
}
Added:
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/NodeExecutionData.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/NodeExecutionData.java?rev=1422043&view=auto
==============================================================================
---
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/NodeExecutionData.java
(added)
+++
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/NodeExecutionData.java
Fri Dec 14 19:15:32 2012
@@ -0,0 +1,157 @@
+/*
+ *
+ * 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.airavata.registry.api.workflow;
+
+import java.util.Date;
+import java.util.List;
+
+import
org.apache.airavata.registry.api.exception.worker.ExperimentLazyLoadedException;
+
+public interface NodeExecutionData {
+
+ /**
+ * Get id of the Node
+ * @return
+ */
+ public abstract String getId();
+
+ /**
+ * Get the id of the experiment which the workflow which has this node
+ * @return
+ */
+ public abstract String getExperimentId();
+
+ /**
+ * Get the id of the workflow execution this node belongs to
+ * @return
+ */
+ public abstract String getWorkflowExecutionId();
+
+ /**
+ * @deprecated
+ * @return
+ */
+ public abstract WorkflowInstanceNode getWorkflowInstanceNode();
+
+ /**
+ * @deprecated
+ * @param workflowInstanceNode
+ */
+ public abstract void setWorkflowInstanceNode(WorkflowInstanceNode
workflowInstanceNode);
+
+
+ /**
+ * Get current state of the execution of this workflow
+ * @return
+ * @throws ExperimentLazyLoadedException
+ */
+ public WorkflowExecutionStatus.State getState();
+
+ /**
+ * Get current state updated time
+ * @return
+ * @throws ExperimentLazyLoadedException
+ */
+ public Date getStatusUpdateTime();
+
+ /**
+ * @deprecated
+ * Get the status of the execution of this node
+ * @return
+ */
+ public abstract NodeExecutionStatus getStatus();
+
+ /**
+ * Update the execution status of the node
+ * @param status
+ */
+ public abstract void setStatus(NodeExecutionStatus status);
+
+ /**
+ * Update the execution status of the node
+ * @param status
+ * @param date
+ */
+ public abstract void setStatus(WorkflowExecutionStatus.State status,
+ Date date);
+
+ /**
+ * Retrieve the input data to the node
+ * @return
+ */
+ public abstract List<InputData> getInputData();
+
+ /**
+ * Retrieve the output data to the node
+ * @return
+ */
+ public abstract List<OutputData> getOutputData();
+
+ /**
+ * Setup input data for the node
+ * @param inputData
+ */
+ public abstract void setInputData(List<InputData> inputData);
+
+ /**
+ * Setup output data for the node
+ * @param outputData
+ */
+ public abstract void setOutputData(List<OutputData> outputData);
+
+ /**
+ * Get node input as comma separated name value pairs
+ * @return
+ */
+ public String getInput();
+
+ /**
+ * Get node output as comma separated name value pairs
+ * @return
+ */
+ public String getOutput();
+
+ /**
+ * Set input as comma separated name value pairs
+ * @param input
+ */
+ public void setInput(String input);
+
+ /**
+ * Set output as comma separated name value pairs
+ * @param output
+ */
+ public void setOutput(String output);
+
+ /**
+ * Get node type
+ * @return
+ */
+ public abstract WorkflowNodeType.WorkflowNode getType();
+
+ /**
+ * Set node type
+ * @param type
+ */
+ public abstract void setType(WorkflowNodeType.WorkflowNode type);
+
+}
\ No newline at end of file
Propchange:
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/NodeExecutionData.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied:
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/NodeExecutionDataImpl.java
(from r1421951,
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/NodeExecutionData.java)
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/NodeExecutionDataImpl.java?p2=airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/NodeExecutionDataImpl.java&p1=airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/NodeExecutionData.java&r1=1421951&r2=1422043&rev=1422043&view=diff
==============================================================================
---
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/NodeExecutionData.java
(original)
+++
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/NodeExecutionDataImpl.java
Fri Dec 14 19:15:32 2012
@@ -24,78 +24,114 @@ package org.apache.airavata.registry.api
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
+
+import org.apache.airavata.registry.api.workflow.WorkflowExecutionStatus.State;
+
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
-public class NodeExecutionData{
+public class NodeExecutionDataImpl implements NodeExecutionData{
private WorkflowInstanceNode workflowInstanceNode;
private List<InputData> inputData;
private List<OutputData> outputData;
private String input;
private String output;
- private WorkflowInstanceNodeStatus status;
+ private NodeExecutionStatus status;
private WorkflowNodeType.WorkflowNode type;
-
- public NodeExecutionData() {
+ private String experimentId;
+ private String workflowExecutionId;
+ private String nodeId;
+
+ public NodeExecutionDataImpl() {
}
- public NodeExecutionData(WorkflowInstanceNode workflowInstanceNode) {
+ /**
+ * deprecated Use <code>NodeExecutionData(String experimentId, String
workflowExecutionId, String nodeId)</code> instead
+ * @param workflowInstanceNode
+ */
+ public NodeExecutionDataImpl(WorkflowInstanceNode workflowInstanceNode) {
+
this(workflowInstanceNode.getWorkflowInstance().getExperimentId(),workflowInstanceNode.getWorkflowInstance().getWorkflowExecutionId(),workflowInstanceNode.getNodeId());
setWorkflowInstanceNode(workflowInstanceNode);
}
-
+
+ public NodeExecutionDataImpl(String experimentId, String
workflowExecutionId, String nodeId) {
+ this.experimentId=experimentId;
+ this.workflowExecutionId=workflowExecutionId;
+ this.nodeId=nodeId;
+ }
+
+ /* (non-Javadoc)
+ * @see
org.apache.airavata.registry.api.workflow.INodeExecutionData#getId()
+ */
+ @Override
+ public String getId(){
+ return nodeId;
+ }
+
+ /* (non-Javadoc)
+ * @see
org.apache.airavata.registry.api.workflow.INodeExecutionData#getExperimentId()
+ */
+ @Override
+ public String getExperimentId(){
+ return experimentId;
+ }
+
+ /* (non-Javadoc)
+ * @see
org.apache.airavata.registry.api.workflow.INodeExecutionData#getWorkflowExecutionId()
+ */
+ @Override
+ public String getWorkflowExecutionId(){
+ return workflowExecutionId;
+ }
+
+ /* (non-Javadoc)
+ * @see
org.apache.airavata.registry.api.workflow.INodeExecutionData#getWorkflowInstanceNode()
+ */
+ @Override
public WorkflowInstanceNode getWorkflowInstanceNode() {
return workflowInstanceNode;
}
+ /* (non-Javadoc)
+ * @see
org.apache.airavata.registry.api.workflow.INodeExecutionData#setWorkflowInstanceNode(org.apache.airavata.registry.api.workflow.WorkflowInstanceNode)
+ */
+ @Override
public void setWorkflowInstanceNode(WorkflowInstanceNode
workflowInstanceNode) {
this.workflowInstanceNode = workflowInstanceNode;
}
- public WorkflowInstanceNodeStatus getStatus() {
+ /* (non-Javadoc)
+ * @see
org.apache.airavata.registry.api.workflow.INodeExecutionData#getStatus()
+ */
+ @Override
+ public NodeExecutionStatus getStatus() {
return status;
}
- public void setStatus(WorkflowInstanceNodeStatus status) {
+ /* (non-Javadoc)
+ * @see
org.apache.airavata.registry.api.workflow.INodeExecutionData#setStatus(org.apache.airavata.registry.api.workflow.NodeExecutionStatus)
+ */
+ @Override
+ public void setStatus(NodeExecutionStatus status) {
this.status = status;
}
- public void setStatus(WorkflowExecutionStatus.State status, Date date) {
- setStatus(new WorkflowInstanceNodeStatus(this.workflowInstanceNode,
status, date));
+ /* (non-Javadoc)
+ * @see
org.apache.airavata.registry.api.workflow.INodeExecutionData#setStatus(org.apache.airavata.registry.api.workflow.WorkflowExecutionStatus.State,
java.util.Date)
+ */
+ @Override
+ public void setStatus(WorkflowExecutionStatus.State status, Date date) {
+ setStatus(new NodeExecutionStatus(this.workflowInstanceNode, status,
date));
}
- private static class NameValue{
- String name;
- String value;
- public NameValue(String name, String value) {
- this.name=name;
- this.value=value;
- }
- }
-
- private static List<NameValue> getIOParameterData(String data){
- List<NameValue> parameters=new ArrayList<NameValue>();
- if (data!=null) {
- String[] pairs = data.split(",");
- for (String paras : pairs) {
- String[] nameVals = paras.trim().split("=");
- NameValue pair = null;
- if(nameVals.length >= 2){
- pair = new NameValue(nameVals[0].trim(),
- nameVals.length>1?
nameVals[1].trim():"");
- }else if(nameVals.length == 1){
- pair = new NameValue(nameVals[0].trim(),
- "");
- }
- parameters.add(pair);
- }
- }
- return parameters;
- }
-
+ /* (non-Javadoc)
+ * @see
org.apache.airavata.registry.api.workflow.INodeExecutionData#getInputData()
+ */
+ @Override
public List<InputData> getInputData() {
if (inputData==null){
inputData=new ArrayList<InputData>();
@@ -107,10 +143,10 @@ public class NodeExecutionData{
return inputData;
}
- public void setInputData(List<InputData> inputData) {
- this.inputData = inputData;
- }
-
+ /* (non-Javadoc)
+ * @see
org.apache.airavata.registry.api.workflow.INodeExecutionData#getOutputData()
+ */
+ @Override
public List<OutputData> getOutputData() {
if (outputData==null){
outputData=new ArrayList<OutputData>();
@@ -122,6 +158,18 @@ public class NodeExecutionData{
return outputData;
}
+ /* (non-Javadoc)
+ * @see
org.apache.airavata.registry.api.workflow.INodeExecutionData#setInputData(java.util.List)
+ */
+ @Override
+ public void setInputData(List<InputData> inputData) {
+ this.inputData = inputData;
+ }
+
+ /* (non-Javadoc)
+ * @see
org.apache.airavata.registry.api.workflow.INodeExecutionData#setOutputData(java.util.List)
+ */
+ @Override
public void setOutputData(List<OutputData> outputData) {
this.outputData = outputData;
}
@@ -142,28 +190,60 @@ public class NodeExecutionData{
this.output = output;
}
- public static void main(String[] args) {
- String input="molecule_id=3pom,
geom_mol2=http://ccg-mw1.ncsa.uiuc.edu/cgenff/x_baya/cgenff_project/3pom/3pom.mol2,
toppar_main_tgz=/u/ac/ccguser/proposed_dir_structure/toppar/cgenff/releases/2b7/main.tgz,
toppar_usr_tgz=gsiftp://login-ember.ncsa.teragrid.org,
toppar_mol_str=http://ccg-mw1.ncsa.uiuc.edu/cgenff/x_baya/cgenff_project/3pom/toppar/3pom.str,
molecule_dir_in_tgz=, GC_UserName=x_baya, GC_ProjectName=x_baya,
GC_WorkflowName=3pom__1349212666 |
opt_freq_input_gjf=/gpfs2/scratch/users/ccguser/xbaya-workdirs/login-ember.ncsa.teragrid.org_application_Tue_Oct_02_17_18_34_EDT_2012_0933dae4-f7c7-4022-87d9-ab370c49a8bd/3pom/gauss/3pom_opt_freq_mp2.gjf,
charmm_miminized_crd=/gpfs2/scratch/users/ccguser/xbaya-workdirs/login-ember.ncsa.teragrid.org_application_Tue_Oct_02_17_18_34_EDT_2012_0933dae4-f7c7-4022-87d9-ab370c49a8bd/3pom/generate/3pom_min.crd,
step1_log=/gpfs2/scratch/users/ccguser/xbaya-workdirs/login-ember.ncsa.teragrid.org_application_Tue_Oct_02_17_18_34_EDT
_2012_0933dae4-f7c7-4022-87d9-ab370c49a8bd/3pom/generate/generate.out,
molecule_dir_out_tgz=/gpfs2/scratch/users/ccguser/xbaya-workdirs/login-ember.ncsa.teragrid.org_application_Tue_Oct_02_17_18_34_EDT_2012_0933dae4-f7c7-4022-87d9-ab370c49a8bd/molecule_dir_out.tgz,
gcvars=/gpfs2/scratch/users/ccguser/xbaya-workdirs/login-ember.ncsa.teragrid.org_application_Tue_Oct_02_17_18_34_EDT_2012_0933dae4-f7c7-4022-87d9-ab370c49a8bd/GCVARS";
-
- getIOParameterData(input);
- }
-
- public WorkflowNodeType.WorkflowNode getType() {
+ /* (non-Javadoc)
+ * @see
org.apache.airavata.registry.api.workflow.INodeExecutionData#getType()
+ */
+ @Override
+ public WorkflowNodeType.WorkflowNode getType() {
return type;
}
- public void setType(WorkflowNodeType.WorkflowNode type) {
+ /* (non-Javadoc)
+ * @see
org.apache.airavata.registry.api.workflow.INodeExecutionData#setType(org.apache.airavata.registry.api.workflow.WorkflowNodeType.WorkflowNode)
+ */
+ @Override
+ public void setType(WorkflowNodeType.WorkflowNode type) {
this.type = type;
}
- public String getId(){
- return getWorkflowInstanceNode().getNodeId();
- }
- public String getExperimentId(){
- return
getWorkflowInstanceNode().getWorkflowInstance().getExperimentId();
- }
-
- public String getWorkflowInstanceId(){
- return
getWorkflowInstanceNode().getWorkflowInstance().getWorkflowExecutionId();
- }
+ @Override
+ public State getState() {
+ return status.getExecutionStatus();
+ }
+
+ @Override
+ public Date getStatusUpdateTime() {
+ return status.getStatusUpdateTime();
+ }
+
+
+ private static class NameValue{
+ String name;
+ String value;
+ public NameValue(String name, String value) {
+ this.name=name;
+ this.value=value;
+ }
+ }
+
+ private static List<NameValue> getIOParameterData(String data){
+ List<NameValue> parameters=new ArrayList<NameValue>();
+ if (data!=null) {
+ String[] pairs = data.split(",");
+ for (String paras : pairs) {
+ String[] nameVals = paras.trim().split("=");
+ NameValue pair = null;
+ if(nameVals.length >= 2){
+ pair = new NameValue(nameVals[0].trim(),
+ nameVals.length>1?
nameVals[1].trim():"");
+ }else if(nameVals.length == 1){
+ pair = new NameValue(nameVals[0].trim(),
+ "");
+ }
+ parameters.add(pair);
+ }
+ }
+ return parameters;
+ }
+
}
Copied:
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/NodeExecutionStatus.java
(from r1421951,
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodeStatus.java)
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/NodeExecutionStatus.java?p2=airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/NodeExecutionStatus.java&p1=airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodeStatus.java&r1=1421951&r2=1422043&rev=1422043&view=diff
==============================================================================
---
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodeStatus.java
(original)
+++
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/NodeExecutionStatus.java
Fri Dec 14 19:15:32 2012
@@ -32,12 +32,12 @@ import javax.xml.bind.annotation.XmlRoot
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement
-public class WorkflowInstanceNodeStatus {
+public class NodeExecutionStatus {
private State executionStatus;
private Date statusUpdateTime = null;
private WorkflowInstanceNode workflowInstanceNode;
- public WorkflowInstanceNodeStatus() {
+ public NodeExecutionStatus() {
}
public State getExecutionStatus() {
@@ -56,11 +56,11 @@ public class WorkflowInstanceNodeStatus
this.statusUpdateTime = statusUpdateTime;
}
- public WorkflowInstanceNodeStatus(WorkflowInstanceNode
workflowInstanceNode, State executionStatus) {
+ public NodeExecutionStatus(WorkflowInstanceNode workflowInstanceNode,
State executionStatus) {
this(workflowInstanceNode, executionStatus, null);
}
- public WorkflowInstanceNodeStatus(WorkflowInstanceNode
workflowInstanceNode, State executionStatus, Date statusUpdateTime) {
+ public NodeExecutionStatus(WorkflowInstanceNode workflowInstanceNode,
State executionStatus, Date statusUpdateTime) {
statusUpdateTime = statusUpdateTime == null ?
Calendar.getInstance().getTime() : statusUpdateTime;
setWorkflowInstanceNode(workflowInstanceNode);
setExecutionStatus(executionStatus);
Propchange:
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/NodeExecutionStatus.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowExecutionData.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowExecutionData.java?rev=1422043&r1=1422042&r2=1422043&view=diff
==============================================================================
---
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowExecutionData.java
(original)
+++
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowExecutionData.java
Fri Dec 14 19:15:32 2012
@@ -112,7 +112,7 @@ public interface WorkflowExecutionData {
@Deprecated
public WorkflowExecution getWorkflowExecution() throws
ExperimentLazyLoadedException;
@Deprecated
- public ExperimentDataImpl getExperimentData() throws
ExperimentLazyLoadedException;
+ public ExperimentData getExperimentData() throws
ExperimentLazyLoadedException;
@Deprecated
public void setExperimentData(ExperimentDataImpl experimentData) throws
ExperimentLazyLoadedException;
}
Modified:
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java?rev=1422043&r1=1422042&r2=1422043&view=diff
==============================================================================
---
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java
(original)
+++
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java
Fri Dec 14 19:15:32 2012
@@ -967,7 +967,7 @@ public class ProvenanceResourceClient {
return experimentDatas;
}
- public void updateWorkflowNodeStatus(WorkflowInstanceNodeStatus
workflowStatusNode) {
+ public void updateWorkflowNodeStatus(NodeExecutionStatus
workflowStatusNode) {
webResource = getProvenanceRegistryBaseResource().path(
ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_WORKFLOWNODE_STATUS);
MultivaluedMap formParams = new MultivaluedMapImpl();
@@ -1085,7 +1085,7 @@ public class ProvenanceResourceClient {
}
}
- public WorkflowInstanceNodeStatus
getWorkflowNodeStatus(WorkflowInstanceNode workflowNode) {
+ public NodeExecutionStatus getWorkflowNodeStatus(WorkflowInstanceNode
workflowNode) {
webResource = getProvenanceRegistryBaseResource().path(
ResourcePathConstants.ProvenanceResourcePathConstants.GET_WORKFLOWNODE_STATUS);
MultivaluedMap queryParams = new MultivaluedMapImpl();
@@ -1120,8 +1120,8 @@ public class ProvenanceResourceClient {
}
}
- WorkflowInstanceNodeStatus workflowInstanceNodeStatus =
- response.getEntity(WorkflowInstanceNodeStatus.class);
+ NodeExecutionStatus workflowInstanceNodeStatus =
+ response.getEntity(NodeExecutionStatus.class);
return workflowInstanceNodeStatus;
}
@@ -1368,7 +1368,7 @@ public class ProvenanceResourceClient {
}
}
- public NodeExecutionData getWorkflowInstanceNodeData(String
workflowInstanceId,
+ public NodeExecutionDataImpl getWorkflowInstanceNodeData(String
workflowInstanceId,
String nodeId)
{
webResource = getProvenanceRegistryBaseResource().path(
ResourcePathConstants.ProvenanceResourcePathConstants.WORKFLOWINSTANCE_NODE_DATA);
@@ -1404,8 +1404,8 @@ public class ProvenanceResourceClient {
}
}
- NodeExecutionData workflowInstanceNodeData =
- response.getEntity(NodeExecutionData.class);
+ NodeExecutionDataImpl workflowInstanceNodeData =
+ response.getEntity(NodeExecutionDataImpl.class);
return workflowInstanceNodeData;
}
Modified:
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/RegistryClient.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/RegistryClient.java?rev=1422043&r1=1422042&r2=1422043&view=diff
==============================================================================
---
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/RegistryClient.java
(original)
+++
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/RegistryClient.java
Fri Dec 14 19:15:32 2012
@@ -39,13 +39,13 @@ import org.apache.airavata.registry.api.
import org.apache.airavata.registry.api.exception.RegistryException;
import
org.apache.airavata.registry.api.exception.worker.ExperimentDoesNotExistsException;
import org.apache.airavata.registry.api.workflow.ExperimentData;
-import org.apache.airavata.registry.api.workflow.NodeExecutionData;
+import org.apache.airavata.registry.api.workflow.NodeExecutionDataImpl;
import org.apache.airavata.registry.api.workflow.WorkflowExecution;
import org.apache.airavata.registry.api.workflow.WorkflowExecutionData;
import org.apache.airavata.registry.api.workflow.WorkflowExecutionStatus;
import org.apache.airavata.registry.api.workflow.WorkflowIOData;
import org.apache.airavata.registry.api.workflow.WorkflowInstanceNode;
-import org.apache.airavata.registry.api.workflow.WorkflowInstanceNodeStatus;
+import org.apache.airavata.registry.api.workflow.NodeExecutionStatus;
import org.apache.airavata.registry.api.workflow.WorkflowNodeGramData;
import org.apache.airavata.registry.api.workflow.WorkflowNodeIOData;
import org.apache.airavata.registry.api.workflow.WorkflowNodeType;
@@ -632,7 +632,7 @@ public class RegistryClient extends Aira
}
- public void updateWorkflowNodeStatus(WorkflowInstanceNodeStatus
workflowStatusNode) throws RegistryException {
+ public void updateWorkflowNodeStatus(NodeExecutionStatus
workflowStatusNode) throws RegistryException {
getProvenanceResourceClient().updateWorkflowNodeStatus(workflowStatusNode);
}
@@ -649,7 +649,7 @@ public class RegistryClient extends Aira
}
- public WorkflowInstanceNodeStatus
getWorkflowNodeStatus(WorkflowInstanceNode workflowNode) throws
RegistryException {
+ public NodeExecutionStatus getWorkflowNodeStatus(WorkflowInstanceNode
workflowNode) throws RegistryException {
return
getProvenanceResourceClient().getWorkflowNodeStatus(workflowNode);
}
@@ -686,7 +686,7 @@ public class RegistryClient extends Aira
}
- public NodeExecutionData getWorkflowInstanceNodeData(String
workflowInstanceId,
+ public NodeExecutionDataImpl getWorkflowInstanceNodeData(String
workflowInstanceId,
String nodeId)
throws RegistryException {
return
getProvenanceResourceClient().getWorkflowInstanceNodeData(workflowInstanceId,
nodeId);
}
Modified:
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProvenanceRegistryResource.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProvenanceRegistryResource.java?rev=1422043&r1=1422042&r2=1422043&view=diff
==============================================================================
---
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProvenanceRegistryResource.java
(original)
+++
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProvenanceRegistryResource.java
Fri Dec 14 19:15:32 2012
@@ -900,7 +900,7 @@ public class ProvenanceRegistryResource
try {
WorkflowExecutionDataImpl workflowInstanceData =
(WorkflowExecutionDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceId);
WorkflowInstanceNode workflowInstanceNode =
workflowInstanceData.getNodeData(nodeId).getWorkflowInstanceNode();
- WorkflowInstanceNodeStatus workflowNodeStatus =
airavataRegistry.getWorkflowNodeStatus(workflowInstanceNode);
+ NodeExecutionStatus workflowNodeStatus =
airavataRegistry.getWorkflowNodeStatus(workflowInstanceNode);
if (workflowNodeStatus != null) {
Response.ResponseBuilder builder =
Response.status(Response.Status.OK);
builder.entity(workflowNodeStatus);
Modified:
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflow.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflow.java?rev=1422043&r1=1422042&r2=1422043&view=diff
==============================================================================
---
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflow.java
(original)
+++
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflow.java
Fri Dec 14 19:15:32 2012
@@ -28,9 +28,10 @@ import org.apache.airavata.client.api.Ai
import org.apache.airavata.client.api.AiravataAPIInvocationException;
//import org.apache.airavata.registry.api.AiravataRegistry2;
import
org.apache.airavata.registry.api.exception.worker.ExperimentLazyLoadedException;
+import org.apache.airavata.registry.api.workflow.NodeExecutionData;
import org.apache.airavata.registry.api.workflow.WorkflowExecution;
import org.apache.airavata.registry.api.workflow.WorkflowExecutionData;
-import org.apache.airavata.registry.api.workflow.NodeExecutionData;
+import org.apache.airavata.registry.api.workflow.NodeExecutionDataImpl;
public class XBayaWorkflow {
private List<XBayaWorkflowNodeElement> workflowServices;
Modified:
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowNodeElement.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowNodeElement.java?rev=1422043&r1=1422042&r2=1422043&view=diff
==============================================================================
---
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowNodeElement.java
(original)
+++
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowNodeElement.java
Fri Dec 14 19:15:32 2012
@@ -24,9 +24,9 @@ package org.apache.airavata.xbaya.model.
import java.util.ArrayList;
import java.util.List;
+import org.apache.airavata.registry.api.workflow.NodeExecutionData;
import org.apache.airavata.registry.api.workflow.InputData;
import org.apache.airavata.registry.api.workflow.OutputData;
-import org.apache.airavata.registry.api.workflow.NodeExecutionData;
import org.apache.airavata.registry.api.workflow.WorkflowInstanceNodePortData;
import org.apache.airavata.schemas.gfac.Parameter;
Modified:
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceReader.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceReader.java?rev=1422043&r1=1422042&r2=1422043&view=diff
==============================================================================
---
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceReader.java
(original)
+++
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceReader.java
Fri Dec 14 19:15:32 2012
@@ -26,6 +26,7 @@ import java.util.List;
import org.apache.airavata.client.api.AiravataAPI;
import org.apache.airavata.registry.api.workflow.ExperimentData;
import org.apache.airavata.registry.api.workflow.NodeExecutionData;
+import org.apache.airavata.registry.api.workflow.NodeExecutionDataImpl;
import org.apache.airavata.workflow.model.graph.Node;
public class ProvenanceReader {
