http://git-wip-us.apache.org/repos/asf/airavata/blob/d6a8208c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidatorResult.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidatorResult.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidatorResult.java
index 878a33f..ff704d0 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidatorResult.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidatorResult.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-13")
 public class ValidatorResult implements 
org.apache.thrift.TBase<ValidatorResult, ValidatorResult._Fields>, 
java.io.Serializable, Cloneable, Comparable<ValidatorResult> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("ValidatorResult");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/d6a8208c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
index b753f91..d795df3 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
@@ -67,7 +67,7 @@ import org.slf4j.LoggerFactory;
  * experimentDescription:
  *    The verbose description of the experiment. This is an optional parameter.
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-13")
 public class ExperimentModel implements 
org.apache.thrift.TBase<ExperimentModel, ExperimentModel._Fields>, 
java.io.Serializable, Cloneable, Comparable<ExperimentModel> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("ExperimentModel");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/d6a8208c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentStatistics.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentStatistics.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentStatistics.java
index 2e91720..1d7c632 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentStatistics.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentStatistics.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-13")
 public class ExperimentStatistics implements 
org.apache.thrift.TBase<ExperimentStatistics, ExperimentStatistics._Fields>, 
java.io.Serializable, Cloneable, Comparable<ExperimentStatistics> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("ExperimentStatistics");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/d6a8208c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentSummaryModel.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentSummaryModel.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentSummaryModel.java
index 7abe9bb..ee59f88 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentSummaryModel.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentSummaryModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-13")
 public class ExperimentSummaryModel implements 
org.apache.thrift.TBase<ExperimentSummaryModel, 
ExperimentSummaryModel._Fields>, java.io.Serializable, Cloneable, 
Comparable<ExperimentSummaryModel> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("ExperimentSummaryModel");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/d6a8208c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/UserConfigurationDataModel.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/UserConfigurationDataModel.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/UserConfigurationDataModel.java
index b1a8f92..51f44e8 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/UserConfigurationDataModel.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/UserConfigurationDataModel.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
  * 
  * 
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-13")
 public class UserConfigurationDataModel implements 
org.apache.thrift.TBase<UserConfigurationDataModel, 
UserConfigurationDataModel._Fields>, java.io.Serializable, Cloneable, 
Comparable<UserConfigurationDataModel> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("UserConfigurationDataModel");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/d6a8208c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/group/GroupModel.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/group/GroupModel.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/group/GroupModel.java
index 0525569..dc5c13a 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/group/GroupModel.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/group/GroupModel.java
@@ -23,17 +23,35 @@
  */
 package org.apache.airavata.model.group;
 
-import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.scheme.IScheme;
 import org.apache.thrift.scheme.SchemeFactory;
 import org.apache.thrift.scheme.StandardScheme;
-import org.apache.thrift.scheme.TupleScheme;
 
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
 import javax.annotation.Generated;
-import java.util.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-13")
 public class GroupModel implements org.apache.thrift.TBase<GroupModel, 
GroupModel._Fields>, java.io.Serializable, Cloneable, Comparable<GroupModel> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("GroupModel");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/d6a8208c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.java
index 58c331e..b94dcdf 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-13")
 public class JobModel implements org.apache.thrift.TBase<JobModel, 
JobModel._Fields>, java.io.Serializable, Cloneable, Comparable<JobModel> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("JobModel");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/d6a8208c/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 f7ac2ce..b3044a5 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
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-13")
 public class ExperimentStatusChangeEvent implements 
org.apache.thrift.TBase<ExperimentStatusChangeEvent, 
ExperimentStatusChangeEvent._Fields>, java.io.Serializable, Cloneable, 
Comparable<ExperimentStatusChangeEvent> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("ExperimentStatusChangeEvent");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/d6a8208c/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 67c1867..4cea176 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
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-13")
 public class JobIdentifier implements org.apache.thrift.TBase<JobIdentifier, 
JobIdentifier._Fields>, java.io.Serializable, Cloneable, 
Comparable<JobIdentifier> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("JobIdentifier");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/d6a8208c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeEvent.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeEvent.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeEvent.java
index 50248a7..273a50c 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeEvent.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-13")
 public class JobStatusChangeEvent implements 
org.apache.thrift.TBase<JobStatusChangeEvent, JobStatusChangeEvent._Fields>, 
java.io.Serializable, Cloneable, Comparable<JobStatusChangeEvent> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("JobStatusChangeEvent");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/d6a8208c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.java
index e66e973..0bebecc 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-13")
 public class JobStatusChangeRequestEvent implements 
org.apache.thrift.TBase<JobStatusChangeRequestEvent, 
JobStatusChangeRequestEvent._Fields>, java.io.Serializable, Cloneable, 
Comparable<JobStatusChangeRequestEvent> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("JobStatusChangeRequestEvent");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/d6a8208c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.java
index 0b3e86f..315184f 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-13")
 public class Message implements org.apache.thrift.TBase<Message, 
Message._Fields>, java.io.Serializable, Cloneable, Comparable<Message> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("Message");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/d6a8208c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.java
index 00c983b..92ac885 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-13")
 public class ProcessIdentifier implements 
