airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject [1/2] airavata git commit: messaging classes changes and fixing some compliation issues
Date Tue, 23 Jun 2015 20:49:23 GMT
Repository: airavata
Updated Branches:
  refs/heads/master 9f2c08608 -> e5d861e70


http://git-wip-us.apache.org/repos/asf/airavata/blob/e5d861e7/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/AiravataJobStatusUpdator.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/AiravataJobStatusUpdator.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/AiravataJobStatusUpdator.java
index fb4ff3f..e029324 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/AiravataJobStatusUpdator.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/AiravataJobStatusUpdator.java
@@ -1,120 +1,120 @@
-/*
- *
- * 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.gfac.impl;
-
-import com.google.common.eventbus.Subscribe;
-import org.apache.airavata.common.utils.AiravataUtils;
-import org.apache.airavata.common.utils.LocalEventPublisher;
-import org.apache.airavata.common.utils.listener.AbstractActivityListener;
-import org.apache.airavata.messaging.core.MessageContext;
-import org.apache.airavata.messaging.core.Publisher;
-import org.apache.airavata.model.job.JobModel;
-import org.apache.airavata.model.messaging.event.JobStatusChangeEvent;
-import org.apache.airavata.model.messaging.event.JobStatusChangeRequestEvent;
-import org.apache.airavata.model.messaging.event.MessageType;
-import org.apache.airavata.model.status.JobState;
-import org.apache.airavata.model.status.JobStatus;
-import org.apache.airavata.registry.cpi.CompositeIdentifier;
-import org.apache.airavata.registry.cpi.ExperimentCatalog;
-import org.apache.airavata.registry.cpi.ExperimentCatalogModelType;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Calendar;
-
-public class AiravataJobStatusUpdator implements AbstractActivityListener {
-    private final static Logger logger = LoggerFactory.getLogger(AiravataJobStatusUpdator.class);
-    private ExperimentCatalog airavataExperimentCatalog;
-
-    private LocalEventPublisher localEventPublisher;
-    private Publisher publisher;
-
-
-    public ExperimentCatalog getAiravataExperimentCatalog() {
-        return airavataExperimentCatalog;
-    }
-
-    public void setAiravataExperimentCatalog(ExperimentCatalog airavataExperimentCatalog) {
-        this.airavataExperimentCatalog = airavataExperimentCatalog;
-    }
-
-
-    @Subscribe
-    public void updateRegistry(JobStatusChangeRequestEvent jobStatus) throws Exception{
-        /* Here we need to parse the jobStatus message and update
-                the registry accordingly, for now we are just printing to standard Out
-                 */
-        JobState state = jobStatus.getState();
-        if (state != null) {
-            try {
-                String taskID = jobStatus.getJobIdentity().getTaskId();
-                String jobID = jobStatus.getJobIdentity().getJobId();
-                String expId = jobStatus.getJobIdentity().getExperimentId();
-                updateJobStatus(expId,taskID, jobID, state);
-    			logger.debug("expId - {}: Publishing job status for " + jobStatus.getJobIdentity().getJobId() + ":"
-                        + state.toString(),jobStatus.getJobIdentity().getExperimentId());
-                JobStatusChangeEvent event = new JobStatusChangeEvent(jobStatus.getState(), jobStatus.getJobIdentity());
-                localEventPublisher.publish(event);
-                String messageId = AiravataUtils.getId("JOB");
-                MessageContext msgCntxt = new MessageContext(event, MessageType.JOB, messageId, jobStatus.getJobIdentity().getGatewayId());
-                msgCntxt.setUpdatedTime(AiravataUtils.getCurrentTimestamp());
-                publisher.publish(msgCntxt);
-            } catch (Exception e) {
-                logger.error("expId - " + jobStatus.getJobIdentity().getExperimentId() + ": Error persisting data"
-                        + e.getLocalizedMessage(), e);
-                throw new Exception("Error persisting job status..", e);
-            }
-        }
-    }
-
-    public  void updateJobStatus(String expId, String taskId, String jobID, JobState state) throws Exception {
-        logger.info("expId - {}: Updating job status for " + jobID + ":" + state.toString(), expId);
-        CompositeIdentifier ids = new CompositeIdentifier(taskId, jobID);
-        JobModel jobModel = (JobModel) airavataExperimentCatalog.get(ExperimentCatalogModelType.JOB_DETAIL, ids);
-        if (jobModel == null) {
-            jobModel = new JobModel();
-        }
-        JobStatus status = new JobStatus();
-        if (JobState.CANCELED.equals(jobModel.getJobStatus().getJobState())) {
-            status.setJobState(jobModel.getJobStatus().getJobState());
-        } else {
-            status.setJobState(state);
-        }
-        status.setTimeOfStateChange(Calendar.getInstance().getTimeInMillis());
-        jobModel.setJobStatus(status);
-        jobModel.setJobId(jobID);
-        logger.debug("expId - {}: Updated job status for " + jobID + ":" + jobModel.getJobStatus().toString(), expId);
-        airavataExperimentCatalog.update(ExperimentCatalogModelType.JOB_STATUS, status, ids);
-    }
-
-	@SuppressWarnings("unchecked")
-	public void setup(Object... configurations) {
-		for (Object configuration : configurations) {
-			if (configuration instanceof ExperimentCatalog){
-				this.airavataExperimentCatalog =(ExperimentCatalog)configuration;
-			} else if (configuration instanceof LocalEventPublisher){
-				this.localEventPublisher =(LocalEventPublisher) configuration;
-			} else if (configuration instanceof Publisher){
-                this.publisher=(Publisher) configuration;
-            }
-		}
-	}
-}
+///*
+// *
+// * 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.gfac.impl;
+//
+//import com.google.common.eventbus.Subscribe;
+//import org.apache.airavata.common.utils.AiravataUtils;
+//import org.apache.airavata.common.utils.LocalEventPublisher;
+//import org.apache.airavata.common.utils.listener.AbstractActivityListener;
+//import org.apache.airavata.messaging.core.MessageContext;
+//import org.apache.airavata.messaging.core.Publisher;
+//import org.apache.airavata.model.job.JobModel;
+//import org.apache.airavata.model.messaging.event.JobStatusChangeEvent;
+//import org.apache.airavata.model.messaging.event.JobStatusChangeRequestEvent;
+//import org.apache.airavata.model.messaging.event.MessageType;
+//import org.apache.airavata.model.status.JobState;
+//import org.apache.airavata.model.status.JobStatus;
+//import org.apache.airavata.registry.cpi.CompositeIdentifier;
+//import org.apache.airavata.registry.cpi.ExperimentCatalog;
+//import org.apache.airavata.registry.cpi.ExperimentCatalogModelType;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//
+//import java.util.Calendar;
+//
+//public class AiravataJobStatusUpdator implements AbstractActivityListener {
+//    private final static Logger logger = LoggerFactory.getLogger(AiravataJobStatusUpdator.class);
+//    private ExperimentCatalog airavataExperimentCatalog;
+//
+//    private LocalEventPublisher localEventPublisher;
+//    private Publisher publisher;
+//
+//
+//    public ExperimentCatalog getAiravataExperimentCatalog() {
+//        return airavataExperimentCatalog;
+//    }
+//
+//    public void setAiravataExperimentCatalog(ExperimentCatalog airavataExperimentCatalog) {
+//        this.airavataExperimentCatalog = airavataExperimentCatalog;
+//    }
+//
+//
+//    @Subscribe
+//    public void updateRegistry(JobStatusChangeRequestEvent jobStatus) throws Exception{
+//        /* Here we need to parse the jobStatus message and update
+//                the registry accordingly, for now we are just printing to standard Out
+//                 */
+//        JobState state = jobStatus.getState();
+//        if (state != null) {
+//            try {
+//                String taskID = jobStatus.getJobIdentity().getTaskId();
+//                String jobID = jobStatus.getJobIdentity().getJobId();
+//                String expId = jobStatus.getJobIdentity().getExperimentId();
+//                updateJobStatus(expId,taskID, jobID, state);
+//    			logger.debug("expId - {}: Publishing job status for " + jobStatus.getJobIdentity().getJobId() + ":"
+//                        + state.toString(),jobStatus.getJobIdentity().getExperimentId());
+//                JobStatusChangeEvent event = new JobStatusChangeEvent(jobStatus.getState(), jobStatus.getJobIdentity());
+//                localEventPublisher.publish(event);
+//                String messageId = AiravataUtils.getId("JOB");
+//                MessageContext msgCntxt = new MessageContext(event, MessageType.JOB, messageId, jobStatus.getJobIdentity().getGatewayId());
+//                msgCntxt.setUpdatedTime(AiravataUtils.getCurrentTimestamp());
+//                publisher.publish(msgCntxt);
+//            } catch (Exception e) {
+//                logger.error("expId - " + jobStatus.getJobIdentity().getExperimentId() + ": Error persisting data"
+//                        + e.getLocalizedMessage(), e);
+//                throw new Exception("Error persisting job status..", e);
+//            }
+//        }
+//    }
+//
+//    public  void updateJobStatus(String expId, String taskId, String jobID, JobState state) throws Exception {
+//        logger.info("expId - {}: Updating job status for " + jobID + ":" + state.toString(), expId);
+//        CompositeIdentifier ids = new CompositeIdentifier(taskId, jobID);
+//        JobModel jobModel = (JobModel) airavataExperimentCatalog.get(ExperimentCatalogModelType.JOB_DETAIL, ids);
+//        if (jobModel == null) {
+//            jobModel = new JobModel();
+//        }
+//        JobStatus status = new JobStatus();
+//        if (JobState.CANCELED.equals(jobModel.getJobStatus().getJobState())) {
+//            status.setJobState(jobModel.getJobStatus().getJobState());
+//        } else {
+//            status.setJobState(state);
+//        }
+//        status.setTimeOfStateChange(Calendar.getInstance().getTimeInMillis());
+//        jobModel.setJobStatus(status);
+//        jobModel.setJobId(jobID);
+//        logger.debug("expId - {}: Updated job status for " + jobID + ":" + jobModel.getJobStatus().toString(), expId);
+//        airavataExperimentCatalog.update(ExperimentCatalogModelType.JOB_STATUS, status, ids);
+//    }
+//
+//	@SuppressWarnings("unchecked")
+//	public void setup(Object... configurations) {
+//		for (Object configuration : configurations) {
+//			if (configuration instanceof ExperimentCatalog){
+//				this.airavataExperimentCatalog =(ExperimentCatalog)configuration;
+//			} else if (configuration instanceof LocalEventPublisher){
+//				this.localEventPublisher =(LocalEventPublisher) configuration;
+//			} else if (configuration instanceof Publisher){
+//                this.publisher=(Publisher) configuration;
+//            }
+//		}
+//	}
+//}

