Author: chathuri
Date: Mon Dec 17 17:00:50 2012
New Revision: 1423019
URL: http://svn.apache.org/viewvc?rev=1423019&view=rev
Log:
removing NodeExecutionData interface since cannot be deserialized when using
REST
Added:
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/NodeExecutionData.java
Removed:
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/NodeExecutionDataImpl.java
Modified:
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/ExperimentData.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/provenance/ProvenanceReader.java
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=1423019&r1=1423018&r2=1423019&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
Mon Dec 17 17:00:50 2012
@@ -1292,13 +1292,13 @@ public class AiravataJPARegistry extends
@Override
- public NodeExecutionDataImpl getWorkflowInstanceNodeData(
+ public NodeExecutionData getWorkflowInstanceNodeData(
String workflowInstanceId, String nodeId) throws
RegistryException {
if (!isWorkflowInstanceNodePresent(workflowInstanceId, nodeId)){
throw new
WorkflowInstanceNodeDoesNotExistsException(workflowInstanceId,nodeId);
}
NodeDataResource nodeData =
jpa.getWorker().getWorkflowInstance(workflowInstanceId).getNodeData(nodeId);
- NodeExecutionDataImpl data = new NodeExecutionDataImpl(new
WorkflowInstanceNode(new
WorkflowExecution(nodeData.getWorkflowDataResource().getExperimentID(),nodeData.getWorkflowDataResource().getWorkflowInstanceID()),nodeData.getNodeID()));
+ NodeExecutionData data = new NodeExecutionData(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=1423019&r1=1423018&r2=1423019&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
Mon Dec 17 17:00:50 2012
@@ -120,7 +120,7 @@ public class ExperimentDataRetriever {
experimentData.getWorkflowExecutionDataList().add(workflowInstanceData);
}
WorkflowInstanceNode workflowInstanceNode = new
WorkflowInstanceNode(workflowInstanceData.getWorkflowExecution(),
rs.getString(10));
- NodeExecutionDataImpl workflowInstanceNodeData = new
NodeExecutionDataImpl(workflowInstanceNode);
+ NodeExecutionData workflowInstanceNodeData = new
NodeExecutionData(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=1423019&r1=1423018&r2=1423019&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
Mon Dec 17 17:00:50 2012
@@ -1356,7 +1356,7 @@ public class AiravataRegistryAPITest ext
registry.updateWorkflowNodeType(workflowInstanceNode, nodeType);
registry.updateWorkflowNodeInput(workflowInstanceNode,
"testParameter=testData");
- NodeExecutionDataImpl nodeData =
registry.getWorkflowInstanceNodeData("testWorkflow7", "testNode");
+ NodeExecutionData nodeData =
registry.getWorkflowInstanceNodeData("testWorkflow7", "testNode");
assertTrue("workflow instance node input saved successfully",
nodeData.getInput().equals("testParameter=testData"));
registry.removeExperiment("testExp");
@@ -1383,7 +1383,7 @@ public class AiravataRegistryAPITest ext
WorkflowInstanceNode workflowInstanceNode = new
WorkflowInstanceNode(new WorkflowExecution("testExp", "testWorkflow8"),
"testNode");
registry.updateWorkflowNodeOutput(workflowInstanceNode, "testData");
- NodeExecutionDataImpl nodeData =
registry.getWorkflowInstanceNodeData("testWorkflow8", "testNode");
+ NodeExecutionData 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=1423019&r1=1423018&r2=1423019&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
Mon Dec 17 17:00:50 2012
@@ -319,7 +319,7 @@ public interface ProvenanceRegistry exte
public boolean isWorkflowInstanceNodePresent(String workflowInstanceId,
String nodeId, boolean createIfNotPresent)throws RegistryException;
- public NodeExecutionDataImpl getWorkflowInstanceNodeData(String
workflowInstanceId, String nodeId)throws RegistryException;
+ public NodeExecutionData 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=1423019&r1=1423018&r2=1423019&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
Mon Dec 17 17:00:50 2012
@@ -30,15 +30,7 @@ import javax.xml.bind.annotation.XmlAcce
import javax.xml.bind.annotation.XmlRootElement;
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.WorkflowExecutionStatus;
-import org.apache.airavata.registry.api.workflow.WorkflowNodeIOData;
+import org.apache.airavata.registry.api.workflow.*;
import org.apache.airavata.registry.api.workflow.WorkflowNodeType.WorkflowNode;
@XmlAccessorType(XmlAccessType.FIELD)
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=1423019&r1=1423018&r2=1423019&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
Mon Dec 17 17:00:50 2012
@@ -31,10 +31,7 @@ import org.apache.airavata.registry.api.
import org.apache.airavata.registry.api.workflow.WorkflowExecutionStatus.State;
import org.apache.airavata.registry.api.workflow.WorkflowNodeType.WorkflowNode;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.*;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement
@@ -43,6 +40,7 @@ public class WorkflowExecutionDataImpl i
@XmlTransient
private ExperimentDataImpl experimentData;
+
private WorkflowExecutionStatus workflowInstanceStatus;
private List<NodeExecutionData> nodeDataList;
Modified:
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ExperimentData.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ExperimentData.java?rev=1423019&r1=1423018&r2=1423019&view=diff
==============================================================================
---
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ExperimentData.java
(original)
+++
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ExperimentData.java
Mon Dec 17 17:00:50 2012
@@ -33,6 +33,8 @@ import javax.xml.bind.annotation.XmlAcce
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlSeeAlso;
+//@XmlRootElement
+//@XmlAccessorType(XmlAccessType.FIELD)
@WebService
@XmlSeeAlso(ExperimentDataImpl.class)
public interface ExperimentData extends WorkflowExecutionData {
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=1423019&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
Mon Dec 17 17:00:50 2012
@@ -0,0 +1,233 @@
+/*
+ *
+ * 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 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 {
+ private WorkflowInstanceNode workflowInstanceNode;
+ private List<InputData> inputData;
+ private List<OutputData> outputData;
+ private String input;
+ private String output;
+ private NodeExecutionStatus status;
+ private WorkflowNodeType.WorkflowNode type;
+ private String experimentId;
+ private String workflowExecutionId;
+ private String nodeId;
+
+ public NodeExecutionData() {
+ }
+
+ /**
+ * deprecated Use <code>NodeExecutionData(String experimentId, String
workflowExecutionId, String nodeId)</code> instead
+ * @param workflowInstanceNode
+ */
+ public NodeExecutionData(WorkflowInstanceNode workflowInstanceNode) {
+
this(workflowInstanceNode.getWorkflowInstance().getExperimentId(),workflowInstanceNode.getWorkflowInstance().getWorkflowExecutionId(),workflowInstanceNode.getNodeId());
+ setWorkflowInstanceNode(workflowInstanceNode);
+ }
+
+ public NodeExecutionData(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()
+ */
+ public String getId(){
+ return nodeId;
+ }
+
+ /* (non-Javadoc)
+ * @see
org.apache.airavata.registry.api.workflow.INodeExecutionData#getExperimentId()
+ */
+ public String getExperimentId(){
+ return experimentId;
+ }
+
+ /* (non-Javadoc)
+ * @see
org.apache.airavata.registry.api.workflow.INodeExecutionData#getWorkflowExecutionId()
+ */
+ public String getWorkflowExecutionId(){
+ return workflowExecutionId;
+ }
+
+ /* (non-Javadoc)
+ * @see
org.apache.airavata.registry.api.workflow.INodeExecutionData#getWorkflowInstanceNode()
+ */
+ public WorkflowInstanceNode getWorkflowInstanceNode() {
+ return workflowInstanceNode;
+ }
+
+ /* (non-Javadoc)
+ * @see
org.apache.airavata.registry.api.workflow.INodeExecutionData#setWorkflowInstanceNode(org.apache.airavata.registry.api.workflow.WorkflowInstanceNode)
+ */
+ public void setWorkflowInstanceNode(WorkflowInstanceNode
workflowInstanceNode) {
+ this.workflowInstanceNode = workflowInstanceNode;
+ }
+
+ /* (non-Javadoc)
+ * @see
org.apache.airavata.registry.api.workflow.INodeExecutionData#getStatus()
+ */
+ public NodeExecutionStatus getStatus() {
+ return status;
+ }
+
+ /* (non-Javadoc)
+ * @see
org.apache.airavata.registry.api.workflow.INodeExecutionData#setStatus(org.apache.airavata.registry.api.workflow.NodeExecutionStatus)
+ */
+ public void setStatus(NodeExecutionStatus status) {
+ this.status = status;
+ }
+
+ /* (non-Javadoc)
+ * @see
org.apache.airavata.registry.api.workflow.INodeExecutionData#setStatus(org.apache.airavata.registry.api.workflow.WorkflowExecutionStatus.State,
java.util.Date)
+ */
+ public void setStatus(WorkflowExecutionStatus.State status, Date date) {
+ setStatus(new NodeExecutionStatus(this.workflowInstanceNode, status,
date));
+
+ }
+
+ /* (non-Javadoc)
+ * @see
org.apache.airavata.registry.api.workflow.INodeExecutionData#getInputData()
+ */
+ public List<InputData> getInputData() {
+ if (inputData==null){
+ inputData=new ArrayList<InputData>();
+ List<NameValue> data = getIOParameterData(getInput());
+ for (NameValue nameValue : data) {
+ inputData.add(new
InputData(getWorkflowInstanceNode(), nameValue.name, nameValue.value));
+ }
+ }
+ return inputData;
+ }
+
+ /* (non-Javadoc)
+ * @see
org.apache.airavata.registry.api.workflow.INodeExecutionData#getOutputData()
+ */
+ public List<OutputData> getOutputData() {
+ if (outputData==null){
+ outputData=new ArrayList<OutputData>();
+ List<NameValue> data = getIOParameterData(getOutput());
+ for (NameValue nameValue : data) {
+ outputData.add(new
OutputData(getWorkflowInstanceNode(), nameValue.name, nameValue.value));
+ }
+ }
+ return outputData;
+ }
+
+ /* (non-Javadoc)
+ * @see
org.apache.airavata.registry.api.workflow.INodeExecutionData#setInputData(java.util.List)
+ */
+ public void setInputData(List<InputData> inputData) {
+ this.inputData = inputData;
+ }
+
+ /* (non-Javadoc)
+ * @see
org.apache.airavata.registry.api.workflow.INodeExecutionData#setOutputData(java.util.List)
+ */
+ public void setOutputData(List<OutputData> outputData) {
+ this.outputData = outputData;
+ }
+
+ public String getInput() {
+ return input;
+ }
+
+ public void setInput(String input) {
+ this.input = input;
+ }
+
+ public String getOutput() {
+ return output;
+ }
+
+ public void setOutput(String output) {
+ this.output = output;
+ }
+
+ /* (non-Javadoc)
+ * @see
org.apache.airavata.registry.api.workflow.INodeExecutionData#getType()
+ */
+ public WorkflowNodeType.WorkflowNode getType() {
+ return type;
+ }
+
+ /* (non-Javadoc)
+ * @see
org.apache.airavata.registry.api.workflow.INodeExecutionData#setType(org.apache.airavata.registry.api.workflow.WorkflowNodeType.WorkflowNode)
+ */
+ public void setType(WorkflowNodeType.WorkflowNode type) {
+ this.type = type;
+ }
+
+ public State getState() {
+ return status.getExecutionStatus();
+ }
+
+ 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;
+ }
+
+}
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=1423019&r1=1423018&r2=1423019&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
Mon Dec 17 17:00:50 2012
@@ -25,9 +25,6 @@ import org.apache.airavata.registry.api.
import org.apache.airavata.registry.api.workflow.WorkflowNodeType.WorkflowNode;
import javax.jws.WebService;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlSeeAlso;
import java.util.Date;
import java.util.List;
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=1423019&r1=1423018&r2=1423019&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
Mon Dec 17 17:00:50 2012
@@ -29,6 +29,7 @@ import com.sun.jersey.api.client.config.
import com.sun.jersey.api.json.JSONConfiguration;
import com.sun.jersey.core.util.MultivaluedMapImpl;
import org.apache.airavata.registry.api.PasswordCallback;
+import org.apache.airavata.registry.api.impl.WorkflowExecutionDataImpl;
import org.apache.airavata.registry.api.workflow.*;
import org.apache.airavata.rest.mappings.resourcemappings.ExperimentDataList;
import org.apache.airavata.rest.mappings.resourcemappings.ExperimentIDList;
@@ -1281,7 +1282,7 @@ public class ProvenanceResourceClient {
}
}
- WorkflowExecutionData workflowInstanceData =
response.getEntity(WorkflowExecutionData.class);
+ WorkflowExecutionDataImpl workflowInstanceData =
response.getEntity(WorkflowExecutionDataImpl.class);
return workflowInstanceData;
}
@@ -1366,7 +1367,7 @@ public class ProvenanceResourceClient {
}
}
- public NodeExecutionDataImpl getWorkflowInstanceNodeData(String
workflowInstanceId,
+ public NodeExecutionData getWorkflowInstanceNodeData(String
workflowInstanceId,
String nodeId)
{
webResource = getProvenanceRegistryBaseResource().path(
ResourcePathConstants.ProvenanceResourcePathConstants.WORKFLOWINSTANCE_NODE_DATA);
@@ -1402,8 +1403,8 @@ public class ProvenanceResourceClient {
}
}
- NodeExecutionDataImpl workflowInstanceNodeData =
- response.getEntity(NodeExecutionDataImpl.class);
+ NodeExecutionData workflowInstanceNodeData =
+ response.getEntity(NodeExecutionData.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=1423019&r1=1423018&r2=1423019&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
Mon Dec 17 17:00:50 2012
@@ -38,17 +38,8 @@ import org.apache.airavata.registry.api.
import org.apache.airavata.registry.api.WorkspaceProject;
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.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.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;
+import org.apache.airavata.registry.api.workflow.*;
+import org.apache.airavata.registry.api.workflow.NodeExecutionData;
public class RegistryClient extends AiravataRegistry2 {
@@ -686,7 +677,7 @@ public class RegistryClient extends Aira
}
- public NodeExecutionDataImpl getWorkflowInstanceNodeData(String
workflowInstanceId,
+ public NodeExecutionData 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=1423019&r1=1423018&r2=1423019&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
Mon Dec 17 17:00:50 2012
@@ -460,7 +460,7 @@ public class ProvenanceRegistryResource
try {
DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd
HH:mm:ss");
Date formattedDate = dateFormat.parse(statusUpdateTime);
- WorkflowExecutionData workflowInstanceData =
airavataRegistry.getWorkflowInstanceData(workflowInstanceId);
+ WorkflowExecutionDataImpl workflowInstanceData =
(WorkflowExecutionDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceId);
WorkflowExecutionStatus.State status =
WorkflowExecutionStatus.State.valueOf(executionStatus);
WorkflowExecutionStatus workflowInstanceStatus = new
WorkflowExecutionStatus(workflowInstanceId, workflowInstanceId);
workflowInstanceStatus.setExecutionStatus(status);
@@ -532,7 +532,7 @@ public class ProvenanceRegistryResource
@FormParam("data") String data) {
AiravataRegistry2 airavataRegistry =
RegPoolUtils.acquireRegistry(context);
try {
- WorkflowExecutionData workflowInstanceData =
airavataRegistry.getWorkflowInstanceData(workflowInstanceID);
+ WorkflowExecutionDataImpl workflowInstanceData =
(WorkflowExecutionDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceID);
WorkflowExecution workflowExecution = new
WorkflowExecution(workflowInstanceID, workflowInstanceID);
WorkflowInstanceNode workflowInstanceNode = new
WorkflowInstanceNode(workflowExecution, nodeID);
airavataRegistry.updateWorkflowNodeInput(workflowInstanceNode,
data);
@@ -567,7 +567,7 @@ public class ProvenanceRegistryResource
@FormParam("data") String data) {
AiravataRegistry2 airavataRegistry =
RegPoolUtils.acquireRegistry(context);
try {
- WorkflowExecutionData workflowInstanceData =
airavataRegistry.getWorkflowInstanceData(workflowInstanceID);
+ WorkflowExecutionDataImpl workflowInstanceData =
(WorkflowExecutionDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceID);
WorkflowExecution workflowExecution = new
WorkflowExecution(workflowInstanceID, workflowInstanceID);
WorkflowInstanceNode workflowInstanceNode = new
WorkflowInstanceNode(workflowExecution, nodeID);
airavataRegistry.updateWorkflowNodeOutput(workflowInstanceNode,
data);
@@ -901,7 +901,7 @@ public class ProvenanceRegistryResource
@QueryParam("nodeId") String nodeId)
{
AiravataRegistry2 airavataRegistry =
RegPoolUtils.acquireRegistry(context);
try {
- WorkflowExecutionData workflowInstanceData =
airavataRegistry.getWorkflowInstanceData(workflowInstanceId);
+ WorkflowExecutionDataImpl workflowInstanceData =
(WorkflowExecutionDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceId);
WorkflowExecution workflowExecution = new
WorkflowExecution(workflowInstanceId, workflowInstanceId);
WorkflowInstanceNode workflowInstanceNode = new
WorkflowInstanceNode(workflowExecution, nodeId);
NodeExecutionStatus workflowNodeStatus =
airavataRegistry.getWorkflowNodeStatus(workflowInstanceNode);
@@ -938,7 +938,7 @@ public class ProvenanceRegistryResource
@QueryParam("nodeId") String
nodeId) {
AiravataRegistry2 airavataRegistry =
RegPoolUtils.acquireRegistry(context);
try {
- WorkflowExecutionData workflowInstanceData =
airavataRegistry.getWorkflowInstanceData(workflowInstanceId);
+ WorkflowExecutionDataImpl workflowInstanceData =
(WorkflowExecutionDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceId);
WorkflowExecution workflowExecution = new
WorkflowExecution(workflowInstanceId, workflowInstanceId);
WorkflowInstanceNode workflowInstanceNode = new
WorkflowInstanceNode(workflowExecution, nodeId);
Date workflowNodeStartTime =
airavataRegistry.getWorkflowNodeStartTime(workflowInstanceNode);
@@ -973,7 +973,7 @@ public class ProvenanceRegistryResource
public Response getWorkflowStartTime(@QueryParam("workflowInstanceId")
String workflowInstanceId) {
AiravataRegistry2 airavataRegistry =
RegPoolUtils.acquireRegistry(context);
try {
- WorkflowExecutionData workflowInstanceData =
airavataRegistry.getWorkflowInstanceData(workflowInstanceId);
+ WorkflowExecutionDataImpl workflowInstanceData =
(WorkflowExecutionDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceId);
WorkflowExecution workflowInstance = new
WorkflowExecution(workflowInstanceId, workflowInstanceId);
Date workflowStartTime =
airavataRegistry.getWorkflowStartTime(workflowInstance);
if (workflowStartTime != null) {
@@ -1036,7 +1036,7 @@ public class ProvenanceRegistryResource
public Response getWorkflowInstanceData(@QueryParam("workflowInstanceId")
String workflowInstanceId) {
AiravataRegistry2 airavataRegistry =
RegPoolUtils.acquireRegistry(context);
try {
- WorkflowExecutionData workflowInstanceData =
airavataRegistry.getWorkflowInstanceData(workflowInstanceId);
+ WorkflowExecutionDataImpl workflowInstanceData =
(WorkflowExecutionDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceId);
if (workflowInstanceData != null) {
Response.ResponseBuilder builder =
Response.status(Response.Status.OK);
builder.entity(workflowInstanceData);
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=1423019&r1=1423018&r2=1423019&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
Mon Dec 17 17:00:50 2012
@@ -31,7 +31,6 @@ import org.apache.airavata.registry.api.
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.NodeExecutionDataImpl;
public class XBayaWorkflow {
private List<XBayaWorkflowNodeElement> workflowServices;
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=1423019&r1=1423018&r2=1423019&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
Mon Dec 17 17:00:50 2012
@@ -26,7 +26,6 @@ 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 {