org.apache.thrift.TBase<ProcessIdentifier, ProcessIdentifier._Fields>, 
java.io.Serializable, Cloneable, Comparable<ProcessIdentifier> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("ProcessIdentifier");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/d6a8208c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java
index b587ff3..5cdb22d 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-13")
 public class ProcessStatusChangeEvent implements 
org.apache.thrift.TBase<ProcessStatusChangeEvent, 
ProcessStatusChangeEvent._Fields>, java.io.Serializable, Cloneable, 
Comparable<ProcessStatusChangeEvent> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("ProcessStatusChangeEvent");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/d6a8208c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java
index 18fc0f2..0e013ee 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-13")
 public class ProcessStatusChangeRequestEvent implements 
org.apache.thrift.TBase<ProcessStatusChangeRequestEvent, 
ProcessStatusChangeRequestEvent._Fields>, java.io.Serializable, Cloneable, 
Comparable<ProcessStatusChangeRequestEvent> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("ProcessStatusChangeRequestEvent");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/d6a8208c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java
index 053d679..5cc8190 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-13")
 public class ProcessSubmitEvent implements 
org.apache.thrift.TBase<ProcessSubmitEvent, ProcessSubmitEvent._Fields>, 
java.io.Serializable, Cloneable, Comparable<ProcessSubmitEvent> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("ProcessSubmitEvent");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/d6a8208c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.java
index cfcf651..230c2ef 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-13")
 public class ProcessTerminateEvent implements 
org.apache.thrift.TBase<ProcessTerminateEvent, ProcessTerminateEvent._Fields>, 
java.io.Serializable, Cloneable, Comparable<ProcessTerminateEvent> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("ProcessTerminateEvent");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/d6a8208c/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 ebcb05f..2d4165f 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
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-13")
 public class TaskIdentifier implements org.apache.thrift.TBase<TaskIdentifier, 
TaskIdentifier._Fields>, java.io.Serializable, Cloneable, 
Comparable<TaskIdentifier> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("TaskIdentifier");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/d6a8208c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java
index 15324db..2e0c24e 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-13")
 public class TaskOutputChangeEvent implements 
org.apache.thrift.TBase<TaskOutputChangeEvent, TaskOutputChangeEvent._Fields>, 
java.io.Serializable, Cloneable, Comparable<TaskOutputChangeEvent> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("TaskOutputChangeEvent");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/d6a8208c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java
index 5422455..bcb4ee3 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-13")
 public class TaskStatusChangeEvent implements 
org.apache.thrift.TBase<TaskStatusChangeEvent, TaskStatusChangeEvent._Fields>, 
java.io.Serializable, Cloneable, Comparable<TaskStatusChangeEvent> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("TaskStatusChangeEvent");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/d6a8208c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java
index 2ad8602..cc38f07 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-13")
 public class TaskStatusChangeRequestEvent implements 
org.apache.thrift.TBase<TaskStatusChangeRequestEvent, 
TaskStatusChangeRequestEvent._Fields>, java.io.Serializable, Cloneable, 
Comparable<TaskStatusChangeRequestEvent> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("TaskStatusChangeRequestEvent");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/d6a8208c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java
index 9dac288..a396ae2 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
  * 
  * 
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-13")
 public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, 
ProcessModel._Fields>, java.io.Serializable, Cloneable, 
Comparable<ProcessModel> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("ProcessModel");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/d6a8208c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java
index cff821e..7dee5f7 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
  * 
  * 
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-13")
 public class ComputationalResourceSchedulingModel implements 
org.apache.thrift.TBase<ComputationalResourceSchedulingModel, 
ComputationalResourceSchedulingModel._Fields>, java.io.Serializable, Cloneable, 
Comparable<ComputationalResourceSchedulingModel> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("ComputationalResourceSchedulingModel");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/d6a8208c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java
index c447d7c..d0b83a2 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-13")
 public class AuthzToken implements org.apache.thrift.TBase<AuthzToken, 
AuthzToken._Fields>, java.io.Serializable, Cloneable, Comparable<AuthzToken> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("AuthzToken");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/d6a8208c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java
index 09e278a..f42fb5f 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java
@@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory;
  *   User friendly reason on how the state is inferred.
  * 
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-13")
 public class ExperimentStatus implements 
org.apache.thrift.TBase<ExperimentStatus, ExperimentStatus._Fields>, 
java.io.Serializable, Cloneable, Comparable<ExperimentStatus> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("ExperimentStatus");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/d6a8208c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java
index 0443043..0dc3e7e 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-13")
 public class JobStatus implements org.apache.thrift.TBase<JobStatus, 
JobStatus._Fields>, java.io.Serializable, Cloneable, Comparable<JobStatus> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("JobStatus");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/d6a8208c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
index f44a5c7..6085208 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-13")
 public class ProcessStatus implements org.apache.thrift.TBase<ProcessStatus, 
ProcessStatus._Fields>, java.io.Serializable, Cloneable, 
Comparable<ProcessStatus> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("ProcessStatus");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/d6a8208c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java
index abbbedb..998b199 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-13")
 public class TaskStatus implements org.apache.thrift.TBase<TaskStatus, 
