You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2014/10/21 23:29:58 UTC

[2/2] git commit: adding gateway id to messaging events

adding gateway id to messaging events


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/adb9b956
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/adb9b956
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/adb9b956

Branch: refs/heads/master
Commit: adb9b956bf6b65aca60af423819b103f673b54f8
Parents: cbd947c
Author: Chathuri Wimalasena <ka...@gmail.com>
Authored: Tue Oct 21 17:29:48 2014 -0400
Committer: Chathuri Wimalasena <ka...@gmail.com>
Committed: Tue Oct 21 17:29:48 2014 -0400

----------------------------------------------------------------------
 .../AiravataExperimentStatusUpdator.java        |   6 +-
 .../lib/airavata/messagingEvents_types.cpp      | 104 +++++++++++++++----
 .../lib/airavata/messagingEvents_types.h        |  76 +++++++++-----
 .../Airavata/Model/Messaging/Event/Types.php    |  80 ++++++++++++++
 .../client/samples/CreateLaunchExperiment.java  |   4 +-
 .../event/ExperimentStatusChangeEvent.java      | 100 +++++++++++++++++-
 .../model/messaging/event/JobIdentifier.java    | 100 +++++++++++++++++-
 .../model/messaging/event/TaskIdentifier.java   | 100 +++++++++++++++++-
 .../messaging/event/WorkflowIdentifier.java     | 100 +++++++++++++++++-
 .../messagingEvents.thrift                      |   4 +
 .../airavata/gfac/core/cpi/BetterGfacImpl.java  |  27 +++--
 .../handler/AbstractRecoverableHandler.java     |   3 +-
 .../core/monitor/AiravataJobStatusUpdator.java  |   3 +-
 .../core/monitor/AiravataTaskStatusUpdator.java |   7 +-
 .../AiravataWorkflowNodeStatusUpdator.java      |   6 +-
 .../state/GfacExperimentStateChangeRequest.java |   3 +-
 .../gfac/core/utils/OutHandlerWorker.java       |   2 +-
 .../gfac/local/provider/impl/LocalProvider.java |   6 +-
 .../monitor/impl/pull/qstat/HPCPullMonitor.java |   9 +-
 .../monitor/impl/push/amqp/AMQPMonitor.java     |   5 +-
 .../airavata/messaging/core/MessageContext.java |   8 +-
 .../messaging/core/impl/RabbitMQConsumer.java   |   8 +-
 .../engine/interpretor/WorkflowInterpreter.java |  26 ++++-
 23 files changed, 701 insertions(+), 86 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/adb9b956/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/listener/AiravataExperimentStatusUpdator.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/listener/AiravataExperimentStatusUpdator.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/listener/AiravataExperimentStatusUpdator.java
index f65baea..91c2efe 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/listener/AiravataExperimentStatusUpdator.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/listener/AiravataExperimentStatusUpdator.java
@@ -89,10 +89,12 @@ public class AiravataExperimentStatusUpdator implements AbstractActivityListener
 	        }
 			updateExperimentStatus(nodeStatus.getWorkflowNodeIdentity().getExperimentId(), state);
 			logger.debug("Publishing experiment status for "+nodeStatus.getWorkflowNodeIdentity().getExperimentId()+":"+state.toString());
-            ExperimentStatusChangeEvent event = new ExperimentStatusChangeEvent(state, nodeStatus.getWorkflowNodeIdentity().getExperimentId());
+            ExperimentStatusChangeEvent event = new ExperimentStatusChangeEvent(state,
+                                                                                nodeStatus.getWorkflowNodeIdentity().getExperimentId(),
+                                                                                nodeStatus.getWorkflowNodeIdentity().getGatewayId());
             monitorPublisher.publish(event);
             String messageId = AiravataUtils.getId("EXPERIMENT");
-            MessageContext msgCntxt = new MessageContext(event, MessageType.EXPERIMENT, messageId);
+            MessageContext msgCntxt = new MessageContext(event, MessageType.EXPERIMENT, messageId, nodeStatus.getWorkflowNodeIdentity().getGatewayId());
             msgCntxt.setUpdatedTime(AiravataUtils.getCurrentTimestamp());
             if ( ServerSettings.isRabbitMqPublishEnabled()){
                 publisher.publish(msgCntxt);

http://git-wip-us.apache.org/repos/asf/airavata/blob/adb9b956/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/messagingEvents_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/messagingEvents_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/messagingEvents_types.cpp
index f7c123a..c661759 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/messagingEvents_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/messagingEvents_types.cpp
@@ -55,8 +55,8 @@ const char* _kMessageTypeNames[] = {
 };
 const std::map<int, const char*> _MessageType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(4, _kMessageTypeValues, _kMessageTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
 
-const char* ExperimentStatusChangeEvent::ascii_fingerprint = "19B5240589E680301A7E32DF3971EFBE";
-const uint8_t ExperimentStatusChangeEvent::binary_fingerprint[16] = {0x19,0xB5,0x24,0x05,0x89,0xE6,0x80,0x30,0x1A,0x7E,0x32,0xDF,0x39,0x71,0xEF,0xBE};
+const char* ExperimentStatusChangeEvent::ascii_fingerprint = "38C252E94E93B69D04EB3A6EE2F9EDFB";
+const uint8_t ExperimentStatusChangeEvent::binary_fingerprint[16] = {0x38,0xC2,0x52,0xE9,0x4E,0x93,0xB6,0x9D,0x04,0xEB,0x3A,0x6E,0xE2,0xF9,0xED,0xFB};
 
 uint32_t ExperimentStatusChangeEvent::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -71,6 +71,7 @@ uint32_t ExperimentStatusChangeEvent::read(::apache::thrift::protocol::TProtocol
 
   bool isset_state = false;
   bool isset_experimentId = false;
+  bool isset_gatewayId = false;
 
   while (true)
   {
@@ -98,6 +99,14 @@ uint32_t ExperimentStatusChangeEvent::read(::apache::thrift::protocol::TProtocol
           xfer += iprot->skip(ftype);
         }
         break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->gatewayId);
+          isset_gatewayId = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
       default:
         xfer += iprot->skip(ftype);
         break;
@@ -111,6 +120,8 @@ uint32_t ExperimentStatusChangeEvent::read(::apache::thrift::protocol::TProtocol
     throw TProtocolException(TProtocolException::INVALID_DATA);
   if (!isset_experimentId)
     throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_gatewayId)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
   return xfer;
 }
 
@@ -126,6 +137,10 @@ uint32_t ExperimentStatusChangeEvent::write(::apache::thrift::protocol::TProtoco
   xfer += oprot->writeString(this->experimentId);
   xfer += oprot->writeFieldEnd();
 
+  xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 3);
+  xfer += oprot->writeString(this->gatewayId);
+  xfer += oprot->writeFieldEnd();
+
   xfer += oprot->writeFieldStop();
   xfer += oprot->writeStructEnd();
   return xfer;
@@ -135,10 +150,11 @@ void swap(ExperimentStatusChangeEvent &a, ExperimentStatusChangeEvent &b) {
   using ::std::swap;
   swap(a.state, b.state);
   swap(a.experimentId, b.experimentId);
+  swap(a.gatewayId, b.gatewayId);
 }
 
-const char* WorkflowIdentifier::ascii_fingerprint = "07A9615F837F7D0A952B595DD3020972";
-const uint8_t WorkflowIdentifier::binary_fingerprint[16] = {0x07,0xA9,0x61,0x5F,0x83,0x7F,0x7D,0x0A,0x95,0x2B,0x59,0x5D,0xD3,0x02,0x09,0x72};
+const char* WorkflowIdentifier::ascii_fingerprint = "AB879940BD15B6B25691265F7384B271";
+const uint8_t WorkflowIdentifier::binary_fingerprint[16] = {0xAB,0x87,0x99,0x40,0xBD,0x15,0xB6,0xB2,0x56,0x91,0x26,0x5F,0x73,0x84,0xB2,0x71};
 
 uint32_t WorkflowIdentifier::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -153,6 +169,7 @@ uint32_t WorkflowIdentifier::read(::apache::thrift::protocol::TProtocol* iprot)
 
   bool isset_workflowNodeId = false;
   bool isset_experimentId = false;
+  bool isset_gatewayId = false;
 
   while (true)
   {
@@ -178,6 +195,14 @@ uint32_t WorkflowIdentifier::read(::apache::thrift::protocol::TProtocol* iprot)
           xfer += iprot->skip(ftype);
         }
         break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->gatewayId);
+          isset_gatewayId = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
       default:
         xfer += iprot->skip(ftype);
         break;
@@ -191,6 +216,8 @@ uint32_t WorkflowIdentifier::read(::apache::thrift::protocol::TProtocol* iprot)
     throw TProtocolException(TProtocolException::INVALID_DATA);
   if (!isset_experimentId)
     throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_gatewayId)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
   return xfer;
 }
 
@@ -206,6 +233,10 @@ uint32_t WorkflowIdentifier::write(::apache::thrift::protocol::TProtocol* oprot)
   xfer += oprot->writeString(this->experimentId);
   xfer += oprot->writeFieldEnd();
 
+  xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 3);
+  xfer += oprot->writeString(this->gatewayId);
+  xfer += oprot->writeFieldEnd();
+
   xfer += oprot->writeFieldStop();
   xfer += oprot->writeStructEnd();
   return xfer;
@@ -215,10 +246,11 @@ void swap(WorkflowIdentifier &a, WorkflowIdentifier &b) {
   using ::std::swap;
   swap(a.workflowNodeId, b.workflowNodeId);
   swap(a.experimentId, b.experimentId);
+  swap(a.gatewayId, b.gatewayId);
 }
 
