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/09/19 16:33:42 UTC
svn commit: r1387617 [1/2] - in /incubator/airavata/trunk/modules:
airavata-client/src/main/java/org/apache/airavata/client/
airavata-client/src/main/java/org/apache/airavata/client/api/
airavata-client/src/main/java/org/apache/airavata/client/impl/ co...
Author: samindaw
Date: Wed Sep 19 14:33:41 2012
New Revision: 1387617
URL: http://svn.apache.org/viewvc?rev=1387617&view=rev
Log:
completing provenance registry api changes, its impls & usages
Added:
incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceDoesNotExistsException.java
incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceNodeDoesNotExistsException.java
incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/ExperimentDataImpl.java
- copied, changed from r1387248, incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/WorkflowExecutionImpl.java
incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ExperimentData.java
- copied, changed from r1387248, incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowExecution.java
incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodeStatus.java (with props)
Removed:
incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/WorkflowExecutionImpl.java
incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowExecution.java
Modified:
incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.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/ProvenanceManagerImpl.java
incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistry1.java
incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistryblahblah.java
incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/ProvenanceRegistry.java
incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/AiravataJCRRegistry.java
incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryUtils.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/WorkflowInstanceNodeData.java
incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java
incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/AbstractResource.java
incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataResource.java
incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentResource.java
incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkerResource.java
incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkflowDataResource.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiments.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceReader.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowNodeStatusUpdater.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowStatusUpdater.java
Modified: incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java?rev=1387617&r1=1387616&r2=1387617&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java (original)
+++ incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java Wed Sep 19 14:33:41 2012
@@ -71,7 +71,7 @@ import org.apache.airavata.common.utils.
import org.apache.airavata.common.workflow.execution.context.WorkflowContextHeaderBuilder;
import org.apache.airavata.registry.api.AiravataRegistry2;
import org.apache.airavata.registry.api.impl.AiravataJCRRegistry;
-import org.apache.airavata.registry.api.workflow.WorkflowExecution;
+import org.apache.airavata.registry.api.workflow.ExperimentData;
import org.apache.airavata.workflow.model.component.ComponentException;
import org.apache.airavata.workflow.model.component.registry.JCRComponentRegistry;
import org.apache.airavata.workflow.model.component.ws.WSComponentPort;
@@ -455,17 +455,17 @@ public class AiravataClient implements A
return topic;
}
- public List<WorkflowExecution> getWorkflowExecutionDataByUser(String user)
+ public List<ExperimentData> getWorkflowExecutionDataByUser(String user)
throws RegistryException {
return getRegistry().getExperimentByUser(user);
}
- public WorkflowExecution getWorkflowExecutionData(String topic)
+ public ExperimentData getWorkflowExecutionData(String topic)
throws RegistryException {
return getRegistry().getExperiment(topic);
}
- public List<WorkflowExecution> getWorkflowExecutionData(String user,
+ public List<ExperimentData> getWorkflowExecutionData(String user,
int pageSize, int PageNo) throws RegistryException {
return getRegistry().getExperimentByUser(user, pageSize, PageNo);
}
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=1387617&r1=1387616&r2=1387617&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 Wed Sep 19 14:33:41 2012
@@ -24,6 +24,7 @@ package org.apache.airavata.client.api;
import java.util.List;
import java.util.Map;
+import org.apache.airavata.registry.api.workflow.ExperimentData;
import org.apache.airavata.registry.api.workflow.WorkflowInstance;
import org.apache.airavata.registry.api.workflow.WorkflowInstanceData;
import org.apache.airavata.registry.api.workflow.WorkflowInstanceMetadata;
@@ -279,7 +280,7 @@ public interface ProvenanceManager {
* @return
* @throws AiravataAPIInvocationException
*/
- public List<WorkflowInstance> getWorkflowInstances() throws AiravataAPIInvocationException;
+ public List<ExperimentData> getWorkflowExperimentData() throws AiravataAPIInvocationException;
/**
* Retrieve all the experiments run by the given owner
@@ -287,7 +288,7 @@ public interface ProvenanceManager {
* @return
* @throws AiravataAPIInvocationException
*/
- public List<WorkflowInstance> getWorkflowInstances(String user) throws AiravataAPIInvocationException;
+ public List<ExperimentData> getWorkflowExperimentData(String user) throws AiravataAPIInvocationException;
/**
* Retrieve all the experiment data run by the given owner with paging
@@ -297,7 +298,7 @@ public interface ProvenanceManager {
* @return
* @throws AiravataAPIInvocationException
*/
- public List<WorkflowInstanceData> getWorkflowInstances(String user, int pageSize, int pageNo) throws AiravataAPIInvocationException;
+ public List<ExperimentData> getWorkflowExperimentData(String user, int pageSize, int pageNo) throws AiravataAPIInvocationException;
/**
* Retrieve experiment data for a given workflow instance
@@ -314,7 +315,7 @@ public interface ProvenanceManager {
* @return
* @throws AiravataAPIInvocationException
*/
- public WorkflowInstanceData getWorkflowInstanceData(WorkflowInstance workflowInstance) throws AiravataAPIInvocationException;
+ public WorkflowInstanceData getWorkflowIsntanceData(WorkflowInstance workflowInstance) throws AiravataAPIInvocationException;
/**
* Retrieve output node names of a experiment
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=1387617&r1=1387616&r2=1387617&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 Wed Sep 19 14:33:41 2012
@@ -30,13 +30,12 @@ import org.apache.airavata.client.Airava
import org.apache.airavata.client.api.AiravataAPIInvocationException;
import org.apache.airavata.client.api.ProvenanceManager;
import org.apache.airavata.common.registry.api.exception.RegistryException;
-import org.apache.airavata.registry.api.workflow.WorkflowExecution;
+import org.apache.airavata.registry.api.workflow.ExperimentData;
import org.apache.airavata.registry.api.workflow.WorkflowInstance;
import org.apache.airavata.registry.api.workflow.WorkflowInstanceData;
import org.apache.airavata.registry.api.workflow.WorkflowInstanceMetadata;
import org.apache.airavata.registry.api.workflow.WorkflowInstanceName;
import org.apache.airavata.registry.api.workflow.WorkflowInstanceNode;
-import org.apache.airavata.registry.api.workflow.WorkflowInstanceNodeData;
import org.apache.airavata.registry.api.workflow.WorkflowInstanceNodePortData;
import org.apache.airavata.registry.api.workflow.WorkflowInstanceStatus;
import org.apache.airavata.registry.api.workflow.WorkflowInstanceStatus.ExecutionStatus;
@@ -188,7 +187,7 @@ public class ProvenanceManagerImpl imple
public void setWorkflowInstanceStatus(WorkflowInstanceStatus status)
throws AiravataAPIInvocationException {
try {
- getClient().getRegistry().updateWorkflowInstanceStatus(status.getWorkflowInstance().getExperimentId(), status);
+ getClient().getRegistry().updateWorkflowInstanceStatus(status);
} catch (RegistryException e) {
throw new AiravataAPIInvocationException(e);
}
@@ -298,70 +297,43 @@ public class ProvenanceManagerImpl imple
}
@Override
- public List<WorkflowInstance> getWorkflowInstances()
+ public List<ExperimentData> getWorkflowExperimentData()
throws AiravataAPIInvocationException {
- return getWorkflowInstances(getClient().getCurrentUser());
+ return getWorkflowExperimentData(getClient().getCurrentUser());
}
@Override
- public List<WorkflowInstance> getWorkflowInstances(String user)
+ public List<ExperimentData> getWorkflowExperimentData(String user)
throws AiravataAPIInvocationException {
- List<WorkflowInstance> list=new ArrayList<WorkflowInstance>();
- List<String> experiments = getExperiments(user);
- for (String id : experiments) {
- list.add(new WorkflowInstance(id, id));
+ try {
+ return getClient().getRegistry().getExperimentByUser(user);
+ } catch (RegistryException e) {
+ throw new AiravataAPIInvocationException(e);
}
- return list;
}
@Override
- public List<WorkflowInstanceData> getWorkflowInstances(String user,
+ public List<ExperimentData> getWorkflowExperimentData(String user,
int pageSize, int pageNo) throws AiravataAPIInvocationException {
try {
- List<WorkflowExecution> experimentIds = getClient().getRegistry().getExperimentByUser(user, pageSize, pageNo);
- List<WorkflowInstanceData> list=new ArrayList<WorkflowInstanceData>();
- for (WorkflowExecution execution : experimentIds) {
- WorkflowInstanceData workflowInstanceData = createWorkflowInstanceData(execution);
- list.add(workflowInstanceData);
- }
- return list;
+ return getClient().getRegistry().getExperimentByUser(user, pageSize, pageNo);
} catch (RegistryException e) {
throw new AiravataAPIInvocationException(e);
}
}
- private WorkflowInstanceData createWorkflowInstanceData(
- WorkflowExecution execution) {
- WorkflowInstance workflowInstance = new WorkflowInstance(execution.getExperimentId(),execution.getTopic());
- WorkflowInstanceData workflowInstanceData = new WorkflowInstanceData(workflowInstance, new WorkflowInstanceName(workflowInstance, execution.getWorkflowInstanceName()),new WorkflowInstanceUser(workflowInstance,execution.getUser()), new WorkflowInstanceStatus(workflowInstance,execution.getExecutionStatus().getExecutionStatus(),execution.getExecutionStatus().getStatusUpdateTime()), new WorkflowInstanceMetadata(workflowInstance,execution.getMetadata()), null);
- Map<WorkflowInstanceNode, List<WorkflowInstanceNodePortData>> groupNodePortInputData = groupNodePortData(execution.getServiceInput());
- Map<WorkflowInstanceNode, List<WorkflowInstanceNodePortData>> groupNodePortOutputData = groupNodePortData(execution.getServiceOutput());
- for (WorkflowInstanceNode instanceNode : groupNodePortInputData.keySet()) {
- workflowInstanceData.addNodeData(new WorkflowInstanceNodeData(instanceNode, groupNodePortInputData.get(instanceNode), null));
- }
- for (WorkflowInstanceNode instanceNode : groupNodePortOutputData.keySet()) {
- WorkflowInstanceNodeData nodeData = workflowInstanceData.getNodeData(instanceNode.getNodeId());
- if (nodeData==null){
- workflowInstanceData.addNodeData(new WorkflowInstanceNodeData(instanceNode, null,groupNodePortOutputData.get(instanceNode)));
- }else{
- nodeData.setOutputData(groupNodePortOutputData.get(instanceNode));
- }
- }
- return workflowInstanceData;
- }
-
@Override
public WorkflowInstanceData getWorkflowInstanceData(String experimentId,
String workflowInstanceId) throws AiravataAPIInvocationException {
try {
- return createWorkflowInstanceData(getClient().getRegistry().getExperiment(experimentId));
+ return getClient().getRegistry().getWorkflowInstanceData(workflowInstanceId);
} catch (RegistryException e) {
throw new AiravataAPIInvocationException(e);
}
}
@Override
- public WorkflowInstanceData getWorkflowInstanceData(WorkflowInstance workflowInstance)
+ public WorkflowInstanceData getWorkflowIsntanceData(WorkflowInstance workflowInstance)
throws AiravataAPIInvocationException {
return getWorkflowInstanceData(workflowInstance.getExperimentId(), workflowInstance.getWorkflowInstanceId());
}
Modified: incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistry1.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistry1.java?rev=1387617&r1=1387616&r2=1387617&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistry1.java (original)
+++ incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistry1.java Wed Sep 19 14:33:41 2012
@@ -268,27 +268,19 @@ public interface AiravataRegistry1 exten
public String getWorkflowExecutionName(String experimentId) throws RegistryException;
- public WorkflowExecution getWorkflowExecution(String experimentId) throws RegistryException;
+ public ExperimentData getWorkflowExecution(String experimentId) throws RegistryException;
public List<String> getWorkflowExecutionIdByUser(String user) throws RegistryException;
- public List<WorkflowExecution> getWorkflowExecutionByUser(String user) throws RegistryException;
+ public List<ExperimentData> getWorkflowExecutionByUser(String user) throws RegistryException;
- public List<WorkflowExecution> getWorkflowExecutionByUser(String user, int pageSize, int pageNo) throws RegistryException;
+ public List<ExperimentData> getWorkflowExecutionByUser(String user, int pageSize, int pageNo) throws RegistryException;
public String getWorkflowExecutionMetadata(String experimentId) throws RegistryException;
public boolean saveWorkflowExecutionMetadata(String experimentId, String metadata) throws RegistryException;
- public boolean saveWorkflowData(WorkflowRunTimeData workflowData)throws RegistryException;
-
- public boolean saveWorkflowLastUpdateTime(String experimentId,Timestamp timestamp)throws RegistryException;
-
public boolean saveWorkflowNodeStatus(String workflowInstanceID,String workflowNodeID,ExecutionStatus status)throws RegistryException;
- public boolean saveWorkflowNodeLastUpdateTime(String workflowInstanceID,String workflowNodeID,Timestamp lastUpdateTime)throws RegistryException;
-
public boolean saveWorkflowNodeGramData(WorkflowNodeGramData workflowNodeGramData)throws RegistryException;
-
- public boolean saveWorkflowNodeGramLocalJobID(String workflowInstanceID,String workflowNodeID,String localJobID)throws RegistryException;
}
Modified: incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistryblahblah.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistryblahblah.java?rev=1387617&r1=1387616&r2=1387617&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistryblahblah.java (original)
+++ incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistryblahblah.java Wed Sep 19 14:33:41 2012
@@ -268,13 +268,13 @@ public interface AiravataRegistryblahbla
public String getWorkflowExecutionName(String experimentId) throws RegistryException;
- public WorkflowExecution getWorkflowExecution(String experimentId) throws RegistryException;
+ public ExperimentData getWorkflowExecution(String experimentId) throws RegistryException;
public List<String> getWorkflowExecutionIdByUser(String user) throws RegistryException;
- public List<WorkflowExecution> getWorkflowExecutionByUser(String user) throws RegistryException;
+ public List<ExperimentData> getWorkflowExecutionByUser(String user) throws RegistryException;
- public List<WorkflowExecution> getWorkflowExecutionByUser(String user, int pageSize, int pageNo) throws RegistryException;
+ public List<ExperimentData> getWorkflowExecutionByUser(String user, int pageSize, int pageNo) throws RegistryException;
public String getWorkflowExecutionMetadata(String experimentId) throws RegistryException;
Modified: incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/ProvenanceRegistry.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/ProvenanceRegistry.java?rev=1387617&r1=1387616&r2=1387617&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/ProvenanceRegistry.java (original)
+++ incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/ProvenanceRegistry.java Wed Sep 19 14:33:41 2012
@@ -21,12 +21,21 @@
package org.apache.airavata.registry.api;
-import java.sql.Timestamp;
+import java.util.Date;
import java.util.List;
import org.apache.airavata.common.registry.api.exception.RegistryException;
-import org.apache.airavata.registry.api.workflow.*;
+import org.apache.airavata.registry.api.workflow.ExperimentData;
+import org.apache.airavata.registry.api.workflow.WorkflowIOData;
+import org.apache.airavata.registry.api.workflow.WorkflowInstance;
+import org.apache.airavata.registry.api.workflow.WorkflowInstanceData;
+import org.apache.airavata.registry.api.workflow.WorkflowInstanceNode;
+import org.apache.airavata.registry.api.workflow.WorkflowInstanceNodeData;
+import org.apache.airavata.registry.api.workflow.WorkflowInstanceNodeStatus;
+import org.apache.airavata.registry.api.workflow.WorkflowInstanceStatus;
import org.apache.airavata.registry.api.workflow.WorkflowInstanceStatus.ExecutionStatus;
+import org.apache.airavata.registry.api.workflow.WorkflowNodeGramData;
+import org.apache.airavata.registry.api.workflow.WorkflowNodeIOData;
public interface ProvenanceRegistry extends AiravataSubRegistry{
@@ -68,11 +77,11 @@ public interface ProvenanceRegistry exte
/**
* Save a name for this workflow execution
* @param experimentId
- * @param workflowIntanceName
+ * @param experimentName
* @return
* @throws RegistryException
*/
- public abstract boolean updateExperimentName(String experimentId,String workflowIntanceName)throws RegistryException;
+ public abstract boolean updateExperimentName(String experimentId,String experimentName)throws RegistryException;
/**
* Return the metadata information saved for the experiment
@@ -93,20 +102,19 @@ public interface ProvenanceRegistry exte
/**
* Return the template name of the workflow that this intance was created from
- * @param experimentId
* @param workflowInstanceId
* @return
* @throws RegistryException
*/
- public abstract String getWorkflowExecutionTemplateName(String experimentId, String workflowInstanceId) throws RegistryException;
+ public abstract String getWorkflowExecutionTemplateName(String workflowInstanceId) throws RegistryException;
/**
* Save the template name of the workflow that this intance was created from
- * @param experimentId
* @param workflowInstanceId
+ * @param templateName
* @throws RegistryException
*/
- public abstract void setWorkflowExecutionTemplateName(String experimentId, String workflowInstanceId) throws RegistryException;
+ public abstract void setWorkflowInstanceTemplateName(String workflowInstanceId, String templateName) throws RegistryException;
public List<WorkflowInstance> getExperimentWorkflowInstances(String experimentId) throws RegistryException;
@@ -130,7 +138,7 @@ public interface ProvenanceRegistry exte
* @return
* @throws RegistryException
*/
- public abstract boolean updateWorkflowInstanceStatus(String instanceId,WorkflowInstanceStatus status)throws RegistryException;
+ public abstract boolean updateWorkflowInstanceStatus(WorkflowInstanceStatus status)throws RegistryException;
/**
@@ -237,7 +245,7 @@ public interface ProvenanceRegistry exte
* @return
* @throws RegistryException
*/
- public abstract WorkflowExecution getExperiment(String experimentId) throws RegistryException;
+ public abstract ExperimentData getExperiment(String experimentId) throws RegistryException;
/**
* Return experiment ids of experiments launched by the given user
@@ -253,7 +261,7 @@ public interface ProvenanceRegistry exte
* @return experiment object list each populated by current data of that experiment
* @throws RegistryException
*/
- public abstract List<WorkflowExecution> getExperimentByUser(String user) throws RegistryException;
+ public abstract List<ExperimentData> getExperimentByUser(String user) throws RegistryException;
/**
* Return the pageNo set of experiments launched by the given user if grouped in to pages of size pageSize
@@ -263,14 +271,7 @@ public interface ProvenanceRegistry exte
* @return
* @throws RegistryException
*/
- public abstract List<WorkflowExecution> getExperimentByUser(String user, int pageSize, int pageNo) throws RegistryException;
-
- /**
- * This store set of metadata for each Workflow Run, Not the workflowNode Specific data, just full workflow Run specific data
- * @param runTimeData
- * @return
- */
- public abstract boolean saveWorkflowData(WorkflowRunTimeData runTimeData)throws RegistryException;
+ public abstract List<ExperimentData> getExperimentByUser(String user, int pageSize, int pageNo) throws RegistryException;
/**
* This will update the workflowStatus for given experimentID,workflowInstanceID combination.
@@ -278,46 +279,29 @@ public interface ProvenanceRegistry exte
* @param workflowStatus
* @return
*/
- public abstract boolean saveWorkflowStatus(String workflowInstanceID,WorkflowInstanceStatus workflowStatus)throws RegistryException;
+ public abstract boolean updateWorkflowNodeStatus(WorkflowInstanceNodeStatus workflowStatusNode)throws RegistryException;
- /**
- * This will update the last update time of the workflow.
- * @param workflowInstanceID
- * @param lastUpdateTime
- * @return
- */
- public abstract boolean saveWorkflowLastUpdateTime(String workflowInstanceID,Timestamp lastUpdateTime)throws RegistryException;
-
- /**
- * This will change the status of a given WorkflowNode for a given workflowInstanceID(given workflow Run).
- * @param workflowInstanceID
- * @param status
- * @return
- */
- public abstract boolean saveWorkflowNodeStatus(String workflowInstanceID,String workflowNodeID,ExecutionStatus status)throws RegistryException;
-
- /**
- * This will change the lastUpdate time for a given Workflow Node for a given workflow Run.
- * @param workflowInstanceID
- * @param workflowNodeID
- * @param lastUpdateTime
- * @return
- */
- public abstract boolean saveWorkflowNodeLastUpdateTime(String workflowInstanceID,String workflowNodeID,Timestamp lastUpdateTime)throws RegistryException;
+ public abstract boolean updateWorkflowNodeStatus(String workflowInstanceId, String nodeId, ExecutionStatus status)throws RegistryException;
+
+ public abstract boolean updateWorkflowNodeStatus(WorkflowInstanceNode workflowNode, ExecutionStatus status)throws RegistryException;
+ public WorkflowInstanceNodeStatus getWorkflowNodeStatus(WorkflowInstanceNode workflowNode)throws RegistryException;
+
+ public Date getWorkflowNodeStartTime(WorkflowInstanceNode workflowNode)throws RegistryException;
+
+ public Date getWorkflowStartTime(WorkflowInstance workflowInstance)throws RegistryException;
+
/**
* This will store the gram specific data in to repository, this can be called before submitting the workflow in to Grid
* @param workflowNodeGramData
* @return
*/
- public abstract boolean saveWorkflowNodeGramData(WorkflowNodeGramData workflowNodeGramData)throws RegistryException;
-
- /**
- * This will update the local job ID for a submitted job to grid.
- * @param workflowInstanceID
- * @param workflowNodeID
- * @param localJobID
- * @return
- */
- public abstract boolean saveWorkflowNodeGramLocalJobID(String workflowInstanceID,String workflowNodeID,String localJobID)throws RegistryException;
+ public abstract boolean updateWorkflowNodeGramData(WorkflowNodeGramData workflowNodeGramData)throws RegistryException;
+
+ public WorkflowInstanceData getWorkflowInstanceData(String workflowInstanceId)throws RegistryException;
+
+ public boolean isWorkflowInstanceNodePresent(String workflowInstanceId, String nodeId)throws RegistryException;
+
+ public WorkflowInstanceNodeData getWorkflowInstanceNodeData(String workflowInstanceId, String nodeId)throws RegistryException;
+
}
\ No newline at end of file
Added: incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceDoesNotExistsException.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceDoesNotExistsException.java?rev=1387617&view=auto
==============================================================================
--- incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceDoesNotExistsException.java (added)
+++ incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceDoesNotExistsException.java Wed Sep 19 14:33:41 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.exception.worker;
+
+import org.apache.airavata.common.registry.api.exception.RegistryException;
+
+public class WorkflowInstanceDoesNotExistsException extends RegistryException {
+
+ private static final long serialVersionUID = -8006347245307495767L;
+
+ public WorkflowInstanceDoesNotExistsException(String instanceId) {
+ super("The workflow instance "+instanceId+" is not present in the registry!!!");
+ }
+
+}
Added: incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceNodeDoesNotExistsException.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceNodeDoesNotExistsException.java?rev=1387617&view=auto
==============================================================================
--- incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceNodeDoesNotExistsException.java (added)
+++ incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceNodeDoesNotExistsException.java Wed Sep 19 14:33:41 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.exception.worker;
+
+import org.apache.airavata.common.registry.api.exception.RegistryException;
+
+public class WorkflowInstanceNodeDoesNotExistsException extends RegistryException {
+
+ private static final long serialVersionUID = -8006347245307495767L;
+
+ public WorkflowInstanceNodeDoesNotExistsException(String instanceId, String nodeId) {
+ super("The node "+nodeId+" for the workflow instance "+instanceId+" is not present in the registry!!!");
+ }
+
+}
Modified: incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/AiravataJCRRegistry.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/AiravataJCRRegistry.java?rev=1387617&r1=1387616&r2=1387617&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/AiravataJCRRegistry.java (original)
+++ incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/AiravataJCRRegistry.java Wed Sep 19 14:33:41 2012
@@ -27,7 +27,16 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.sql.Timestamp;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.TimeZone;
import java.util.regex.Pattern;
import javax.jcr.Node;
@@ -47,14 +56,19 @@ import org.apache.airavata.commons.gfac.
import org.apache.airavata.commons.gfac.type.ServiceDescription;
import org.apache.airavata.commons.gfac.wsdl.WSDLConstants;
import org.apache.airavata.commons.gfac.wsdl.WSDLGenerator;
-import org.apache.airavata.registry.api.ProvenanceRegistry;
import org.apache.airavata.registry.api.Axis2Registry;
import org.apache.airavata.registry.api.DataRegistry;
+import org.apache.airavata.registry.api.ProvenanceRegistry;
import org.apache.airavata.registry.api.exception.DeploymentDescriptionRetrieveException;
import org.apache.airavata.registry.api.exception.HostDescriptionRetrieveException;
import org.apache.airavata.registry.api.exception.ServiceDescriptionRetrieveException;
-import org.apache.airavata.registry.api.workflow.*;
+import org.apache.airavata.registry.api.workflow.ExperimentData;
+import org.apache.airavata.registry.api.workflow.WorkflowIOData;
+import org.apache.airavata.registry.api.workflow.WorkflowInstance;
+import org.apache.airavata.registry.api.workflow.WorkflowInstanceStatus;
import org.apache.airavata.registry.api.workflow.WorkflowInstanceStatus.ExecutionStatus;
+import org.apache.airavata.registry.api.workflow.WorkflowNodeGramData;
+import org.apache.airavata.registry.api.workflow.WorkflowNodeIOData;
import org.apache.airavata.schemas.gfac.MethodType;
import org.apache.airavata.schemas.gfac.PortTypeType;
import org.apache.airavata.schemas.gfac.ServiceType;
@@ -1215,20 +1229,20 @@ public class AiravataJCRRegistry extends
return property;
}
- public WorkflowExecution getWorkflowExecution(String experimentId)
+ public ExperimentData getWorkflowExecution(String experimentId)
throws RegistryException {
if (getProvenanceRegistry()!=null){
return getProvenanceRegistry().getExperiment(experimentId);
}
- WorkflowExecution workflowExecution = new WorkflowExecutionImpl();
+ ExperimentData workflowExecution = new ExperimentDataImpl();
workflowExecution.setExperimentId(experimentId);
- workflowExecution.setExecutionStatus(getWorkflowExecutionStatus(experimentId));
+// workflowExecution.setExecutionStatus(getWorkflowExecutionStatus(experimentId));
workflowExecution.setUser(getWorkflowExecutionUser(experimentId));
workflowExecution.setMetadata(getWorkflowExecutionMetadata(experimentId));
- workflowExecution.setWorkflowInstanceName(getWorkflowExecutionName(experimentId));
- workflowExecution.setOutput(getWorkflowExecutionOutput(experimentId));
- workflowExecution.setServiceInput(searchWorkflowExecutionServiceInput(experimentId,".*",".*"));
- workflowExecution.setServiceOutput(searchWorkflowExecutionServiceOutput(experimentId,".*",".*"));
+// workflowExecution.setWorkflowInstanceName(getWorkflowExecutionName(experimentId));
+// workflowExecution.setOutput(getWorkflowExecutionOutput(experimentId));
+// workflowExecution.setServiceInput(searchWorkflowExecutionServiceInput(experimentId,".*",".*"));
+// workflowExecution.setServiceOutput(searchWorkflowExecutionServiceOutput(experimentId,".*",".*"));
return workflowExecution;
}
@@ -1270,17 +1284,17 @@ public class AiravataJCRRegistry extends
return ids;
}
- public List<WorkflowExecution> getWorkflowExecutionByUser(String user)
+ public List<ExperimentData> getWorkflowExecutionByUser(String user)
throws RegistryException {
if (getProvenanceRegistry()!=null){
return getProvenanceRegistry().getExperimentByUser(user);
}
- return getWorkflowExecution(user,-1,-1);
+ return getExperimentData(user,-1,-1);
}
- private List<WorkflowExecution> getWorkflowExecution(String user, int startLimit, int endLimit)
+ private List<ExperimentData> getExperimentData(String user, int startLimit, int endLimit)
throws RegistryException {
- List<WorkflowExecution> executions=new ArrayList<WorkflowExecution>();
+ List<ExperimentData> executions=new ArrayList<ExperimentData>();
List<String> workflowExecutionIdByUser = getWorkflowExecutionIdByUser(user);
int count=0;
for (String id : workflowExecutionIdByUser) {
@@ -1295,12 +1309,12 @@ public class AiravataJCRRegistry extends
return executions;
}
- public List<WorkflowExecution> getWorkflowExecutionByUser(String user,
+ public List<ExperimentData> getExperimentDataByUser(String user,
int pageSize, int pageNo) throws RegistryException {
if (getProvenanceRegistry()!=null){
return getProvenanceRegistry().getExperimentByUser(user, pageSize, pageNo);
}
- return getWorkflowExecution(user,pageSize*pageNo,pageSize*(pageNo+1));
+ return getExperimentData(user,pageSize*pageNo,pageSize*(pageNo+1));
}
public String getWorkflowExecutionMetadata(String experimentId)
@@ -1622,34 +1636,11 @@ public class AiravataJCRRegistry extends
}
}
- @Override
- public boolean saveWorkflowData(WorkflowRunTimeData workflowData)throws RegistryException{
- if (getProvenanceRegistry()!=null){
- return getProvenanceRegistry().saveWorkflowData(workflowData);
- }
- return false;
- }
-
- @Override
- public boolean saveWorkflowLastUpdateTime(String experimentId,Timestamp timestamp)throws RegistryException{
- if (getProvenanceRegistry()!=null){
- return getProvenanceRegistry().saveWorkflowLastUpdateTime(experimentId, timestamp);
- }
- return false;
- }
@Override
public boolean saveWorkflowNodeStatus(String workflowInstanceID,String workflowNodeID,ExecutionStatus status)throws RegistryException{
if (getProvenanceRegistry()!=null){
- return getProvenanceRegistry().saveWorkflowNodeStatus(workflowInstanceID,workflowNodeID, status);
- }
- return false;
- }
-
- @Override
- public boolean saveWorkflowNodeLastUpdateTime(String workflowInstanceID,String workflowNodeID,Timestamp lastUpdateTime)throws RegistryException{
- if (getProvenanceRegistry()!=null){
- return getProvenanceRegistry().saveWorkflowNodeLastUpdateTime(workflowInstanceID,workflowNodeID, lastUpdateTime);
+ return getProvenanceRegistry().updateWorkflowNodeStatus(workflowInstanceID,workflowNodeID, status);
}
return false;
}
@@ -1657,16 +1648,14 @@ public class AiravataJCRRegistry extends
@Override
public boolean saveWorkflowNodeGramData(WorkflowNodeGramData workflowNodeGramData)throws RegistryException{
if (getProvenanceRegistry()!=null){
- return getProvenanceRegistry().saveWorkflowNodeGramData(workflowNodeGramData);
+ return getProvenanceRegistry().updateWorkflowNodeGramData(workflowNodeGramData);
}
return false;
}
- @Override
- public boolean saveWorkflowNodeGramLocalJobID(String workflowInstanceID, String workflowNodeID, String localJobID) throws RegistryException {
- if (getProvenanceRegistry() != null) {
- return getProvenanceRegistry().saveWorkflowNodeGramLocalJobID(workflowInstanceID, workflowNodeID, localJobID);
- }
- return false;
- }
+ @Override
+ public List<ExperimentData> getWorkflowExecutionByUser(String user,
+ int pageSize, int pageNo) throws RegistryException {
+ return null;
+ }
}
Copied: incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/ExperimentDataImpl.java (from r1387248, incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/WorkflowExecutionImpl.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/ExperimentDataImpl.java?p2=incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/ExperimentDataImpl.java&p1=incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/WorkflowExecutionImpl.java&r1=1387248&r2=1387617&rev=1387617&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/WorkflowExecutionImpl.java (original)
+++ incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/ExperimentDataImpl.java Wed Sep 19 14:33:41 2012
@@ -24,12 +24,13 @@ package org.apache.airavata.registry.api
import java.util.ArrayList;
import java.util.List;
-import org.apache.airavata.registry.api.workflow.WorkflowExecution;
-import org.apache.airavata.registry.api.workflow.WorkflowInstanceStatus;
+import org.apache.airavata.registry.api.workflow.ExperimentData;
import org.apache.airavata.registry.api.workflow.WorkflowIOData;
+import org.apache.airavata.registry.api.workflow.WorkflowInstanceData;
+import org.apache.airavata.registry.api.workflow.WorkflowInstanceStatus;
import org.apache.airavata.registry.api.workflow.WorkflowNodeIOData;
-public class WorkflowExecutionImpl implements WorkflowExecution{
+public class ExperimentDataImpl implements ExperimentData{
private WorkflowInstanceStatus executionStatus;
private String user;
private List<WorkflowNodeIOData> serviceInput;
@@ -38,7 +39,8 @@ public class WorkflowExecutionImpl imple
private String experimentId;
private String metadata;
private String workflowInstanceName;
-
+ private List<WorkflowInstanceData> workflowInstanceDataList=new ArrayList<WorkflowInstanceData>();
+
public String getMetadata() {
return metadata;
}
@@ -126,14 +128,20 @@ public class WorkflowExecutionImpl imple
}
return null;
}
+
@Override
- public String getWorkflowInstanceName() {
+ public String getExperimentName() {
return workflowInstanceName;
}
@Override
- public void setWorkflowInstanceName(String workflowInstanceName) {
+ public void setExperimentName(String workflowInstanceName) {
this.workflowInstanceName=workflowInstanceName;
}
+
+ @Override
+ public List<WorkflowInstanceData> getWorkflowInstanceData() {
+ return workflowInstanceDataList;
+ }
}
Modified: incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryUtils.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryUtils.java?rev=1387617&r1=1387616&r2=1387617&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryUtils.java (original)
+++ incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryUtils.java Wed Sep 19 14:33:41 2012
@@ -20,6 +20,14 @@
*/
package org.apache.airavata.registry.api.util;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.HashMap;
+import java.util.Properties;
+
import org.apache.airavata.common.exception.AiravataConfigurationException;
import org.apache.airavata.common.registry.api.exception.RegistryException;
import org.apache.airavata.registry.api.AiravataRegistry2;
@@ -34,11 +42,6 @@ import org.apache.airavata.registry.api.
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.IOException;
-import java.net.*;
-import java.util.HashMap;
-import java.util.Properties;
-
public class RegistryUtils {
private static final Logger log = LoggerFactory.getLogger(RegistryUtils.class);
Copied: incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ExperimentData.java (from r1387248, incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowExecution.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ExperimentData.java?p2=incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ExperimentData.java&p1=incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowExecution.java&r1=1387248&r2=1387617&rev=1387617&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowExecution.java (original)
+++ incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ExperimentData.java Wed Sep 19 14:33:41 2012
@@ -23,31 +23,31 @@ package org.apache.airavata.registry.api
import java.util.List;
-
-public interface WorkflowExecution {
+public interface ExperimentData {
public String getExperimentId();
public String getTopic();
- public WorkflowInstanceStatus getExecutionStatus();
+// public WorkflowInstanceStatus getExecutionStatus();
public String getUser();
- public List<WorkflowNodeIOData> getServiceInput();
- public List<WorkflowNodeIOData> getServiceOutput();
- public List<WorkflowIOData> getOutput();
- public WorkflowNodeIOData getServiceInput(String nodeId);
- public WorkflowNodeIOData getServiceOutput(String nodeId);
- public WorkflowIOData getOutput(String nodeId);
+// public List<WorkflowNodeIOData> getServiceInput();
+// public List<WorkflowNodeIOData> getServiceOutput();
+// public List<WorkflowIOData> getOutput();
+// public WorkflowNodeIOData getServiceInput(String nodeId);
+// public WorkflowNodeIOData getServiceOutput(String nodeId);
+// public WorkflowIOData getOutput(String nodeId);
public String getMetadata();
- public String getWorkflowInstanceName();
+ public String getExperimentName();
+ public List<WorkflowInstanceData> getWorkflowInstanceData();
public void setExperimentId(String experimentId);
public void setTopic(String topic);
- public void setExecutionStatus(WorkflowInstanceStatus executionStatus);
+// public void setExecutionStatus(WorkflowInstanceStatus executionStatus);
public void setUser(String user);
- public void setServiceInput(List<WorkflowNodeIOData> serviceInputs);
- public void setServiceOutput(List<WorkflowNodeIOData> serviceOutputs);
- public void setOutput(List<WorkflowIOData> outputs);
- public void addServiceInput(WorkflowNodeIOData serviceInput);
- public void addServiceOutput(WorkflowNodeIOData serviceOutput);
- public void addOutput(WorkflowIOData output);
+// public void setServiceInput(List<WorkflowNodeIOData> serviceInputs);
+// public void setServiceOutput(List<WorkflowNodeIOData> serviceOutputs);
+// public void setOutput(List<WorkflowIOData> outputs);
+// public void addServiceInput(WorkflowNodeIOData serviceInput);
+// public void addServiceOutput(WorkflowNodeIOData serviceOutput);
+// public void addOutput(WorkflowIOData output);
public void setMetadata(String metadata);
- public void setWorkflowInstanceName(String workflowInstanceName);
+ public void setExperimentName(String experimentName);
}
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=1387617&r1=1387616&r2=1387617&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 Wed Sep 19 14:33:41 2012
@@ -30,19 +30,15 @@ import org.apache.airavata.registry.api.
public class WorkflowInstanceData {
private WorkflowInstance workflowInstance;
- private WorkflowInstanceUser workflowInstanceUser;
+ private ExperimentData experimentData;
private WorkflowInstanceStatus workflowInstanceStatus;
- private WorkflowInstanceMetadata workflowInstanceMetadata;
- private WorkflowInstanceName workflowInstanceName;
private List<WorkflowInstanceNodeData> nodeDataList;
- public WorkflowInstanceData(WorkflowInstance workflowInstance,WorkflowInstanceName workflowInstanceName,WorkflowInstanceUser workflowInstanceUser,WorkflowInstanceStatus workflowInstanceStatus,WorkflowInstanceMetadata workflowInstanceMetadata,List<WorkflowInstanceNodeData> nodeDataList) {
+ public WorkflowInstanceData(ExperimentData experimentData, WorkflowInstance workflowInstance,WorkflowInstanceStatus workflowInstanceStatus,List<WorkflowInstanceNodeData> nodeDataList) {
+ this.experimentData=experimentData;
this.workflowInstance=workflowInstance;
- this.workflowInstanceUser=workflowInstanceUser;
this.workflowInstanceStatus=workflowInstanceStatus;
- this.workflowInstanceMetadata=workflowInstanceMetadata;
- this.workflowInstanceName=workflowInstanceName;
this.nodeDataList=nodeDataList;
}
@@ -69,10 +65,6 @@ public class WorkflowInstanceData {
return workflowInstance.getWorkflowName();
}
- public String getUser(){
- return workflowInstanceUser.getUser();
- }
-
public ExecutionStatus getStatus(){
return workflowInstanceStatus.getExecutionStatus();
}
@@ -80,11 +72,7 @@ public class WorkflowInstanceData {
public Date getStatusUpdateTime(){
return workflowInstanceStatus.getStatusUpdateTime();
}
-
- public String getMetadata(){
- return workflowInstanceMetadata.getMetadata();
- }
-
+
public WorkflowInstanceNodeData getNodeData(String nodeId){
for (WorkflowInstanceNodeData nodeData : getNodeDataList()) {
if (nodeData.getWorkflowInstanceNode().getNodeId().equals(nodeId)){
@@ -104,8 +92,12 @@ public class WorkflowInstanceData {
return null;
}
- public WorkflowInstanceName getWorkflowInstanceName() {
- return workflowInstanceName;
+ public ExperimentData getExperimentData() {
+ return experimentData;
+ }
+
+ public void setExperimentData(ExperimentData experimentData) {
+ this.experimentData = experimentData;
}
}
Modified: incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodeData.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodeData.java?rev=1387617&r1=1387616&r2=1387617&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodeData.java (original)
+++ incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodeData.java Wed Sep 19 14:33:41 2012
@@ -24,11 +24,13 @@ package org.apache.airavata.registry.api
import java.util.List;
public class WorkflowInstanceNodeData{
+ private WorkflowInstanceData workflowInstanceData;
private WorkflowInstanceNode workflowInstanceNode;
private List<WorkflowInstanceNodePortData> inputData;
private List<WorkflowInstanceNodePortData> outputData;
- public WorkflowInstanceNodeData(WorkflowInstanceNode workflowInstanceNode, List<WorkflowInstanceNodePortData> inputData,List<WorkflowInstanceNodePortData> outputData) {
+ public WorkflowInstanceNodeData(WorkflowInstanceData workflowInstanceData, WorkflowInstanceNode workflowInstanceNode, List<WorkflowInstanceNodePortData> inputData,List<WorkflowInstanceNodePortData> outputData) {
+ setWorkflowInstanceData(workflowInstanceData);
setWorkflowInstanceNode(workflowInstanceNode);
setInputData(inputData);
setOutputData(outputData);
@@ -57,4 +59,12 @@ public class WorkflowInstanceNodeData{
public void setOutputData(List<WorkflowInstanceNodePortData> outputData) {
this.outputData = outputData;
}
+
+ public WorkflowInstanceData getWorkflowInstanceData() {
+ return workflowInstanceData;
+ }
+
+ public void setWorkflowInstanceData(WorkflowInstanceData workflowInstanceData) {
+ this.workflowInstanceData = workflowInstanceData;
+ }
}
Added: incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodeStatus.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodeStatus.java?rev=1387617&view=auto
==============================================================================
--- incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodeStatus.java (added)
+++ incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodeStatus.java Wed Sep 19 14:33:41 2012
@@ -0,0 +1,69 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.airavata.registry.api.workflow;
+
+import java.util.Calendar;
+import java.util.Date;
+
+import org.apache.airavata.registry.api.workflow.WorkflowInstanceStatus.ExecutionStatus;
+
+public class WorkflowInstanceNodeStatus {
+ private ExecutionStatus executionStatus;
+ private Date statusUpdateTime = null;
+ private WorkflowInstanceNode workflowInstanceNode;
+
+ public ExecutionStatus getExecutionStatus() {
+ return executionStatus;
+ }
+
+ public void setExecutionStatus(ExecutionStatus executionStatus) {
+ this.executionStatus = executionStatus;
+ }
+
+ public Date getStatusUpdateTime() {
+ return statusUpdateTime;
+ }
+
+ public void setStatusUpdateTime(Date statusUpdateTime) {
+ this.statusUpdateTime = statusUpdateTime;
+ }
+
+ public WorkflowInstanceNodeStatus(WorkflowInstanceNode workflowInstanceNode, ExecutionStatus executionStatus) {
+ this(workflowInstanceNode, executionStatus, null);
+ }
+
+ public WorkflowInstanceNodeStatus(WorkflowInstanceNode workflowInstanceNode, ExecutionStatus executionStatus, Date statusUpdateTime) {
+ statusUpdateTime = statusUpdateTime == null ? Calendar.getInstance().getTime() : statusUpdateTime;
+ setWorkflowInstanceNode(workflowInstanceNode);
+ setExecutionStatus(executionStatus);
+ setStatusUpdateTime(statusUpdateTime);
+ }
+
+ public WorkflowInstanceNode getWorkflowInstanceNode() {
+ return workflowInstanceNode;
+ }
+
+ public void setWorkflowInstanceNode(WorkflowInstanceNode workflowInstanceNode) {
+ this.workflowInstanceNode = workflowInstanceNode;
+ }
+
+}
Propchange: incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodeStatus.java
------------------------------------------------------------------------------
svn:mime-type = text/plain