TaskStatus._Fields>, java.io.Serializable, Cloneable, Comparable<TaskStatus> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("TaskStatus");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/d6a8208c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java
index 8097b92..471c842 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-13")
 public class DataStagingTaskModel implements 
org.apache.thrift.TBase<DataStagingTaskModel, DataStagingTaskModel._Fields>, 
java.io.Serializable, Cloneable, Comparable<DataStagingTaskModel> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("DataStagingTaskModel");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/d6a8208c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java
index d19c340..ce770e2 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java
@@ -55,7 +55,7 @@ import org.slf4j.LoggerFactory;
  * EnvironmentSetupTaskModel: A structure holding the environment creation 
task details
  * 
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-13")
 public class EnvironmentSetupTaskModel implements 
org.apache.thrift.TBase<EnvironmentSetupTaskModel, 
EnvironmentSetupTaskModel._Fields>, java.io.Serializable, Cloneable, 
Comparable<EnvironmentSetupTaskModel> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("EnvironmentSetupTaskModel");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/d6a8208c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java
index 461b01e..679ba4a 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-13")
 public class JobSubmissionTaskModel implements 
org.apache.thrift.TBase<JobSubmissionTaskModel, 
JobSubmissionTaskModel._Fields>, java.io.Serializable, Cloneable, 
Comparable<JobSubmissionTaskModel> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("JobSubmissionTaskModel");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/d6a8208c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java
index 8fd72cb..c516c25 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-13")
 public class MonitorTaskModel implements 
org.apache.thrift.TBase<MonitorTaskModel, MonitorTaskModel._Fields>, 
java.io.Serializable, Cloneable, Comparable<MonitorTaskModel> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("MonitorTaskModel");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/d6a8208c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
index 0819236..29ea16a 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
  * subTaskModel:
  *   A generic byte object for the Task developer to store internal serialized 
data into registry catalogs.
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-13")
 public class TaskModel implements org.apache.thrift.TBase<TaskModel, 
TaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<TaskModel> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("TaskModel");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/d6a8208c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java
index 9fc5644..2906b32 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
  * 
  * 
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-13")
 public class NSFDemographics implements 
org.apache.thrift.TBase<NSFDemographics, NSFDemographics._Fields>, 
java.io.Serializable, Cloneable, Comparable<NSFDemographics> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("NSFDemographics");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/d6a8208c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java
index 49d19b9..a0976a5 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java
@@ -103,7 +103,7 @@ import org.slf4j.LoggerFactory;
  * *  User’s preferred timezone - IANA Timezone Databases - 
http://www.iana.org/time-zones.
  * *
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-07-13")
 public class UserProfile implements org.apache.thrift.TBase<UserProfile, 
UserProfile._Fields>, java.io.Serializable, Cloneable, Comparable<UserProfile> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("UserProfile");
 
@@ -112,22 +112,21 @@ public class UserProfile implements 
org.apache.thrift.TBase<UserProfile, UserPro
   private static final org.apache.thrift.protocol.TField USER_ID_FIELD_DESC = 
new org.apache.thrift.protocol.TField("userId", 
org.apache.thrift.protocol.TType.STRING, (short)3);
   private static final org.apache.thrift.protocol.TField EMAILS_FIELD_DESC = 
new org.apache.thrift.protocol.TField("emails", 
org.apache.thrift.protocol.TType.LIST, (short)4);
   private static final org.apache.thrift.protocol.TField USER_NAME_FIELD_DESC 
