airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From samin...@apache.org
Subject svn commit: r1421951 [2/2] - in /airavata/trunk/modules: airavata-client/src/main/java/org/apache/airavata/client/api/ airavata-client/src/main/java/org/apache/airavata/client/impl/ integration-tests/ integration-tests/src/test/java/org/apache/airavata...
Date Fri, 14 Dec 2012 16:03:22 GMT
Added: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/OutputData.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/OutputData.java?rev=1421951&view=auto
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/OutputData.java (added)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/OutputData.java Fri Dec 14 16:02:57 2012
@@ -0,0 +1,34 @@
+/*
+ *
+ * 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;
+
+public class OutputData extends WorkflowInstanceNodePortData {
+	public OutputData() {
+		super();
+	}
+    public OutputData(WorkflowInstanceNode workflowInstanceNode, String portName, String portValue) {
+		super(workflowInstanceNode, portName, portValue);
+	}
+	public OutputData(WorkflowInstanceNode workflowInstanceNode, String data) {
+		super(workflowInstanceNode, data);
+	}
+}

Propchange: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/OutputData.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowExecution.java (from r1421909, airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstance.java)
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowExecution.java?p2=airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowExecution.java&p1=airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstance.java&r1=1421909&r2=1421951&rev=1421951&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstance.java (original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowExecution.java Fri Dec 14 16:02:57 2012
@@ -24,31 +24,31 @@ package org.apache.airavata.registry.api
 import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
-public class WorkflowInstance {
+public class WorkflowExecution {
 	private String experimentId;
-	private String workflowInstanceId;
+	private String workflowExecutionId;
 	private String templateName;
 
-    public WorkflowInstance() {
+    public WorkflowExecution() {
     }
 
-    public WorkflowInstance(String experimentId,String instanceId) {
+    public WorkflowExecution(String experimentId,String instanceId) {
 		setExperimentId(experimentId);
-		setWorkflowInstanceId(instanceId);
+		setWorkflowExecutionId(instanceId);
 	}
 
-    public WorkflowInstance(String experimentId, String workflowInstanceId, String templateName) {
+    public WorkflowExecution(String experimentId, String workflowInstanceId, String templateName) {
         this.experimentId = experimentId;
-        this.workflowInstanceId = workflowInstanceId;
+        this.workflowExecutionId = workflowInstanceId;
         this.templateName = templateName;
     }
 
-    public String getWorkflowInstanceId() {
-		return workflowInstanceId;
+    public String getWorkflowExecutionId() {
+		return workflowExecutionId;
 	}
 
-	public void setWorkflowInstanceId(String workflowInstanceId) {
-		this.workflowInstanceId = workflowInstanceId;
+	public void setWorkflowExecutionId(String workflowExecutionId) {
+		this.workflowExecutionId = workflowExecutionId;
 	}
 
 	public String getExperimentId() {

Copied: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowExecutionData.java (from r1421909, airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceData.java)
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowExecutionData.java?p2=airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowExecutionData.java&p1=airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceData.java&r1=1421909&r2=1421951&rev=1421951&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceData.java (original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowExecutionData.java Fri Dec 14 16:02:57 2012
@@ -31,20 +31,88 @@ import java.util.List;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.FIELD)
-public interface WorkflowInstanceData {
-    public WorkflowInstance getWorkflowInstance() throws ExperimentLazyLoadedException;
-    public List<WorkflowInstanceNodeData> getNodeDataList() throws ExperimentLazyLoadedException;
-    public List<WorkflowInstanceNodeData> getNodeDataList(WorkflowNode type)throws ExperimentLazyLoadedException;
-    public void addNodeData(WorkflowInstanceNodeData...nodeData) throws ExperimentLazyLoadedException;
-    public WorkflowInstanceNodeData getNodeData(String nodeId) throws ExperimentLazyLoadedException;
+public interface WorkflowExecutionData {
+	/**
+	 * Get workflow execution id
+	 * @return
+	 */
+	public String getId();
+	
+    /**
+     * Retrieve all node data in this workflow execution
+     * @return
+     * @throws ExperimentLazyLoadedException
+     */
+    public List<NodeExecutionData> getNodeDataList() throws ExperimentLazyLoadedException;
+    
+    /**
+     * Retrieve all node data of the type <code>type</code>
+     * @param type
+     * @return
+     * @throws ExperimentLazyLoadedException
+     */
+    public List<NodeExecutionData> getNodeDataList(WorkflowNode type)throws ExperimentLazyLoadedException;
+    
+    /**
+     * Retrieve the node data with the given node Id
+     * @param nodeId
+     * @return
+     * @throws ExperimentLazyLoadedException
+     */
+    public NodeExecutionData getNodeData(String nodeId) throws ExperimentLazyLoadedException;
+
+    /**
+     * Add node data to the workflow execution
+     * @param nodeData
+     * @throws ExperimentLazyLoadedException
+     */
+    public void addNodeData(NodeExecutionData...nodeData) throws ExperimentLazyLoadedException;
+    
+    /**
+     * Get id of the experiment which this workflow execution belongs to 
+     * @return
+     */
     public String getExperimentId();
-    public String getWorkflowInstanceId() throws ExperimentLazyLoadedException;
+    
+    /**
+     * Get the workflow template name corresponding to this workflow execution
+     * @return
+     * @throws ExperimentLazyLoadedException
+     */
     public String getTemplateName() throws ExperimentLazyLoadedException;
-    public WorkflowInstanceStatus.ExecutionStatus getStatus() throws ExperimentLazyLoadedException;
+    
+    /**
+     * Get current state of the execution of this workflow
+     * @return
+     * @throws ExperimentLazyLoadedException
+     */
+    public WorkflowExecutionStatus.State getState() throws ExperimentLazyLoadedException;
+    
+    /**
+     * Get current state updated time
+     * @return
+     * @throws ExperimentLazyLoadedException
+     */
     public Date getStatusUpdateTime() throws ExperimentLazyLoadedException;
+    
+    /**
+     * Retrieve inputs to the workflow execution
+     * @return
+     * @throws ExperimentLazyLoadedException
+     */
+    public List<InputData> getWorkflowInputs () throws ExperimentLazyLoadedException;
+    
+    /**
+     * Retrieve outputs to the workflow execution
+     * @return
+     * @throws ExperimentLazyLoadedException
+     */
+    public List<OutputData> getWorkflowOutputs ()throws ExperimentLazyLoadedException;
+
+    @Deprecated
+    public WorkflowExecution getWorkflowExecution() throws ExperimentLazyLoadedException;
+    @Deprecated
     public ExperimentDataImpl getExperimentData() throws ExperimentLazyLoadedException;
+    @Deprecated
     public void setExperimentData(ExperimentDataImpl experimentData) throws ExperimentLazyLoadedException;
-    public List<WorkflowInstanceNodePortData> getWorkflowInput () throws ExperimentLazyLoadedException;
-    public List<WorkflowInstanceNodePortData> getWorkflowOutput ()throws ExperimentLazyLoadedException;
-    public String getId();
 }

