You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sa...@apache.org on 2012/07/06 16:23:44 UTC
svn commit: r1358231 - in /incubator/airavata/trunk/modules:
airavata-client/src/main/java/org/apache/airavata/client/api/
airavata-client/src/main/java/org/apache/airavata/client/impl/
commons/registry-api/src/main/java/org/apache/airavata/registry/ap...
Author: samindaw
Date: Fri Jul 6 14:23:43 2012
New Revision: 1358231
URL: http://svn.apache.org/viewvc?rev=1358231&view=rev
Log:
updating the names of th eAPI
Modified:
incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ExecutionManager.java
incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ProvenanceManager.java
incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerImpl.java
incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ProvenanceManagerImpl.java
incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstance.java
incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceData.java
incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodePortData.java
Modified: incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ExecutionManager.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ExecutionManager.java?rev=1358231&r1=1358230&r2=1358231&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ExecutionManager.java (original)
+++ incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ExecutionManager.java Fri Jul 6 14:23:43 2012
@@ -37,7 +37,7 @@ public interface ExecutionManager {
* @return
* @throws AiravataAPIInvocationException
*/
- public abstract String runWorkflow(String workflowTemplateId,List<WorkflowInput> inputs) throws AiravataAPIInvocationException;
+ public abstract String runExperiment(String workflowTemplateId,List<WorkflowInput> inputs) throws AiravataAPIInvocationException;
/**
*
@@ -46,7 +46,7 @@ public interface ExecutionManager {
* @return
* @throws AiravataAPIInvocationException
*/
- public abstract String runWorkflow(Workflow workflow,List<WorkflowInput> inputs) throws AiravataAPIInvocationException;
+ public abstract String runExperiment(Workflow workflow,List<WorkflowInput> inputs) throws AiravataAPIInvocationException;
/**
*
@@ -58,7 +58,7 @@ public interface ExecutionManager {
* @return
* @throws AiravataAPIInvocationException
*/
- public abstract String runWorkflow(String workflowTemplateId,List<WorkflowInput> inputs, String user, String metadata, String workflowInstanceName)throws AiravataAPIInvocationException;
+ public abstract String runExperiment(String workflowTemplateId,List<WorkflowInput> inputs, String user, String metadata, String workflowInstanceName)throws AiravataAPIInvocationException;
/**
*
@@ -71,7 +71,7 @@ public interface ExecutionManager {
* @return
* @throws AiravataAPIInvocationException
*/
- public abstract String runWorkflow(String workflowTemplateId,List<WorkflowInput> inputs, String user, String metadata, String workflowInstanceName, WorkflowContextHeaderBuilder builder)throws AiravataAPIInvocationException;
+ public abstract String runExperiment(String workflowTemplateId,List<WorkflowInput> inputs, String user, String metadata, String workflowInstanceName, WorkflowContextHeaderBuilder builder)throws AiravataAPIInvocationException;
/**
*
@@ -82,24 +82,24 @@ public interface ExecutionManager {
* @return
* @throws AiravataAPIInvocationException
*/
- public abstract String runWorkflow(Workflow workflow,List<WorkflowInput> inputs, String user, String metadata)throws AiravataAPIInvocationException;
+ public abstract String runExperiment(Workflow workflow,List<WorkflowInput> inputs, String user, String metadata)throws AiravataAPIInvocationException;
/**
*
- * @param topic
+ * @param experimentId
* @return
* @throws AiravataAPIInvocationException
*/
- public Monitor getWorkflowIntanceMonitor(String topic)throws AiravataAPIInvocationException;
+ public Monitor getExperimentMonitor(String experimentId)throws AiravataAPIInvocationException;
/**
*
- * @param topic
+ * @param experimentId
* @param listener
* @return
* @throws AiravataAPIInvocationException
*/
- public Monitor getWorkflowInstanceMonitor(String topic, MonitorEventListener listener) throws AiravataAPIInvocationException;
+ public Monitor getExperimentMonitor(String experimentId, MonitorEventListener listener) throws AiravataAPIInvocationException;
/**
* Creates a WorkflowContextHeaderBuilder object that can be used to customize the scheduling of a workflow execution.
Modified: incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ProvenanceManager.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ProvenanceManager.java?rev=1358231&r1=1358230&r2=1358231&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ProvenanceManager.java (original)
+++ incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ProvenanceManager.java Fri Jul 6 14:23:43 2012
@@ -24,7 +24,6 @@ package org.apache.airavata.client.api;
import java.util.List;
import java.util.Map;
-import org.apache.airavata.common.registry.api.exception.RegistryException;
import org.apache.airavata.registry.api.workflow.WorkflowInstance;
import org.apache.airavata.registry.api.workflow.WorkflowInstanceData;
import org.apache.airavata.registry.api.workflow.WorkflowInstanceMetadata;
@@ -49,12 +48,12 @@ public interface ProvenanceManager {
/**
*
* @param experimentId
- * @param topicId
+ * @param workflowInstanceId
* @param nodeId
* @param data
* @throws AiravataAPIInvocationException
*/
- public void addWorkflowInstanceNodeInputData(String experimentId, String topicId, String nodeId, String data) throws AiravataAPIInvocationException;
+ public void addWorkflowInstanceNodeInputData(String experimentId, String workflowInstanceId, String nodeId, String data) throws AiravataAPIInvocationException;
/**
*
@@ -66,12 +65,12 @@ public interface ProvenanceManager {
/**
*
* @param experimentId
- * @param topicId
+ * @param workflowInstanceId
* @param nodeId
* @param data
* @throws AiravataAPIInvocationException
*/
- public void addWorkflowInstanceNodeOutputData(String experimentId, String topicId, String nodeId, String data) throws AiravataAPIInvocationException;
+ public void addWorkflowInstanceNodeOutputData(String experimentId, String workflowInstanceId, String nodeId, String data) throws AiravataAPIInvocationException;
/**
*
@@ -84,12 +83,12 @@ public interface ProvenanceManager {
/**
*
* @param experimentId
- * @param topicId
+ * @param workflowInstanceId
* @param nodeId
* @return
* @throws AiravataAPIInvocationException
*/
- public List<WorkflowInstanceNodePortData> getWorkflowInstanceNodeInputData(String experimentId, String topicId, String nodeId) throws AiravataAPIInvocationException;
+ public List<WorkflowInstanceNodePortData> getWorkflowInstanceNodeInputData(String experimentId, String workflowInstanceId, String nodeId) throws AiravataAPIInvocationException;
/**
*
@@ -111,12 +110,12 @@ public interface ProvenanceManager {
/**
*
* @param experimentId
- * @param topicId
+ * @param workflowInstanceId
* @param nodeId
* @return
* @throws AiravataAPIInvocationException
*/
- public List<WorkflowInstanceNodePortData> getWorkflowInstanceNodeOutputData(String experimentId, String topicId, String nodeId) throws AiravataAPIInvocationException;
+ public List<WorkflowInstanceNodePortData> getWorkflowInstanceNodeOutputData(String experimentId, String workflowInstanceId, String nodeId) throws AiravataAPIInvocationException;
/**
*
@@ -130,11 +129,11 @@ public interface ProvenanceManager {
/**
*
* @param experimentId
- * @param topicId
+ * @param workflowInstanceId
* @param status
* @throws AiravataAPIInvocationException
*/
- public void setWorkflowInstanceStatus(String experimentId, String topicId, ExecutionStatus status) throws AiravataAPIInvocationException;
+ public void setWorkflowInstanceStatus(String experimentId, String workflowInstanceId, ExecutionStatus status) throws AiravataAPIInvocationException;
/**
*
@@ -146,11 +145,11 @@ public interface ProvenanceManager {
/**
*
* @param experimentId
- * @param topicId
+ * @param workflowInstanceId
* @return
* @throws AiravataAPIInvocationException
*/
- public WorkflowInstanceStatus getWorkflowInstanceStatus(String experimentId, String topicId) throws AiravataAPIInvocationException;
+ public WorkflowInstanceStatus getWorkflowInstanceStatus(String experimentId, String workflowInstanceId) throws AiravataAPIInvocationException;
/**
*
@@ -163,11 +162,11 @@ public interface ProvenanceManager {
/**
*
* @param experimentId
- * @param topicId
+ * @param workflowInstanceId
* @param user
* @throws AiravataAPIInvocationException
*/
- public void setWorkflowInstanceUser(String experimentId, String topicId, String user) throws AiravataAPIInvocationException;
+ public void setWorkflowInstanceUser(String experimentId, String workflowInstanceId, String user) throws AiravataAPIInvocationException;
/**
*
@@ -179,11 +178,11 @@ public interface ProvenanceManager {
/**
*
* @param experimentId
- * @param topicId
+ * @param workflowInstanceId
* @return
* @throws AiravataAPIInvocationException
*/
- public WorkflowInstanceUser getWorkflowInstanceUser(String experimentId, String topicId) throws AiravataAPIInvocationException;
+ public WorkflowInstanceUser getWorkflowInstanceUser(String experimentId, String workflowInstanceId) throws AiravataAPIInvocationException;
/**
*
@@ -196,11 +195,11 @@ public interface ProvenanceManager {
/**
*
* @param experimentId
- * @param topicId
+ * @param workflowInstanceId
* @param metadata
* @throws AiravataAPIInvocationException
*/
- public void setWorkflowInstanceMetadata(String experimentId, String topicId, String metadata) throws AiravataAPIInvocationException;
+ public void setWorkflowInstanceMetadata(String experimentId, String workflowInstanceId, String metadata) throws AiravataAPIInvocationException;
/**
*
@@ -212,11 +211,11 @@ public interface ProvenanceManager {
/**
*
* @param experimentId
- * @param topicId
+ * @param workflowInstanceId
* @return
* @throws AiravataAPIInvocationException
*/
- public WorkflowInstanceMetadata getWorkflowInstanceMetadata(String experimentId, String topicId) throws AiravataAPIInvocationException;
+ public WorkflowInstanceMetadata getWorkflowInstanceMetadata(String experimentId, String workflowInstanceId) throws AiravataAPIInvocationException;
/**
*
@@ -269,11 +268,11 @@ public interface ProvenanceManager {
/**
*
* @param experimentId
- * @param topicId
+ * @param workflowInstanceId
* @return
* @throws AiravataAPIInvocationException
*/
- public WorkflowInstanceData getWorkflowInstanceData(String experimentId, String topicId) throws AiravataAPIInvocationException;
+ public WorkflowInstanceData getWorkflowInstanceData(String experimentId, String workflowInstanceId) throws AiravataAPIInvocationException;
/**
*
Modified: incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerImpl.java?rev=1358231&r1=1358230&r2=1358231&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerImpl.java (original)
+++ incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerImpl.java Fri Jul 6 14:23:43 2012
@@ -42,19 +42,19 @@ public class ExecutionManagerImpl implem
}
@Override
- public String runWorkflow(String workflowTemplateId,
+ public String runExperiment(String workflowTemplateId,
List<WorkflowInput> inputs) throws AiravataAPIInvocationException {
- return runWorkflow(workflowTemplateId, inputs ,getClient().getCurrentUser(),null, workflowTemplateId+"_"+Calendar.getInstance().getTime().toString());
+ return runExperiment(workflowTemplateId, inputs ,getClient().getCurrentUser(),null, workflowTemplateId+"_"+Calendar.getInstance().getTime().toString());
}
@Override
- public String runWorkflow(Workflow workflow, List<WorkflowInput> inputs)
+ public String runExperiment(Workflow workflow, List<WorkflowInput> inputs)
throws AiravataAPIInvocationException {
- return runWorkflow(workflow,inputs, getClient().getCurrentUser(),null);
+ return runExperiment(workflow,inputs, getClient().getCurrentUser(),null);
}
@Override
- public String runWorkflow(String workflowTemplateId,
+ public String runExperiment(String workflowTemplateId,
List<WorkflowInput> inputs, String user, String metadata, String workflowInstanceName)
throws AiravataAPIInvocationException {
try {
@@ -66,7 +66,7 @@ public class ExecutionManagerImpl implem
}
@Override
- public String runWorkflow(Workflow workflow, List<WorkflowInput> inputs,
+ public String runExperiment(Workflow workflow, List<WorkflowInput> inputs,
String user, String metadata) throws AiravataAPIInvocationException {
try {
return getClient().runWorkflow(workflow, inputs, user, metadata,workflow.getName()+"_"+Calendar.getInstance().getTime().toString());
@@ -76,16 +76,16 @@ public class ExecutionManagerImpl implem
}
@Override
- public Monitor getWorkflowIntanceMonitor(String topic)
+ public Monitor getExperimentMonitor(String experimentId)
throws AiravataAPIInvocationException {
- return getClient().getWorkflowExecutionMonitor(topic);
+ return getClient().getWorkflowExecutionMonitor(experimentId);
}
@Override
- public Monitor getWorkflowInstanceMonitor(String topic,
+ public Monitor getExperimentMonitor(String experimentId,
MonitorEventListener listener)
throws AiravataAPIInvocationException {
- return getClient().getWorkflowExecutionMonitor(topic,listener);
+ return getClient().getWorkflowExecutionMonitor(experimentId,listener);
}
public AiravataClient getClient() {
@@ -96,7 +96,7 @@ public class ExecutionManagerImpl implem
}
@Override
- public String runWorkflow(String workflowTemplateId,
+ public String runExperiment(String workflowTemplateId,
List<WorkflowInput> inputs, String user, String metadata,
String workflowInstanceName, WorkflowContextHeaderBuilder builder)
throws AiravataAPIInvocationException {
Modified: incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ProvenanceManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ProvenanceManagerImpl.java?rev=1358231&r1=1358230&r2=1358231&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ProvenanceManagerImpl.java (original)
+++ incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ProvenanceManagerImpl.java Fri Jul 6 14:23:43 2012
@@ -62,9 +62,9 @@ public class ProvenanceManagerImpl imple
@Override
public void addWorkflowInstanceNodeInputData(String experimentId,
- String topicId, String nodeId, String data)
+ String workflowInstanceId, String nodeId, String data)
throws AiravataAPIInvocationException {
- addWorkflowInstanceNodeInputData(new WorkflowInstanceNodePortData(new WorkflowInstanceNode(new WorkflowInstance(experimentId, topicId), nodeId), data));
+ addWorkflowInstanceNodeInputData(new WorkflowInstanceNodePortData(new WorkflowInstanceNode(new WorkflowInstance(experimentId, workflowInstanceId), nodeId), data));
}
@Override
@@ -80,9 +80,9 @@ public class ProvenanceManagerImpl imple
@Override
public void addWorkflowInstanceNodeOutputData(String experimentId,
- String topicId, String nodeId, String data)
+ String workflowInstanceId, String nodeId, String data)
throws AiravataAPIInvocationException {
- addWorkflowInstanceNodeOutputData(new WorkflowInstanceNodePortData(new WorkflowInstanceNode(new WorkflowInstance(experimentId, topicId), nodeId), data));
+ addWorkflowInstanceNodeOutputData(new WorkflowInstanceNodePortData(new WorkflowInstanceNode(new WorkflowInstance(experimentId, workflowInstanceId), nodeId), data));
}
@@ -108,14 +108,14 @@ public class ProvenanceManagerImpl imple
@Override
public List<WorkflowInstanceNodePortData> getWorkflowInstanceNodeInputData(
- String experimentId, String topicId, String nodeId)
+ String experimentId, String workflowInstanceId, String nodeId)
throws AiravataAPIInvocationException {
- return getWorkflowInstanceNodeInputData(new WorkflowInstanceNode(new WorkflowInstance(experimentId, topicId), nodeId));
+ return getWorkflowInstanceNodeInputData(new WorkflowInstanceNode(new WorkflowInstance(experimentId, workflowInstanceId), nodeId));
}
private List<WorkflowInstanceNodePortData> getWorkflowInstanceNodePortDataListForWorkflowInstanceNode(Map<WorkflowInstanceNode,List<WorkflowInstanceNodePortData>> portData, WorkflowInstanceNode instanceNode, boolean createIfNotPresent){
for (WorkflowInstanceNode node : portData.keySet()) {
- if (node.getWorkflowInstance().getExperimentId().equals(instanceNode.getWorkflowInstance().getExperimentId()) && node.getWorkflowInstance().getTopicId().equals(instanceNode.getWorkflowInstance().getTopicId()) &&
+ if (node.getWorkflowInstance().getExperimentId().equals(instanceNode.getWorkflowInstance().getExperimentId()) && node.getWorkflowInstance().getWorkflowInstanceId().equals(instanceNode.getWorkflowInstance().getWorkflowInstanceId()) &&
node.getNodeId().equals(instanceNode.getNodeId())){
return portData.get(node);
}
@@ -161,9 +161,9 @@ public class ProvenanceManagerImpl imple
@Override
public List<WorkflowInstanceNodePortData> getWorkflowInstanceNodeOutputData(
- String experimentId, String topicId, String nodeId)
+ String experimentId, String workflowInstanceId, String nodeId)
throws AiravataAPIInvocationException {
- return getWorkflowInstanceNodeOutputData(new WorkflowInstanceNode(new WorkflowInstance(experimentId, topicId), nodeId));
+ return getWorkflowInstanceNodeOutputData(new WorkflowInstanceNode(new WorkflowInstance(experimentId, workflowInstanceId), nodeId));
}
@@ -178,9 +178,9 @@ public class ProvenanceManagerImpl imple
}
@Override
- public void setWorkflowInstanceStatus(String experimentId, String topicId,
+ public void setWorkflowInstanceStatus(String experimentId, String workflowInstanceId,
ExecutionStatus status) throws AiravataAPIInvocationException {
- setWorkflowInstanceStatus(new WorkflowInstanceStatus(new WorkflowInstance(experimentId, topicId),status));
+ setWorkflowInstanceStatus(new WorkflowInstanceStatus(new WorkflowInstance(experimentId, workflowInstanceId),status));
}
@Override
@@ -196,7 +196,7 @@ public class ProvenanceManagerImpl imple
@Override
public WorkflowInstanceStatus getWorkflowInstanceStatus(
- String experimentId, String topicId)
+ String experimentId, String workflowInstanceId)
throws AiravataAPIInvocationException {
try {
return getClient().getRegistry().getWorkflowExecutionStatus(experimentId);
@@ -209,11 +209,11 @@ public class ProvenanceManagerImpl imple
public WorkflowInstanceStatus getWorkflowInstanceStatus(
WorkflowInstance workflowInstance)
throws AiravataAPIInvocationException {
- return getWorkflowInstanceStatus(workflowInstance.getExperimentId(), workflowInstance.getTopicId());
+ return getWorkflowInstanceStatus(workflowInstance.getExperimentId(), workflowInstance.getWorkflowInstanceId());
}
@Override
- public void setWorkflowInstanceUser(String experimentId, String topicId,
+ public void setWorkflowInstanceUser(String experimentId, String workflowInstanceId,
String user) throws AiravataAPIInvocationException {
try {
getClient().getRegistry().saveWorkflowExecutionUser(experimentId, user);
@@ -225,13 +225,13 @@ public class ProvenanceManagerImpl imple
@Override
public void setWorkflowInstanceUser(WorkflowInstanceUser user)
throws AiravataAPIInvocationException {
- setWorkflowInstanceUser(user.getWorkflowInstance().getExperimentId(), user.getWorkflowInstance().getTopicId(), user.getUser());
+ setWorkflowInstanceUser(user.getWorkflowInstance().getExperimentId(), user.getWorkflowInstance().getWorkflowInstanceId(), user.getUser());
}
@Override
public WorkflowInstanceUser getWorkflowInstanceUser(String experimentId,
- String topicId) throws AiravataAPIInvocationException {
- return getWorkflowInstanceUser(new WorkflowInstance(experimentId, topicId));
+ String workflowInstanceId) throws AiravataAPIInvocationException {
+ return getWorkflowInstanceUser(new WorkflowInstance(experimentId, workflowInstanceId));
}
@Override
@@ -247,7 +247,7 @@ public class ProvenanceManagerImpl imple
@Override
public void setWorkflowInstanceMetadata(String experimentId,
- String topicId, String metadata)
+ String workflowInstanceId, String metadata)
throws AiravataAPIInvocationException {
try {
getClient().getRegistry().saveWorkflowExecutionMetadata(experimentId, metadata);
@@ -261,14 +261,14 @@ public class ProvenanceManagerImpl imple
public void setWorkflowInstanceMetadata(
WorkflowInstanceMetadata instanceMetadata)
throws AiravataAPIInvocationException {
- setWorkflowInstanceMetadata(instanceMetadata.getWorkflowInstance().getExperimentId(), instanceMetadata.getWorkflowInstance().getTopicId(), instanceMetadata.getMetadata());
+ setWorkflowInstanceMetadata(instanceMetadata.getWorkflowInstance().getExperimentId(), instanceMetadata.getWorkflowInstance().getWorkflowInstanceId(), instanceMetadata.getMetadata());
}
@Override
public WorkflowInstanceMetadata getWorkflowInstanceMetadata(
- String experimentId, String topicId)
+ String experimentId, String workflowInstanceId)
throws AiravataAPIInvocationException {
- return getWorkflowInstanceMetadata(new WorkflowInstance(experimentId, topicId));
+ return getWorkflowInstanceMetadata(new WorkflowInstance(experimentId, workflowInstanceId));
}
@Override
@@ -351,7 +351,7 @@ public class ProvenanceManagerImpl imple
@Override
public WorkflowInstanceData getWorkflowInstanceData(String experimentId,
- String topicId) throws AiravataAPIInvocationException {
+ String workflowInstanceId) throws AiravataAPIInvocationException {
try {
return createWorkflowInstanceData(getClient().getRegistry().getWorkflowExecution(experimentId));
} catch (RegistryException e) {
@@ -362,7 +362,7 @@ public class ProvenanceManagerImpl imple
@Override
public WorkflowInstanceData getWorkflowInstanceData(WorkflowInstance workflowInstance)
throws AiravataAPIInvocationException {
- return getWorkflowInstanceData(workflowInstance.getExperimentId(), workflowInstance.getTopicId());
+ return getWorkflowInstanceData(workflowInstance.getExperimentId(), workflowInstance.getWorkflowInstanceId());
}
@Override
Modified: incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstance.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstance.java?rev=1358231&r1=1358230&r2=1358231&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstance.java (original)
+++ incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstance.java Fri Jul 6 14:23:43 2012
@@ -23,20 +23,20 @@ package org.apache.airavata.registry.api
public class WorkflowInstance {
private String experimentId;
- private String topicId;
+ private String workflowInstanceId;
private String workflowName;
public WorkflowInstance(String experimentId,String topicId) {
setExperimentId(experimentId);
- setTopicId(topicId);
+ setWorkflowInstanceId(topicId);
}
- public String getTopicId() {
- return topicId;
+ public String getWorkflowInstanceId() {
+ return workflowInstanceId;
}
- public void setTopicId(String topicId) {
- this.topicId = topicId;
+ public void setWorkflowInstanceId(String workflowInstanceId) {
+ this.workflowInstanceId = workflowInstanceId;
}
public String getExperimentId() {
Modified: incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceData.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceData.java?rev=1358231&r1=1358230&r2=1358231&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceData.java (original)
+++ incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceData.java Fri Jul 6 14:23:43 2012
@@ -60,7 +60,7 @@ public class WorkflowInstanceData {
}
public String getTopicId(){
- return workflowInstance.getTopicId();
+ return workflowInstance.getWorkflowInstanceId();
}
public String getWorkflowName(){
Modified: incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodePortData.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodePortData.java?rev=1358231&r1=1358230&r2=1358231&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodePortData.java (original)
+++ incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodePortData.java Fri Jul 6 14:23:43 2012
@@ -55,6 +55,6 @@ public class WorkflowInstanceNodePortDat
@Override
public String getWorkflowId() {
- return getWorkflowInstanceNode().getWorkflowInstance().getTopicId();
+ return getWorkflowInstanceNode().getWorkflowInstance().getWorkflowInstanceId();
}
}