= new org.apache.thrift.protocol.TField("userName", 
org.apache.thrift.protocol.TType.STRING, (short)5);
-  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)6);
-  private static final org.apache.thrift.protocol.TField ORCID_ID_FIELD_DESC = 
new org.apache.thrift.protocol.TField("orcidId", 
org.apache.thrift.protocol.TType.STRING, (short)7);
-  private static final org.apache.thrift.protocol.TField PHONES_FIELD_DESC = 
new org.apache.thrift.protocol.TField("phones", 
org.apache.thrift.protocol.TType.LIST, (short)8);
-  private static final org.apache.thrift.protocol.TField COUNTRY_FIELD_DESC = 
new org.apache.thrift.protocol.TField("country", 
org.apache.thrift.protocol.TType.STRING, (short)9);
-  private static final org.apache.thrift.protocol.TField 
NATIONALITY_FIELD_DESC = new org.apache.thrift.protocol.TField("nationality", 
org.apache.thrift.protocol.TType.LIST, (short)10);
-  private static final org.apache.thrift.protocol.TField 
HOME_ORGANIZATION_FIELD_DESC = new 
org.apache.thrift.protocol.TField("homeOrganization", 
org.apache.thrift.protocol.TType.STRING, (short)11);
-  private static final org.apache.thrift.protocol.TField 
ORGINATION_AFFILIATION_FIELD_DESC = new 
org.apache.thrift.protocol.TField("orginationAffiliation", 
org.apache.thrift.protocol.TType.STRING, (short)12);
-  private static final org.apache.thrift.protocol.TField 
CREATION_TIME_FIELD_DESC = new 
org.apache.thrift.protocol.TField("creationTime", 
org.apache.thrift.protocol.TType.STRING, (short)13);
-  private static final org.apache.thrift.protocol.TField 
LAST_ACCESS_TIME_FIELD_DESC = new 
org.apache.thrift.protocol.TField("lastAccessTime", 
org.apache.thrift.protocol.TType.STRING, (short)14);
-  private static final org.apache.thrift.protocol.TField 
VALID_UNTIL_FIELD_DESC = new org.apache.thrift.protocol.TField("validUntil", 
org.apache.thrift.protocol.TType.STRING, (short)15);
-  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)16);
-  private static final org.apache.thrift.protocol.TField COMMENTS_FIELD_DESC = 
new org.apache.thrift.protocol.TField("comments", 
org.apache.thrift.protocol.TType.STRING, (short)17);
-  private static final org.apache.thrift.protocol.TField 
LABELED_URI_FIELD_DESC = new org.apache.thrift.protocol.TField("labeledURI", 
org.apache.thrift.protocol.TType.LIST, (short)18);
-  private static final org.apache.thrift.protocol.TField GPG_KEY_FIELD_DESC = 
new org.apache.thrift.protocol.TField("gpgKey", 
org.apache.thrift.protocol.TType.STRING, (short)19);
-  private static final org.apache.thrift.protocol.TField TIME_ZONE_FIELD_DESC 
= new org.apache.thrift.protocol.TField("timeZone", 
org.apache.thrift.protocol.TType.STRING, (short)20);
-  private static final org.apache.thrift.protocol.TField 
NSF_DEMOGRAPHICS_FIELD_DESC = new 
org.apache.thrift.protocol.TField("nsfDemographics", 
org.apache.thrift.protocol.TType.STRUCT, (short)21);
+  private static final org.apache.thrift.protocol.TField ORCID_ID_FIELD_DESC = 
new org.apache.thrift.protocol.TField("orcidId", 
org.apache.thrift.protocol.TType.STRING, (short)6);
+  private static final org.apache.thrift.protocol.TField PHONES_FIELD_DESC = 
new org.apache.thrift.protocol.TField("phones", 
org.apache.thrift.protocol.TType.LIST, (short)7);
+  private static final org.apache.thrift.protocol.TField COUNTRY_FIELD_DESC = 
new org.apache.thrift.protocol.TField("country", 
org.apache.thrift.protocol.TType.STRING, (short)8);
+  private static final org.apache.thrift.protocol.TField 
NATIONALITY_FIELD_DESC = new org.apache.thrift.protocol.TField("nationality", 
org.apache.thrift.protocol.TType.LIST, (short)9);
+  private static final org.apache.thrift.protocol.TField 
HOME_ORGANIZATION_FIELD_DESC = new 
org.apache.thrift.protocol.TField("homeOrganization", 
org.apache.thrift.protocol.TType.STRING, (short)10);
+  private static final org.apache.thrift.protocol.TField 
ORGINATION_AFFILIATION_FIELD_DESC = new 
org.apache.thrift.protocol.TField("orginationAffiliation", 
org.apache.thrift.protocol.TType.STRING, (short)11);
+  private static final org.apache.thrift.protocol.TField 
CREATION_TIME_FIELD_DESC = new 
org.apache.thrift.protocol.TField("creationTime", 
org.apache.thrift.protocol.TType.STRING, (short)12);
+  private static final org.apache.thrift.protocol.TField 
LAST_ACCESS_TIME_FIELD_DESC = new 
org.apache.thrift.protocol.TField("lastAccessTime", 
org.apache.thrift.protocol.TType.STRING, (short)13);
+  private static final org.apache.thrift.protocol.TField 
VALID_UNTIL_FIELD_DESC = new org.apache.thrift.protocol.TField("validUntil", 
org.apache.thrift.protocol.TType.STRING, (short)14);
+  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)15);
+  private static final org.apache.thrift.protocol.TField COMMENTS_FIELD_DESC = 
new org.apache.thrift.protocol.TField("comments", 
org.apache.thrift.protocol.TType.STRING, (short)16);
+  private static final org.apache.thrift.protocol.TField 
LABELED_URI_FIELD_DESC = new org.apache.thrift.protocol.TField("labeledURI", 
org.apache.thrift.protocol.TType.LIST, (short)17);
+  private static final org.apache.thrift.protocol.TField GPG_KEY_FIELD_DESC = 
new org.apache.thrift.protocol.TField("gpgKey", 
org.apache.thrift.protocol.TType.STRING, (short)18);
+  private static final org.apache.thrift.protocol.TField TIME_ZONE_FIELD_DESC 
= new org.apache.thrift.protocol.TField("timeZone", 
org.apache.thrift.protocol.TType.STRING, (short)19);
+  private static final org.apache.thrift.protocol.TField 
NSF_DEMOGRAPHICS_FIELD_DESC = new 
org.apache.thrift.protocol.TField("nsfDemographics", 
org.apache.thrift.protocol.TType.STRUCT, (short)20);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = 
new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -140,7 +139,6 @@ public class UserProfile implements 
org.apache.thrift.TBase<UserProfile, UserPro
   private String userId; // required
   private List<String> emails; // required
   private String userName; // optional