-const char* WorkflowNodeStatusChangeEvent::ascii_fingerprint = "E9096211D03C8F19468314A49FB23CF0";
-const uint8_t WorkflowNodeStatusChangeEvent::binary_fingerprint[16] = {0xE9,0x09,0x62,0x11,0xD0,0x3C,0x8F,0x19,0x46,0x83,0x14,0xA4,0x9F,0xB2,0x3C,0xF0};
+const char* WorkflowNodeStatusChangeEvent::ascii_fingerprint = "9686679C94D43D75F2B35A0BED2E4003";
+const uint8_t WorkflowNodeStatusChangeEvent::binary_fingerprint[16] = {0x96,0x86,0x67,0x9C,0x94,0xD4,0x3D,0x75,0xF2,0xB3,0x5A,0x0B,0xED,0x2E,0x40,0x03};
 
 uint32_t WorkflowNodeStatusChangeEvent::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -299,8 +331,8 @@ void swap(WorkflowNodeStatusChangeEvent &a, WorkflowNodeStatusChangeEvent &b) {
   swap(a.workflowNodeIdentity, b.workflowNodeIdentity);
 }
 
-const char* TaskIdentifier::ascii_fingerprint = "AB879940BD15B6B25691265F7384B271";
-const uint8_t TaskIdentifier::binary_fingerprint[16] = {0xAB,0x87,0x99,0x40,0xBD,0x15,0xB6,0xB2,0x56,0x91,0x26,0x5F,0x73,0x84,0xB2,0x71};
+const char* TaskIdentifier::ascii_fingerprint = "C93D890311F28844166CF6E571EB3AC2";
+const uint8_t TaskIdentifier::binary_fingerprint[16] = {0xC9,0x3D,0x89,0x03,0x11,0xF2,0x88,0x44,0x16,0x6C,0xF6,0xE5,0x71,0xEB,0x3A,0xC2};
 
 uint32_t TaskIdentifier::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -316,6 +348,7 @@ uint32_t TaskIdentifier::read(::apache::thrift::protocol::TProtocol* iprot) {
   bool isset_taskId = false;
   bool isset_workflowNodeId = false;
   bool isset_experimentId = false;
+  bool isset_gatewayId = false;
 
   while (true)
   {
@@ -349,6 +382,14 @@ uint32_t TaskIdentifier::read(::apache::thrift::protocol::TProtocol* iprot) {
           xfer += iprot->skip(ftype);
         }
         break;
+      case 4:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->gatewayId);
+          isset_gatewayId = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
       default:
         xfer += iprot->skip(ftype);
         break;
@@ -364,6 +405,8 @@ uint32_t TaskIdentifier::read(::apache::thrift::protocol::TProtocol* iprot) {
     throw TProtocolException(TProtocolException::INVALID_DATA);
   if (!isset_experimentId)
     throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_gatewayId)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
   return xfer;
 }
 
@@ -383,6 +426,10 @@ uint32_t TaskIdentifier::write(::apache::thrift::protocol::TProtocol* oprot) con
   xfer += oprot->writeString(this->experimentId);
   xfer += oprot->writeFieldEnd();
 
+  xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 4);
+  xfer += oprot->writeString(this->gatewayId);
+  xfer += oprot->writeFieldEnd();
+
   xfer += oprot->writeFieldStop();
   xfer += oprot->writeStructEnd();
   return xfer;
@@ -393,10 +440,11 @@ void swap(TaskIdentifier &a, TaskIdentifier &b) {
   swap(a.taskId, b.taskId);
   swap(a.workflowNodeId, b.workflowNodeId);
   swap(a.experimentId, b.experimentId);
+  swap(a.gatewayId, b.gatewayId);
 }
 
-const char* TaskStatusChangeEvent::ascii_fingerprint = "9686679C94D43D75F2B35A0BED2E4003";
-const uint8_t TaskStatusChangeEvent::binary_fingerprint[16] = {0x96,0x86,0x67,0x9C,0x94,0xD4,0x3D,0x75,0xF2,0xB3,0x5A,0x0B,0xED,0x2E,0x40,0x03};
+const char* TaskStatusChangeEvent::ascii_fingerprint = "8D18A3CD1822DBC67D7BD8CB98E7B4F1";
+const uint8_t TaskStatusChangeEvent::binary_fingerprint[16] = {0x8D,0x18,0xA3,0xCD,0x18,0x22,0xDB,0xC6,0x7D,0x7B,0xD8,0xCB,0x98,0xE7,0xB4,0xF1};
 
 uint32_t TaskStatusChangeEvent::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -477,8 +525,8 @@ void swap(TaskStatusChangeEvent &a, TaskStatusChangeEvent &b) {
   swap(a.taskIdentity, b.taskIdentity);
 }
 
-const char* TaskStatusChangeRequestEvent::ascii_fingerprint = "9686679C94D43D75F2B35A0BED2E4003";
-const uint8_t TaskStatusChangeRequestEvent::binary_fingerprint[16] = {0x96,0x86,0x67,0x9C,0x94,0xD4,0x3D,0x75,0xF2,0xB3,0x5A,0x0B,0xED,0x2E,0x40,0x03};
+const char* TaskStatusChangeRequestEvent::ascii_fingerprint = "8D18A3CD1822DBC67D7BD8CB98E7B4F1";
+const uint8_t TaskStatusChangeRequestEvent::binary_fingerprint[16] = {0x8D,0x18,0xA3,0xCD,0x18,0x22,0xDB,0xC6,0x7D,0x7B,0xD8,0xCB,0x98,0xE7,0xB4,0xF1};
 
 uint32_t TaskStatusChangeRequestEvent::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -559,8 +607,8 @@ void swap(TaskStatusChangeRequestEvent &a, TaskStatusChangeRequestEvent &b) {
   swap(a.taskIdentity, b.taskIdentity);
 }
 
-const char* TaskOutputChangeEvent::ascii_fingerprint = "6488123A3A8B4CF758D069C9B693C7EB";
-const uint8_t TaskOutputChangeEvent::binary_fingerprint[16] = {0x64,0x88,0x12,0x3A,0x3A,0x8B,0x4C,0xF7,0x58,0xD0,0x69,0xC9,0xB6,0x93,0xC7,0xEB};
+const char* TaskOutputChangeEvent::ascii_fingerprint = "A7F4390C8E4A64CE48431C1FB6A45F50";
+const uint8_t TaskOutputChangeEvent::binary_fingerprint[16] = {0xA7,0xF4,0x39,0x0C,0x8E,0x4A,0x64,0xCE,0x48,0x43,0x1C,0x1F,0xB6,0xA4,0x5F,0x50};
 
 uint32_t TaskOutputChangeEvent::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -659,8 +707,8 @@ void swap(TaskOutputChangeEvent &a, TaskOutputChangeEvent &b) {
   swap(a.taskIdentity, b.taskIdentity);
 }
 
-const char* JobIdentifier::ascii_fingerprint = "C93D890311F28844166CF6E571EB3AC2";
-const uint8_t JobIdentifier::binary_fingerprint[16] = {0xC9,0x3D,0x89,0x03,0x11,0xF2,0x88,0x44,0x16,0x6C,0xF6,0xE5,0x71,0xEB,0x3A,0xC2};
+const char* JobIdentifier::ascii_fingerprint = "BFF0E21728CB005F9AA5774A41542B8D";
+const uint8_t JobIdentifier::binary_fingerprint[16] = {0xBF,0xF0,0xE2,0x17,0x28,0xCB,0x00,0x5F,0x9A,0xA5,0x77,0x4A,0x41,0x54,0x2B,0x8D};
 
 uint32_t JobIdentifier::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -677,6 +725,7 @@ uint32_t JobIdentifier::read(::apache::thrift::protocol::TProtocol* iprot) {
   bool isset_taskId = false;
   bool isset_workflowNodeId = false;
   bool isset_experimentId = false;
+  bool isset_gatewayId = false;
 
   while (true)
   {
@@ -718,6 +767,14 @@ uint32_t JobIdentifier::read(::apache::thrift::protocol::TProtocol* iprot) {
           xfer += iprot->skip(ftype);
         }
         break;
+      case 5:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->gatewayId);
+          isset_gatewayId = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
       default:
         xfer += iprot->skip(ftype);
         break;
@@ -735,6 +792,8 @@ uint32_t JobIdentifier::read(::apache::thrift::protocol::TProtocol* iprot) {
     throw TProtocolException(TProtocolException::INVALID_DATA);
   if (!isset_experimentId)
     throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_gatewayId)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
   return xfer;
 }
 
@@ -758,6 +817,10 @@ uint32_t JobIdentifier::write(::apache::thrift::protocol::TProtocol* oprot) cons
   xfer += oprot->writeString(this->experimentId);
   xfer += oprot->writeFieldEnd();
 
+  xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 5);
+  xfer += oprot->writeString(this->gatewayId);
+  xfer += oprot->writeFieldEnd();
+
   xfer += oprot->writeFieldStop();
   xfer += oprot->writeStructEnd();
   return xfer;
@@ -769,10 +832,11 @@ void swap(JobIdentifier &a, JobIdentifier &b) {
   swap(a.taskId, b.taskId);
   swap(a.workflowNodeId, b.workflowNodeId);
   swap(a.experimentId, b.experimentId);
+  swap(a.gatewayId, b.gatewayId);
 }
 
-const char* JobStatusChangeEvent::ascii_fingerprint = "8D18A3CD1822DBC67D7BD8CB98E7B4F1";
-const uint8_t JobStatusChangeEvent::binary_fingerprint[16] = {0x8D,0x18,0xA3,0xCD,0x18,0x22,0xDB,0xC6,0x7D,0x7B,0xD8,0xCB,0x98,0xE7,0xB4,0xF1};
+const char* JobStatusChangeEvent::ascii_fingerprint = "062775D589B60D1687103FD465B0F5E8";
+const uint8_t JobStatusChangeEvent::binary_fingerprint[16] = {0x06,0x27,0x75,0xD5,0x89,0xB6,0x0D,0x16,0x87,0x10,0x3F,0xD4,0x65,0xB0,0xF5,0xE8};
 
 uint32_t JobStatusChangeEvent::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -853,8 +917,8 @@ void swap(JobStatusChangeEvent &a, JobStatusChangeEvent &b) {
   swap(a.jobIdentity, b.jobIdentity);
 }
 
