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/14 21:02:47 UTC
svn commit: r1422063 - in /airavata/trunk/modules: integration-tests/
registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/
registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/
rest/client/src...
Author: chathuri
Date: Fri Dec 14 20:02:42 2012
New Revision: 1422063
URL: http://svn.apache.org/viewvc?rev=1422063&view=rev
Log:
updating rest service to have interfaces
Modified:
airavata/trunk/modules/integration-tests/derby-start.txt
airavata/trunk/modules/integration-tests/derby-stop.txt
airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/ProvenanceRegistryService.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/NodeExecutionData.java
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowExecutionData.java
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowExecutionStatus.java
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/resourcemappings/ExperimentDataList.java
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProvenanceRegistryResource.java
airavata/trunk/modules/rest/service/src/test/resources/testdb/test.h2.db
airavata/trunk/modules/security/src/test/resources/testdb/test.h2.db
Modified: airavata/trunk/modules/integration-tests/derby-start.txt
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/integration-tests/derby-start.txt?rev=1422063&r1=1422062&r2=1422063&view=diff
==============================================================================
--- airavata/trunk/modules/integration-tests/derby-start.txt (original)
+++ airavata/trunk/modules/integration-tests/derby-start.txt Fri Dec 14 20:02:42 2012
@@ -1 +1 @@
-cd: 22: can't cd to /home/samindaw/prj-co/airavata/modules/integration-tests/target/tests/apache-tomcat-7.0.33/webapps/axis2/WEB-INF/bin
+./derby.sh: line 22: cd: /Users/chathuri/airavata/source/trunk_new/modules/integration-tests/target/tests/apache-tomcat-7.0.33/webapps/axis2/WEB-INF/bin: No such file or directory
Modified: airavata/trunk/modules/integration-tests/derby-stop.txt
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/integration-tests/derby-stop.txt?rev=1422063&r1=1422062&r2=1422063&view=diff
==============================================================================
--- airavata/trunk/modules/integration-tests/derby-stop.txt (original)
+++ airavata/trunk/modules/integration-tests/derby-stop.txt Fri Dec 14 20:02:42 2012
@@ -1,2 +0,0 @@
-Does not exist
-./stop-derby.sh: 7: [[: not found
Modified: airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/ProvenanceRegistryService.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/ProvenanceRegistryService.java?rev=1422063&r1=1422062&r2=1422063&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/ProvenanceRegistryService.java (original)
+++ airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/ProvenanceRegistryService.java Fri Dec 14 20:02:42 2012
@@ -22,7 +22,7 @@
package org.apache.airavata.registry.services;
import org.apache.airavata.registry.api.exception.RegistryException;
-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 javax.ws.rs.core.Response;
@@ -269,7 +269,7 @@ public interface ProvenanceRegistryServi
* @return
* @throws org.apache.airavata.registry.api.exception.RegistryException
*/
- public Response updateWorkflowNodeStatus(WorkflowInstanceNodeStatus workflowStatusNode) throws RegistryException;
+ public Response updateWorkflowNodeStatus(NodeExecutionStatus workflowStatusNode) throws RegistryException;
public Response updateWorkflowNodeStatus(String workflowInstanceId, String nodeId, String executionStatus)
throws RegistryException;
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=1422063&r1=1422062&r2=1422063&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 Fri Dec 14 20:02:42 2012
@@ -24,14 +24,17 @@ package org.apache.airavata.registry.api
import java.util.List;
import org.apache.airavata.registry.api.exception.worker.ExperimentLazyLoadedException;
+import org.apache.airavata.registry.api.impl.ExperimentDataImpl;
import org.apache.airavata.registry.api.impl.WorkflowExecutionDataImpl;
+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;
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
+@WebService
+@XmlSeeAlso(ExperimentDataImpl.class)
public interface ExperimentData extends WorkflowExecutionData {
//Current Id and Topic values are similar
Modified: 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=1422063&r1=1422062&r2=1422063&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/NodeExecutionData.java Fri Dec 14 20:02:42 2012
@@ -26,6 +26,11 @@ import java.util.List;
import org.apache.airavata.registry.api.exception.worker.ExperimentLazyLoadedException;
+import javax.jws.WebService;
+import javax.xml.bind.annotation.XmlSeeAlso;
+
+@WebService
+@XmlSeeAlso(NodeExecutionDataImpl.class)
public interface NodeExecutionData {
/**
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=1422063&r1=1422062&r2=1422063&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 20:02:42 2012
@@ -21,16 +21,19 @@ package org.apache.airavata.registry.api
import org.apache.airavata.registry.api.exception.worker.ExperimentLazyLoadedException;
import org.apache.airavata.registry.api.impl.ExperimentDataImpl;
+import org.apache.airavata.registry.api.impl.WorkflowExecutionDataImpl;
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;
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
+@WebService
+@XmlSeeAlso(WorkflowExecutionDataImpl.class)
public interface WorkflowExecutionData {
/**
* Get workflow execution id
Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowExecutionStatus.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowExecutionStatus.java?rev=1422063&r1=1422062&r2=1422063&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowExecutionStatus.java (original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowExecutionStatus.java Fri Dec 14 20:02:42 2012
@@ -30,9 +30,15 @@ import java.util.Date;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement
public class WorkflowExecutionStatus {
+
public WorkflowExecutionStatus() {
}
+ public WorkflowExecutionStatus(String experimentID, String workflowInstanceID) {
+ workflowInstance.setExperimentId(experimentID);
+ workflowInstance.setWorkflowExecutionId(workflowInstanceID);
+ }
+
public enum State {
STARTED {
public String toString() {
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=1422063&r1=1422062&r2=1422063&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 20:02:42 2012
@@ -29,8 +29,6 @@ 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.ExperimentDataImpl;
-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;
@@ -754,7 +752,7 @@ public class ProvenanceResourceClient {
+ status);
}
}
- ExperimentDataImpl experimentData = response.getEntity(ExperimentDataImpl.class);
+ ExperimentData experimentData = response.getEntity(ExperimentData.class);
return experimentData;
}
@@ -792,7 +790,7 @@ public class ProvenanceResourceClient {
}
}
- ExperimentDataImpl experimentData = response.getEntity(ExperimentDataImpl.class);
+ ExperimentData experimentData = response.getEntity(ExperimentData.class);
return experimentData;
}
@@ -832,9 +830,9 @@ public class ProvenanceResourceClient {
}
ExperimentDataList experimentDataList = response.getEntity(ExperimentDataList.class);
- List<ExperimentDataImpl> dataList = experimentDataList.getExperimentDataList();
+ List<ExperimentData> dataList = experimentDataList.getExperimentDataList();
- for (ExperimentDataImpl experimentData : dataList) {
+ for (ExperimentData experimentData : dataList) {
experimentDatas.add(experimentData);
}
return experimentDatas;
@@ -877,9 +875,9 @@ public class ProvenanceResourceClient {
}
ExperimentDataList experimentDataList = response.getEntity(ExperimentDataList.class);
- List<ExperimentDataImpl> dataList = experimentDataList.getExperimentDataList();
+ List<ExperimentData> dataList = experimentDataList.getExperimentDataList();
- for (ExperimentDataImpl experimentData : dataList) {
+ for (ExperimentData experimentData : dataList) {
experimentDatas.add(experimentData);
}
return experimentDatas;
@@ -959,9 +957,9 @@ public class ProvenanceResourceClient {
}
}
ExperimentDataList experimentDataList = response.getEntity(ExperimentDataList.class);
- List<ExperimentDataImpl> dataList = experimentDataList.getExperimentDataList();
+ List<ExperimentData> dataList = experimentDataList.getExperimentDataList();
- for (ExperimentDataImpl experimentData : dataList) {
+ for (ExperimentData experimentData : dataList) {
experimentDatas.add(experimentData);
}
return experimentDatas;
@@ -1283,7 +1281,7 @@ public class ProvenanceResourceClient {
}
}
- WorkflowExecutionDataImpl workflowInstanceData = response.getEntity(WorkflowExecutionDataImpl.class);
+ WorkflowExecutionData workflowInstanceData = response.getEntity(WorkflowExecutionData.class);
return workflowInstanceData;
}
Modified: airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/resourcemappings/ExperimentDataList.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/resourcemappings/ExperimentDataList.java?rev=1422063&r1=1422062&r2=1422063&view=diff
==============================================================================
--- airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/resourcemappings/ExperimentDataList.java (original)
+++ airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/resourcemappings/ExperimentDataList.java Fri Dec 14 20:02:42 2012
@@ -22,6 +22,7 @@
package org.apache.airavata.rest.mappings.resourcemappings;
import org.apache.airavata.registry.api.impl.ExperimentDataImpl;
+import org.apache.airavata.registry.api.workflow.ExperimentData;
import javax.xml.bind.annotation.XmlRootElement;
import java.util.ArrayList;
@@ -29,16 +30,16 @@ import java.util.List;
@XmlRootElement
public class ExperimentDataList {
- private List<ExperimentDataImpl> experimentDataList = new ArrayList<ExperimentDataImpl>();
+ private List<ExperimentData> experimentDataList = new ArrayList<ExperimentData>();
public ExperimentDataList() {
}
- public List<ExperimentDataImpl> getExperimentDataList() {
+ public List<ExperimentData> getExperimentDataList() {
return experimentDataList;
}
- public void setExperimentDataList(List<ExperimentDataImpl> experimentDataList) {
+ public void setExperimentDataList(List<ExperimentData> experimentDataList) {
this.experimentDataList = experimentDataList;
}
}
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=1422063&r1=1422062&r2=1422063&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 20:02:42 2012
@@ -460,10 +460,11 @@ public class ProvenanceRegistryResource
try {
DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date formattedDate = dateFormat.parse(statusUpdateTime);
- WorkflowExecutionDataImpl workflowInstanceData = (WorkflowExecutionDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceId);
- WorkflowExecution workflowInstance = workflowInstanceData.getWorkflowExecution();
+ WorkflowExecutionData workflowInstanceData = airavataRegistry.getWorkflowInstanceData(workflowInstanceId);
WorkflowExecutionStatus.State status = WorkflowExecutionStatus.State.valueOf(executionStatus);
- WorkflowExecutionStatus workflowInstanceStatus = new WorkflowExecutionStatus(workflowInstance, status, formattedDate);
+ WorkflowExecutionStatus workflowInstanceStatus = new WorkflowExecutionStatus(workflowInstanceId, workflowInstanceId);
+ workflowInstanceStatus.setExecutionStatus(status);
+ workflowInstanceStatus.setStatusUpdateTime(formattedDate);
airavataRegistry.updateWorkflowInstanceStatus(workflowInstanceStatus);
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
builder.entity("Workflow instance status updated successfully...");
@@ -531,8 +532,9 @@ public class ProvenanceRegistryResource
@FormParam("data") String data) {
AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
- WorkflowExecutionDataImpl workflowInstanceData = (WorkflowExecutionDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceID);
- WorkflowInstanceNode workflowInstanceNode = workflowInstanceData.getNodeData(nodeID).getWorkflowInstanceNode();
+ WorkflowExecutionData workflowInstanceData = airavataRegistry.getWorkflowInstanceData(workflowInstanceID);
+ WorkflowExecution workflowExecution = new WorkflowExecution(workflowInstanceID, workflowInstanceID);
+ WorkflowInstanceNode workflowInstanceNode = new WorkflowInstanceNode(workflowExecution, nodeID);
airavataRegistry.updateWorkflowNodeInput(workflowInstanceNode, data);
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
builder.entity("Workflow node input saved successfully...");
@@ -565,8 +567,9 @@ public class ProvenanceRegistryResource
@FormParam("data") String data) {
AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
- WorkflowExecutionDataImpl workflowInstanceData = (WorkflowExecutionDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceID);
- WorkflowInstanceNode workflowInstanceNode = workflowInstanceData.getNodeData(nodeID).getWorkflowInstanceNode();
+ WorkflowExecutionData workflowInstanceData = airavataRegistry.getWorkflowInstanceData(workflowInstanceID);
+ WorkflowExecution workflowExecution = new WorkflowExecution(workflowInstanceID, workflowInstanceID);
+ WorkflowInstanceNode workflowInstanceNode = new WorkflowInstanceNode(workflowExecution, nodeID);
airavataRegistry.updateWorkflowNodeOutput(workflowInstanceNode, data);
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
builder.entity("Workflow node output saved successfully...");
@@ -760,7 +763,7 @@ public class ProvenanceRegistryResource
public Response getExperiment(@QueryParam("experimentId") String experimentId) {
AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
- ExperimentDataImpl experimentData = (ExperimentDataImpl) airavataRegistry.getExperiment(experimentId);
+ ExperimentData experimentData = airavataRegistry.getExperiment(experimentId);
if (experimentData != null) {
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
builder.entity(experimentData);
@@ -828,9 +831,9 @@ public class ProvenanceRegistryResource
try {
List<ExperimentData> experimentDataList = airavataRegistry.getExperimentByUser(username);
ExperimentDataList experimentData = new ExperimentDataList();
- List<ExperimentDataImpl> experimentDatas = new ArrayList<ExperimentDataImpl>();
+ List<ExperimentData> experimentDatas = new ArrayList<ExperimentData>();
for (int i = 0; i < experimentDataList.size(); i++) {
- experimentDatas.add((ExperimentDataImpl) experimentDataList.get(i));
+ experimentDatas.add(experimentDataList.get(i));
}
experimentData.setExperimentDataList(experimentDatas);
if (experimentDataList.size() != 0) {
@@ -898,8 +901,9 @@ public class ProvenanceRegistryResource
@QueryParam("nodeId") String nodeId) {
AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
- WorkflowExecutionDataImpl workflowInstanceData = (WorkflowExecutionDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceId);
- WorkflowInstanceNode workflowInstanceNode = workflowInstanceData.getNodeData(nodeId).getWorkflowInstanceNode();
+ WorkflowExecutionData workflowInstanceData = airavataRegistry.getWorkflowInstanceData(workflowInstanceId);
+ WorkflowExecution workflowExecution = new WorkflowExecution(workflowInstanceId, workflowInstanceId);
+ WorkflowInstanceNode workflowInstanceNode = new WorkflowInstanceNode(workflowExecution, nodeId);
NodeExecutionStatus workflowNodeStatus = airavataRegistry.getWorkflowNodeStatus(workflowInstanceNode);
if (workflowNodeStatus != null) {
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
@@ -934,8 +938,9 @@ public class ProvenanceRegistryResource
@QueryParam("nodeId") String nodeId) {
AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
- WorkflowExecutionDataImpl workflowInstanceData = (WorkflowExecutionDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceId);
- WorkflowInstanceNode workflowInstanceNode = workflowInstanceData.getNodeData(nodeId).getWorkflowInstanceNode();
+ WorkflowExecutionData workflowInstanceData = airavataRegistry.getWorkflowInstanceData(workflowInstanceId);
+ WorkflowExecution workflowExecution = new WorkflowExecution(workflowInstanceId, workflowInstanceId);
+ WorkflowInstanceNode workflowInstanceNode = new WorkflowInstanceNode(workflowExecution, nodeId);
Date workflowNodeStartTime = airavataRegistry.getWorkflowNodeStartTime(workflowInstanceNode);
if (workflowNodeStartTime != null) {
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
@@ -968,8 +973,8 @@ public class ProvenanceRegistryResource
public Response getWorkflowStartTime(@QueryParam("workflowInstanceId") String workflowInstanceId) {
AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
- WorkflowExecutionDataImpl workflowInstanceData = (WorkflowExecutionDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceId);
- WorkflowExecution workflowInstance = workflowInstanceData.getWorkflowExecution();
+ WorkflowExecutionData workflowInstanceData = airavataRegistry.getWorkflowInstanceData(workflowInstanceId);
+ WorkflowExecution workflowInstance = new WorkflowExecution(workflowInstanceId, workflowInstanceId);
Date workflowStartTime = airavataRegistry.getWorkflowStartTime(workflowInstance);
if (workflowStartTime != null) {
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
@@ -1031,7 +1036,7 @@ public class ProvenanceRegistryResource
public Response getWorkflowInstanceData(@QueryParam("workflowInstanceId") String workflowInstanceId) {
AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
- WorkflowExecutionDataImpl workflowInstanceData = (WorkflowExecutionDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceId);
+ WorkflowExecutionData workflowInstanceData = airavataRegistry.getWorkflowInstanceData(workflowInstanceId);
if (workflowInstanceData != null) {
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
builder.entity(workflowInstanceData);
@@ -1209,15 +1214,12 @@ public class ProvenanceRegistryResource
@FormParam("nodeType") String nodeType) {
AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
- WorkflowExecutionDataImpl workflowInstanceData = (WorkflowExecutionDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceId);
- NodeExecutionData workflowInstanceNodeData =
- workflowInstanceData.getNodeData(nodeId);
- WorkflowInstanceNode workflowInstanceNode =
- workflowInstanceNodeData.getWorkflowInstanceNode();
+ WorkflowExecution workflowExecution = new WorkflowExecution(workflowInstanceId, workflowInstanceId);
+ WorkflowInstanceNode workflowInstanceNode = new WorkflowInstanceNode(workflowExecution, nodeId);
+
WorkflowNodeType workflowNodeType = new WorkflowNodeType();
- //currently from API only service node is being used
- workflowNodeType.setNodeType(WorkflowNodeType.WorkflowNode.SERVICENODE);
+ workflowNodeType.setNodeType(WorkflowNodeType.getType(nodeType).getNodeType());
// workflowNodeType.setNodeType(nodeType);
airavataRegistry.updateWorkflowNodeType(workflowInstanceNode, workflowNodeType);
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
@@ -1313,8 +1315,8 @@ public class ProvenanceRegistryResource
public Response getExperimentMetaInformation(@QueryParam("experimentId") String experimentId) {
AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
- ExperimentDataImpl experimentMetaInformation =
- (ExperimentDataImpl) airavataRegistry.getExperimentMetaInformation(experimentId);
+ ExperimentData experimentMetaInformation =
+ airavataRegistry.getExperimentMetaInformation(experimentId);
if (experimentMetaInformation != null) {
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
builder.entity(experimentMetaInformation);
@@ -1349,7 +1351,7 @@ public class ProvenanceRegistryResource
List<ExperimentData> allExperimentMetaInformation =
airavataRegistry.getAllExperimentMetaInformation(user);
ExperimentDataList experimentDataList = new ExperimentDataList();
- List<ExperimentDataImpl> experimentDatas = new ArrayList<ExperimentDataImpl>();
+ List<ExperimentData> experimentDatas = new ArrayList<ExperimentData>();
for (ExperimentData experimentData : allExperimentMetaInformation) {
experimentDatas.add((ExperimentDataImpl) experimentData);
}
@@ -1391,9 +1393,9 @@ public class ProvenanceRegistryResource
List<ExperimentData> experimentDataList =
airavataRegistry.searchExperiments(user, experimentNameRegex);
ExperimentDataList experimentData = new ExperimentDataList();
- List<ExperimentDataImpl> experimentDatas = new ArrayList<ExperimentDataImpl>();
+ List<ExperimentData> experimentDatas = new ArrayList<ExperimentData>();
for (ExperimentData experimentData1 : experimentDataList) {
- experimentDatas.add((ExperimentDataImpl) experimentData1);
+ experimentDatas.add(experimentData1);
}
experimentData.setExperimentDataList(experimentDatas);
if (experimentDataList.size() != 0) {
Modified: airavata/trunk/modules/rest/service/src/test/resources/testdb/test.h2.db
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/test/resources/testdb/test.h2.db?rev=1422063&r1=1422062&r2=1422063&view=diff
==============================================================================
Binary files - no diff available.
Modified: airavata/trunk/modules/security/src/test/resources/testdb/test.h2.db
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/security/src/test/resources/testdb/test.h2.db?rev=1422063&r1=1422062&r2=1422063&view=diff
==============================================================================
Binary files - no diff available.