-  private String gatewayId; // optional
   private String orcidId; // optional
   private List<String> phones; // optional
   private String country; // optional
@@ -164,26 +162,25 @@ public class UserProfile implements 
org.apache.thrift.TBase<UserProfile, UserPro
     USER_ID((short)3, "userId"),
     EMAILS((short)4, "emails"),
     USER_NAME((short)5, "userName"),
-    GATEWAY_ID((short)6, "gatewayId"),
-    ORCID_ID((short)7, "orcidId"),
-    PHONES((short)8, "phones"),
-    COUNTRY((short)9, "country"),
-    NATIONALITY((short)10, "nationality"),
-    HOME_ORGANIZATION((short)11, "homeOrganization"),
-    ORGINATION_AFFILIATION((short)12, "orginationAffiliation"),
-    CREATION_TIME((short)13, "creationTime"),
-    LAST_ACCESS_TIME((short)14, "lastAccessTime"),
-    VALID_UNTIL((short)15, "validUntil"),
+    ORCID_ID((short)6, "orcidId"),
+    PHONES((short)7, "phones"),
+    COUNTRY((short)8, "country"),
+    NATIONALITY((short)9, "nationality"),
+    HOME_ORGANIZATION((short)10, "homeOrganization"),
+    ORGINATION_AFFILIATION((short)11, "orginationAffiliation"),
+    CREATION_TIME((short)12, "creationTime"),
+    LAST_ACCESS_TIME((short)13, "lastAccessTime"),
+    VALID_UNTIL((short)14, "validUntil"),
     /**
      * 
      * @see Status
      */
-    STATE((short)16, "State"),
-    COMMENTS((short)17, "comments"),
-    LABELED_URI((short)18, "labeledURI"),
-    GPG_KEY((short)19, "gpgKey"),
-    TIME_ZONE((short)20, "timeZone"),
-    NSF_DEMOGRAPHICS((short)21, "nsfDemographics");
+    STATE((short)15, "State"),
+    COMMENTS((short)16, "comments"),
+    LABELED_URI((short)17, "labeledURI"),
+    GPG_KEY((short)18, "gpgKey"),
+    TIME_ZONE((short)19, "timeZone"),
+    NSF_DEMOGRAPHICS((short)20, "nsfDemographics");
 
     private static final Map<String, _Fields> byName = new HashMap<String, 
_Fields>();
 
@@ -208,37 +205,35 @@ public class UserProfile implements 
org.apache.thrift.TBase<UserProfile, UserPro
           return EMAILS;
         case 5: // USER_NAME
           return USER_NAME;
-        case 6: // GATEWAY_ID
-          return GATEWAY_ID;
-        case 7: // ORCID_ID
+        case 6: // ORCID_ID
           return ORCID_ID;
-        case 8: // PHONES
+        case 7: // PHONES
           return PHONES;
-        case 9: // COUNTRY
+        case 8: // COUNTRY
           return COUNTRY;
-        case 10: // NATIONALITY
+        case 9: // NATIONALITY
           return NATIONALITY;
-        case 11: // HOME_ORGANIZATION
+        case 10: // HOME_ORGANIZATION
           return HOME_ORGANIZATION;
-        case 12: // ORGINATION_AFFILIATION
+        case 11: // ORGINATION_AFFILIATION
           return ORGINATION_AFFILIATION;
-        case 13: // CREATION_TIME
+        case 12: // CREATION_TIME
           return CREATION_TIME;
-        case 14: // LAST_ACCESS_TIME
+        case 13: // LAST_ACCESS_TIME
           return LAST_ACCESS_TIME;
-        case 15: // VALID_UNTIL
+        case 14: // VALID_UNTIL
           return VALID_UNTIL;
-        case 16: // STATE
+        case 15: // STATE
           return STATE;
-        case 17: // COMMENTS
+        case 16: // COMMENTS
           return COMMENTS;
-        case 18: // LABELED_URI
+        case 17: // LABELED_URI
           return LABELED_URI;
-        case 19: // GPG_KEY
+        case 18: // GPG_KEY
           return GPG_KEY;
-        case 20: // TIME_ZONE
+        case 19: // TIME_ZONE
           return TIME_ZONE;
-        case 21: // NSF_DEMOGRAPHICS
+        case 20: // NSF_DEMOGRAPHICS
           return NSF_DEMOGRAPHICS;
         default:
           return null;
@@ -280,7 +275,7 @@ public class UserProfile implements 
org.apache.thrift.TBase<UserProfile, UserPro
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = 
{_Fields.USER_NAME,_Fields.GATEWAY_ID,_Fields.ORCID_ID,_Fields.PHONES,_Fields.COUNTRY,_Fields.NATIONALITY,_Fields.HOME_ORGANIZATION,_Fields.ORGINATION_AFFILIATION,_Fields.COMMENTS,_Fields.LABELED_URI,_Fields.GPG_KEY,_Fields.TIME_ZONE,_Fields.NSF_DEMOGRAPHICS};
+  private static final _Fields optionals[] = 
{_Fields.USER_NAME,_Fields.ORCID_ID,_Fields.PHONES,_Fields.COUNTRY,_Fields.NATIONALITY,_Fields.HOME_ORGANIZATION,_Fields.ORGINATION_AFFILIATION,_Fields.COMMENTS,_Fields.LABELED_URI,_Fields.GPG_KEY,_Fields.TIME_ZONE,_Fields.NSF_DEMOGRAPHICS};
   public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> 