-const char* JobStatusChangeRequestEvent::ascii_fingerprint = "8D18A3CD1822DBC67D7BD8CB98E7B4F1";
-const uint8_t JobStatusChangeRequestEvent::binary_fingerprint[16] = {0x8D,0x18,0xA3,0xCD,0x18,0x22,0xDB,0xC6,0x7D,0x7B,0xD8,0xCB,0x98,0xE7,0xB4,0xF1};
+const char* JobStatusChangeRequestEvent::ascii_fingerprint = "062775D589B60D1687103FD465B0F5E8";
+const uint8_t JobStatusChangeRequestEvent::binary_fingerprint[16] = {0x06,0x27,0x75,0xD5,0x89,0xB6,0x0D,0x16,0x87,0x10,0x3F,0xD4,0x65,0xB0,0xF5,0xE8};
 
 uint32_t JobStatusChangeRequestEvent::read(::apache::thrift::protocol::TProtocol* iprot) {
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/adb9b956/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/messagingEvents_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/messagingEvents_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/messagingEvents_types.h
index 3ce8e79..4eefe50 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/messagingEvents_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/messagingEvents_types.h
@@ -61,16 +61,17 @@ extern const std::map<int, const char*> _MessageType_VALUES_TO_NAMES;
 class ExperimentStatusChangeEvent {
  public:
 
-  static const char* ascii_fingerprint; // = "19B5240589E680301A7E32DF3971EFBE";
-  static const uint8_t binary_fingerprint[16]; // = {0x19,0xB5,0x24,0x05,0x89,0xE6,0x80,0x30,0x1A,0x7E,0x32,0xDF,0x39,0x71,0xEF,0xBE};
+  static const char* ascii_fingerprint; // = "38C252E94E93B69D04EB3A6EE2F9EDFB";
+  static const uint8_t binary_fingerprint[16]; // = {0x38,0xC2,0x52,0xE9,0x4E,0x93,0xB6,0x9D,0x04,0xEB,0x3A,0x6E,0xE2,0xF9,0xED,0xFB};
 
-  ExperimentStatusChangeEvent() : state(( ::apache::airavata::model::workspace::experiment::ExperimentState::type)0), experimentId() {
+  ExperimentStatusChangeEvent() : state(( ::apache::airavata::model::workspace::experiment::ExperimentState::type)0), experimentId(), gatewayId() {
   }
 
   virtual ~ExperimentStatusChangeEvent() throw() {}
 
    ::apache::airavata::model::workspace::experiment::ExperimentState::type state;
   std::string experimentId;
+  std::string gatewayId;
 
   void __set_state(const  ::apache::airavata::model::workspace::experiment::ExperimentState::type val) {
     state = val;
@@ -80,12 +81,18 @@ class ExperimentStatusChangeEvent {
     experimentId = val;
   }
 
+  void __set_gatewayId(const std::string& val) {
+    gatewayId = val;
+  }
+
   bool operator == (const ExperimentStatusChangeEvent & rhs) const
   {
     if (!(state == rhs.state))
       return false;
     if (!(experimentId == rhs.experimentId))
       return false;
+    if (!(gatewayId == rhs.gatewayId))
+      return false;
     return true;
   }
   bool operator != (const ExperimentStatusChangeEvent &rhs) const {
@@ -105,16 +112,17 @@ void swap(ExperimentStatusChangeEvent &a, ExperimentStatusChangeEvent &b);
 class WorkflowIdentifier {
  public:
 
-  static const char* ascii_fingerprint; // = "07A9615F837F7D0A952B595DD3020972";
-  static const uint8_t binary_fingerprint[16]; // = {0x07,0xA9,0x61,0x5F,0x83,0x7F,0x7D,0x0A,0x95,0x2B,0x59,0x5D,0xD3,0x02,0x09,0x72};
+  static const char* ascii_fingerprint; // = "AB879940BD15B6B25691265F7384B271";
+  static const uint8_t binary_fingerprint[16]; // = {0xAB,0x87,0x99,0x40,0xBD,0x15,0xB6,0xB2,0x56,0x91,0x26,0x5F,0x73,0x84,0xB2,0x71};
 
-  WorkflowIdentifier() : workflowNodeId(), experimentId() {
+  WorkflowIdentifier() : workflowNodeId(), experimentId(), gatewayId() {
   }
 
   virtual ~WorkflowIdentifier() throw() {}
 
   std::string workflowNodeId;
   std::string experimentId;
+  std::string gatewayId;
 
   void __set_workflowNodeId(const std::string& val) {
     workflowNodeId = val;
@@ -124,12 +132,18 @@ class WorkflowIdentifier {
     experimentId = val;
   }
 
+  void __set_gatewayId(const std::string& val) {
+    gatewayId = val;
+  }
+
   bool operator == (const WorkflowIdentifier & rhs) const
   {
     if (!(workflowNodeId == rhs.workflowNodeId))
       return false;
     if (!(experimentId == rhs.experimentId))
       return false;
+    if (!(gatewayId == rhs.gatewayId))
+      return false;
     return true;
   }
   bool operator != (const WorkflowIdentifier &rhs) const {
@@ -149,8 +163,8 @@ void swap(WorkflowIdentifier &a, WorkflowIdentifier &b);
 class WorkflowNodeStatusChangeEvent {
  public:
 
-  static const char* ascii_fingerprint; // = "E9096211D03C8F19468314A49FB23CF0";
-  static const uint8_t binary_fingerprint[16]; // = {0xE9,0x09,0x62,0x11,0xD0,0x3C,0x8F,0x19,0x46,0x83,0x14,0xA4,0x9F,0xB2,0x3C,0xF0};
+  static const char* ascii_fingerprint; // = "9686679C94D43D75F2B35A0BED2E4003";
+  static const uint8_t binary_fingerprint[16]; // = {0x96,0x86,0x67,0x9C,0x94,0xD4,0x3D,0x75,0xF2,0xB3,0x5A,0x0B,0xED,0x2E,0x40,0x03};
 
   WorkflowNodeStatusChangeEvent() : state(( ::apache::airavata::model::workspace::experiment::WorkflowNodeState::type)0) {
   }
@@ -193,10 +207,10 @@ void swap(WorkflowNodeStatusChangeEvent &a, WorkflowNodeStatusChangeEvent &b);
 class TaskIdentifier {
  public:
 
-  static const char* ascii_fingerprint; // = "AB879940BD15B6B25691265F7384B271";
-  static const uint8_t binary_fingerprint[16]; // = {0xAB,0x87,0x99,0x40,0xBD,0x15,0xB6,0xB2,0x56,0x91,0x26,0x5F,0x73,0x84,0xB2,0x71};
+  static const char* ascii_fingerprint; // = "C93D890311F28844166CF6E571EB3AC2";
+  static const uint8_t binary_fingerprint[16]; // = {0xC9,0x3D,0x89,0x03,0x11,0xF2,0x88,0x44,0x16,0x6C,0xF6,0xE5,0x71,0xEB,0x3A,0xC2};
 
-  TaskIdentifier() : taskId(), workflowNodeId(), experimentId() {
+  TaskIdentifier() : taskId(), workflowNodeId(), experimentId(), gatewayId() {
   }
 
   virtual ~TaskIdentifier() throw() {}
@@ -204,6 +218,7 @@ class TaskIdentifier {
   std::string taskId;
   std::string workflowNodeId;
   std::string experimentId;
+  std::string gatewayId;
 
   void __set_taskId(const std::string& val) {
     taskId = val;
@@ -217,6 +232,10 @@ class TaskIdentifier {
     experimentId = val;
   }
 
+  void __set_gatewayId(const std::string& val) {
+    gatewayId = val;
+  }
+
   bool operator == (const TaskIdentifier & rhs) const
   {
     if (!(taskId == rhs.taskId))
@@ -225,6 +244,8 @@ class TaskIdentifier {
       return false;
     if (!(experimentId == rhs.experimentId))
       return false;
+    if (!(gatewayId == rhs.gatewayId))
+      return false;
     return true;
   }
   bool operator != (const TaskIdentifier &rhs) const {
@@ -244,8 +265,8 @@ void swap(TaskIdentifier &a, TaskIdentifier &b);
 class TaskStatusChangeEvent {
  public:
 
-  static const char* ascii_fingerprint; // = "9686679C94D43D75F2B35A0BED2E4003";
-  static const uint8_t binary_fingerprint[16]; // = {0x96,0x86,0x67,0x9C,0x94,0xD4,0x3D,0x75,0xF2,0xB3,0x5A,0x0B,0xED,0x2E,0x40,0x03};
+  static const char* ascii_fingerprint; // = "8D18A3CD1822DBC67D7BD8CB98E7B4F1";
+  static const uint8_t binary_fingerprint[16]; // = {0x8D,0x18,0xA3,0xCD,0x18,0x22,0xDB,0xC6,0x7D,0x7B,0xD8,0xCB,0x98,0xE7,0xB4,0xF1};
 
   TaskStatusChangeEvent() : state(( ::apache::airavata::model::workspace::experiment::TaskState::type)0) {
   }
@@ -288,8 +309,8 @@ void swap(TaskStatusChangeEvent &a, TaskStatusChangeEvent &b);
 class TaskStatusChangeRequestEvent {
  public:
 
-  static const char* ascii_fingerprint; // = "9686679C94D43D75F2B35A0BED2E4003";
-  static const uint8_t binary_fingerprint[16]; // = {0x96,0x86,0x67,0x9C,0x94,0xD4,0x3D,0x75,0xF2,0xB3,0x5A,0x0B,0xED,0x2E,0x40,0x03};
+  static const char* ascii_fingerprint; // = "8D18A3CD1822DBC67D7BD8CB98E7B4F1";
+  static const uint8_t binary_fingerprint[16]; // = {0x8D,0x18,0xA3,0xCD,0x18,0x22,0xDB,0xC6,0x7D,0x7B,0xD8,0xCB,0x98,0xE7,0xB4,0xF1};
 
   TaskStatusChangeRequestEvent() : state(( ::apache::airavata::model::workspace::experiment::TaskState::type)0) {
   }
@@ -332,8 +353,8 @@ void swap(TaskStatusChangeRequestEvent &a, TaskStatusChangeRequestEvent &b);
 class TaskOutputChangeEvent {
  public:
 
-  static const char* ascii_fingerprint; // = "6488123A3A8B4CF758D069C9B693C7EB";
-  static const uint8_t binary_fingerprint[16]; // = {0x64,0x88,0x12,0x3A,0x3A,0x8B,0x4C,0xF7,0x58,0xD0,0x69,0xC9,0xB6,0x93,0xC7,0xEB};
+  static const char* ascii_fingerprint; // = "A7F4390C8E4A64CE48431C1FB6A45F50";
+  static const uint8_t binary_fingerprint[16]; // = {0xA7,0xF4,0x39,0x0C,0x8E,0x4A,0x64,0xCE,0x48,0x43,0x1C,0x1F,0xB6,0xA4,0x5F,0x50};
 
   TaskOutputChangeEvent() {
   }
@@ -376,10 +397,10 @@ void swap(TaskOutputChangeEvent &a, TaskOutputChangeEvent &b);
 class JobIdentifier {
  public:
 
-  static const char* ascii_fingerprint; // = "C93D890311F28844166CF6E571EB3AC2";
-  static const uint8_t binary_fingerprint[16]; // = {0xC9,0x3D,0x89,0x03,0x11,0xF2,0x88,0x44,0x16,0x6C,0xF6,0xE5,0x71,0xEB,0x3A,0xC2};
+  static const char* ascii_fingerprint; // = "BFF0E21728CB005F9AA5774A41542B8D";
+  static const uint8_t binary_fingerprint[16]; // = {0xBF,0xF0,0xE2,0x17,0x28,0xCB,0x00,0x5F,0x9A,0xA5,0x77,0x4A,0x41,0x54,0x2B,0x8D};
 
-  JobIdentifier() : jobId(), taskId(), workflowNodeId(), experimentId() {
+  JobIdentifier() : jobId(), taskId(), workflowNodeId(), experimentId(), gatewayId() {
   }
 
   virtual ~JobIdentifier() throw() {}
@@ -388,6 +409,7 @@ class JobIdentifier {
   std::string taskId;
   std::string workflowNodeId;
   std::string experimentId;
+  std::string gatewayId;
 
   void __set_jobId(const std::string& val) {
     jobId = val;
@@ -405,6 +427,10 @@ class JobIdentifier {
     experimentId = val;
   }
 
+  void __set_gatewayId(const std::string& val) {
+    gatewayId = val;
+  }
+
   bool operator == (const JobIdentifier & rhs) const
   {
     if (!(jobId == rhs.jobId))
@@ -415,6 +441,8 @@ class JobIdentifier {
       return false;
     if (!(experimentId == rhs.experimentId))
       return false;
+    if (!(gatewayId == rhs.gatewayId))
+      return false;
     return true;
   }
   bool operator != (const JobIdentifier &rhs) const {
@@ -434,8 +462,8 @@ void swap(JobIdentifier &a, JobIdentifier &b);
 class JobStatusChangeEvent {
  public:
 
-  static const char* ascii_fingerprint; // = "8D18A3CD1822DBC67D7BD8CB98E7B4F1";
-  static const uint8_t binary_fingerprint[16]; // = {0x8D,0x18,0xA3,0xCD,0x18,0x22,0xDB,0xC6,0x7D,0x7B,0xD8,0xCB,0x98,0xE7,0xB4,0xF1};
+  static const char* ascii_fingerprint; // = "062775D589B60D1687103FD465B0F5E8";
+  static const uint8_t binary_fingerprint[16]; // = {0x06,0x27,0x75,0xD5,0x89,0xB6,0x0D,0x16,0x87,0x10,0x3F,0xD4,0x65,0xB0,0xF5,0xE8};
 
   JobStatusChangeEvent() : state(( ::apache::airavata::model::workspace::experiment::JobState::type)0) {
   }
@@ -478,8 +506,8 @@ void swap(JobStatusChangeEvent &a, JobStatusChangeEvent &b);
 class JobStatusChangeRequestEvent {
  public:
 
-  static const char* ascii_fingerprint; // = "8D18A3CD1822DBC67D7BD8CB98E7B4F1";
-  static const uint8_t binary_fingerprint[16]; // = {0x8D,0x18,0xA3,0xCD,0x18,0x22,0xDB,0xC6,0x7D,0x7B,0xD8,0xCB,0x98,0xE7,0xB4,0xF1};
+  static const char* ascii_fingerprint; // = "062775D589B60D1687103FD465B0F5E8";
+  static const uint8_t binary_fingerprint[16]; // = {0x06,0x27,0x75,0xD5,0x89,0xB6,0x0D,0x16,0x87,0x10,0x3F,0xD4,0x65,0xB0,0xF5,0xE8};
 
   JobStatusChangeRequestEvent() : state(( ::apache::airavata::model::workspace::experiment::JobState::type)0) {
   }

http://git-wip-us.apache.org/repos/asf/airavata/blob/adb9b956/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Messaging/Event/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Messaging/Event/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Messaging/Event/Types.php
index bb950ab..0be911b 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Messaging/Event/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Messaging/Event/Types.php
@@ -48,6 +48,7 @@ class ExperimentStatusChangeEvent {
 
   public $state = null;
   public $experimentId = null;
+  public $gatewayId = null;
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
@@ -60,6 +61,10 @@ class ExperimentStatusChangeEvent {
           'var' => 'experimentId',
           'type' => TType::STRING,
           ),
+        3 => array(
+          'var' => 'gatewayId',
+          'type' => TType::STRING,
+          ),
         );
     }
     if (is_array($vals)) {
@@ -69,6 +74,9 @@ class ExperimentStatusChangeEvent {
       if (isset($vals['experimentId'])) {
         $this->experimentId = $vals['experimentId'];
       }
+      if (isset($vals['gatewayId'])) {
+        $this->gatewayId = $vals['gatewayId'];
+      }
     }
   }
 
@@ -105,6 +113,13 @@ class ExperimentStatusChangeEvent {
             $xfer += $input->skip($ftype);
           }
           break;
+        case 3:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->gatewayId);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
         default:
           $xfer += $input->skip($ftype);
           break;
@@ -128,6 +143,11 @@ class ExperimentStatusChangeEvent {
       $xfer += $output->writeString($this->experimentId);
       $xfer += $output->writeFieldEnd();
     }
+    if ($this->gatewayId !== null) {
+      $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 3);
+      $xfer += $output->writeString($this->gatewayId);
+      $xfer += $output->writeFieldEnd();
+    }
     $xfer += $output->writeFieldStop();
     $xfer += $output->writeStructEnd();
     return $xfer;
@@ -140,6 +160,7 @@ class WorkflowIdentifier {
 
   public $workflowNodeId = null;
   public $experimentId = null;
+  public $gatewayId = null;
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
@@ -152,6 +173,10 @@ class WorkflowIdentifier {
           'var' => 'experimentId',
           'type' => TType::STRING,
           ),
+        3 => array(
+          'var' => 'gatewayId',
+          'type' => TType::STRING,
+          ),
         );
     }
     if (is_array($vals)) {
@@ -161,6 +186,9 @@ class WorkflowIdentifier {
       if (isset($vals['experimentId'])) {
         $this->experimentId = $vals['experimentId'];
       }
+      if (isset($vals['gatewayId'])) {
+        $this->gatewayId = $vals['gatewayId'];
+      }
     }
   }
 
@@ -197,6 +225,13 @@ class WorkflowIdentifier {
             $xfer += $input->skip($ftype);
           }
           break;
+        case 3:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->gatewayId);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
         default:
           $xfer += $input->skip($ftype);
           break;
@@ -220,6 +255,11 @@ class WorkflowIdentifier {
       $xfer += $output->writeString($this->experimentId);
       $xfer += $output->writeFieldEnd();
     }
+    if ($this->gatewayId !== null) {
+      $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 3);
+      $xfer += $output->writeString($this->gatewayId);
+      $xfer += $output->writeFieldEnd();
+    }
     $xfer += $output->writeFieldStop();
     $xfer += $output->writeStructEnd();
     return $xfer;
@@ -330,6 +370,7 @@ class TaskIdentifier {
   public $taskId = null;
   public $workflowNodeId = null;
   public $experimentId = null;
+  public $gatewayId = null;
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
@@ -346,6 +387,10 @@ class TaskIdentifier {
           'var' => 'experimentId',
           'type' => TType::STRING,
           ),
+        4 => array(
+          'var' => 'gatewayId',
+          'type' => TType::STRING,
+          ),
         );
     }
     if (is_array($vals)) {
@@ -358,6 +403,9 @@ class TaskIdentifier {
       if (isset($vals['experimentId'])) {
         $this->experimentId = $vals['experimentId'];
       }
+      if (isset($vals['gatewayId'])) {
+        $this->gatewayId = $vals['gatewayId'];
+      }
     }
   }
 
@@ -401,6 +449,13 @@ class TaskIdentifier {
             $xfer += $input->skip($ftype);
           }
           break;
+        case 4:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->gatewayId);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
         default:
           $xfer += $input->skip($ftype);
           break;
@@ -429,6 +484,11 @@ class TaskIdentifier {
       $xfer += $output->writeString($this->experimentId);
       $xfer += $output->writeFieldEnd();
     }
+    if ($this->gatewayId !== null) {
+      $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 4);
+      $xfer += $output->writeString($this->gatewayId);
+      $xfer += $output->writeFieldEnd();
+    }
     $xfer += $output->writeFieldStop();
     $xfer += $output->writeStructEnd();
     return $xfer;
@@ -762,6 +822,7 @@ class JobIdentifier {
   public $taskId = null;
   public $workflowNodeId = null;
   public $experimentId = null;
+  public $gatewayId = null;
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
@@ -782,6 +843,10 @@ class JobIdentifier {
           'var' => 'experimentId',
           'type' => TType::STRING,
           ),
+        5 => array(
+          'var' => 'gatewayId',
+          'type' => TType::STRING,
+          ),
         );
     }
     if (is_array($vals)) {
@@ -797,6 +862,9 @@ class JobIdentifier {
       if (isset($vals['experimentId'])) {
         $this->experimentId = $vals['experimentId'];
       }
+      if (isset($vals['gatewayId'])) {
+        $this->gatewayId = $vals['gatewayId'];
+      }
     }
   }
 
@@ -847,6 +915,13 @@ class JobIdentifier {
             $xfer += $input->skip($ftype);
           }
           break;
+        case 5:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->gatewayId);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
         default:
           $xfer += $input->skip($ftype);
           break;
@@ -880,6 +955,11 @@ class JobIdentifier {
       $xfer += $output->writeString($this->experimentId);
       $xfer += $output->writeFieldEnd();
     }
+    if ($this->gatewayId !== null) {
+      $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 5);
+      $xfer += $output->writeString($this->gatewayId);
+      $xfer += $output->writeFieldEnd();
+    }
     $xfer += $output->writeFieldStop();
     $xfer += $output->writeStructEnd();
     return $xfer;

http://git-wip-us.apache.org/repos/asf/airavata/blob/adb9b956/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
index 0dc0bc5..181ad51 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
@@ -70,8 +70,8 @@ public class CreateLaunchExperiment {
     public static void main(String[] args) throws Exception {
                 airavataClient = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST, THRIFT_SERVER_PORT);
                 System.out.println("API version is " + airavataClient.getAPIVersion());
-//                registerApplications(); // run this only the first time
-                createAndLaunchExp();
+                registerApplications(); // run this only the first time
+//                createAndLaunchExp();
     }
     
     private static String fsdResourceId;

http://git-wip-us.apache.org/repos/asf/airavata/blob/adb9b956/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.java
index bf84876..1fd919d 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.java
@@ -54,6 +54,7 @@ import org.slf4j.LoggerFactory;
 
   private static final org.apache.thrift.protocol.TField STATE_FIELD_DESC = new org.apache.thrift.protocol.TField("state", org.apache.thrift.protocol.TType.I32, (short)1);
   private static final org.apache.thrift.protocol.TField EXPERIMENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("experimentId", org.apache.thrift.protocol.TType.STRING, (short)2);
+  private static final org.apache.thrift.protocol.TField GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayId", org.apache.thrift.protocol.TType.STRING, (short)3);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -63,6 +64,7 @@ import org.slf4j.LoggerFactory;
 
   private org.apache.airavata.model.workspace.experiment.ExperimentState state; // required
   private String experimentId; // required
+  private String gatewayId; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -71,7 +73,8 @@ import org.slf4j.LoggerFactory;
      * @see org.apache.airavata.model.workspace.experiment.ExperimentState
      */
     STATE((short)1, "state"),
-    EXPERIMENT_ID((short)2, "experimentId");
+    EXPERIMENT_ID((short)2, "experimentId"),
+    GATEWAY_ID((short)3, "gatewayId");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -90,6 +93,8 @@ import org.slf4j.LoggerFactory;
           return STATE;
         case 2: // EXPERIMENT_ID
           return EXPERIMENT_ID;
+        case 3: // GATEWAY_ID
+          return GATEWAY_ID;
         default:
           return null;
       }
@@ -137,6 +142,8 @@ import org.slf4j.LoggerFactory;
         new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.workspace.experiment.ExperimentState.class)));
     tmpMap.put(_Fields.EXPERIMENT_ID, new org.apache.thrift.meta_data.FieldMetaData("experimentId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.GATEWAY_ID, new org.apache.thrift.meta_data.FieldMetaData("gatewayId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ExperimentStatusChangeEvent.class, metaDataMap);
   }
@@ -146,11 +153,13 @@ import org.slf4j.LoggerFactory;
 
   public ExperimentStatusChangeEvent(
     org.apache.airavata.model.workspace.experiment.ExperimentState state,
-    String experimentId)
+    String experimentId,
+    String gatewayId)
   {
     this();
     this.state = state;
     this.experimentId = experimentId;
+    this.gatewayId = gatewayId;
   }
 
   /**
@@ -163,6 +172,9 @@ import org.slf4j.LoggerFactory;
     if (other.isSetExperimentId()) {
       this.experimentId = other.experimentId;
     }
+    if (other.isSetGatewayId()) {
+      this.gatewayId = other.gatewayId;
+    }
   }
 
   public ExperimentStatusChangeEvent deepCopy() {
@@ -173,6 +185,7 @@ import org.slf4j.LoggerFactory;
   public void clear() {
     this.state = null;
     this.experimentId = null;
+    this.gatewayId = null;
   }
 
   /**
@@ -229,6 +242,29 @@ import org.slf4j.LoggerFactory;
     }
   }
 
+  public String getGatewayId() {
+    return this.gatewayId;
+  }
+
+  public void setGatewayId(String gatewayId) {
+    this.gatewayId = gatewayId;
+  }
+
+  public void unsetGatewayId() {
+    this.gatewayId = null;
+  }
+
+  /** Returns true if field gatewayId is set (has been assigned a value) and false otherwise */
+  public boolean isSetGatewayId() {
+    return this.gatewayId != null;
+  }
+
+  public void setGatewayIdIsSet(boolean value) {
+    if (!value) {
+      this.gatewayId = null;
+    }
+  }
+
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
     case STATE:
@@ -247,6 +283,14 @@ import org.slf4j.LoggerFactory;
       }
       break;
 
+    case GATEWAY_ID:
+      if (value == null) {
+        unsetGatewayId();
+      } else {
+        setGatewayId((String)value);
+      }
+      break;
+
     }
   }
 
@@ -258,6 +302,9 @@ import org.slf4j.LoggerFactory;
     case EXPERIMENT_ID:
       return getExperimentId();
 
+    case GATEWAY_ID:
+      return getGatewayId();
+
     }
     throw new IllegalStateException();
   }
@@ -273,6 +320,8 @@ import org.slf4j.LoggerFactory;
       return isSetState();
     case EXPERIMENT_ID:
       return isSetExperimentId();
+    case GATEWAY_ID:
+      return isSetGatewayId();
     }
     throw new IllegalStateException();
   }
@@ -308,6 +357,15 @@ import org.slf4j.LoggerFactory;
         return false;
     }
 
+    boolean this_present_gatewayId = true && this.isSetGatewayId();
+    boolean that_present_gatewayId = true && that.isSetGatewayId();
+    if (this_present_gatewayId || that_present_gatewayId) {
+      if (!(this_present_gatewayId && that_present_gatewayId))
+        return false;
+      if (!this.gatewayId.equals(that.gatewayId))
+        return false;
+    }
+
     return true;
   }
 
@@ -344,6 +402,16 @@ import org.slf4j.LoggerFactory;
         return lastComparison;
       }
     }