Copied: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowExecutionStatus.java (from r1421909, airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceStatus.java)
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowExecutionStatus.java?p2=airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowExecutionStatus.java&p1=airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceStatus.java&r1=1421909&r2=1421951&rev=1421951&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceStatus.java (original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowExecutionStatus.java Fri Dec 14 16:02:57 2012
@@ -29,11 +29,11 @@ import java.util.Date;
 
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlRootElement
-public class WorkflowInstanceStatus {
-    public WorkflowInstanceStatus() {
+public class WorkflowExecutionStatus {
+    public WorkflowExecutionStatus() {
     }
 
-    public enum ExecutionStatus {
+    public enum State {
         STARTED {
             public String toString() {
                 return "STARTED";
@@ -66,15 +66,15 @@ public class WorkflowInstanceStatus {
         }
     }
 
-    private ExecutionStatus executionStatus;
+    private State executionStatus;
     private Date statusUpdateTime = null;
-    private WorkflowInstance workflowInstance;
+    private WorkflowExecution workflowInstance;
 
-    public ExecutionStatus getExecutionStatus() {
+    public State getExecutionStatus() {
         return executionStatus;
     }
 
-    public void setExecutionStatus(ExecutionStatus executionStatus) {
+    public void setExecutionStatus(State executionStatus) {
         this.executionStatus = executionStatus;
     }
 
@@ -86,22 +86,22 @@ public class WorkflowInstanceStatus {
         this.statusUpdateTime = statusUpdateTime;
     }
 
-    public WorkflowInstanceStatus(WorkflowInstance workflowInstance, ExecutionStatus executionStatus) {
+    public WorkflowExecutionStatus(WorkflowExecution workflowInstance, State executionStatus) {
         this(workflowInstance, executionStatus, null);
     }
 
-    public WorkflowInstanceStatus(WorkflowInstance workflowInstance, ExecutionStatus executionStatus, Date statusUpdateTime) {
+    public WorkflowExecutionStatus(WorkflowExecution workflowInstance, State executionStatus, Date statusUpdateTime) {
         statusUpdateTime = statusUpdateTime == null ? Calendar.getInstance().getTime() : statusUpdateTime;
         setWorkflowInstance(workflowInstance);
         setExecutionStatus(executionStatus);
         setStatusUpdateTime(statusUpdateTime);
     }
 
-    public WorkflowInstance getWorkflowInstance() {
+    public WorkflowExecution getWorkflowInstance() {
         return workflowInstance;
     }
 
-    public void setWorkflowInstance(WorkflowInstance workflowInstance) {
+    public void setWorkflowInstance(WorkflowExecution workflowInstance) {
         this.workflowInstance = workflowInstance;
     }
 }

Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNode.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNode.java?rev=1421951&r1=1421950&r2=1421951&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNode.java (original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNode.java Fri Dec 14 16:02:57 2012
@@ -28,22 +28,22 @@ import javax.xml.bind.annotation.XmlRoot
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlRootElement
 public class WorkflowInstanceNode{
-	private WorkflowInstance workflowInstance;
+	private WorkflowExecution workflowInstance;
 	private String nodeId;
 
     public WorkflowInstanceNode() {
     }
 
-    public WorkflowInstanceNode(WorkflowInstance workflowInstance, String nodeId) {
+    public WorkflowInstanceNode(WorkflowExecution workflowInstance, String nodeId) {
 		setWorkflowInstance(workflowInstance);
 		setNodeId(nodeId);
 	}
 
-	public WorkflowInstance getWorkflowInstance() {
+	public WorkflowExecution getWorkflowInstance() {
 		return workflowInstance;
 	}
 
-	public void setWorkflowInstance(WorkflowInstance workflowInstance) {
+	public void setWorkflowInstance(WorkflowExecution workflowInstance) {
 		this.workflowInstance = workflowInstance;
 	}
 

Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodePortData.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodePortData.java?rev=1421951&r1=1421950&r2=1421951&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodePortData.java (original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodePortData.java Fri Dec 14 16:02:57 2012
@@ -80,7 +80,7 @@ public class WorkflowInstanceNodePortDat
     }
     
     public String getWorkflowInstanceId(){
-    	return getWorkflowInstanceNode().getWorkflowInstance().getWorkflowInstanceId();
+    	return getWorkflowInstanceNode().getWorkflowInstance().getWorkflowExecutionId();
     }
     
     public String getWorkflowInstanceNodeId(){

Modified: 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/WorkflowInstanceNodeStatus.java?rev=1421951&r1=1421950&r2=1421951&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/WorkflowInstanceNodeStatus.java Fri Dec 14 16:02:57 2012
@@ -24,7 +24,7 @@ package org.apache.airavata.registry.api
 import java.util.Calendar;
 import java.util.Date;
 
-import org.apache.airavata.registry.api.workflow.WorkflowInstanceStatus.ExecutionStatus;
+import org.apache.airavata.registry.api.workflow.WorkflowExecutionStatus.State;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -33,18 +33,18 @@ import javax.xml.bind.annotation.XmlRoot
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlRootElement
 public class WorkflowInstanceNodeStatus {
-    private ExecutionStatus executionStatus;
+    private State executionStatus;
     private Date statusUpdateTime = null;
     private WorkflowInstanceNode workflowInstanceNode;
 
     public WorkflowInstanceNodeStatus() {
     }
 
-    public ExecutionStatus getExecutionStatus() {
+    public State getExecutionStatus() {
         return executionStatus;
     }
 
-    public void setExecutionStatus(ExecutionStatus executionStatus) {
+    public void setExecutionStatus(State executionStatus) {
         this.executionStatus = executionStatus;
     }
 
@@ -56,11 +56,11 @@ public class WorkflowInstanceNodeStatus 
         this.statusUpdateTime = statusUpdateTime;
     }
 
-    public WorkflowInstanceNodeStatus(WorkflowInstanceNode workflowInstanceNode, ExecutionStatus executionStatus) {
+    public WorkflowInstanceNodeStatus(WorkflowInstanceNode workflowInstanceNode, State executionStatus) {
         this(workflowInstanceNode, executionStatus, null);
     }
 
-    public WorkflowInstanceNodeStatus(WorkflowInstanceNode workflowInstanceNode, ExecutionStatus executionStatus, Date statusUpdateTime) {
+    public WorkflowInstanceNodeStatus(WorkflowInstanceNode workflowInstanceNode, State executionStatus, Date statusUpdateTime) {
         statusUpdateTime = statusUpdateTime == null ? Calendar.getInstance().getTime() : statusUpdateTime;
         setWorkflowInstanceNode(workflowInstanceNode);
         setExecutionStatus(executionStatus);

Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowNodeIOData.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowNodeIOData.java?rev=1421951&r1=1421950&r2=1421951&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowNodeIOData.java (original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowNodeIOData.java Fri Dec 14 16:02:57 2012
@@ -36,8 +36,8 @@ public class WorkflowNodeIOData extends 
 
 
     /** when you construct this object it set to STARTED state **/
-    private WorkflowInstanceStatus nodeStatus = new
-            WorkflowInstanceStatus(new WorkflowInstance(experimentId,workflowId,workflowName), WorkflowInstanceStatus.ExecutionStatus.STARTED);
+    private WorkflowExecutionStatus nodeStatus = new
+            WorkflowExecutionStatus(new WorkflowExecution(experimentId,workflowId,workflowName), WorkflowExecutionStatus.State.STARTED);
     
     public WorkflowNodeIOData() {
 	}
@@ -104,11 +104,11 @@ public class WorkflowNodeIOData extends 
         return nodeType;
     }
 
-    public WorkflowInstanceStatus getNodeStatus() {
+    public WorkflowExecutionStatus getNodeStatus() {
         return nodeStatus;
     }
 
-    public void setNodeStatus(WorkflowInstanceStatus nodeStatus) {
+    public void setNodeStatus(WorkflowExecutionStatus nodeStatus) {
         this.nodeStatus = nodeStatus;
     }
 }

Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowRunTimeData.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowRunTimeData.java?rev=1421951&r1=1421950&r2=1421951&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowRunTimeData.java (original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowRunTimeData.java Fri Dec 14 16:02:57 2012
@@ -27,11 +27,11 @@ public class WorkflowRunTimeData {
     String workflowInstanceID;
     String templateID;
     Timestamp startTime;
-    WorkflowInstanceStatus.ExecutionStatus workflowStatus;
+    WorkflowExecutionStatus.State workflowStatus;
     Timestamp lastUpdateTime;
 
     public WorkflowRunTimeData(String experimentID, String workflowInstanceID, String templateID,
-                               Timestamp startTime, WorkflowInstanceStatus.ExecutionStatus workflowStatus, Timestamp lastUpdateTime) {
+                               Timestamp startTime, WorkflowExecutionStatus.State workflowStatus, Timestamp lastUpdateTime) {
         this.experimentID = experimentID;
         this.workflowInstanceID = workflowInstanceID;
         this.templateID = templateID;
@@ -56,7 +56,7 @@ public class WorkflowRunTimeData {
         return startTime;
     }
 
-    public WorkflowInstanceStatus.ExecutionStatus getWorkflowStatus() {
+    public WorkflowExecutionStatus.State getWorkflowStatus() {
         return workflowStatus;
     }
 
@@ -80,7 +80,7 @@ public class WorkflowRunTimeData {
         this.startTime = startTime;
     }
 
-    public void setWorkflowStatus(WorkflowInstanceStatus.ExecutionStatus workflowStatus) {
+    public void setWorkflowStatus(WorkflowExecutionStatus.State workflowStatus) {
         this.workflowStatus = workflowStatus;
     }
 

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=1421951&r1=1421950&r2=1421951&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 16:02:57 2012
@@ -30,7 +30,7 @@ import com.sun.jersey.api.json.JSONConfi
 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.WorkflowInstanceDataImpl;
+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;
@@ -411,8 +411,8 @@ public class ProvenanceResourceClient {
         }
     }
 
-    public List<WorkflowInstance> getExperimentWorkflowInstances(String experimentId) {
-        List<WorkflowInstance> workflowInstanceList = new ArrayList<WorkflowInstance>();
+    public List<WorkflowExecution> getExperimentWorkflowInstances(String experimentId) {
+        List<WorkflowExecution> workflowInstanceList = new ArrayList<WorkflowExecution>();
         webResource = getProvenanceRegistryBaseResource().path(
                 ResourcePathConstants.ProvenanceResourcePathConstants.GET_EXPERIMENTWORKFLOWINSTANCES);
         MultivaluedMap queryParams = new MultivaluedMapImpl();
@@ -447,10 +447,10 @@ public class ProvenanceResourceClient {
         }
 
         WorkflowInstancesList workflowInstancesList = response.getEntity(WorkflowInstancesList.class);
-        WorkflowInstance[] workflowInstances = workflowInstancesList.getWorkflowInstances();
+        WorkflowExecution[] workflowInstances = workflowInstancesList.getWorkflowInstances();
 
 
-        for (WorkflowInstance workflowInstance : workflowInstances) {
+        for (WorkflowExecution workflowInstance : workflowInstances) {
             workflowInstanceList.add(workflowInstance);
         }
 
@@ -536,7 +536,7 @@ public class ProvenanceResourceClient {
         }
     }
 
-    public void updateWorkflowInstanceStatus(String instanceId, WorkflowInstanceStatus.ExecutionStatus executionStatus) {
+    public void updateWorkflowInstanceStatus(String instanceId, WorkflowExecutionStatus.State executionStatus) {
         webResource = getProvenanceRegistryBaseResource().path(
                 ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_WORKFLOWINSTANCESTATUS_INSTANCEID);
         MultivaluedMap formParams = new MultivaluedMapImpl();
@@ -570,14 +570,14 @@ public class ProvenanceResourceClient {
         }
     }
 
-    public void updateWorkflowInstanceStatus(WorkflowInstanceStatus workflowInstanceStatus) {
+    public void updateWorkflowInstanceStatus(WorkflowExecutionStatus workflowInstanceStatus) {
         DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String statusUpdateDate = dateFormat.format(workflowInstanceStatus.getStatusUpdateTime());
         webResource = getProvenanceRegistryBaseResource().path(
                 ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_WORKFLOWINSTANCESTATUS);
         MultivaluedMap formParams = new MultivaluedMapImpl();
         formParams.add("workflowInstanceId",
-                workflowInstanceStatus.getWorkflowInstance().getWorkflowInstanceId());
+                workflowInstanceStatus.getWorkflowInstance().getWorkflowExecutionId());
         formParams.add("executionStatus",
                 workflowInstanceStatus.getExecutionStatus().name());
         formParams.add("statusUpdateTime",
@@ -611,7 +611,7 @@ public class ProvenanceResourceClient {
         }
     }
 
-    public WorkflowInstanceStatus getWorkflowInstanceStatus(String instanceId) {
+    public WorkflowExecutionStatus getWorkflowInstanceStatus(String instanceId) {
         webResource = getProvenanceRegistryBaseResource().path(
                 ResourcePathConstants.ProvenanceResourcePathConstants.GET_WORKFLOWINSTANCESTATUS);
         MultivaluedMap queryParams = new MultivaluedMapImpl();
@@ -645,7 +645,7 @@ public class ProvenanceResourceClient {
             }
         }
 
-        WorkflowInstanceStatus workflowInstanceStatus = response.getEntity(WorkflowInstanceStatus.class);
+        WorkflowExecutionStatus workflowInstanceStatus = response.getEntity(WorkflowExecutionStatus.class);
         return workflowInstanceStatus;
     }
 
@@ -654,7 +654,7 @@ public class ProvenanceResourceClient {
                 ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_WORKFLOWNODEINPUT);
         MultivaluedMap formParams = new MultivaluedMapImpl();
         formParams.add("nodeID", node.getNodeId());
-        formParams.add("workflowInstanceId", node.getWorkflowInstance().getWorkflowInstanceId());
+        formParams.add("workflowInstanceId", node.getWorkflowInstance().getWorkflowExecutionId());
         formParams.add("data", data);
 
         ClientResponse response = webResource.accept(
@@ -691,7 +691,7 @@ public class ProvenanceResourceClient {
                 ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_WORKFLOWNODEOUTPUT);
         MultivaluedMap formParams = new MultivaluedMapImpl();
         formParams.add("nodeID", node.getNodeId());
-        formParams.add("workflowInstanceId", node.getWorkflowInstance().getWorkflowInstanceId());
+        formParams.add("workflowInstanceId", node.getWorkflowInstance().getWorkflowExecutionId());
         formParams.add("data", data);
 
         ClientResponse response = webResource.accept(
@@ -972,7 +972,7 @@ public class ProvenanceResourceClient {
                 ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_WORKFLOWNODE_STATUS);
         MultivaluedMap formParams = new MultivaluedMapImpl();
         formParams.add("workflowInstanceId",
-                workflowStatusNode.getWorkflowInstanceNode().getWorkflowInstance().getWorkflowInstanceId());
+                workflowStatusNode.getWorkflowInstanceNode().getWorkflowInstance().getWorkflowExecutionId());
         formParams.add("nodeId",
                 workflowStatusNode.getWorkflowInstanceNode().getNodeId());
         formParams.add("executionStatus",
@@ -1009,7 +1009,7 @@ public class ProvenanceResourceClient {
 
     public void updateWorkflowNodeStatus(String workflowInstanceId,
                                          String nodeId,
-                                         WorkflowInstanceStatus.ExecutionStatus executionStatus) {
+                                         WorkflowExecutionStatus.State executionStatus) {
         webResource = getProvenanceRegistryBaseResource().path(
                 ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_WORKFLOWNODE_STATUS);
         MultivaluedMap formParams = new MultivaluedMapImpl();
@@ -1047,12 +1047,12 @@ public class ProvenanceResourceClient {
     }
 
     public void updateWorkflowNodeStatus(WorkflowInstanceNode workflowNode,
-                                         WorkflowInstanceStatus.ExecutionStatus executionStatus) {
+                                         WorkflowExecutionStatus.State executionStatus) {
         webResource = getProvenanceRegistryBaseResource().path(
                 ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_WORKFLOWNODE_STATUS);
         MultivaluedMap formParams = new MultivaluedMapImpl();
         formParams.add("workflowInstanceId",
-                workflowNode.getWorkflowInstance().getWorkflowInstanceId());
+                workflowNode.getWorkflowInstance().getWorkflowExecutionId());
         formParams.add("nodeId", workflowNode.getNodeId());
         formParams.add("executionStatus", executionStatus.name());
 
@@ -1089,7 +1089,7 @@ public class ProvenanceResourceClient {
         webResource = getProvenanceRegistryBaseResource().path(
                 ResourcePathConstants.ProvenanceResourcePathConstants.GET_WORKFLOWNODE_STATUS);
         MultivaluedMap queryParams = new MultivaluedMapImpl();
-        queryParams.add("workflowInstanceId", workflowNode.getWorkflowInstance().getWorkflowInstanceId());
+        queryParams.add("workflowInstanceId", workflowNode.getWorkflowInstance().getWorkflowExecutionId());
         queryParams.add("nodeId", workflowNode.getNodeId());
         ClientResponse response = webResource.queryParams(queryParams).accept(
                 MediaType.APPLICATION_JSON).get(ClientResponse.class);
@@ -1129,7 +1129,7 @@ public class ProvenanceResourceClient {
         webResource = getProvenanceRegistryBaseResource().path(
                 ResourcePathConstants.ProvenanceResourcePathConstants.GET_WORKFLOWNODE_STARTTIME);
         MultivaluedMap queryParams = new MultivaluedMapImpl();
-        queryParams.add("workflowInstanceId", workflowNode.getWorkflowInstance().getWorkflowInstanceId());
+        queryParams.add("workflowInstanceId", workflowNode.getWorkflowInstance().getWorkflowExecutionId());
         queryParams.add("nodeId", workflowNode.getNodeId());
         ClientResponse response = webResource.queryParams(queryParams).accept(
                 MediaType.TEXT_PLAIN).get(ClientResponse.class);
@@ -1171,11 +1171,11 @@ public class ProvenanceResourceClient {
         }
     }
 
-    public Date getWorkflowStartTime(WorkflowInstance workflowInstance) {
+    public Date getWorkflowStartTime(WorkflowExecution workflowInstance) {
         webResource = getProvenanceRegistryBaseResource().path(
                 ResourcePathConstants.ProvenanceResourcePathConstants.GET_WORKFLOW_STARTTIME);
         MultivaluedMap queryParams = new MultivaluedMapImpl();
-        queryParams.add("workflowInstanceId", workflowInstance.getWorkflowInstanceId());
+        queryParams.add("workflowInstanceId", workflowInstance.getWorkflowExecutionId());
         ClientResponse response = webResource.queryParams(queryParams).accept(
                 MediaType.TEXT_PLAIN).get(ClientResponse.class);
         int status = response.getStatus();
@@ -1249,7 +1249,7 @@ public class ProvenanceResourceClient {
         }
     }
 
-    public WorkflowInstanceData getWorkflowInstanceData(String workflowInstanceId) {
+    public WorkflowExecutionData getWorkflowInstanceData(String workflowInstanceId) {
         webResource = getProvenanceRegistryBaseResource().path(
                 ResourcePathConstants.ProvenanceResourcePathConstants.GET_WORKFLOWINSTANCEDATA);
         MultivaluedMap queryParams = new MultivaluedMapImpl();
@@ -1283,7 +1283,7 @@ public class ProvenanceResourceClient {
             }
         }
 
-        WorkflowInstanceDataImpl workflowInstanceData = response.getEntity(WorkflowInstanceDataImpl.class);
+        WorkflowExecutionDataImpl workflowInstanceData = response.getEntity(WorkflowExecutionDataImpl.class);
         return workflowInstanceData;
     }
 
@@ -1368,7 +1368,7 @@ public class ProvenanceResourceClient {
         }
     }
 
-    public WorkflowInstanceNodeData getWorkflowInstanceNodeData(String workflowInstanceId,
+    public NodeExecutionData getWorkflowInstanceNodeData(String workflowInstanceId,
                                                                 String nodeId) {
         webResource = getProvenanceRegistryBaseResource().path(
                 ResourcePathConstants.ProvenanceResourcePathConstants.WORKFLOWINSTANCE_NODE_DATA);
@@ -1404,8 +1404,8 @@ public class ProvenanceResourceClient {
             }
         }
 
-        WorkflowInstanceNodeData workflowInstanceNodeData =
-                response.getEntity(WorkflowInstanceNodeData.class);
+        NodeExecutionData workflowInstanceNodeData =
+                response.getEntity(NodeExecutionData.class);
         return workflowInstanceNodeData;
     }
 
@@ -1453,7 +1453,7 @@ public class ProvenanceResourceClient {
         webResource = getProvenanceRegistryBaseResource().path(
                 ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_WORKFLOWNODETYPE);
         MultivaluedMap formParams = new MultivaluedMapImpl();
-        formParams.add("workflowInstanceId", node.getWorkflowInstance().getWorkflowInstanceId());
+        formParams.add("workflowInstanceId", node.getWorkflowInstance().getWorkflowExecutionId());
         formParams.add("nodeId", node.getNodeId());
         formParams.add("nodeType", type.getNodeType().name());
 

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=1421951&r1=1421950&r2=1421951&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 16:02:57 2012
@@ -21,19 +21,34 @@
 
 package org.apache.airavata.rest.client;
 
+import java.net.URI;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
 import org.apache.airavata.common.utils.Version;
 import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
 import org.apache.airavata.commons.gfac.type.HostDescription;
 import org.apache.airavata.commons.gfac.type.ServiceDescription;
-import org.apache.airavata.registry.api.*;
+import org.apache.airavata.registry.api.AiravataExperiment;
+import org.apache.airavata.registry.api.AiravataRegistry2;
+import org.apache.airavata.registry.api.AiravataUser;
+import org.apache.airavata.registry.api.PasswordCallback;
+import org.apache.airavata.registry.api.ResourceMetadata;
+import org.apache.airavata.registry.api.WorkspaceProject;
 import org.apache.airavata.registry.api.exception.RegistryException;
-import org.apache.airavata.registry.api.exception.worker.*;
-import org.apache.airavata.registry.api.workflow.*;
-
-import java.net.URI;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+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.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.WorkflowNodeGramData;
+import org.apache.airavata.registry.api.workflow.WorkflowNodeIOData;
+import org.apache.airavata.registry.api.workflow.WorkflowNodeType;
 
 public class RegistryClient extends AiravataRegistry2 {
 
@@ -485,7 +500,7 @@ public class RegistryClient extends Aira
     }
 
 
-    public List<WorkflowInstance> getExperimentWorkflowInstances(String experimentId) throws RegistryException {
+    public List<WorkflowExecution> getExperimentWorkflowInstances(String experimentId) throws RegistryException {
         return getProvenanceResourceClient().getExperimentWorkflowInstances(experimentId);
     }
 
@@ -502,17 +517,17 @@ public class RegistryClient extends Aira
 
 
     public void updateWorkflowInstanceStatus(String instanceId,
-                                             WorkflowInstanceStatus.ExecutionStatus status) throws RegistryException {
+                                             WorkflowExecutionStatus.State status) throws RegistryException {
         getProvenanceResourceClient().updateWorkflowInstanceStatus(instanceId, status);
     }
 
 
-    public void updateWorkflowInstanceStatus(WorkflowInstanceStatus status) throws RegistryException {
+    public void updateWorkflowInstanceStatus(WorkflowExecutionStatus status) throws RegistryException {
         getProvenanceResourceClient().updateWorkflowInstanceStatus(status);
     }
 
 
-    public WorkflowInstanceStatus getWorkflowInstanceStatus(String instanceId) throws RegistryException {
+    public WorkflowExecutionStatus getWorkflowInstanceStatus(String instanceId) throws RegistryException {
         return getProvenanceResourceClient().getWorkflowInstanceStatus(instanceId);
     }
 
@@ -623,13 +638,13 @@ public class RegistryClient extends Aira
 
 
     public void updateWorkflowNodeStatus(String workflowInstanceId, String nodeId,
-                                         WorkflowInstanceStatus.ExecutionStatus status) throws RegistryException {
+                                         WorkflowExecutionStatus.State status) throws RegistryException {
         getProvenanceResourceClient().updateWorkflowNodeStatus(workflowInstanceId, nodeId, status);
     }
 
 
     public void updateWorkflowNodeStatus(WorkflowInstanceNode workflowNode,
-                                         WorkflowInstanceStatus.ExecutionStatus status) throws RegistryException {
+                                         WorkflowExecutionStatus.State status) throws RegistryException {
         getProvenanceResourceClient().updateWorkflowNodeStatus(workflowNode, status);
     }
 
@@ -644,7 +659,7 @@ public class RegistryClient extends Aira
     }
 
 
-    public Date getWorkflowStartTime(WorkflowInstance workflowInstance) throws RegistryException {
+    public Date getWorkflowStartTime(WorkflowExecution workflowInstance) throws RegistryException {
         return getProvenanceResourceClient().getWorkflowStartTime(workflowInstance);
     }
 
@@ -654,7 +669,7 @@ public class RegistryClient extends Aira
     }
 
 
-    public WorkflowInstanceData getWorkflowInstanceData(String workflowInstanceId) throws RegistryException {
+    public WorkflowExecutionData getWorkflowInstanceData(String workflowInstanceId) throws RegistryException {
         return getProvenanceResourceClient().getWorkflowInstanceData(workflowInstanceId);
     }
 
@@ -671,7 +686,7 @@ public class RegistryClient extends Aira
     }
 
 
-    public WorkflowInstanceNodeData getWorkflowInstanceNodeData(String workflowInstanceId,
+    public NodeExecutionData getWorkflowInstanceNodeData(String workflowInstanceId,
                                                                 String nodeId) throws RegistryException {
         return getProvenanceResourceClient().getWorkflowInstanceNodeData(workflowInstanceId, nodeId);
     }

Modified: airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/resourcemappings/WorkflowInstancesList.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/resourcemappings/WorkflowInstancesList.java?rev=1421951&r1=1421950&r2=1421951&view=diff
==============================================================================
--- airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/resourcemappings/WorkflowInstancesList.java (original)
+++ airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/resourcemappings/WorkflowInstancesList.java Fri Dec 14 16:02:57 2012
@@ -20,19 +20,19 @@
  */
 package org.apache.airavata.rest.mappings.resourcemappings;
 
-import org.apache.airavata.registry.api.workflow.WorkflowInstance;
+import org.apache.airavata.registry.api.workflow.WorkflowExecution;
 
 import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 public class WorkflowInstancesList {
-    WorkflowInstance[] workflowInstances = new WorkflowInstance[]{};
+    WorkflowExecution[] workflowInstances = new WorkflowExecution[]{};
 
-    public WorkflowInstance[] getWorkflowInstances() {
+    public WorkflowExecution[] getWorkflowInstances() {
         return workflowInstances;
     }
 
-    public void setWorkflowInstances(WorkflowInstance[] workflowInstances) {
+    public void setWorkflowInstances(WorkflowExecution[] workflowInstances) {
         this.workflowInstances = workflowInstances;
     }
 }

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=1421951&r1=1421950&r2=1421951&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 16:02:57 2012
@@ -25,7 +25,7 @@ import org.apache.airavata.registry.api.
 import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.registry.api.exception.worker.ExperimentLazyLoadedException;
 import org.apache.airavata.registry.api.impl.ExperimentDataImpl;
-import org.apache.airavata.registry.api.impl.WorkflowInstanceDataImpl;
+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;
@@ -316,9 +316,9 @@ public class ProvenanceRegistryResource 
     public Response getExperimentWorkflowInstances(@QueryParam("experimentId") String experimentId) {
         AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
         try {
-            List<WorkflowInstance> experimentWorkflowInstances = airavataRegistry.getExperimentWorkflowInstances(experimentId);
+            List<WorkflowExecution> experimentWorkflowInstances = airavataRegistry.getExperimentWorkflowInstances(experimentId);
             WorkflowInstancesList workflowInstancesList = new WorkflowInstancesList();
-            WorkflowInstance[] workflowInstances = new WorkflowInstance[experimentWorkflowInstances.size()];
+            WorkflowExecution[] workflowInstances = new WorkflowExecution[experimentWorkflowInstances.size()];
             for (int i = 0; i < experimentWorkflowInstances.size(); i++) {
                 workflowInstances[i] = experimentWorkflowInstances.get(i);
             }
@@ -426,7 +426,7 @@ public class ProvenanceRegistryResource 
                                                            @FormParam("executionStatus") String executionStatus) {
         AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
         try {
-            WorkflowInstanceStatus.ExecutionStatus status = WorkflowInstanceStatus.ExecutionStatus.valueOf(executionStatus);
+            WorkflowExecutionStatus.State status = WorkflowExecutionStatus.State.valueOf(executionStatus);
             airavataRegistry.updateWorkflowInstanceStatus(instanceId, status);
             Response.ResponseBuilder builder = Response.status(Response.Status.OK);
             builder.entity("Workflow instance status updated successfully...");
@@ -460,10 +460,10 @@ public class ProvenanceRegistryResource 
         try {
             DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             Date formattedDate = dateFormat.parse(statusUpdateTime);
-            WorkflowInstanceDataImpl workflowInstanceData = (WorkflowInstanceDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceId);
-            WorkflowInstance workflowInstance = workflowInstanceData.getWorkflowInstance();
-            WorkflowInstanceStatus.ExecutionStatus status = WorkflowInstanceStatus.ExecutionStatus.valueOf(executionStatus);
-            WorkflowInstanceStatus workflowInstanceStatus = new WorkflowInstanceStatus(workflowInstance, status, formattedDate);
+            WorkflowExecutionDataImpl workflowInstanceData = (WorkflowExecutionDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceId);
+            WorkflowExecution workflowInstance = workflowInstanceData.getWorkflowExecution();
+            WorkflowExecutionStatus.State status = WorkflowExecutionStatus.State.valueOf(executionStatus);
+            WorkflowExecutionStatus workflowInstanceStatus = new WorkflowExecutionStatus(workflowInstance, status, formattedDate);
             airavataRegistry.updateWorkflowInstanceStatus(workflowInstanceStatus);
             Response.ResponseBuilder builder = Response.status(Response.Status.OK);
             builder.entity("Workflow instance status updated successfully...");
@@ -495,7 +495,7 @@ public class ProvenanceRegistryResource 
     public Response getWorkflowInstanceStatus(@QueryParam("instanceId") String instanceId) {
         AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
         try {
-            WorkflowInstanceStatus workflowInstanceStatus = airavataRegistry.getWorkflowInstanceStatus(instanceId);
+            WorkflowExecutionStatus workflowInstanceStatus = airavataRegistry.getWorkflowInstanceStatus(instanceId);
             if (workflowInstanceStatus != null) {
                 Response.ResponseBuilder builder = Response.status(Response.Status.OK);
                 builder.entity(workflowInstanceStatus);
@@ -531,7 +531,7 @@ public class ProvenanceRegistryResource 
                                             @FormParam("data") String data) {
         AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
         try {
-            WorkflowInstanceDataImpl workflowInstanceData = (WorkflowInstanceDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceID);
+            WorkflowExecutionDataImpl workflowInstanceData = (WorkflowExecutionDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceID);
             WorkflowInstanceNode workflowInstanceNode = workflowInstanceData.getNodeData(nodeID).getWorkflowInstanceNode();
             airavataRegistry.updateWorkflowNodeInput(workflowInstanceNode, data);
             Response.ResponseBuilder builder = Response.status(Response.Status.OK);
@@ -565,7 +565,7 @@ public class ProvenanceRegistryResource 
                                              @FormParam("data") String data) {
         AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
         try {
-            WorkflowInstanceDataImpl workflowInstanceData = (WorkflowInstanceDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceID);
+            WorkflowExecutionDataImpl workflowInstanceData = (WorkflowExecutionDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceID);
             WorkflowInstanceNode workflowInstanceNode = workflowInstanceData.getNodeData(nodeID).getWorkflowInstanceNode();
             airavataRegistry.updateWorkflowNodeOutput(workflowInstanceNode, data);
             Response.ResponseBuilder builder = Response.status(Response.Status.OK);
@@ -868,7 +868,7 @@ public class ProvenanceRegistryResource 
                                              @FormParam("executionStatus") String executionStatus) {
         AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
         try {
-            WorkflowInstanceStatus.ExecutionStatus status = WorkflowInstanceStatus.ExecutionStatus.valueOf(executionStatus);
+            WorkflowExecutionStatus.State status = WorkflowExecutionStatus.State.valueOf(executionStatus);
             airavataRegistry.updateWorkflowNodeStatus(workflowInstanceId, nodeId, status);
             Response.ResponseBuilder builder = Response.status(Response.Status.OK);
             builder.entity("Workflow node status updated successfully...");
@@ -898,7 +898,7 @@ public class ProvenanceRegistryResource 
                                           @QueryParam("nodeId") String nodeId) {
         AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
         try {
-            WorkflowInstanceDataImpl workflowInstanceData = (WorkflowInstanceDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceId);
+            WorkflowExecutionDataImpl workflowInstanceData = (WorkflowExecutionDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceId);
             WorkflowInstanceNode workflowInstanceNode = workflowInstanceData.getNodeData(nodeId).getWorkflowInstanceNode();
             WorkflowInstanceNodeStatus workflowNodeStatus = airavataRegistry.getWorkflowNodeStatus(workflowInstanceNode);
             if (workflowNodeStatus != null) {
@@ -934,7 +934,7 @@ public class ProvenanceRegistryResource 
                                              @QueryParam("nodeId") String nodeId) {
         AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
         try {
-            WorkflowInstanceDataImpl workflowInstanceData = (WorkflowInstanceDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceId);
+            WorkflowExecutionDataImpl workflowInstanceData = (WorkflowExecutionDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceId);
             WorkflowInstanceNode workflowInstanceNode = workflowInstanceData.getNodeData(nodeId).getWorkflowInstanceNode();
             Date workflowNodeStartTime = airavataRegistry.getWorkflowNodeStartTime(workflowInstanceNode);
             if (workflowNodeStartTime != null) {
@@ -968,8 +968,8 @@ public class ProvenanceRegistryResource 
     public Response getWorkflowStartTime(@QueryParam("workflowInstanceId") String workflowInstanceId) {
         AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
         try {
-            WorkflowInstanceDataImpl workflowInstanceData = (WorkflowInstanceDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceId);
-            WorkflowInstance workflowInstance = workflowInstanceData.getWorkflowInstance();
+            WorkflowExecutionDataImpl workflowInstanceData = (WorkflowExecutionDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceId);
+            WorkflowExecution workflowInstance = workflowInstanceData.getWorkflowExecution();
             Date workflowStartTime = airavataRegistry.getWorkflowStartTime(workflowInstance);
             if (workflowStartTime != null) {
                 Response.ResponseBuilder builder = Response.status(Response.Status.OK);
@@ -1031,7 +1031,7 @@ public class ProvenanceRegistryResource 
     public Response getWorkflowInstanceData(@QueryParam("workflowInstanceId") String workflowInstanceId) {
         AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
         try {
-            WorkflowInstanceDataImpl workflowInstanceData = (WorkflowInstanceDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceId);
+            WorkflowExecutionDataImpl workflowInstanceData = (WorkflowExecutionDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceId);
             if (workflowInstanceData != null) {
                 Response.ResponseBuilder builder = Response.status(Response.Status.OK);
                 builder.entity(workflowInstanceData);
@@ -1141,7 +1141,7 @@ public class ProvenanceRegistryResource 
                                                 @QueryParam("nodeId") String nodeId) {
         AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
         try {
-            WorkflowInstanceNodeData workflowInstanceNodeData = airavataRegistry.getWorkflowInstanceNodeData(workflowInstanceId, nodeId);
+            NodeExecutionData workflowInstanceNodeData = airavataRegistry.getWorkflowInstanceNodeData(workflowInstanceId, nodeId);
             if (workflowInstanceNodeData != null) {
                 Response.ResponseBuilder builder = Response.status(Response.Status.OK);
                 builder.entity(workflowInstanceNodeData);
@@ -1209,8 +1209,8 @@ public class ProvenanceRegistryResource 
                                            @FormParam("nodeType") String nodeType) {
         AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
         try {
-            WorkflowInstanceDataImpl workflowInstanceData = (WorkflowInstanceDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceId);
-            WorkflowInstanceNodeData workflowInstanceNodeData =
+            WorkflowExecutionDataImpl workflowInstanceData = (WorkflowExecutionDataImpl)airavataRegistry.getWorkflowInstanceData(workflowInstanceId);
+            NodeExecutionData workflowInstanceNodeData =
                     workflowInstanceData.getNodeData(nodeId);
             WorkflowInstanceNode workflowInstanceNode =
                     workflowInstanceNodeData.getWorkflowInstanceNode();

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java?rev=1421951&r1=1421950&r2=1421951&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java Fri Dec 14 16:02:57 2012
@@ -46,9 +46,9 @@ import org.apache.airavata.client.api.Ai
 import org.apache.airavata.common.utils.Pair;
 import org.apache.airavata.common.utils.WSDLUtil;
 import org.apache.airavata.common.utils.XMLUtil;
-import org.apache.airavata.registry.api.workflow.WorkflowInstance;
+import org.apache.airavata.registry.api.workflow.WorkflowExecution;
 import org.apache.airavata.registry.api.workflow.WorkflowInstanceNode;
-import org.apache.airavata.registry.api.workflow.WorkflowInstanceStatus.ExecutionStatus;
+import org.apache.airavata.registry.api.workflow.WorkflowExecutionStatus.State;
 import org.apache.airavata.registry.api.workflow.WorkflowNodeType;
 import org.apache.airavata.workflow.model.component.Component;
 import org.apache.airavata.workflow.model.component.amazon.InstanceComponent;
@@ -188,7 +188,7 @@ public class WorkflowInterpreter {
                 //Saving workflow input Node data before running the workflow
                 WorkflowNodeType workflowNodeType = new WorkflowNodeType();
                 workflowNodeType.setNodeType(WorkflowNodeType.WorkflowNode.INPUTNODE);
-                WorkflowInstanceNode workflowInstanceNode = new WorkflowInstanceNode(new WorkflowInstance(getConfig().getTopic(),
+                WorkflowInstanceNode workflowInstanceNode = new WorkflowInstanceNode(new WorkflowExecution(getConfig().getTopic(),
                         getConfig().getTopic()), node.getID());
                 this.getConfig().getConfiguration().getAiravataAPI().getProvenanceManager().setWorkflowInstanceNodeInput(workflowInstanceNode, (String)values[i]);
                 this.getConfig().getConfiguration().getAiravataAPI().getProvenanceManager().setWorkflowNodeType(workflowInstanceNode, workflowNodeType);
@@ -253,7 +253,7 @@ public class WorkflowInterpreter {
 
                     try {
                         this.getConfig().getConfiguration().getAiravataAPI().getProvenanceManager().setWorkflowInstanceStatus(
-                                this.config.getTopic(), this.config.getTopic(), ExecutionStatus.FINISHED);
+                                this.config.getTopic(), this.config.getTopic(), State.FINISHED);
                     } catch (Exception e) {
                         throw new WorkflowException(e);
                     }
@@ -264,7 +264,7 @@ public class WorkflowInterpreter {
 				if (this.config.isActOnProvenance()) {
 					try {
 						this.getConfig().getConfiguration().getAiravataAPI().getProvenanceManager().
-                                setWorkflowInstanceStatus(this.config.getTopic(),this.config.getTopic(), ExecutionStatus.FAILED);
+                                setWorkflowInstanceStatus(this.config.getTopic(),this.config.getTopic(), State.FAILED);
 					} catch (AiravataAPIInvocationException e) {
 						throw new WorkflowException(e);
 					}
@@ -426,7 +426,7 @@ public class WorkflowInterpreter {
                     // Saving output Node data in to database
                     WorkflowNodeType workflowNodeType = new WorkflowNodeType();
                     workflowNodeType.setNodeType(WorkflowNodeType.WorkflowNode.OUTPUTNODE);
-                    WorkflowInstanceNode workflowInstanceNode = new WorkflowInstanceNode(new WorkflowInstance(config.getTopic(), config.getTopic()), node.getID());
+                    WorkflowInstanceNode workflowInstanceNode = new WorkflowInstanceNode(new WorkflowExecution(config.getTopic(), config.getTopic()), node.getID());
                     this.getConfig().getConfiguration().getAiravataAPI().getProvenanceManager().setWorkflowInstanceNodeOutput(workflowInstanceNode, ((OutputNode) node).getDescription());
                     this.getConfig().getConfiguration().getAiravataAPI().getProvenanceManager().setWorkflowNodeType(workflowInstanceNode, workflowNodeType);
 

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=1421951&r1=1421950&r2=1421951&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 16:02:57 2012
@@ -28,16 +28,16 @@ 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.WorkflowInstance;
-import org.apache.airavata.registry.api.workflow.WorkflowInstanceData;
-import org.apache.airavata.registry.api.workflow.WorkflowInstanceNodeData;
+import org.apache.airavata.registry.api.workflow.WorkflowExecution;
+import org.apache.airavata.registry.api.workflow.WorkflowExecutionData;
+import org.apache.airavata.registry.api.workflow.NodeExecutionData;
 
 public class XBayaWorkflow {
 	private List<XBayaWorkflowNodeElement> workflowServices;
-	private WorkflowInstance workflowInstance;
+	private WorkflowExecution workflowInstance;
 	private AiravataAPI airavataAPI;
 	
-	public XBayaWorkflow(WorkflowInstance workflowInstance, AiravataAPI airavataAPI) {
+	public XBayaWorkflow(WorkflowExecution workflowInstance, AiravataAPI airavataAPI) {
 		setWorkflowInstance(workflowInstance);
 		setAiravataAPI(airavataAPI);
 	}
@@ -46,9 +46,9 @@ public class XBayaWorkflow {
 		if (workflowServices==null){
 			workflowServices=new ArrayList<XBayaWorkflowNodeElement>();
 			try {
-				WorkflowInstanceData workflowInstanceData = getAiravataAPI().getProvenanceManager().getWorkflowInstanceData(getWorkflowId(), getWorkflowId());
-				List<WorkflowInstanceNodeData> nodeDataList = workflowInstanceData.getNodeDataList();
-				for (WorkflowInstanceNodeData nodeData : nodeDataList) {
+				WorkflowExecutionData workflowInstanceData = getAiravataAPI().getProvenanceManager().getWorkflowInstanceData(getWorkflowId(), getWorkflowId());
+				List<NodeExecutionData> nodeDataList = workflowInstanceData.getNodeDataList();
+				for (NodeExecutionData nodeData : nodeDataList) {
 					workflowServices.add(new XBayaWorkflowNodeElement(nodeData.getWorkflowInstanceNode().getNodeId(), nodeData));
 				}
 			} catch (AiravataAPIInvocationException e) {
@@ -73,7 +73,7 @@ public class XBayaWorkflow {
 	}
 
 	public String getWorkflowId() {
-		return getWorkflowInstance().getWorkflowInstanceId();
+		return getWorkflowInstance().getWorkflowExecutionId();
 	}
 
     public AiravataAPI getAiravataAPI() {
@@ -84,11 +84,11 @@ public class XBayaWorkflow {
         this.airavataAPI = airavataAPI;
     }
 
-    public WorkflowInstance getWorkflowInstance() {
+    public WorkflowExecution getWorkflowInstance() {
 		return workflowInstance;
 	}
 
-	public void setWorkflowInstance(WorkflowInstance workflowInstance) {
+	public void setWorkflowInstance(WorkflowExecution workflowInstance) {
 		this.workflowInstance = workflowInstance;
 	}
 }

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiment.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiment.java?rev=1421951&r1=1421950&r2=1421951&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiment.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiment.java Fri Dec 14 16:02:57 2012
@@ -28,7 +28,7 @@ import org.apache.airavata.client.api.Ai
 import org.apache.airavata.client.api.AiravataAPIInvocationException;
 import org.apache.airavata.registry.api.exception.RegistryException;
 //import org.apache.airavata.registry.api.AiravataRegistry2;
-import org.apache.airavata.registry.api.workflow.WorkflowInstance;
+import org.apache.airavata.registry.api.workflow.WorkflowExecution;
 
 public class XBayaWorkflowExperiment {
 	private List<XBayaWorkflow> workflows;
@@ -44,8 +44,8 @@ public class XBayaWorkflowExperiment {
 		if (workflows==null){
 			workflows=new ArrayList<XBayaWorkflow>();
 			try {
-				List<WorkflowInstance> experimentWorkflowInstances = getAiravataAPI().getProvenanceManager().getExperimentWorkflowInstances(getExperimentId());
-				for (WorkflowInstance workflowInstance : experimentWorkflowInstances) {
+				List<WorkflowExecution> experimentWorkflowInstances = getAiravataAPI().getProvenanceManager().getExperimentWorkflowInstances(getExperimentId());
+				for (WorkflowExecution workflowInstance : experimentWorkflowInstances) {
 					workflows.add(new XBayaWorkflow(workflowInstance, getAiravataAPI()));
 				}
 			}  catch (AiravataAPIInvocationException e) {

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=1421951&r1=1421950&r2=1421951&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 16:02:57 2012
@@ -24,17 +24,19 @@ package org.apache.airavata.xbaya.model.
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.airavata.registry.api.workflow.WorkflowInstanceNodeData;
+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;
 
 public class XBayaWorkflowNodeElement {
 	private InputParameters inputParameters;
 	private OutputParameters outputParameters;
-	private WorkflowInstanceNodeData nodeData;
+	private NodeExecutionData nodeData;
 	private String nodeId;
 	
-	public XBayaWorkflowNodeElement(String nodeId, WorkflowInstanceNodeData nodeData) {
+	public XBayaWorkflowNodeElement(String nodeId, NodeExecutionData nodeData) {
 		setNodeId(nodeId);
 		setNodeData(nodeData);
 	}
@@ -42,15 +44,27 @@ public class XBayaWorkflowNodeElement {
 	public OutputParameters getOutputParameters() {
 		if (outputParameters==null){
 			outputParameters=new OutputParameters((NodeParameter[])null);
-			outputParameters.getParameters().addAll(generateParameterList(nodeData.getOutputData()));
+			outputParameters.getParameters().addAll(generateParameterListForOutput(nodeData.getOutputData()));
 		}
 		return outputParameters;
 	}
 
-	private List<NodeParameter> generateParameterList(
-			List<WorkflowInstanceNodePortData> outputData) {
+	private List<NodeParameter> generateParameterListForInput(
+			List<InputData> list) {
 		List<NodeParameter> params=new ArrayList<NodeParameter>();
-		for (WorkflowInstanceNodePortData portData : outputData) {
+		for (WorkflowInstanceNodePortData portData : list) {
+			Parameter parameter = Parameter.Factory.newInstance();
+			parameter.setParameterName(portData.getName());
+			NodeParameter serviceParameter = new NodeParameter(parameter, portData.getValue());
+			params.add(serviceParameter);
+		}
+		return params;
+	}
+	
+	private List<NodeParameter> generateParameterListForOutput(
+			List<OutputData> list) {
+		List<NodeParameter> params=new ArrayList<NodeParameter>();
+		for (WorkflowInstanceNodePortData portData : list) {
 			Parameter parameter = Parameter.Factory.newInstance();
 			parameter.setParameterName(portData.getName());
 			NodeParameter serviceParameter = new NodeParameter(parameter, portData.getValue());
@@ -66,7 +80,7 @@ public class XBayaWorkflowNodeElement {
 	public InputParameters getInputParameters() {
 		if (inputParameters==null){
 			inputParameters=new InputParameters((NodeParameter[])null);
-			inputParameters.getParameters().addAll(generateParameterList(nodeData.getInputData()));
+			inputParameters.getParameters().addAll(generateParameterListForInput(nodeData.getInputData()));
 		}
 		return inputParameters;
 	}
@@ -83,11 +97,11 @@ public class XBayaWorkflowNodeElement {
 		this.nodeId = nodeId;
 	}
 
-	public WorkflowInstanceNodeData getNodeData() {
+	public NodeExecutionData getNodeData() {
 		return nodeData;
 	}
 
-	public void setNodeData(WorkflowInstanceNodeData nodeData) {
+	public void setNodeData(NodeExecutionData nodeData) {
 		this.nodeData = nodeData;
 	}
 }

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=1421951&r1=1421950&r2=1421951&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 16:02:57 2012
@@ -25,7 +25,7 @@ import java.util.List;
 //import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.client.api.AiravataAPI;
 import org.apache.airavata.registry.api.workflow.ExperimentData;
-import org.apache.airavata.registry.api.workflow.WorkflowInstanceNodeData;
+import org.apache.airavata.registry.api.workflow.NodeExecutionData;
 import org.apache.airavata.workflow.model.graph.Node;
 
 public class ProvenanceReader {
@@ -47,11 +47,11 @@ public class ProvenanceReader {
     public Object read() throws Exception {
         try {
             ExperimentData workflowExecution = airavataAPI.getProvenanceManager().getExperimentData(experimentId);
-            List<WorkflowInstanceNodeData> nodeDataList = workflowExecution.getWorkflowInstanceData().get(0).getNodeDataList();
+            List<NodeExecutionData> nodeDataList = workflowExecution.getWorkflowExecutionDataList().get(0).getNodeDataList();
             if (nodeDataList.size() == 0) {
                 return null;
             }
-            for (WorkflowInstanceNodeData data : nodeDataList) {
+            for (NodeExecutionData data : nodeDataList) {
                 if (this.node.getID().equals(data.getWorkflowInstanceNode().getNodeId())) {
                     return data.getOutputData().get(0).getValue();
                 }

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java?rev=1421951&r1=1421950&r2=1421951&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java Fri Dec 14 16:02:57 2012
@@ -29,7 +29,7 @@ import org.apache.airavata.client.api.Ai
 import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.common.utils.XMLUtil;
 //import org.apache.airavata.registry.api.AiravataRegistry2;
-import org.apache.airavata.registry.api.workflow.WorkflowInstance;
+import org.apache.airavata.registry.api.workflow.WorkflowExecution;
 import org.apache.airavata.registry.api.workflow.WorkflowInstanceNode;
 import org.apache.airavata.workflow.model.exceptions.WorkflowException;
 import org.apache.airavata.workflow.model.graph.DataPort;
@@ -178,7 +178,7 @@ public final class ProvenanceWrite imple
 			}
             if (inputs!=null) {
 				try {
-					this.airavataAPI.getProvenanceManager().setWorkflowInstanceNodeInput(new WorkflowInstanceNode(new WorkflowInstance(experimentId, experimentId), node.getID()), xsul5.XmlConstants.BUILDER.serializeToString(inputs));
+					this.airavataAPI.getProvenanceManager().setWorkflowInstanceNodeInput(new WorkflowInstanceNode(new WorkflowExecution(experimentId, experimentId), node.getID()), xsul5.XmlConstants.BUILDER.serializeToString(inputs));
                 } catch (AiravataAPIInvocationException e) {
 					throw new WorkflowException(e);
 				}
@@ -208,7 +208,7 @@ public final class ProvenanceWrite imple
 				}
 			}
             try {
-				this.airavataAPI.getProvenanceManager().setWorkflowInstanceNodeOutput(new WorkflowInstanceNode(new WorkflowInstance(experimentId,experimentId),node.getID()),xsul5.XmlConstants.BUILDER.serializeToString(outputs));
+				this.airavataAPI.getProvenanceManager().setWorkflowInstanceNodeOutput(new WorkflowInstanceNode(new WorkflowExecution(experimentId,experimentId),node.getID()),xsul5.XmlConstants.BUILDER.serializeToString(outputs));
             } catch (AiravataAPIInvocationException e) {
 				throw new WorkflowException(e);
 			}

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowNodeStatusUpdater.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowNodeStatusUpdater.java?rev=1421951&r1=1421950&r2=1421951&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowNodeStatusUpdater.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowNodeStatusUpdater.java Fri Dec 14 16:02:57 2012
@@ -23,9 +23,9 @@ package org.apache.airavata.xbaya.proven
 import org.apache.airavata.client.api.AiravataAPI;
 import org.apache.airavata.client.api.AiravataAPIInvocationException;
 //import org.apache.airavata.registry.api.AiravataRegistry2;
-import org.apache.airavata.registry.api.workflow.WorkflowInstance;
+import org.apache.airavata.registry.api.workflow.WorkflowExecution;
 import org.apache.airavata.registry.api.workflow.WorkflowInstanceNode;
-import org.apache.airavata.registry.api.workflow.WorkflowInstanceStatus;
+import org.apache.airavata.registry.api.workflow.WorkflowExecutionStatus;
 import org.apache.airavata.registry.api.workflow.WorkflowNodeType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -44,10 +44,10 @@ public class WorkflowNodeStatusUpdater {
             //todo we currently save only service nodes
             WorkflowNodeType workflowNodeType = new WorkflowNodeType();
             workflowNodeType.setNodeType(WorkflowNodeType.WorkflowNode.SERVICENODE);
-            WorkflowInstanceNode node = new WorkflowInstanceNode(new WorkflowInstance(workflowInstanceID,workflowInstanceID), nodeID);
+            WorkflowInstanceNode node = new WorkflowInstanceNode(new WorkflowExecution(workflowInstanceID,workflowInstanceID), nodeID);
 			airavataAPI.getProvenanceManager().setWorkflowInstanceNodeInput(node, inputs);
             airavataAPI.getProvenanceManager().setWorkflowNodeType(node, workflowNodeType);
-            airavataAPI.getProvenanceManager().setWorkflowInstanceNodeStatus(workflowInstanceID, workflowInstanceID, nodeID, WorkflowInstanceStatus.ExecutionStatus.STARTED);
+            airavataAPI.getProvenanceManager().setWorkflowInstanceNodeStatus(workflowInstanceID, workflowInstanceID, nodeID, WorkflowExecutionStatus.State.STARTED);
         } catch (AiravataAPIInvocationException e) {
             logger.error("Error updating Wokflow Node status !!");
             return false;
@@ -57,8 +57,8 @@ public class WorkflowNodeStatusUpdater {
 
     public boolean workflowFailed(String workflowInstanceID,String nodeID){
         try {
-            airavataAPI.getProvenanceManager().setWorkflowInstanceNodeStatus(workflowInstanceID, workflowInstanceID, nodeID, WorkflowInstanceStatus.ExecutionStatus.FAILED);
-            airavataAPI.getProvenanceManager().setWorkflowInstanceStatus(workflowInstanceID, workflowInstanceID, WorkflowInstanceStatus.ExecutionStatus.FAILED);
+            airavataAPI.getProvenanceManager().setWorkflowInstanceNodeStatus(workflowInstanceID, workflowInstanceID, nodeID, WorkflowExecutionStatus.State.FAILED);
+            airavataAPI.getProvenanceManager().setWorkflowInstanceStatus(workflowInstanceID, workflowInstanceID, WorkflowExecutionStatus.State.FAILED);
         } catch (AiravataAPIInvocationException e) {
             logger.error("Error updating Wokflow Node status !!");
             return false;
@@ -70,10 +70,10 @@ public class WorkflowNodeStatusUpdater {
         try {
         	WorkflowNodeType workflowNodeType = new WorkflowNodeType();
             workflowNodeType.setNodeType(WorkflowNodeType.WorkflowNode.SERVICENODE);
-            WorkflowInstanceNode node = new WorkflowInstanceNode(new WorkflowInstance(workflowInstanceID,workflowInstanceID), nodeID);
+            WorkflowInstanceNode node = new WorkflowInstanceNode(new WorkflowExecution(workflowInstanceID,workflowInstanceID), nodeID);
             airavataAPI.getProvenanceManager().setWorkflowInstanceNodeOutput(node, inputs);
             airavataAPI.getProvenanceManager().setWorkflowNodeType(node,workflowNodeType);
-            airavataAPI.getProvenanceManager().setWorkflowInstanceNodeStatus(workflowInstanceID, workflowInstanceID, nodeID, WorkflowInstanceStatus.ExecutionStatus.FINISHED);
+            airavataAPI.getProvenanceManager().setWorkflowInstanceNodeStatus(workflowInstanceID, workflowInstanceID, nodeID, WorkflowExecutionStatus.State.FINISHED);
         } catch (AiravataAPIInvocationException e) {
             logger.error("Error updating Wokflow Node status !!");
             return false;
@@ -83,7 +83,7 @@ public class WorkflowNodeStatusUpdater {
 
     public boolean workflowRunning(String workflowInstanceID,String nodeID){
         try {
-            airavataAPI.getProvenanceManager().setWorkflowInstanceNodeStatus(workflowInstanceID, workflowInstanceID, nodeID, WorkflowInstanceStatus.ExecutionStatus.RUNNING);
+            airavataAPI.getProvenanceManager().setWorkflowInstanceNodeStatus(workflowInstanceID, workflowInstanceID, nodeID, WorkflowExecutionStatus.State.RUNNING);
         } catch (AiravataAPIInvocationException e) {
             logger.error("Error updating Wokflow Node status !!");
             return false;
@@ -93,7 +93,7 @@ public class WorkflowNodeStatusUpdater {
 
      public boolean workflowPaused(String workflowInstanceID,String nodeID){
         try {
-            airavataAPI.getProvenanceManager().setWorkflowInstanceNodeStatus(workflowInstanceID, workflowInstanceID, nodeID, WorkflowInstanceStatus.ExecutionStatus.PAUSED);
+            airavataAPI.getProvenanceManager().setWorkflowInstanceNodeStatus(workflowInstanceID, workflowInstanceID, nodeID, WorkflowExecutionStatus.State.PAUSED);
         } catch (AiravataAPIInvocationException e) {
             logger.error("Error updating Wokflow Node status !!");
             return false;

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowStatusUpdater.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowStatusUpdater.java?rev=1421951&r1=1421950&r2=1421951&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowStatusUpdater.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowStatusUpdater.java Fri Dec 14 16:02:57 2012
@@ -26,8 +26,8 @@ import org.apache.airavata.client.api.Ai
 import org.apache.airavata.client.api.AiravataAPIInvocationException;
 import org.apache.airavata.registry.api.exception.RegistryException;
 //import org.apache.airavata.registry.api.AiravataRegistry2;
-import org.apache.airavata.registry.api.workflow.WorkflowInstance;
-import org.apache.airavata.registry.api.workflow.WorkflowInstanceStatus;
+import org.apache.airavata.registry.api.workflow.WorkflowExecution;
+import org.apache.airavata.registry.api.workflow.WorkflowExecutionStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -42,7 +42,7 @@ public class WorkflowStatusUpdater {
 
     public boolean workflowStarted(String experimentID){
         try {
-            airavataAPI.getProvenanceManager().setWorkflowInstanceStatus(experimentID, experimentID, WorkflowInstanceStatus.ExecutionStatus.STARTED);
+            airavataAPI.getProvenanceManager().setWorkflowInstanceStatus(experimentID, experimentID, WorkflowExecutionStatus.State.STARTED);
         } catch (AiravataAPIInvocationException e) {
             logger.error("Error updating Wokflow Node status !!");
             return false;
@@ -52,7 +52,7 @@ public class WorkflowStatusUpdater {
 
     public boolean workflowFailed(String experimentID){
         try {
-            airavataAPI.getProvenanceManager().setWorkflowInstanceStatus(experimentID, experimentID, WorkflowInstanceStatus.ExecutionStatus.FAILED);
+            airavataAPI.getProvenanceManager().setWorkflowInstanceStatus(experimentID, experimentID, WorkflowExecutionStatus.State.FAILED);
         } catch (AiravataAPIInvocationException e) {
             logger.error("Error updating Wokflow Node status !!");
             return false;
@@ -62,7 +62,7 @@ public class WorkflowStatusUpdater {
 
     public boolean workflowFinished(String experimentID){
         try {
-            airavataAPI.getProvenanceManager().setWorkflowInstanceStatus(experimentID, experimentID, WorkflowInstanceStatus.ExecutionStatus.FINISHED);
+            airavataAPI.getProvenanceManager().setWorkflowInstanceStatus(experimentID, experimentID, WorkflowExecutionStatus.State.FINISHED);
         } catch (AiravataAPIInvocationException e) {
             logger.error("Error updating Wokflow Node status !!");
             return false;
@@ -72,7 +72,7 @@ public class WorkflowStatusUpdater {
 
     public boolean workflowRunning(String experimentID){
         try {
-            airavataAPI.getProvenanceManager().setWorkflowInstanceStatus(experimentID, experimentID, WorkflowInstanceStatus.ExecutionStatus.RUNNING);
+            airavataAPI.getProvenanceManager().setWorkflowInstanceStatus(experimentID, experimentID, WorkflowExecutionStatus.State.RUNNING);
         } catch (AiravataAPIInvocationException e) {
             logger.error("Error updating Wokflow Node status !!");
             return false;
@@ -82,7 +82,7 @@ public class WorkflowStatusUpdater {
 
      public boolean workflowPaused(String experimentID){
         try {
-            airavataAPI.getProvenanceManager().setWorkflowInstanceStatus(experimentID, experimentID, WorkflowInstanceStatus.ExecutionStatus.PAUSED);
+            airavataAPI.getProvenanceManager().setWorkflowInstanceStatus(experimentID, experimentID, WorkflowExecutionStatus.State.PAUSED);
         } catch (AiravataAPIInvocationException e) {
             logger.error("Error updating Wokflow Node status !!");
             return false;
@@ -94,7 +94,7 @@ public class WorkflowStatusUpdater {
         Timestamp currentTime = new Timestamp((new java.util.Date()).getTime());
         try {
             airavataAPI.getProvenanceManager().setWorkflowInstanceTemplateName(workflowInstanceID, workflowTemplateID);
-            airavataAPI.getProvenanceManager().setWorkflowInstanceStatus(new WorkflowInstanceStatus(new WorkflowInstance(experimentID, workflowInstanceID), WorkflowInstanceStatus.ExecutionStatus.STARTED,currentTime));
+            airavataAPI.getProvenanceManager().setWorkflowInstanceStatus(new WorkflowExecutionStatus(new WorkflowExecution(experimentID, workflowInstanceID), WorkflowExecutionStatus.State.STARTED,currentTime));
         } catch (AiravataAPIInvocationException e) {
             logger.error("Error saving Workflow Data !!");
         }

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowExperimentNode.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowExperimentNode.java?rev=1421951&r1=1421950&r2=1421951&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowExperimentNode.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowExperimentNode.java Fri Dec 14 16:02:57 2012
@@ -33,7 +33,7 @@ import javax.swing.tree.TreeNode;
 import org.apache.airavata.client.api.AiravataAPIInvocationException;
 import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.registry.api.workflow.ExperimentName;
-import org.apache.airavata.registry.api.workflow.WorkflowInstanceStatus;
+import org.apache.airavata.registry.api.workflow.WorkflowExecutionStatus;
 import org.apache.airavata.xbaya.model.registrybrowser.XBayaWorkflowExperiment;
 import org.apache.airavata.xbaya.ui.actions.AbstractBrowserActionItem;
 import org.apache.airavata.xbaya.ui.actions.registry.browser.CopyAction;
@@ -67,7 +67,7 @@ public class XBayaWorkflowExperimentNode
 		}
     	String caption=workflowExecutionName;
     	try {
-			WorkflowInstanceStatus workflowExecutionStatus = getRegistry().getProvenanceManager().getWorkflowInstanceStatus(getExperiment().getExperimentId(), getExperiment().getExperimentId());
+			WorkflowExecutionStatus workflowExecutionStatus = getRegistry().getProvenanceManager().getWorkflowInstanceStatus(getExperiment().getExperimentId(), getExperiment().getExperimentId());
 			if (workflowExecutionStatus!=null && workflowExecutionStatus.getExecutionStatus()!=null){
 				caption += " - <i>" + workflowExecutionStatus.getExecutionStatus().toString()+"</i>";
 				if (workflowExecutionStatus.getStatusUpdateTime()!=null) {



Mime
View raw message