metaDataMap;
   static {
     Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new 
EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -295,8 +290,6 @@ public class UserProfile implements 
org.apache.thrift.TBase<UserProfile, UserPro
             new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
     tmpMap.put(_Fields.USER_NAME, new 
org.apache.thrift.meta_data.FieldMetaData("userName", 
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         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.OPTIONAL, 
-        new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.ORCID_ID, new 
org.apache.thrift.meta_data.FieldMetaData("orcidId", 
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.PHONES, new 
org.apache.thrift.meta_data.FieldMetaData("phones", 
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
@@ -382,9 +375,6 @@ public class UserProfile implements 
org.apache.thrift.TBase<UserProfile, UserPro
     if (other.isSetUserName()) {
       this.userName = other.userName;
     }
-    if (other.isSetGatewayId()) {
-      this.gatewayId = other.gatewayId;
-    }
     if (other.isSetOrcidId()) {
       this.orcidId = other.orcidId;
     }
@@ -448,7 +438,6 @@ public class UserProfile implements 
org.apache.thrift.TBase<UserProfile, UserPro
     this.userId = null;
     this.emails = null;
     this.userName = null;
-    this.gatewayId = null;
     this.orcidId = null;
     this.phones = null;
     this.country = null;
@@ -596,29 +585,6 @@ public class UserProfile implements 
org.apache.thrift.TBase<UserProfile, UserPro
     }
   }
 
-  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 String getOrcidId() {
     return this.orcidId;
   }
@@ -1059,14 +1025,6 @@ public class UserProfile implements 
org.apache.thrift.TBase<UserProfile, UserPro
       }
       break;
 
-    case GATEWAY_ID:
-      if (value == null) {
-        unsetGatewayId();
-      } else {
-        setGatewayId((String)value);
-      }
-      break;
-
     case ORCID_ID:
       if (value == null) {
         unsetOrcidId();
@@ -1207,9 +1165,6 @@ public class UserProfile implements 
org.apache.thrift.TBase<UserProfile, UserPro
     case USER_NAME:
       return getUserName();
 
-    case GATEWAY_ID:
-      return getGatewayId();
-
     case ORCID_ID:
       return getOrcidId();
 
@@ -1276,8 +1231,6 @@ public class UserProfile implements 
org.apache.thrift.TBase<UserProfile, UserPro
       return isSetEmails();
     case USER_NAME:
       return isSetUserName();
-    case GATEWAY_ID:
-      return isSetGatewayId();
     case ORCID_ID:
       return isSetOrcidId();
     case PHONES:
@@ -1370,15 +1323,6 @@ public class UserProfile implements 
org.apache.thrift.TBase<UserProfile, UserPro
         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;
-    }
-
     boolean this_present_orcidId = true && this.isSetOrcidId();
     boolean that_present_orcidId = true && that.isSetOrcidId();
     if (this_present_orcidId || that_present_orcidId) {
@@ -1546,11 +1490,6 @@ public class UserProfile implements 
org.apache.thrift.TBase<UserProfile, UserPro
     if (present_userName)
       list.add(userName);
 
-    boolean present_gatewayId = true && (isSetGatewayId());
-    list.add(present_gatewayId);
-    if (present_gatewayId)
-      list.add(gatewayId);
-
     boolean present_orcidId = true && (isSetOrcidId());
     list.add(present_orcidId);
     if (present_orcidId)
@@ -1687,16 +1626,6 @@ public class UserProfile implements 
org.apache.thrift.TBase<UserProfile, UserPro
         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;
-      }
-    }
     lastComparison = 
Boolean.valueOf(isSetOrcidId()).compareTo(other.isSetOrcidId());
     if (lastComparison != 0) {
       return lastComparison;
@@ -1908,16 +1837,6 @@ public class UserProfile implements 
org.apache.thrift.TBase<UserProfile, UserPro
       }
       first = false;
     }
-    if (isSetGatewayId()) {
-      if (!first) sb.append(", ");
-      sb.append("gatewayId:");
-      if (this.gatewayId == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.gatewayId);
-      }
-      first = false;
-    }
     if (isSetOrcidId()) {
       if (!first) sb.append(", ");
       sb.append("orcidId:");
@@ -2188,15 +2107,7 @@ public class UserProfile implements 
org.apache.thrift.TBase<UserProfile, UserPro
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
             }
             break;
-          case 6: // 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;
-          case 7: // ORCID_ID
+          case 6: // ORCID_ID
             if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
               struct.orcidId = iprot.readString();
               struct.setOrcidIdIsSet(true);
@@ -2204,7 +2115,7 @@ public class UserProfile implements 
org.apache.thrift.TBase<UserProfile, UserPro
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
             }
             break;