+    lastComparison = Boolean.valueOf(isSetGatewayId()).compareTo(other.isSetGatewayId());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetGatewayId()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gatewayId, other.gatewayId);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
     return 0;
   }
 
@@ -379,6 +447,14 @@ import org.slf4j.LoggerFactory;
       sb.append(this.experimentId);
     }
     first = false;
+    if (!first) sb.append(", ");
+    sb.append("gatewayId:");
+    if (this.gatewayId == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.gatewayId);
+    }
+    first = false;
     sb.append(")");
     return sb.toString();
   }
@@ -393,6 +469,10 @@ import org.slf4j.LoggerFactory;
       throw new org.apache.thrift.protocol.TProtocolException("Required field 'experimentId' is unset! Struct:" + toString());
     }
 
+    if (!isSetGatewayId()) {
+      throw new org.apache.thrift.protocol.TProtocolException("Required field 'gatewayId' is unset! Struct:" + toString());
+    }
+
     // check for sub-struct validity
   }
 
@@ -446,6 +526,14 @@ import org.slf4j.LoggerFactory;
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
+          case 3: // GATEWAY_ID
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.gatewayId = iprot.readString();
+              struct.setGatewayIdIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
           default:
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
         }
@@ -469,6 +557,11 @@ import org.slf4j.LoggerFactory;
         oprot.writeString(struct.experimentId);
         oprot.writeFieldEnd();
       }