http://git-wip-us.apache.org/repos/asf/airavata/blob/e5d861e7/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/AiravataProcessStatusUpdator.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/AiravataProcessStatusUpdator.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/AiravataProcessStatusUpdator.java
index 17d53e1..6f85e6c 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/AiravataProcessStatusUpdator.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/AiravataProcessStatusUpdator.java
@@ -1,129 +1,125 @@
-/*
- *
- * 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.gfac.impl;
-
-import com.google.common.eventbus.Subscribe;
-import org.apache.airavata.common.utils.AiravataUtils;
-import org.apache.airavata.common.utils.LocalEventPublisher;
-import org.apache.airavata.common.utils.listener.AbstractActivityListener;
-import org.apache.airavata.messaging.core.MessageContext;
-import org.apache.airavata.messaging.core.Publisher;
-import org.apache.airavata.model.messaging.event.MessageType;
-import org.apache.airavata.model.messaging.event.TaskStatusChangeEvent;
-import org.apache.airavata.model.messaging.event.WorkflowIdentifier;
-import org.apache.airavata.model.messaging.event.WorkflowNodeStatusChangeEvent;
-import org.apache.airavata.model.experiment.WorkflowNodeDetails;
-import org.apache.airavata.model.experiment.WorkflowNodeState;
-import org.apache.airavata.model.experiment.WorkflowNodeStatus;
-import org.apache.airavata.registry.cpi.ExperimentCatalog;
-import org.apache.airavata.registry.cpi.ExperimentCatalogModelType;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Calendar;
-
-public class AiravataProcessStatusUpdator implements AbstractActivityListener {
-    private final static Logger logger = LoggerFactory.getLogger(AiravataProcessStatusUpdator.class);
-
-    private ExperimentCatalog airavataExperimentCatalog;
-    private LocalEventPublisher localEventPublisher;
-    private Publisher publisher;
-
-
-
-
-    public ExperimentCatalog getAiravataExperimentCatalog() {
-        return airavataExperimentCatalog;
-    }
-
-    public void setAiravataExperimentCatalog(ExperimentCatalog airavataExperimentCatalog) {
-        this.airavataExperimentCatalog = airavataExperimentCatalog;
-    }
-
-    @Subscribe
-    public void setupWorkflowNodeStatus(TaskStatusChangeEvent taskStatus) throws Exception{
-    	WorkflowNodeState state=WorkflowNodeState.UNKNOWN;
-    	switch(taskStatus.getState()){
-    	case CANCELED:
-    		state=WorkflowNodeState.CANCELED; break;
-    	case COMPLETED:
-    		state=WorkflowNodeState.COMPLETED; break;
-    	case CONFIGURING_WORKSPACE:
-    		state=WorkflowNodeState.INVOKED; break;
-    	case FAILED:
-    		state=WorkflowNodeState.FAILED; break;
-    	case EXECUTING: case WAITING: case PRE_PROCESSING: case POST_PROCESSING: case OUTPUT_DATA_STAGING: case INPUT_DATA_STAGING:
-    		state=WorkflowNodeState.EXECUTING; break;
-    	case STARTED:
-    		state=WorkflowNodeState.INVOKED; break;
-    	case CANCELING:
-    		state=WorkflowNodeState.CANCELING; break;
-		default:
-			return;
-    	}
-    	try {
-            String expId = taskStatus.getTaskIdentity().getExperimentId();
-			updateWorkflowNodeStatus(expId, taskStatus.getTaskIdentity().getWorkflowNodeId(), state);
-            logger.debug("expId - {}: Publishing workflow node status for " + taskStatus.getTaskIdentity().getWorkflowNodeId()
-                    + ":" + state.toString(), taskStatus.getTaskIdentity().getExperimentId());
-            WorkflowIdentifier workflowIdentity = new WorkflowIdentifier(taskStatus.getTaskIdentity().getWorkflowNodeId(),
-                                                                         taskStatus.getTaskIdentity().getExperimentId(),
-                                                                         taskStatus.getTaskIdentity().getGatewayId());
-            WorkflowNodeStatusChangeEvent event = new WorkflowNodeStatusChangeEvent(state, workflowIdentity);
-            localEventPublisher.publish(event);
-            String messageId = AiravataUtils.getId("WFNODE");
-            MessageContext msgCntxt = new MessageContext(event, MessageType.WORKFLOWNODE, messageId, taskStatus.getTaskIdentity().getGatewayId());
-            msgCntxt.setUpdatedTime(AiravataUtils.getCurrentTimestamp());
-
-            publisher.publish(msgCntxt);
-		} catch (Exception e) {
-            logger.error("expId - " + taskStatus.getTaskIdentity().getExperimentId() + ": Error persisting data"
-                    + e.getLocalizedMessage(), e);
-            throw new Exception("Error persisting workflow node status..", e);
-        }
-    }
-
-    public  void updateWorkflowNodeStatus(String experimentId, String workflowNodeId, WorkflowNodeState state) throws Exception {
-		logger.info("expId - {}: Updating workflow node status for "+workflowNodeId+":"+state.toString(), experimentId);
-    	WorkflowNodeDetails details = (WorkflowNodeDetails) airavataExperimentCatalog.get(ExperimentCatalogModelType.WORKFLOW_NODE_DETAIL, workflowNodeId);
-        if(details == null) {
-            details = new WorkflowNodeDetails();
-            details.setNodeInstanceId(workflowNodeId);
-        }
-        WorkflowNodeStatus status = new WorkflowNodeStatus();
-        status.setWorkflowNodeState(state);
-        status.setTimeOfStateChange(Calendar.getInstance().getTimeInMillis());
-        details.setWorkflowNodeStatus(status);
-        airavataExperimentCatalog.update(ExperimentCatalogModelType.WORKFLOW_NODE_STATUS, status, workflowNodeId);
-    }
-
-	public void setup(Object... configurations) {
-		for (Object configuration : configurations) {
-			if (configuration instanceof ExperimentCatalog){
-				this.airavataExperimentCatalog =(ExperimentCatalog)configuration;
-			} else if (configuration instanceof LocalEventPublisher){
-				this.localEventPublisher =(LocalEventPublisher) configuration;
-			}  else if (configuration instanceof Publisher){
-                this.publisher=(Publisher) configuration;
-            }
-        }
-	}
-}
+///*
+// *
+// * 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.gfac.impl;
+//
+//import com.google.common.eventbus.Subscribe;
+//import org.apache.airavata.common.utils.AiravataUtils;
+//import org.apache.airavata.common.utils.LocalEventPublisher;
+//import org.apache.airavata.common.utils.listener.AbstractActivityListener;
+//import org.apache.airavata.messaging.core.MessageContext;
+//import org.apache.airavata.messaging.core.Publisher;
+//import org.apache.airavata.model.messaging.event.MessageType;
+//import org.apache.airavata.model.messaging.event.TaskStatusChangeEvent;
+//import org.apache.airavata.model.messaging.event.WorkflowIdentifier;
+//import org.apache.airavata.model.messaging.event.WorkflowNodeStatusChangeEvent;
+//import org.apache.airavata.model.experiment.WorkflowNodeDetails;
+//import org.apache.airavata.model.experiment.WorkflowNodeState;
+//import org.apache.airavata.model.experiment.WorkflowNodeStatus;
+//import org.apache.airavata.model.status.ProcessState;
+//import org.apache.airavata.model.status.ProcessStatus;
+//import org.apache.airavata.registry.cpi.ExperimentCatalog;
+//import org.apache.airavata.registry.cpi.ExperimentCatalogModelType;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//
+//import java.util.Calendar;
+//
+//public class AiravataProcessStatusUpdator implements AbstractActivityListener {
+//    private final static Logger logger = LoggerFactory.getLogger(AiravataProcessStatusUpdator.class);
+//
+//    private ExperimentCatalog airavataExperimentCatalog;
+//    private LocalEventPublisher localEventPublisher;
+//    private Publisher publisher;
+//
+//
+//
+//
+//    public ExperimentCatalog getAiravataExperimentCatalog() {
+//        return airavataExperimentCatalog;
+//    }
+//
+//    public void setAiravataExperimentCatalog(ExperimentCatalog airavataExperimentCatalog) {
+//        this.airavataExperimentCatalog = airavataExperimentCatalog;
+//    }
+//
+//    @Subscribe
+//    public void setupProcessStatus(TaskStatusChangeEvent taskStatus) throws Exception{
+//        ProcessState state;
+//    	switch(taskStatus.getState()){
+//    	case CANCELED:
+//    		state=ProcessState.CANCELED; break;
+//    	case COMPLETED:
+//    		state=ProcessState.EXECUTING; break;
+//    	case FAILED:
+//    		state=ProcessState.FAILED; break;
+//    	case EXECUTING:
+//    		state=ProcessState.EXECUTING; break;
+//		default:
+//			return;
+//    	}
+//    	try {
+//            String expId = taskStatus.getTaskIdentity().getExperimentId();
+//			updateWorkflowNodeStatus(expId, taskStatus.getTaskIdentity().getWorkflowNodeId(), state);
+//            logger.debug("expId - {}: Publishing workflow node status for " + taskStatus.getTaskIdentity().getWorkflowNodeId()
+//                    + ":" + state.toString(), taskStatus.getTaskIdentity().getExperimentId());
+//            WorkflowIdentifier workflowIdentity = new WorkflowIdentifier(taskStatus.getTaskIdentity().getWorkflowNodeId(),
+//                                                                         taskStatus.getTaskIdentity().getExperimentId(),
+//                                                                         taskStatus.getTaskIdentity().getGatewayId());
+//            WorkflowNodeStatusChangeEvent event = new WorkflowNodeStatusChangeEvent(state, workflowIdentity);
+//            localEventPublisher.publish(event);
+//            String messageId = AiravataUtils.getId("WFNODE");
+//            MessageContext msgCntxt = new MessageContext(event, MessageType.WORKFLOWNODE, messageId, taskStatus.getTaskIdentity().getGatewayId());
+//            msgCntxt.setUpdatedTime(AiravataUtils.getCurrentTimestamp());
+//
+//            publisher.publish(msgCntxt);
+//		} catch (Exception e) {
+//            logger.error("expId - " + taskStatus.getTaskIdentity().getExperimentId() + ": Error persisting data"
+//                    + e.getLocalizedMessage(), e);
+//            throw new Exception("Error persisting workflow node status..", e);
+//        }
+//    }
+//
+//    public  void updateWorkflowNodeStatus(String experimentId, String workflowNodeId, WorkflowNodeState state) throws Exception {
+//		logger.info("expId - {}: Updating workflow node status for "+workflowNodeId+":"+state.toString(), experimentId);
+//    	WorkflowNodeDetails details = (WorkflowNodeDetails) airavataExperimentCatalog.get(ExperimentCatalogModelType.WORKFLOW_NODE_DETAIL, workflowNodeId);
+//        if(details == null) {
+//            details = new WorkflowNodeDetails();
+//            details.setNodeInstanceId(workflowNodeId);
+//        }
+//        WorkflowNodeStatus status = new WorkflowNodeStatus();
+//        status.setWorkflowNodeState(state);
+//        status.setTimeOfStateChange(Calendar.getInstance().getTimeInMillis());
+//        details.setWorkflowNodeStatus(status);
+//        airavataExperimentCatalog.update(ExperimentCatalogModelType.WORKFLOW_NODE_STATUS, status, workflowNodeId);
+//    }
+//
+//	public void setup(Object... configurations) {
+//		for (Object configuration : configurations) {
+//			if (configuration instanceof ExperimentCatalog){
+//				this.airavataExperimentCatalog =(ExperimentCatalog)configuration;
+//			} else if (configuration instanceof LocalEventPublisher){
+//				this.localEventPublisher =(LocalEventPublisher) configuration;
+//			}  else if (configuration instanceof Publisher){
+//                this.publisher=(Publisher) configuration;
+//            }
+//        }
+//	}
+//}

http://git-wip-us.apache.org/repos/asf/airavata/blob/e5d861e7/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/AiravataTaskStatusUpdator.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/AiravataTaskStatusUpdator.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/AiravataTaskStatusUpdator.java
index 1e4c1d8..8ddacc4 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/AiravataTaskStatusUpdator.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/AiravataTaskStatusUpdator.java
@@ -1,159 +1,159 @@
-/*
- *
- * 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.gfac.impl;
-
-import com.google.common.eventbus.Subscribe;
-import org.apache.airavata.common.exception.AiravataException;
-import org.apache.airavata.common.utils.AiravataUtils;
-import org.apache.airavata.common.utils.LocalEventPublisher;
-import org.apache.airavata.common.utils.listener.AbstractActivityListener;
-import org.apache.airavata.messaging.core.MessageContext;
-import org.apache.airavata.messaging.core.Publisher;
-import org.apache.airavata.model.messaging.event.JobStatusChangeEvent;
-import org.apache.airavata.model.messaging.event.MessageType;
-import org.apache.airavata.model.messaging.event.TaskIdentifier;
-import org.apache.airavata.model.messaging.event.TaskOutputChangeEvent;
-import org.apache.airavata.model.messaging.event.TaskStatusChangeEvent;
-import org.apache.airavata.model.messaging.event.TaskStatusChangeRequestEvent;
-import org.apache.airavata.model.status.TaskState;
-import org.apache.airavata.registry.cpi.ExperimentCatalog;
-import org.apache.airavata.registry.cpi.ExperimentCatalogModelType;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Calendar;
-
-public class AiravataTaskStatusUpdator implements AbstractActivityListener {
-    private final static Logger logger = LoggerFactory.getLogger(AiravataTaskStatusUpdator.class);
-    private ExperimentCatalog airavataExperimentCatalog;
-    private LocalEventPublisher localEventPublisher;
-    private Publisher publisher;
-    
-    public ExperimentCatalog getAiravataExperimentCatalog() {
-        return airavataExperimentCatalog;
-    }
-
-    public void setAiravataExperimentCatalog(ExperimentCatalog airavataExperimentCatalog) {
-        this.airavataExperimentCatalog = airavataExperimentCatalog;
-    }
-
-    @Subscribe
-    public void setupTaskStatus(TaskStatusChangeRequestEvent taskStatus) throws Exception{
-    	try {
-			updateTaskStatus(taskStatus.getTaskIdentity().getTaskId(), taskStatus.getState());
-            logger.debug("expId - {}: Publishing task status for " + taskStatus.getTaskIdentity().getTaskId() + ":"
-                    + taskStatus.getState().toString(), taskStatus.getTaskIdentity().getExperimentId());
-            TaskStatusChangeEvent event = new TaskStatusChangeEvent(taskStatus.getState(), taskStatus.getTaskIdentity());
-            localEventPublisher.publish(event);
-            String messageId = AiravataUtils.getId("TASK");
-            MessageContext msgCntxt = new MessageContext(event, MessageType.TASK, messageId, taskStatus.getTaskIdentity().getGatewayId());
-            msgCntxt.setUpdatedTime(AiravataUtils.getCurrentTimestamp());
-            publisher.publish(msgCntxt);
-		} catch (Exception e) {
-            String msg = "Error persisting data task status to database...";
-            logger.error(msg + e.getLocalizedMessage(), e);
-            throw new Exception(msg, e);
-		}
-    }
-
-    @Subscribe
-    public void setupTaskStatus(JobStatusChangeEvent jobStatus) throws Exception{
-    	TaskState state;
-    	switch(jobStatus.getState()){
-    	case ACTIVE:
-    		state=TaskState.EXECUTING; break;
-    	case CANCELED:
-    		state=TaskState.CANCELED; break;
-    	case COMPLETE: case FAILED:
-    		state=TaskState.EXECUTING; break;
-    	case SUSPENDED: case QUEUED:
-    		state=TaskState.EXECUTING; break;
-    	case SUBMITTED:
-    		state=TaskState.EXECUTING; break;
-		default:
-			return;
-    	}
-    	try {
-			updateTaskStatus(jobStatus.getJobIdentity().getTaskId(), state);
-            logger.debug("expId - {}: Publishing task status for " + jobStatus.getJobIdentity().getTaskId() + ":"
-                    + state.toString(), jobStatus.getJobIdentity().getExperimentId());
-            TaskIdentifier taskIdentity = new TaskIdentifier(jobStatus.getJobIdentity().getTaskId(),
-                                                         jobStatus.getJobIdentity().getWorkflowNodeId(),
-                                                         jobStatus.getJobIdentity().getExperimentId(),
-                                                         jobStatus.getJobIdentity().getGatewayId());
-            TaskStatusChangeEvent event = new TaskStatusChangeEvent(state, taskIdentity);
-            localEventPublisher.publish(event);
-            String messageId = AiravataUtils.getId("TASK");
-            MessageContext msgCntxt = new MessageContext(event, MessageType.TASK, messageId,jobStatus.getJobIdentity().getGatewayId());
-            msgCntxt.setUpdatedTime(AiravataUtils.getCurrentTimestamp());
-            publisher.publish(msgCntxt);
-
-        }  catch (Exception e) {
-            logger.error("expId - " + jobStatus.getJobIdentity().getExperimentId() + ": Error persisting data" + e.getLocalizedMessage(), e);
-            throw new Exception("Error persisting task status..", e);
-		}
-    }
-    
-    public  TaskState updateTaskStatus(String taskId, TaskState state) throws Exception {
-    	TaskDetails details = (TaskDetails) airavataExperimentCatalog.get(ExperimentCatalogModelType.TASK_DETAIL, taskId);
-        if(details == null) {
-            logger.error("Task details cannot be null at this point");
-            throw new Exception("Task details cannot be null at this point");
-        }
-        org.apache.airavata.model.workspace.experiment.TaskStatus status = new org.apache.airavata.model.workspace.experiment.TaskStatus();
-        if(!TaskState.CANCELED.equals(details.getTaskStatus().getExecutionState())
-                && !TaskState.CANCELING.equals(details.getTaskStatus().getExecutionState())){
-            status.setExecutionState(state);
-        }else{
-            status.setExecutionState(details.getTaskStatus().getExecutionState());
-        }
-        status.setTimeOfStateChange(Calendar.getInstance().getTimeInMillis());
-        details.setTaskStatus(status);
-        logger.debug("Updating task status for "+taskId+":"+details.getTaskStatus().toString());
-
-        airavataExperimentCatalog.update(ExperimentCatalogModelType.TASK_STATUS, status, taskId);
-        return status.getExecutionState();
-    }
-
-	public void setup(Object... configurations) {
-		for (Object configuration : configurations) {
-			if (configuration instanceof ExperimentCatalog){
-				this.airavataExperimentCatalog =(ExperimentCatalog)configuration;
-			} else if (configuration instanceof LocalEventPublisher){
-				this.localEventPublisher =(LocalEventPublisher) configuration;
-			} else if (configuration instanceof Publisher){
-                this.publisher=(Publisher) configuration;
-            }
-        }
-	}
-
-
-    @Subscribe
-    public void taskOutputChanged(TaskOutputChangeEvent taskOutputEvent) throws AiravataException {
-        String taskId = taskOutputEvent.getTaskIdentity().getTaskId();
-        logger.debug("Task Output changed event received for workflow node : " +
-                taskOutputEvent.getTaskIdentity().getWorkflowNodeId() + ", task : " + taskId);
-        // TODO - do we need to update the output to the registry? , we do it in the workflowInterpreter too.
-        MessageContext messageContext = new MessageContext(taskOutputEvent, MessageType.TASKOUTPUT, taskOutputEvent.getTaskIdentity().getTaskId(), taskOutputEvent.getTaskIdentity().getGatewayId());
-        messageContext.setUpdatedTime(AiravataUtils.getCurrentTimestamp());
-        publisher.publish(messageContext);
-    }
-}
+///*
+// *
+// * 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.gfac.impl;
+//
+//import com.google.common.eventbus.Subscribe;
+//import org.apache.airavata.common.exception.AiravataException;
+//import org.apache.airavata.common.utils.AiravataUtils;
+//import org.apache.airavata.common.utils.LocalEventPublisher;
+//import org.apache.airavata.common.utils.listener.AbstractActivityListener;
+//import org.apache.airavata.messaging.core.MessageContext;
+//import org.apache.airavata.messaging.core.Publisher;
+//import org.apache.airavata.model.messaging.event.JobStatusChangeEvent;
+//import org.apache.airavata.model.messaging.event.MessageType;
+//import org.apache.airavata.model.messaging.event.TaskIdentifier;
+//import org.apache.airavata.model.messaging.event.TaskOutputChangeEvent;
+//import org.apache.airavata.model.messaging.event.TaskStatusChangeEvent;
+//import org.apache.airavata.model.messaging.event.TaskStatusChangeRequestEvent;
+//import org.apache.airavata.model.status.TaskState;
+//import org.apache.airavata.registry.cpi.ExperimentCatalog;
+//import org.apache.airavata.registry.cpi.ExperimentCatalogModelType;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//
+//import java.util.Calendar;
+//
+//public class AiravataTaskStatusUpdator implements AbstractActivityListener {
+//    private final static Logger logger = LoggerFactory.getLogger(AiravataTaskStatusUpdator.class);
+//    private ExperimentCatalog airavataExperimentCatalog;
+//    private LocalEventPublisher localEventPublisher;
+//    private Publisher publisher;
+//
+//    public ExperimentCatalog getAiravataExperimentCatalog() {
+//        return airavataExperimentCatalog;
+//    }
+//
+//    public void setAiravataExperimentCatalog(ExperimentCatalog airavataExperimentCatalog) {
+//        this.airavataExperimentCatalog = airavataExperimentCatalog;
+//    }
+//
+//    @Subscribe
+//    public void setupTaskStatus(TaskStatusChangeRequestEvent taskStatus) throws Exception{
+//    	try {
+//			updateTaskStatus(taskStatus.getTaskIdentity().getTaskId(), taskStatus.getState());
+//            logger.debug("expId - {}: Publishing task status for " + taskStatus.getTaskIdentity().getTaskId() + ":"
+//                    + taskStatus.getState().toString(), taskStatus.getTaskIdentity().getExperimentId());
+//            TaskStatusChangeEvent event = new TaskStatusChangeEvent(taskStatus.getState(), taskStatus.getTaskIdentity());
+//            localEventPublisher.publish(event);
+//            String messageId = AiravataUtils.getId("TASK");
+//            MessageContext msgCntxt = new MessageContext(event, MessageType.TASK, messageId, taskStatus.getTaskIdentity().getGatewayId());
+//            msgCntxt.setUpdatedTime(AiravataUtils.getCurrentTimestamp());
+//            publisher.publish(msgCntxt);
+//		} catch (Exception e) {
+//            String msg = "Error persisting data task status to database...";
+//            logger.error(msg + e.getLocalizedMessage(), e);
+//            throw new Exception(msg, e);
+//		}
+//    }
+//
+//    @Subscribe
+//    public void setupTaskStatus(JobStatusChangeEvent jobStatus) throws Exception{
+//    	TaskState state;
+//    	switch(jobStatus.getState()){
+//    	case ACTIVE:
+//    		state=TaskState.EXECUTING; break;
+//    	case CANCELED:
+//    		state=TaskState.CANCELED; break;
+//    	case COMPLETE: case FAILED:
+//    		state=TaskState.EXECUTING; break;
+//    	case SUSPENDED: case QUEUED:
+//    		state=TaskState.EXECUTING; break;
+//    	case SUBMITTED:
+//    		state=TaskState.EXECUTING; break;
+//		default:
+//			return;
+//    	}
+//    	try {
+//			updateTaskStatus(jobStatus.getJobIdentity().getTaskId(), state);
+//            logger.debug("expId - {}: Publishing task status for " + jobStatus.getJobIdentity().getTaskId() + ":"
+//                    + state.toString(), jobStatus.getJobIdentity().getExperimentId());
+//            TaskIdentifier taskIdentity = new TaskIdentifier(jobStatus.getJobIdentity().getTaskId(),
+//                                                         jobStatus.getJobIdentity().getWorkflowNodeId(),
+//                                                         jobStatus.getJobIdentity().getExperimentId(),
+//                                                         jobStatus.getJobIdentity().getGatewayId());
+//            TaskStatusChangeEvent event = new TaskStatusChangeEvent(state, taskIdentity);
+//            localEventPublisher.publish(event);
+//            String messageId = AiravataUtils.getId("TASK");
+//            MessageContext msgCntxt = new MessageContext(event, MessageType.TASK, messageId,jobStatus.getJobIdentity().getGatewayId());
+//            msgCntxt.setUpdatedTime(AiravataUtils.getCurrentTimestamp());
+//            publisher.publish(msgCntxt);
+//
+//        }  catch (Exception e) {
+//            logger.error("expId - " + jobStatus.getJobIdentity().getExperimentId() + ": Error persisting data" + e.getLocalizedMessage(), e);
+//            throw new Exception("Error persisting task status..", e);
+//		}
+//    }
+//
+//    public  TaskState updateTaskStatus(String taskId, TaskState state) throws Exception {
+//    	TaskDetails details = (TaskDetails) airavataExperimentCatalog.get(ExperimentCatalogModelType.TASK_DETAIL, taskId);
+//        if(details == null) {
+//            logger.error("Task details cannot be null at this point");
+//            throw new Exception("Task details cannot be null at this point");
+//        }
+//        org.apache.airavata.model.workspace.experiment.TaskStatus status = new org.apache.airavata.model.workspace.experiment.TaskStatus();
+//        if(!TaskState.CANCELED.equals(details.getTaskStatus().getExecutionState())
+//                && !TaskState.CANCELING.equals(details.getTaskStatus().getExecutionState())){
+//            status.setExecutionState(state);
+//        }else{
+//            status.setExecutionState(details.getTaskStatus().getExecutionState());
+//        }
+//        status.setTimeOfStateChange(Calendar.getInstance().getTimeInMillis());
+//        details.setTaskStatus(status);
+//        logger.debug("Updating task status for "+taskId+":"+details.getTaskStatus().toString());
+//
+//        airavataExperimentCatalog.update(ExperimentCatalogModelType.TASK_STATUS, status, taskId);
+//        return status.getExecutionState();
+//    }
+//
+//	public void setup(Object... configurations) {
+//		for (Object configuration : configurations) {
+//			if (configuration instanceof ExperimentCatalog){
+//				this.airavataExperimentCatalog =(ExperimentCatalog)configuration;
+//			} else if (configuration instanceof LocalEventPublisher){
+//				this.localEventPublisher =(LocalEventPublisher) configuration;
+//			} else if (configuration instanceof Publisher){
+//                this.publisher=(Publisher) configuration;
+//            }
+//        }
+//	}
+//
+//
+//    @Subscribe
+//    public void taskOutputChanged(TaskOutputChangeEvent taskOutputEvent) throws AiravataException {
+//        String taskId = taskOutputEvent.getTaskIdentity().getTaskId();
+//        logger.debug("Task Output changed event received for workflow node : " +
+//                taskOutputEvent.getTaskIdentity().getWorkflowNodeId() + ", task : " + taskId);
+//        // TODO - do we need to update the output to the registry? , we do it in the workflowInterpreter too.
+//        MessageContext messageContext = new MessageContext(taskOutputEvent, MessageType.TASKOUTPUT, taskOutputEvent.getTaskIdentity().getTaskId(), taskOutputEvent.getTaskIdentity().getGatewayId());
+//        messageContext.setUpdatedTime(AiravataUtils.getCurrentTimestamp());
+//        publisher.publish(messageContext);
+//    }
+//}

http://git-wip-us.apache.org/repos/asf/airavata/blob/e5d861e7/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQStatusConsumer.java
----------------------------------------------------------------------
diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQStatusConsumer.java b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQStatusConsumer.java
index 4f3868f..4510a07 100644
--- a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQStatusConsumer.java
+++ b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQStatusConsumer.java
@@ -161,7 +161,7 @@ public class RabbitMQStatusConsumer implements Consumer {
                                     experimentStatusChangeEvent.getState());
                             event = experimentStatusChangeEvent;
                             gatewayId = experimentStatusChangeEvent.getGatewayId();
-                        } else if (message.getMessageType().equals(MessageType.WORKFLOWNODE)) {
+                        } else if (message.getMessageType().equals(MessageType.PROCESS)) {
                            /* WorkflowNodeStatusChangeEvent wfnStatusChangeEvent = new WorkflowNodeStatusChangeEvent();
                             ThriftUtils.createThriftFromBytes(message.getEvent(), wfnStatusChangeEvent);
                             log.debug(" Message Received with message id '" + message.getMessageId()

http://git-wip-us.apache.org/repos/asf/airavata/blob/e5d861e7/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
index 25a2ce6..52ec0fc 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
@@ -98,9 +98,9 @@ public class ThriftDataModelConversion {
             experimentSummary.setUserName(experimentSummaryResource.getUserName());
             experimentSummary.setName(experimentSummaryResource.getExperimentName());
             experimentSummary.setDescription(experimentSummaryResource.getDescription());
-            experimentSummary.setExecutionId(experimentSummaryResource.getExecutionId());
-            experimentSummary.setExperimentStatus(experimentSummaryResource.getState());
-            experimentSummary.setStatusUpdateTime(experimentSummaryResource.getTimeOfStateChange().getTime());
+            ExperimentState experimentState = ExperimentState.valueOf(experimentSummaryResource.getState());
+//            FIXME : Experiment Summary resource is incomplete at this point
+//            experimentSummary.setExperimentStatus(experimentSummaryResource.getState());
             return experimentSummary;
         }
         return null;

http://git-wip-us.apache.org/repos/asf/airavata/blob/e5d861e7/thrift-interface-descriptions/airavata-api/experiment_model.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/airavata-api/experiment_model.thrift b/thrift-interface-descriptions/airavata-api/experiment_model.thrift
index b70429d..1c5c0c7 100644
--- a/thrift-interface-descriptions/airavata-api/experiment_model.thrift
+++ b/thrift-interface-descriptions/airavata-api/experiment_model.thrift
@@ -76,31 +76,33 @@ struct UserConfigurationDataModel {
 struct ExperimentModel {
     1: required string experimentId,
     2: required string projectId,
-    3: required ExperimentType experimentType = ExperimentType.SINGLE_APPLICATION;
-    4: required string userName,
-    5: required string experimentName,
-    6: optional i64 creationTime,
-    7: optional string description,
-    8: optional string executionId,
-    9: optional string gatewayExecutionId,
-    10: optional bool enableEmailNotification,
-    11: optional list<string> emailAddresses,
-    12: optional UserConfigurationDataModel userConfigurationData,
-    13: optional list<application_io_models.InputDataObjectType> experimentInputs,
-    14: optional list<application_io_models.OutputDataObjectType> experimentOutputs,
-    15: optional status_models.ExperimentStatus experimentStatus,
-    16: optional list<airavata_commons.ErrorModel> errors
+    3: required string gatewayId,
+    4: required ExperimentType experimentType = ExperimentType.SINGLE_APPLICATION;
+    5: required string userName,
+    6: required string experimentName,
+    7: optional i64 creationTime,
+    8: optional string description,
+    9: optional string executionId,
+    10: optional string gatewayExecutionId,
+    11: optional bool enableEmailNotification,
+    12: optional list<string> emailAddresses,
+    13: optional UserConfigurationDataModel userConfigurationData,
+    14: optional list<application_io_models.InputDataObjectType> experimentInputs,
+    15: optional list<application_io_models.OutputDataObjectType> experimentOutputs,
+    16: optional status_models.ExperimentStatus experimentStatus,
+    17: optional list<airavata_commons.ErrorModel> errors
 }
 
 struct ExperimentSummaryModel {
     1: required string experimentId,
     2: required string projectId,
-    3: optional i64 creationTime,
-    4: required string userName,
-    5: required string name,
-    6: optional string description,
-    7: optional string applicationId,
-    8: optional status_models.ExperimentStatus experimentStatus,
+    3: required string gatewayId,
+    4: optional i64 creationTime,
+    5: required string userName,
+    6: required string name,
+    7: optional string description,
+    8: optional string applicationId,
+    9: optional status_models.ExperimentStatus experimentStatus,
 }
 
 struct ExperimentStatistics {

http://git-wip-us.apache.org/repos/asf/airavata/blob/e5d861e7/thrift-interface-descriptions/airavata-api/messaging_events.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/airavata-api/messaging_events.thrift b/thrift-interface-descriptions/airavata-api/messaging_events.thrift
index b391ed7..e20d8ba 100644
--- a/thrift-interface-descriptions/airavata-api/messaging_events.thrift
+++ b/thrift-interface-descriptions/airavata-api/messaging_events.thrift
@@ -80,7 +80,7 @@ struct ProcessStatusChangeEvent {
 }
 
 struct ProcessStatusChangeRequestEvent {
-    1: required status_models.TaskState state;
+    1: required status_models.ProcessState state;
     2: required ProcessIdentifier processIdentity;
 }
 


Mime
View raw message