-          case 8: // PHONES
+          case 7: // PHONES
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list27 = 
iprot.readListBegin();
@@ -2222,7 +2133,7 @@ public class UserProfile implements 
org.apache.thrift.TBase<UserProfile, UserPro
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
             }
             break;
-          case 9: // COUNTRY
+          case 8: // COUNTRY
             if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
               struct.country = iprot.readString();
               struct.setCountryIsSet(true);
@@ -2230,7 +2141,7 @@ public class UserProfile implements 
org.apache.thrift.TBase<UserProfile, UserPro
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
             }
             break;
-          case 10: // NATIONALITY
+          case 9: // NATIONALITY
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list30 = 
iprot.readListBegin();
@@ -2248,7 +2159,7 @@ public class UserProfile implements 
org.apache.thrift.TBase<UserProfile, UserPro
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
             }
             break;
-          case 11: // HOME_ORGANIZATION
+          case 10: // HOME_ORGANIZATION
             if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
               struct.homeOrganization = iprot.readString();
               struct.setHomeOrganizationIsSet(true);
@@ -2256,7 +2167,7 @@ public class UserProfile implements 
org.apache.thrift.TBase<UserProfile, UserPro
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
             }
             break;
-          case 12: // ORGINATION_AFFILIATION
+          case 11: // ORGINATION_AFFILIATION
             if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
               struct.orginationAffiliation = iprot.readString();
               struct.setOrginationAffiliationIsSet(true);
@@ -2264,7 +2175,7 @@ public class UserProfile implements 
org.apache.thrift.TBase<UserProfile, UserPro
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
             }
             break;
-          case 13: // CREATION_TIME
+          case 12: // CREATION_TIME
             if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
               struct.creationTime = iprot.readString();
               struct.setCreationTimeIsSet(true);
@@ -2272,7 +2183,7 @@ public class UserProfile implements 
org.apache.thrift.TBase<UserProfile, UserPro
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
             }
             break;
-          case 14: // LAST_ACCESS_TIME
+          case 13: // LAST_ACCESS_TIME
             if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
               struct.lastAccessTime = iprot.readString();
               struct.setLastAccessTimeIsSet(true);
@@ -2280,7 +2191,7 @@ public class UserProfile implements 
org.apache.thrift.TBase<UserProfile, UserPro
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
             }
             break;
-          case 15: // VALID_UNTIL
+          case 14: // VALID_UNTIL
             if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
               struct.validUntil = iprot.readString();
               struct.setValidUntilIsSet(true);
@@ -2288,7 +2199,7 @@ public class UserProfile implements 
org.apache.thrift.TBase<UserProfile, UserPro
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
             }
             break;
-          case 16: // STATE
+          case 15: // STATE
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.State = 
org.apache.airavata.model.user.Status.findByValue(iprot.readI32());
               struct.setStateIsSet(true);
@@ -2296,7 +2207,7 @@ public class UserProfile implements 
org.apache.thrift.TBase<UserProfile, UserPro
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
             }
             break;
-          case 17: // COMMENTS
+          case 16: // COMMENTS
             if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
               struct.comments = iprot.readString();
               struct.setCommentsIsSet(true);
@@ -2304,7 +2215,7 @@ public class UserProfile implements 
org.apache.thrift.TBase<UserProfile, UserPro
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
             }
             break;
-          case 18: // LABELED_URI
+          case 17: // LABELED_URI
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list33 = 
iprot.readListBegin();
@@ -2322,7 +2233,7 @@ public class UserProfile implements 
org.apache.thrift.TBase<UserProfile, UserPro
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
             }
             break;
-          case 19: // GPG_KEY
+          case 18: // GPG_KEY
             if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
               struct.gpgKey = iprot.readString();
               struct.setGpgKeyIsSet(true);
@@ -2330,7 +2241,7 @@ public class UserProfile implements 
org.apache.thrift.TBase<UserProfile, UserPro
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
             }
             break;
-          case 20: // TIME_ZONE
+          case 19: // TIME_ZONE
             if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
               struct.timeZone = iprot.readString();
               struct.setTimeZoneIsSet(true);
@@ -2338,7 +2249,7 @@ public class UserProfile implements 
org.apache.thrift.TBase<UserProfile, UserPro
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
             }
             break;
-          case 21: // NSF_DEMOGRAPHICS
+          case 20: // NSF_DEMOGRAPHICS
             if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
               struct.nsfDemographics = new NSFDemographics();
               struct.nsfDemographics.read(iprot);
@@ -2394,13 +2305,6 @@ public class UserProfile implements 
org.apache.thrift.TBase<UserProfile, UserPro
           oprot.writeFieldEnd();
         }
       }