+      if (struct.gatewayId != null) {
+        oprot.writeFieldBegin(GATEWAY_ID_FIELD_DESC);
+        oprot.writeString(struct.gatewayId);
+        oprot.writeFieldEnd();
+      }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
@@ -488,6 +581,7 @@ import org.slf4j.LoggerFactory;
       TTupleProtocol oprot = (TTupleProtocol) prot;
       oprot.writeI32(struct.state.getValue());
       oprot.writeString(struct.experimentId);
+      oprot.writeString(struct.gatewayId);
     }
 
     @Override
@@ -497,6 +591,8 @@ import org.slf4j.LoggerFactory;
       struct.setStateIsSet(true);
       struct.experimentId = iprot.readString();
       struct.setExperimentIdIsSet(true);
+      struct.gatewayId = iprot.readString();
+      struct.setGatewayIdIsSet(true);
     }
   }
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/adb9b956/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.java
index ef2eb40..a391da2 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.java
@@ -56,6 +56,7 @@ import org.slf4j.LoggerFactory;
   private static final org.apache.thrift.protocol.TField TASK_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("taskId", org.apache.thrift.protocol.TType.STRING, (short)2);
   private static final org.apache.thrift.protocol.TField WORKFLOW_NODE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("workflowNodeId", org.apache.thrift.protocol.TType.STRING, (short)3);
   private static final org.apache.thrift.protocol.TField EXPERIMENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("experimentId", org.apache.thrift.protocol.TType.STRING, (short)4);
+  private static final org.apache.thrift.protocol.TField GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayId", org.apache.thrift.protocol.TType.STRING, (short)5);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -67,13 +68,15 @@ import org.slf4j.LoggerFactory;
   private String taskId; // required
   private String workflowNodeId; // required
   private String experimentId; // required
+  private String gatewayId; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     JOB_ID((short)1, "jobId"),
     TASK_ID((short)2, "taskId"),
     WORKFLOW_NODE_ID((short)3, "workflowNodeId"),
-    EXPERIMENT_ID((short)4, "experimentId");
+    EXPERIMENT_ID((short)4, "experimentId"),
+    GATEWAY_ID((short)5, "gatewayId");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -96,6 +99,8 @@ import org.slf4j.LoggerFactory;
           return WORKFLOW_NODE_ID;
         case 4: // EXPERIMENT_ID
           return EXPERIMENT_ID;
+        case 5: // GATEWAY_ID
+          return GATEWAY_ID;
         default:
           return null;
       }
@@ -147,6 +152,8 @@ import org.slf4j.LoggerFactory;
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.EXPERIMENT_ID, new org.apache.thrift.meta_data.FieldMetaData("experimentId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.GATEWAY_ID, new org.apache.thrift.meta_data.FieldMetaData("gatewayId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(JobIdentifier.class, metaDataMap);
   }
@@ -158,13 +165,15 @@ import org.slf4j.LoggerFactory;
     String jobId,
     String taskId,
     String workflowNodeId,
-    String experimentId)
+    String experimentId,
+    String gatewayId)
   {
     this();
     this.jobId = jobId;
     this.taskId = taskId;
     this.workflowNodeId = workflowNodeId;
     this.experimentId = experimentId;
+    this.gatewayId = gatewayId;
   }
 
   /**
@@ -183,6 +192,9 @@ import org.slf4j.LoggerFactory;
     if (other.isSetExperimentId()) {
       this.experimentId = other.experimentId;
     }
+    if (other.isSetGatewayId()) {
+      this.gatewayId = other.gatewayId;
+    }
   }
 
   public JobIdentifier deepCopy() {
@@ -195,6 +207,7 @@ import org.slf4j.LoggerFactory;
     this.taskId = null;
     this.workflowNodeId = null;
     this.experimentId = null;
+    this.gatewayId = null;
   }
 
   public String getJobId() {
@@ -289,6 +302,29 @@ import org.slf4j.LoggerFactory;
     }
   }
 
+  public String getGatewayId() {
+    return this.gatewayId;
+  }
+
+  public void setGatewayId(String gatewayId) {
+    this.gatewayId = gatewayId;
+  }
+
+  public void unsetGatewayId() {
+    this.gatewayId = null;
+  }
+
+  /** Returns true if field gatewayId is set (has been assigned a value) and false otherwise */
+  public boolean isSetGatewayId() {
+    return this.gatewayId != null;
+  }
+
+  public void setGatewayIdIsSet(boolean value) {
+    if (!value) {
+      this.gatewayId = null;
+    }
+  }
+
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
     case JOB_ID:
@@ -323,6 +359,14 @@ import org.slf4j.LoggerFactory;
       }
       break;
 
+    case GATEWAY_ID:
+      if (value == null) {
+        unsetGatewayId();
+      } else {
+        setGatewayId((String)value);
+      }
+      break;
+
     }
   }
 
@@ -340,6 +384,9 @@ import org.slf4j.LoggerFactory;
     case EXPERIMENT_ID:
       return getExperimentId();
 
+    case GATEWAY_ID:
+      return getGatewayId();
+
     }
     throw new IllegalStateException();
   }
@@ -359,6 +406,8 @@ import org.slf4j.LoggerFactory;
       return isSetWorkflowNodeId();
     case EXPERIMENT_ID:
       return isSetExperimentId();
+    case GATEWAY_ID:
+      return isSetGatewayId();
     }
     throw new IllegalStateException();
   }
@@ -412,6 +461,15 @@ import org.slf4j.LoggerFactory;
         return false;
     }
 
+    boolean this_present_gatewayId = true && this.isSetGatewayId();
+    boolean that_present_gatewayId = true && that.isSetGatewayId();
+    if (this_present_gatewayId || that_present_gatewayId) {
+      if (!(this_present_gatewayId && that_present_gatewayId))
+        return false;
+      if (!this.gatewayId.equals(that.gatewayId))
+        return false;
+    }
+
     return true;
   }
 
@@ -468,6 +526,16 @@ import org.slf4j.LoggerFactory;
         return lastComparison;
       }
     }
+    lastComparison = Boolean.valueOf(isSetGatewayId()).compareTo(other.isSetGatewayId());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetGatewayId()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gatewayId, other.gatewayId);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
     return 0;
   }
 
@@ -519,6 +587,14 @@ import org.slf4j.LoggerFactory;
       sb.append(this.experimentId);
     }
     first = false;
+    if (!first) sb.append(", ");
+    sb.append("gatewayId:");
+    if (this.gatewayId == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.gatewayId);
+    }
+    first = false;
     sb.append(")");
     return sb.toString();
   }
@@ -541,6 +617,10 @@ import org.slf4j.LoggerFactory;
       throw new org.apache.thrift.protocol.TProtocolException("Required field 'experimentId' is unset! Struct:" + toString());
     }
 
+    if (!isSetGatewayId()) {
+      throw new org.apache.thrift.protocol.TProtocolException("Required field 'gatewayId' is unset! Struct:" + toString());
+    }
+
     // check for sub-struct validity
   }
 
@@ -610,6 +690,14 @@ import org.slf4j.LoggerFactory;
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
+          case 5: // GATEWAY_ID
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.gatewayId = iprot.readString();
+              struct.setGatewayIdIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
           default:
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
         }
@@ -643,6 +731,11 @@ import org.slf4j.LoggerFactory;
         oprot.writeString(struct.experimentId);
         oprot.writeFieldEnd();
       }
+      if (struct.gatewayId != null) {
+        oprot.writeFieldBegin(GATEWAY_ID_FIELD_DESC);
+        oprot.writeString(struct.gatewayId);
+        oprot.writeFieldEnd();
+      }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
@@ -664,6 +757,7 @@ import org.slf4j.LoggerFactory;
       oprot.writeString(struct.taskId);
       oprot.writeString(struct.workflowNodeId);
       oprot.writeString(struct.experimentId);
+      oprot.writeString(struct.gatewayId);
     }
 
     @Override
@@ -677,6 +771,8 @@ import org.slf4j.LoggerFactory;
       struct.setWorkflowNodeIdIsSet(true);
       struct.experimentId = iprot.readString();
       struct.setExperimentIdIsSet(true);
+      struct.gatewayId = iprot.readString();
+      struct.setGatewayIdIsSet(true);
     }
   }
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/adb9b956/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java
index f33173a..2a4cca8 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java
@@ -55,6 +55,7 @@ import org.slf4j.LoggerFactory;
   private static final org.apache.thrift.protocol.TField TASK_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("taskId", org.apache.thrift.protocol.TType.STRING, (short)1);
   private static final org.apache.thrift.protocol.TField WORKFLOW_NODE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("workflowNodeId", org.apache.thrift.protocol.TType.STRING, (short)2);
   private static final org.apache.thrift.protocol.TField EXPERIMENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("experimentId", org.apache.thrift.protocol.TType.STRING, (short)3);
+  private static final org.apache.thrift.protocol.TField GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayId", org.apache.thrift.protocol.TType.STRING, (short)4);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -65,12 +66,14 @@ import org.slf4j.LoggerFactory;
   private String taskId; // required
   private String workflowNodeId; // required
   private String experimentId; // required
+  private String gatewayId; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     TASK_ID((short)1, "taskId"),
     WORKFLOW_NODE_ID((short)2, "workflowNodeId"),
-    EXPERIMENT_ID((short)3, "experimentId");
+    EXPERIMENT_ID((short)3, "experimentId"),
+    GATEWAY_ID((short)4, "gatewayId");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -91,6 +94,8 @@ import org.slf4j.LoggerFactory;
           return WORKFLOW_NODE_ID;
         case 3: // EXPERIMENT_ID
           return EXPERIMENT_ID;
+        case 4: // GATEWAY_ID
+          return GATEWAY_ID;
         default:
           return null;
       }
@@ -140,6 +145,8 @@ import org.slf4j.LoggerFactory;
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.EXPERIMENT_ID, new org.apache.thrift.meta_data.FieldMetaData("experimentId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.GATEWAY_ID, new org.apache.thrift.meta_data.FieldMetaData("gatewayId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TaskIdentifier.class, metaDataMap);
   }
@@ -150,12 +157,14 @@ import org.slf4j.LoggerFactory;
   public TaskIdentifier(
     String taskId,
     String workflowNodeId,
-    String experimentId)
+    String experimentId,
+    String gatewayId)
   {
     this();
     this.taskId = taskId;
     this.workflowNodeId = workflowNodeId;
     this.experimentId = experimentId;
+    this.gatewayId = gatewayId;
   }
 
   /**
@@ -171,6 +180,9 @@ import org.slf4j.LoggerFactory;
     if (other.isSetExperimentId()) {
       this.experimentId = other.experimentId;
     }
+    if (other.isSetGatewayId()) {
+      this.gatewayId = other.gatewayId;
+    }
   }
 
   public TaskIdentifier deepCopy() {
@@ -182,6 +194,7 @@ import org.slf4j.LoggerFactory;
     this.taskId = null;
     this.workflowNodeId = null;
     this.experimentId = null;
+    this.gatewayId = null;
   }
 
   public String getTaskId() {
@@ -253,6 +266,29 @@ import org.slf4j.LoggerFactory;
     }
   }
 
+  public String getGatewayId() {
+    return this.gatewayId;
+  }
+
+  public void setGatewayId(String gatewayId) {
+    this.gatewayId = gatewayId;
+  }
+
+  public void unsetGatewayId() {
+    this.gatewayId = null;
+  }
+
+  /** Returns true if field gatewayId is set (has been assigned a value) and false otherwise */
+  public boolean isSetGatewayId() {
+    return this.gatewayId != null;
+  }
+
+  public void setGatewayIdIsSet(boolean value) {
+    if (!value) {
+      this.gatewayId = null;
+    }
+  }
+
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
     case TASK_ID:
@@ -279,6 +315,14 @@ import org.slf4j.LoggerFactory;
       }
       break;
 
+    case GATEWAY_ID:
+      if (value == null) {
+        unsetGatewayId();
+      } else {
+        setGatewayId((String)value);
+      }
+      break;
+
     }
   }
 
@@ -293,6 +337,9 @@ import org.slf4j.LoggerFactory;
     case EXPERIMENT_ID:
       return getExperimentId();
 
+    case GATEWAY_ID:
+      return getGatewayId();
+
     }
     throw new IllegalStateException();
   }
@@ -310,6 +357,8 @@ import org.slf4j.LoggerFactory;
       return isSetWorkflowNodeId();
     case EXPERIMENT_ID:
       return isSetExperimentId();
+    case GATEWAY_ID:
+      return isSetGatewayId();
     }
     throw new IllegalStateException();
   }
@@ -354,6 +403,15 @@ import org.slf4j.LoggerFactory;
         return false;
     }
 