-      if (struct.gatewayId != null) {
-        if (struct.isSetGatewayId()) {
-          oprot.writeFieldBegin(GATEWAY_ID_FIELD_DESC);
-          oprot.writeString(struct.gatewayId);
-          oprot.writeFieldEnd();
-        }
-      }
       if (struct.orcidId != null) {
         if (struct.isSetOrcidId()) {
           oprot.writeFieldBegin(ORCID_ID_FIELD_DESC);
@@ -2554,49 +2458,43 @@ public class UserProfile implements 
org.apache.thrift.TBase<UserProfile, UserPro
       if (struct.isSetUserName()) {
         optionals.set(0);
       }
-      if (struct.isSetGatewayId()) {
-        optionals.set(1);
-      }
       if (struct.isSetOrcidId()) {
-        optionals.set(2);
+        optionals.set(1);
       }
       if (struct.isSetPhones()) {
-        optionals.set(3);
+        optionals.set(2);
       }
       if (struct.isSetCountry()) {
-        optionals.set(4);
+        optionals.set(3);
       }
       if (struct.isSetNationality()) {
-        optionals.set(5);
+        optionals.set(4);
       }
       if (struct.isSetHomeOrganization()) {
-        optionals.set(6);
+        optionals.set(5);
       }
       if (struct.isSetOrginationAffiliation()) {
-        optionals.set(7);
+        optionals.set(6);
       }
       if (struct.isSetComments()) {
-        optionals.set(8);
+        optionals.set(7);
       }
       if (struct.isSetLabeledURI()) {
-        optionals.set(9);
+        optionals.set(8);
       }
       if (struct.isSetGpgKey()) {
-        optionals.set(10);
+        optionals.set(9);
       }
       if (struct.isSetTimeZone()) {
-        optionals.set(11);
+        optionals.set(10);
       }
       if (struct.isSetNsfDemographics()) {
-        optionals.set(12);
+        optionals.set(11);
       }
-      oprot.writeBitSet(optionals, 13);
+      oprot.writeBitSet(optionals, 12);
       if (struct.isSetUserName()) {
         oprot.writeString(struct.userName);
       }
-      if (struct.isSetGatewayId()) {
-        oprot.writeString(struct.gatewayId);
-      }
       if (struct.isSetOrcidId()) {
         oprot.writeString(struct.orcidId);
       }
@@ -2678,20 +2576,16 @@ public class UserProfile implements 
org.apache.thrift.TBase<UserProfile, UserPro
       struct.setValidUntilIsSet(true);
       struct.State = 
org.apache.airavata.model.user.Status.findByValue(iprot.readI32());
       struct.setStateIsSet(true);
-      BitSet incoming = iprot.readBitSet(13);
+      BitSet incoming = iprot.readBitSet(12);
       if (incoming.get(0)) {
         struct.userName = iprot.readString();
         struct.setUserNameIsSet(true);
       }
       if (incoming.get(1)) {
-        struct.gatewayId = iprot.readString();
-        struct.setGatewayIdIsSet(true);
-      }
-      if (incoming.get(2)) {
         struct.orcidId = iprot.readString();
         struct.setOrcidIdIsSet(true);
       }
-      if (incoming.get(3)) {
+      if (incoming.get(2)) {
         {
           org.apache.thrift.protocol.TList _list47 = new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, 
iprot.readI32());
           struct.phones = new ArrayList<String>(_list47.size);
@@ -2704,11 +2598,11 @@ public class UserProfile implements 
org.apache.thrift.TBase<UserProfile, UserPro
         }
         struct.setPhonesIsSet(true);
       }
-      if (incoming.get(4)) {
+      if (incoming.get(3)) {
         struct.country = iprot.readString();
         struct.setCountryIsSet(true);
       }
-      if (incoming.get(5)) {
+      if (incoming.get(4)) {
         {
           org.apache.thrift.protocol.TList _list50 = new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, 
iprot.readI32());
           struct.nationality = new ArrayList<String>(_list50.size);
@@ -2721,19 +2615,19 @@ public class UserProfile implements 
org.apache.thrift.TBase<UserProfile, UserPro
         }
         struct.setNationalityIsSet(true);
       }
-      if (incoming.get(6)) {
+      if (incoming.get(5)) {
         struct.homeOrganization = iprot.readString();
         struct.setHomeOrganizationIsSet(true);
       }
-      if (incoming.get(7)) {
+      if (incoming.get(6)) {
         struct.orginationAffiliation = iprot.readString();
         struct.setOrginationAffiliationIsSet(true);
       }
-      if (incoming.get(8)) {
+      if (incoming.get(7)) {
         struct.comments = iprot.readString();
         struct.setCommentsIsSet(true);
       }
-      if (incoming.get(9)) {
+      if (incoming.get(8)) {
         {
           org.apache.thrift.protocol.TList _list53 = new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, 
iprot.readI32());
           struct.labeledURI = new ArrayList<String>(_list53.size);
@@ -2746,15 +2640,15 @@ public class UserProfile implements 
org.apache.thrift.TBase<UserProfile, UserPro
         }
         struct.setLabeledURIIsSet(true);
       }
-      if (incoming.get(10)) {
+      if (incoming.get(9)) {
         struct.gpgKey = iprot.readString();
         struct.setGpgKeyIsSet(true);
       }
-      if (incoming.get(11)) {
+      if (incoming.get(10)) {
         struct.timeZone = iprot.readString();
         struct.setTimeZoneIsSet(true);
       }
-      if (incoming.get(12)) {
+      if (incoming.get(11)) {
         struct.nsfDemographics = new NSFDemographics();
         struct.nsfDemographics.read(iprot);
         struct.setNsfDemographicsIsSet(true);

Reply via email to