+    boolean this_present_gatewayId = true && this.isSetGatewayId();
+    boolean that_present_gatewayId = true && that.isSetGatewayId();
+    if (this_present_gatewayId || that_present_gatewayId) {
+      if (!(this_present_gatewayId && that_present_gatewayId))
+        return false;
+      if (!this.gatewayId.equals(that.gatewayId))
+        return false;
+    }
+
     return true;
   }
 
@@ -400,6 +458,16 @@ import org.slf4j.LoggerFactory;
         return lastComparison;
       }
     }
+    lastComparison = Boolean.valueOf(isSetGatewayId()).compareTo(other.isSetGatewayId());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetGatewayId()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gatewayId, other.gatewayId);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
     return 0;
   }
 
@@ -443,6 +511,14 @@ import org.slf4j.LoggerFactory;
       sb.append(this.experimentId);
     }
     first = false;
+    if (!first) sb.append(", ");
+    sb.append("gatewayId:");
+    if (this.gatewayId == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.gatewayId);
+    }
+    first = false;
     sb.append(")");
     return sb.toString();
   }
@@ -461,6 +537,10 @@ import org.slf4j.LoggerFactory;
       throw new org.apache.thrift.protocol.TProtocolException("Required field 'experimentId' is unset! Struct:" + toString());
     }
 
+    if (!isSetGatewayId()) {
+      throw new org.apache.thrift.protocol.TProtocolException("Required field 'gatewayId' is unset! Struct:" + toString());
+    }
+
     // check for sub-struct validity
   }
 
@@ -522,6 +602,14 @@ import org.slf4j.LoggerFactory;
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
+          case 4: // GATEWAY_ID
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.gatewayId = iprot.readString();
+              struct.setGatewayIdIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
           default:
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
         }
@@ -550,6 +638,11 @@ import org.slf4j.LoggerFactory;
         oprot.writeString(struct.experimentId);
         oprot.writeFieldEnd();
       }
+      if (struct.gatewayId != null) {
+        oprot.writeFieldBegin(GATEWAY_ID_FIELD_DESC);
+        oprot.writeString(struct.gatewayId);
+        oprot.writeFieldEnd();
+      }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
@@ -570,6 +663,7 @@ import org.slf4j.LoggerFactory;
       oprot.writeString(struct.taskId);
       oprot.writeString(struct.workflowNodeId);
       oprot.writeString(struct.experimentId);
+      oprot.writeString(struct.gatewayId);
     }
 
     @Override
@@ -581,6 +675,8 @@ import org.slf4j.LoggerFactory;
       struct.setWorkflowNodeIdIsSet(true);
       struct.experimentId = iprot.readString();
       struct.setExperimentIdIsSet(true);
+      struct.gatewayId = iprot.readString();
+      struct.setGatewayIdIsSet(true);
     }
   }
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/adb9b956/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/WorkflowIdentifier.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/WorkflowIdentifier.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/WorkflowIdentifier.java
index afa498f..3753857 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/WorkflowIdentifier.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/WorkflowIdentifier.java
@@ -54,6 +54,7 @@ import org.slf4j.LoggerFactory;
 
   private static final org.apache.thrift.protocol.TField WORKFLOW_NODE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("workflowNodeId", org.apache.thrift.protocol.TType.STRING, (short)1);
   private static final org.apache.thrift.protocol.TField EXPERIMENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("experimentId", org.apache.thrift.protocol.TType.STRING, (short)2);
+  private static final org.apache.thrift.protocol.TField GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayId", org.apache.thrift.protocol.TType.STRING, (short)3);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -63,11 +64,13 @@ import org.slf4j.LoggerFactory;
 
   private String workflowNodeId; // required
   private String experimentId; // required
+  private String gatewayId; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     WORKFLOW_NODE_ID((short)1, "workflowNodeId"),
-    EXPERIMENT_ID((short)2, "experimentId");
+    EXPERIMENT_ID((short)2, "experimentId"),
+    GATEWAY_ID((short)3, "gatewayId");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -86,6 +89,8 @@ import org.slf4j.LoggerFactory;
           return WORKFLOW_NODE_ID;
         case 2: // EXPERIMENT_ID
           return EXPERIMENT_ID;
+        case 3: // GATEWAY_ID
+          return GATEWAY_ID;
         default:
           return null;
       }
@@ -133,6 +138,8 @@ import org.slf4j.LoggerFactory;
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.EXPERIMENT_ID, new org.apache.thrift.meta_data.FieldMetaData("experimentId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.GATEWAY_ID, new org.apache.thrift.meta_data.FieldMetaData("gatewayId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(WorkflowIdentifier.class, metaDataMap);
   }
@@ -142,11 +149,13 @@ import org.slf4j.LoggerFactory;
 
   public WorkflowIdentifier(
     String workflowNodeId,
-    String experimentId)
+    String experimentId,
+    String gatewayId)
   {
     this();
     this.workflowNodeId = workflowNodeId;
     this.experimentId = experimentId;
+    this.gatewayId = gatewayId;
   }
 
   /**
@@ -159,6 +168,9 @@ import org.slf4j.LoggerFactory;
     if (other.isSetExperimentId()) {
       this.experimentId = other.experimentId;
     }
+    if (other.isSetGatewayId()) {
+      this.gatewayId = other.gatewayId;
+    }
   }
 
   public WorkflowIdentifier deepCopy() {
@@ -169,6 +181,7 @@ import org.slf4j.LoggerFactory;
   public void clear() {
     this.workflowNodeId = null;
     this.experimentId = null;
+    this.gatewayId = null;
   }
 
   public String getWorkflowNodeId() {
@@ -217,6 +230,29 @@ import org.slf4j.LoggerFactory;
     }
   }
 
+  public String getGatewayId() {
+    return this.gatewayId;
+  }
+
+  public void setGatewayId(String gatewayId) {
+    this.gatewayId = gatewayId;
+  }
+
+  public void unsetGatewayId() {
+    this.gatewayId = null;
+  }
+
+  /** Returns true if field gatewayId is set (has been assigned a value) and false otherwise */
+  public boolean isSetGatewayId() {
+    return this.gatewayId != null;
+  }
+
+  public void setGatewayIdIsSet(boolean value) {
+    if (!value) {
+      this.gatewayId = null;
+    }
+  }
+
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
     case WORKFLOW_NODE_ID:
@@ -235,6 +271,14 @@ import org.slf4j.LoggerFactory;
       }
       break;
 
+    case GATEWAY_ID:
+      if (value == null) {
+        unsetGatewayId();
+      } else {
+        setGatewayId((String)value);
+      }
+      break;
+
     }
   }
 
@@ -246,6 +290,9 @@ import org.slf4j.LoggerFactory;
     case EXPERIMENT_ID:
       return getExperimentId();
 
+    case GATEWAY_ID:
+      return getGatewayId();
+
     }
     throw new IllegalStateException();
   }
@@ -261,6 +308,8 @@ import org.slf4j.LoggerFactory;
       return isSetWorkflowNodeId();
     case EXPERIMENT_ID:
       return isSetExperimentId();
+    case GATEWAY_ID:
+      return isSetGatewayId();
     }
     throw new IllegalStateException();
   }
@@ -296,6 +345,15 @@ import org.slf4j.LoggerFactory;
         return false;
     }
 
+    boolean this_present_gatewayId = true && this.isSetGatewayId();
+    boolean that_present_gatewayId = true && that.isSetGatewayId();
+    if (this_present_gatewayId || that_present_gatewayId) {
+      if (!(this_present_gatewayId && that_present_gatewayId))
+        return false;
+      if (!this.gatewayId.equals(that.gatewayId))
+        return false;
+    }
+
     return true;
   }
 
@@ -332,6 +390,16 @@ import org.slf4j.LoggerFactory;
         return lastComparison;
       }
     }
+    lastComparison = Boolean.valueOf(isSetGatewayId()).compareTo(other.isSetGatewayId());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetGatewayId()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gatewayId, other.gatewayId);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
     return 0;
   }
 
@@ -367,6 +435,14 @@ import org.slf4j.LoggerFactory;
       sb.append(this.experimentId);
     }
     first = false;
+    if (!first) sb.append(", ");
+    sb.append("gatewayId:");
+    if (this.gatewayId == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.gatewayId);
+    }
+    first = false;
     sb.append(")");
     return sb.toString();
   }
@@ -381,6 +457,10 @@ import org.slf4j.LoggerFactory;
       throw new org.apache.thrift.protocol.TProtocolException("Required field 'experimentId' is unset! Struct:" + toString());
     }
 
+    if (!isSetGatewayId()) {
+      throw new org.apache.thrift.protocol.TProtocolException("Required field 'gatewayId' is unset! Struct:" + toString());
+    }
+
     // check for sub-struct validity
   }
 
@@ -434,6 +514,14 @@ import org.slf4j.LoggerFactory;
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
+          case 3: // GATEWAY_ID
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.gatewayId = iprot.readString();
+              struct.setGatewayIdIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
           default:
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
         }
@@ -457,6 +545,11 @@ import org.slf4j.LoggerFactory;
         oprot.writeString(struct.experimentId);
         oprot.writeFieldEnd();
       }
+      if (struct.gatewayId != null) {
+        oprot.writeFieldBegin(GATEWAY_ID_FIELD_DESC);
+        oprot.writeString(struct.gatewayId);
+        oprot.writeFieldEnd();
+      }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
@@ -476,6 +569,7 @@ import org.slf4j.LoggerFactory;
       TTupleProtocol oprot = (TTupleProtocol) prot;
       oprot.writeString(struct.workflowNodeId);
       oprot.writeString(struct.experimentId);
+      oprot.writeString(struct.gatewayId);
     }
 
     @Override
@@ -485,6 +579,8 @@ import org.slf4j.LoggerFactory;
       struct.setWorkflowNodeIdIsSet(true);
       struct.experimentId = iprot.readString();
       struct.setExperimentIdIsSet(true);
+      struct.gatewayId = iprot.readString();
+      struct.setGatewayIdIsSet(true);
     }
   }
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/adb9b956/airavata-api/thrift-interface-descriptions/messagingEvents.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/messagingEvents.thrift b/airavata-api/thrift-interface-descriptions/messagingEvents.thrift
index aceca83..d7178cc 100644
--- a/airavata-api/thrift-interface-descriptions/messagingEvents.thrift
+++ b/airavata-api/thrift-interface-descriptions/messagingEvents.thrift
@@ -43,11 +43,13 @@ enum MessageType {
 struct ExperimentStatusChangeEvent {
     1: required experimentModel.ExperimentState state;
     2: required string experimentId;
+    3: required string gatewayId;
 }
 
 struct WorkflowIdentifier {
     1: required string workflowNodeId;
     2: required string experimentId;
+    3: required string gatewayId;
 }
 
 struct WorkflowNodeStatusChangeEvent {
@@ -59,6 +61,7 @@ struct TaskIdentifier {
     1: required string taskId;
     2: required string workflowNodeId;
     3: required string experimentId;
+    4: required string gatewayId;
 }
 
 struct TaskStatusChangeEvent {
@@ -81,6 +84,7 @@ struct JobIdentifier {
     2: required string taskId;
     3: required string workflowNodeId;
     4: required string experimentId;
+    5: required string gatewayId;
 }
 
 //struct JobMonitor {

http://git-wip-us.apache.org/repos/asf/airavata/blob/adb9b956/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
index 4a5d6aa..803614b 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
@@ -620,7 +620,8 @@ public class BetterGfacImpl implements GFac,Watcher {
                         JobIdentifier jobIdentifier = new JobIdentifier(jobExecutionContext.getJobDetails().getJobID(),
                                                                         jobExecutionContext.getTaskData().getTaskID(),
                                                                         jobExecutionContext.getWorkflowNodeDetails().getNodeInstanceId(),
-                                                                        jobExecutionContext.getExperimentID());
+                                                                        jobExecutionContext.getExperimentID(),
+                                                                        jobExecutionContext.getGatewayID());
                         changeRequestEvent.setJobIdentity(jobIdentifier);
                         monitorPublisher.publish(changeRequestEvent);
                     } catch (NullPointerException e1) {
@@ -631,7 +632,8 @@ public class BetterGfacImpl implements GFac,Watcher {
                         monitorPublisher.publish(new TaskStatusChangeRequestEvent(TaskState.FAILED,
                                                                                   new TaskIdentifier(jobExecutionContext.getTaskData().getTaskID(),
                                                                                                      jobExecutionContext.getWorkflowNodeDetails().getNodeInstanceId(),
-                                                                                                     jobExecutionContext.getExperimentID())));
+                                                                                                     jobExecutionContext.getExperimentID(),
+                                                                                                     jobExecutionContext.getGatewayID())));
 
                     }
                     jobExecutionContext.setProperty(ERROR_SENT, "true");
@@ -707,7 +709,8 @@ public class BetterGfacImpl implements GFac,Watcher {
                 JobIdentifier jobIdentity = new JobIdentifier(
                         jobExecutionContext.getJobDetails().getJobID(), jobExecutionContext.getTaskData().getTaskID(),
                         jobExecutionContext.getWorkflowNodeDetails().getNodeInstanceId(),
-                        jobExecutionContext.getExperimentID());
+                        jobExecutionContext.getExperimentID(),
+                        jobExecutionContext.getGatewayID());
 				monitorPublisher.publish(new JobStatusChangeEvent(JobState.FAILED, jobIdentity));
 			} catch (NullPointerException e1) {
 				log.error("Error occured during updating the statuses of Experiments,tasks or Job statuses to failed, "
@@ -717,7 +720,8 @@ public class BetterGfacImpl implements GFac,Watcher {
 				// Updating the task status if there's any task associated
                 TaskIdentifier taskIdentity = new TaskIdentifier(jobExecutionContext.getTaskData().getTaskID(),
                         jobExecutionContext.getWorkflowNodeDetails().getNodeInstanceId(),
-                        jobExecutionContext.getExperimentID());
+                        jobExecutionContext.getExperimentID(),
+                        jobExecutionContext.getGatewayID());
 				monitorPublisher.publish(new TaskStatusChangeEvent(TaskState.FAILED, taskIdentity));
 
 			}
@@ -778,7 +782,8 @@ public class BetterGfacImpl implements GFac,Watcher {
 				// ));
                 JobIdentifier jobIdentity = new JobIdentifier(
                         jobExecutionContext.getJobDetails().getJobID(),jobExecutionContext.getTaskData().getTaskID(),jobExecutionContext.getWorkflowNodeDetails().getNodeInstanceId(),
-                        jobExecutionContext.getExperimentID());
+                        jobExecutionContext.getExperimentID(),
+                        jobExecutionContext.getGatewayID());
 				monitorPublisher.publish(new JobStatusChangeEvent(JobState.FAILED, jobIdentity));
 			} catch (NullPointerException e1) {
 				log.error("Error occured during updating the statuses of Experiments,tasks or Job statuses to failed, "
@@ -787,7 +792,8 @@ public class BetterGfacImpl implements GFac,Watcher {
 				// Updating the task status if there's any task associated
                 TaskIdentifier taskIdentity = new TaskIdentifier(jobExecutionContext.getTaskData().getTaskID(),
                         jobExecutionContext.getWorkflowNodeDetails().getNodeInstanceId(),
-                        jobExecutionContext.getExperimentID());
+                        jobExecutionContext.getExperimentID(),
+                        jobExecutionContext.getGatewayID());
                 monitorPublisher.publish(new TaskStatusChangeEvent(TaskState.FAILED, taskIdentity));
 
 			}
@@ -1009,7 +1015,8 @@ public class BetterGfacImpl implements GFac,Watcher {
                 } catch (Exception e) {
                     TaskIdentifier taskIdentity = new TaskIdentifier(jobExecutionContext.getTaskData().getTaskID(),
                             jobExecutionContext.getWorkflowNodeDetails().getNodeInstanceId(),
-                            jobExecutionContext.getExperimentID());
+                            jobExecutionContext.getExperimentID(),
+                            jobExecutionContext.getGatewayID());
                     monitorPublisher.publish(new TaskStatusChangeRequestEvent(TaskState.FAILED, taskIdentity));
                     throw new GFacException(e);
                 }
@@ -1028,7 +1035,8 @@ public class BetterGfacImpl implements GFac,Watcher {
         // Updating the task status if there's any task associated
         TaskIdentifier taskIdentity = new TaskIdentifier(jobExecutionContext.getTaskData().getTaskID(),
                 jobExecutionContext.getWorkflowNodeDetails().getNodeInstanceId(),
-                jobExecutionContext.getExperimentID());
+                jobExecutionContext.getExperimentID(),
+                jobExecutionContext.getGatewayID());
         monitorPublisher.publish(new TaskStatusChangeEvent(TaskState.COMPLETED, taskIdentity));
         monitorPublisher.publish(new GfacExperimentStateChangeRequest(new MonitorID(jobExecutionContext), GfacExperimentState.COMPLETED));
     }
@@ -1157,7 +1165,8 @@ public class BetterGfacImpl implements GFac,Watcher {
 
         TaskIdentifier taskIdentity = new TaskIdentifier(jobExecutionContext.getTaskData().getTaskID(),
                 jobExecutionContext.getWorkflowNodeDetails().getNodeInstanceId(),
-                jobExecutionContext.getExperimentID());
+                jobExecutionContext.getExperimentID(),
+                jobExecutionContext.getGatewayID());
         monitorPublisher.publish(new TaskStatusChangeEvent(TaskState.COMPLETED, taskIdentity));
         monitorPublisher.publish(new GfacExperimentStateChangeRequest(new MonitorID(jobExecutionContext), GfacExperimentState.COMPLETED));
     }

http://git-wip-us.apache.org/repos/asf/airavata/blob/adb9b956/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/handler/AbstractRecoverableHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/handler/AbstractRecoverableHandler.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/handler/AbstractRecoverableHandler.java
index 3a004b9..1ae19f3 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/handler/AbstractRecoverableHandler.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/handler/AbstractRecoverableHandler.java
@@ -81,7 +81,8 @@ public abstract class AbstractRecoverableHandler implements GFacRecoverableHandl
     protected void fireTaskOutputChangeEvent(JobExecutionContext jobExecutionContext, List<DataObjectType> outputArray) {
         TaskIdentifier taskIdentity = new TaskIdentifier(jobExecutionContext.getTaskData().getTaskID(),
                 jobExecutionContext.getWorkflowNodeDetails().getNodeInstanceId(),
-                jobExecutionContext.getExperimentID());
+                jobExecutionContext.getExperimentID(),
+                jobExecutionContext.getGatewayID());
         publisher.publish(new TaskOutputChangeEvent(outputArray, taskIdentity));
     }
 }

http://git-wip-us.apache.org/repos/asf/airavata/blob/adb9b956/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/AiravataJobStatusUpdator.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/AiravataJobStatusUpdator.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/AiravataJobStatusUpdator.java
index fc7e0d2..e9ee007 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/AiravataJobStatusUpdator.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/AiravataJobStatusUpdator.java
@@ -27,7 +27,6 @@ import org.apache.airavata.common.utils.ServerSettings;
 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.messaging.core.impl.RabbitMQPublisher;
 import org.apache.airavata.model.messaging.event.JobStatusChangeEvent;
 import org.apache.airavata.model.messaging.event.JobStatusChangeRequestEvent;
 import org.apache.airavata.model.messaging.event.MessageType;
@@ -73,7 +72,7 @@ public class AiravataJobStatusUpdator implements AbstractActivityListener {
                 JobStatusChangeEvent event = new JobStatusChangeEvent(jobStatus.getState(), jobStatus.getJobIdentity());
                 monitorPublisher.publish(event);
                 String messageId = AiravataUtils.getId("JOB");
-                MessageContext msgCntxt = new MessageContext(event, MessageType.JOB, messageId);
+                MessageContext msgCntxt = new MessageContext(event, MessageType.JOB, messageId, jobStatus.getJobIdentity().getGatewayId());
                 msgCntxt.setUpdatedTime(AiravataUtils.getCurrentTimestamp());
                 if ( ServerSettings.isRabbitMqPublishEnabled()){
                     publisher.publish(msgCntxt);