airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject [16/31] airavata git commit: adding more fields to the gateway Model
Date Wed, 13 Jul 2016 05:33:23 GMT
http://git-wip-us.apache.org/repos/asf/airavata/blob/fd5d8369/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 ad5d994..0443043 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-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
 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/fd5d8369/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 01a1932..f44a5c7 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-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
 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/fd5d8369/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 a46a3c6..abbbedb 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-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
 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/fd5d8369/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 2858048..8097b92 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-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
 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/fd5d8369/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 4286a11..d19c340 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-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
 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/fd5d8369/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 a7fc645..461b01e 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-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
 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/fd5d8369/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 f455b3a..8fd72cb 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-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
 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/fd5d8369/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 ab3a5f6..0819236 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-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
 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/fd5d8369/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 0a13976..9fc5644 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-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
 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/fd5d8369/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 ff2b2cb..67e4161 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-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
 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);

http://git-wip-us.apache.org/repos/asf/airavata/blob/fd5d8369/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
index 272f096..123b4c5 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
@@ -51,14 +51,19 @@ 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-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
 public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields>, java.io.Serializable, Cloneable, Comparable<Gateway> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Gateway");
 
   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)1);
-  private static final org.apache.thrift.protocol.TField GATEWAY_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayName", org.apache.thrift.protocol.TType.STRING, (short)2);
-  private static final org.apache.thrift.protocol.TField DOMAIN_FIELD_DESC = new org.apache.thrift.protocol.TField("domain", org.apache.thrift.protocol.TType.STRING, (short)3);
-  private static final org.apache.thrift.protocol.TField EMAIL_ADDRESS_FIELD_DESC = new org.apache.thrift.protocol.TField("emailAddress", org.apache.thrift.protocol.TType.STRING, (short)4);
+  private static final org.apache.thrift.protocol.TField GATEWAY_APPROVAL_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayApprovalStatus", org.apache.thrift.protocol.TType.I32, (short)2);
+  private static final org.apache.thrift.protocol.TField GATEWAY_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayName", org.apache.thrift.protocol.TType.STRING, (short)3);
+  private static final org.apache.thrift.protocol.TField DOMAIN_FIELD_DESC = new org.apache.thrift.protocol.TField("domain", org.apache.thrift.protocol.TType.STRING, (short)4);
+  private static final org.apache.thrift.protocol.TField EMAIL_ADDRESS_FIELD_DESC = new org.apache.thrift.protocol.TField("emailAddress", org.apache.thrift.protocol.TType.STRING, (short)5);
+  private static final org.apache.thrift.protocol.TField GATEWAY_ACRONYM_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayAcronym", org.apache.thrift.protocol.TType.STRING, (short)6);
+  private static final org.apache.thrift.protocol.TField GATEWAY_URL_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayURL", org.apache.thrift.protocol.TType.STRING, (short)7);
+  private static final org.apache.thrift.protocol.TField GATEWAY_PUBLIC_ABSTRACT_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayPublicAbstract", org.apache.thrift.protocol.TType.STRING, (short)8);
+  private static final org.apache.thrift.protocol.TField REVIEW_PROPOSAL_DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("reviewProposalDescription", org.apache.thrift.protocol.TType.STRING, (short)9);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -67,16 +72,30 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
   }
 
   private String gatewayId; // required
+  private GatewayApprovalStatus gatewayApprovalStatus; // required
   private String gatewayName; // optional
   private String domain; // optional
   private String emailAddress; // optional
+  private String gatewayAcronym; // optional
+  private String gatewayURL; // optional
+  private String gatewayPublicAbstract; // optional
+  private String reviewProposalDescription; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     GATEWAY_ID((short)1, "gatewayId"),
-    GATEWAY_NAME((short)2, "gatewayName"),
-    DOMAIN((short)3, "domain"),
-    EMAIL_ADDRESS((short)4, "emailAddress");
+    /**
+     * 
+     * @see GatewayApprovalStatus
+     */
+    GATEWAY_APPROVAL_STATUS((short)2, "gatewayApprovalStatus"),
+    GATEWAY_NAME((short)3, "gatewayName"),
+    DOMAIN((short)4, "domain"),
+    EMAIL_ADDRESS((short)5, "emailAddress"),
+    GATEWAY_ACRONYM((short)6, "gatewayAcronym"),
+    GATEWAY_URL((short)7, "gatewayURL"),
+    GATEWAY_PUBLIC_ABSTRACT((short)8, "gatewayPublicAbstract"),
+    REVIEW_PROPOSAL_DESCRIPTION((short)9, "reviewProposalDescription");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -93,12 +112,22 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
       switch(fieldId) {
         case 1: // GATEWAY_ID
           return GATEWAY_ID;
-        case 2: // GATEWAY_NAME
+        case 2: // GATEWAY_APPROVAL_STATUS
+          return GATEWAY_APPROVAL_STATUS;
+        case 3: // GATEWAY_NAME
           return GATEWAY_NAME;
-        case 3: // DOMAIN
+        case 4: // DOMAIN
           return DOMAIN;
-        case 4: // EMAIL_ADDRESS
+        case 5: // EMAIL_ADDRESS
           return EMAIL_ADDRESS;
+        case 6: // GATEWAY_ACRONYM
+          return GATEWAY_ACRONYM;
+        case 7: // GATEWAY_URL
+          return GATEWAY_URL;
+        case 8: // GATEWAY_PUBLIC_ABSTRACT
+          return GATEWAY_PUBLIC_ABSTRACT;
+        case 9: // REVIEW_PROPOSAL_DESCRIPTION
+          return REVIEW_PROPOSAL_DESCRIPTION;
         default:
           return null;
       }
@@ -139,18 +168,28 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.GATEWAY_NAME,_Fields.DOMAIN,_Fields.EMAIL_ADDRESS};
+  private static final _Fields optionals[] = {_Fields.GATEWAY_NAME,_Fields.DOMAIN,_Fields.EMAIL_ADDRESS,_Fields.GATEWAY_ACRONYM,_Fields.GATEWAY_URL,_Fields.GATEWAY_PUBLIC_ABSTRACT,_Fields.REVIEW_PROPOSAL_DESCRIPTION};
   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);
     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)));
+    tmpMap.put(_Fields.GATEWAY_APPROVAL_STATUS, new org.apache.thrift.meta_data.FieldMetaData("gatewayApprovalStatus", org.apache.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, GatewayApprovalStatus.class)));
     tmpMap.put(_Fields.GATEWAY_NAME, new org.apache.thrift.meta_data.FieldMetaData("gatewayName", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.DOMAIN, new org.apache.thrift.meta_data.FieldMetaData("domain", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.EMAIL_ADDRESS, new org.apache.thrift.meta_data.FieldMetaData("emailAddress", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.GATEWAY_ACRONYM, new org.apache.thrift.meta_data.FieldMetaData("gatewayAcronym", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.GATEWAY_URL, new org.apache.thrift.meta_data.FieldMetaData("gatewayURL", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.GATEWAY_PUBLIC_ABSTRACT, new org.apache.thrift.meta_data.FieldMetaData("gatewayPublicAbstract", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.REVIEW_PROPOSAL_DESCRIPTION, new org.apache.thrift.meta_data.FieldMetaData("reviewProposalDescription", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Gateway.class, metaDataMap);
   }
@@ -159,10 +198,12 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
   }
 
   public Gateway(
-    String gatewayId)
+    String gatewayId,
+    GatewayApprovalStatus gatewayApprovalStatus)
   {
     this();
     this.gatewayId = gatewayId;
+    this.gatewayApprovalStatus = gatewayApprovalStatus;
   }
 
   /**
@@ -172,6 +213,9 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
     if (other.isSetGatewayId()) {
       this.gatewayId = other.gatewayId;
     }
+    if (other.isSetGatewayApprovalStatus()) {
+      this.gatewayApprovalStatus = other.gatewayApprovalStatus;
+    }
     if (other.isSetGatewayName()) {
       this.gatewayName = other.gatewayName;
     }
@@ -181,6 +225,18 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
     if (other.isSetEmailAddress()) {
       this.emailAddress = other.emailAddress;
     }
+    if (other.isSetGatewayAcronym()) {
+      this.gatewayAcronym = other.gatewayAcronym;
+    }
+    if (other.isSetGatewayURL()) {
+      this.gatewayURL = other.gatewayURL;
+    }
+    if (other.isSetGatewayPublicAbstract()) {
+      this.gatewayPublicAbstract = other.gatewayPublicAbstract;
+    }
+    if (other.isSetReviewProposalDescription()) {
+      this.reviewProposalDescription = other.reviewProposalDescription;
+    }
   }
 
   public Gateway deepCopy() {
@@ -190,9 +246,14 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
   @Override
   public void clear() {
     this.gatewayId = null;
+    this.gatewayApprovalStatus = null;
     this.gatewayName = null;
     this.domain = null;
     this.emailAddress = null;
+    this.gatewayAcronym = null;
+    this.gatewayURL = null;
+    this.gatewayPublicAbstract = null;
+    this.reviewProposalDescription = null;
   }
 
   public String getGatewayId() {
@@ -218,6 +279,37 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
     }
   }
 
+  /**
+   * 
+   * @see GatewayApprovalStatus
+   */
+  public GatewayApprovalStatus getGatewayApprovalStatus() {
+    return this.gatewayApprovalStatus;
+  }
+
+  /**
+   * 
+   * @see GatewayApprovalStatus
+   */
+  public void setGatewayApprovalStatus(GatewayApprovalStatus gatewayApprovalStatus) {
+    this.gatewayApprovalStatus = gatewayApprovalStatus;
+  }
+
+  public void unsetGatewayApprovalStatus() {
+    this.gatewayApprovalStatus = null;
+  }
+
+  /** Returns true if field gatewayApprovalStatus is set (has been assigned a value) and false otherwise */
+  public boolean isSetGatewayApprovalStatus() {
+    return this.gatewayApprovalStatus != null;
+  }
+
+  public void setGatewayApprovalStatusIsSet(boolean value) {
+    if (!value) {
+      this.gatewayApprovalStatus = null;
+    }
+  }
+
   public String getGatewayName() {
     return this.gatewayName;
   }
@@ -287,6 +379,98 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
     }
   }
 
+  public String getGatewayAcronym() {
+    return this.gatewayAcronym;
+  }
+
+  public void setGatewayAcronym(String gatewayAcronym) {
+    this.gatewayAcronym = gatewayAcronym;
+  }
+
+  public void unsetGatewayAcronym() {
+    this.gatewayAcronym = null;
+  }
+
+  /** Returns true if field gatewayAcronym is set (has been assigned a value) and false otherwise */
+  public boolean isSetGatewayAcronym() {
+    return this.gatewayAcronym != null;
+  }
+
+  public void setGatewayAcronymIsSet(boolean value) {
+    if (!value) {
+      this.gatewayAcronym = null;
+    }
+  }
+
+  public String getGatewayURL() {
+    return this.gatewayURL;
+  }
+
+  public void setGatewayURL(String gatewayURL) {
+    this.gatewayURL = gatewayURL;
+  }
+
+  public void unsetGatewayURL() {
+    this.gatewayURL = null;
+  }
+
+  /** Returns true if field gatewayURL is set (has been assigned a value) and false otherwise */
+  public boolean isSetGatewayURL() {
+    return this.gatewayURL != null;
+  }
+
+  public void setGatewayURLIsSet(boolean value) {
+    if (!value) {
+      this.gatewayURL = null;
+    }
+  }
+
+  public String getGatewayPublicAbstract() {
+    return this.gatewayPublicAbstract;
+  }
+
+  public void setGatewayPublicAbstract(String gatewayPublicAbstract) {
+    this.gatewayPublicAbstract = gatewayPublicAbstract;
+  }
+
+  public void unsetGatewayPublicAbstract() {
+    this.gatewayPublicAbstract = null;
+  }
+
+  /** Returns true if field gatewayPublicAbstract is set (has been assigned a value) and false otherwise */
+  public boolean isSetGatewayPublicAbstract() {
+    return this.gatewayPublicAbstract != null;
+  }
+
+  public void setGatewayPublicAbstractIsSet(boolean value) {
+    if (!value) {
+      this.gatewayPublicAbstract = null;
+    }
+  }
+
+  public String getReviewProposalDescription() {
+    return this.reviewProposalDescription;
+  }
+
+  public void setReviewProposalDescription(String reviewProposalDescription) {
+    this.reviewProposalDescription = reviewProposalDescription;
+  }
+
+  public void unsetReviewProposalDescription() {
+    this.reviewProposalDescription = null;
+  }
+
+  /** Returns true if field reviewProposalDescription is set (has been assigned a value) and false otherwise */
+  public boolean isSetReviewProposalDescription() {
+    return this.reviewProposalDescription != null;
+  }
+
+  public void setReviewProposalDescriptionIsSet(boolean value) {
+    if (!value) {
+      this.reviewProposalDescription = null;
+    }
+  }
+
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
     case GATEWAY_ID:
@@ -297,6 +481,14 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
       }
       break;
 
+    case GATEWAY_APPROVAL_STATUS:
+      if (value == null) {
+        unsetGatewayApprovalStatus();
+      } else {
+        setGatewayApprovalStatus((GatewayApprovalStatus)value);
+      }
+      break;
+
     case GATEWAY_NAME:
       if (value == null) {
         unsetGatewayName();
@@ -321,6 +513,38 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
       }
       break;
 
+    case GATEWAY_ACRONYM:
+      if (value == null) {
+        unsetGatewayAcronym();
+      } else {
+        setGatewayAcronym((String)value);
+      }
+      break;
+
+    case GATEWAY_URL:
+      if (value == null) {
+        unsetGatewayURL();
+      } else {
+        setGatewayURL((String)value);
+      }
+      break;
+
+    case GATEWAY_PUBLIC_ABSTRACT:
+      if (value == null) {
+        unsetGatewayPublicAbstract();
+      } else {
+        setGatewayPublicAbstract((String)value);
+      }
+      break;
+
+    case REVIEW_PROPOSAL_DESCRIPTION:
+      if (value == null) {
+        unsetReviewProposalDescription();
+      } else {
+        setReviewProposalDescription((String)value);
+      }
+      break;
+
     }
   }
 
@@ -329,6 +553,9 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
     case GATEWAY_ID:
       return getGatewayId();
 
+    case GATEWAY_APPROVAL_STATUS:
+      return getGatewayApprovalStatus();
+
     case GATEWAY_NAME:
       return getGatewayName();
 
@@ -338,6 +565,18 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
     case EMAIL_ADDRESS:
       return getEmailAddress();
 
+    case GATEWAY_ACRONYM:
+      return getGatewayAcronym();
+
+    case GATEWAY_URL:
+      return getGatewayURL();
+
+    case GATEWAY_PUBLIC_ABSTRACT:
+      return getGatewayPublicAbstract();
+
+    case REVIEW_PROPOSAL_DESCRIPTION:
+      return getReviewProposalDescription();
+
     }
     throw new IllegalStateException();
   }
@@ -351,12 +590,22 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
     switch (field) {
     case GATEWAY_ID:
       return isSetGatewayId();
+    case GATEWAY_APPROVAL_STATUS:
+      return isSetGatewayApprovalStatus();
     case GATEWAY_NAME:
       return isSetGatewayName();
     case DOMAIN:
       return isSetDomain();
     case EMAIL_ADDRESS:
       return isSetEmailAddress();
+    case GATEWAY_ACRONYM:
+      return isSetGatewayAcronym();
+    case GATEWAY_URL:
+      return isSetGatewayURL();
+    case GATEWAY_PUBLIC_ABSTRACT:
+      return isSetGatewayPublicAbstract();
+    case REVIEW_PROPOSAL_DESCRIPTION:
+      return isSetReviewProposalDescription();
     }
     throw new IllegalStateException();
   }
@@ -383,6 +632,15 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
         return false;
     }
 
+    boolean this_present_gatewayApprovalStatus = true && this.isSetGatewayApprovalStatus();
+    boolean that_present_gatewayApprovalStatus = true && that.isSetGatewayApprovalStatus();
+    if (this_present_gatewayApprovalStatus || that_present_gatewayApprovalStatus) {
+      if (!(this_present_gatewayApprovalStatus && that_present_gatewayApprovalStatus))
+        return false;
+      if (!this.gatewayApprovalStatus.equals(that.gatewayApprovalStatus))
+        return false;
+    }
+
     boolean this_present_gatewayName = true && this.isSetGatewayName();
     boolean that_present_gatewayName = true && that.isSetGatewayName();
     if (this_present_gatewayName || that_present_gatewayName) {
@@ -410,6 +668,42 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
         return false;
     }
 
+    boolean this_present_gatewayAcronym = true && this.isSetGatewayAcronym();
+    boolean that_present_gatewayAcronym = true && that.isSetGatewayAcronym();
+    if (this_present_gatewayAcronym || that_present_gatewayAcronym) {
+      if (!(this_present_gatewayAcronym && that_present_gatewayAcronym))
+        return false;
+      if (!this.gatewayAcronym.equals(that.gatewayAcronym))
+        return false;
+    }
+
+    boolean this_present_gatewayURL = true && this.isSetGatewayURL();
+    boolean that_present_gatewayURL = true && that.isSetGatewayURL();
+    if (this_present_gatewayURL || that_present_gatewayURL) {
+      if (!(this_present_gatewayURL && that_present_gatewayURL))
+        return false;
+      if (!this.gatewayURL.equals(that.gatewayURL))
+        return false;
+    }
+
+    boolean this_present_gatewayPublicAbstract = true && this.isSetGatewayPublicAbstract();
+    boolean that_present_gatewayPublicAbstract = true && that.isSetGatewayPublicAbstract();
+    if (this_present_gatewayPublicAbstract || that_present_gatewayPublicAbstract) {
+      if (!(this_present_gatewayPublicAbstract && that_present_gatewayPublicAbstract))
+        return false;
+      if (!this.gatewayPublicAbstract.equals(that.gatewayPublicAbstract))
+        return false;
+    }
+
+    boolean this_present_reviewProposalDescription = true && this.isSetReviewProposalDescription();
+    boolean that_present_reviewProposalDescription = true && that.isSetReviewProposalDescription();
+    if (this_present_reviewProposalDescription || that_present_reviewProposalDescription) {
+      if (!(this_present_reviewProposalDescription && that_present_reviewProposalDescription))
+        return false;
+      if (!this.reviewProposalDescription.equals(that.reviewProposalDescription))
+        return false;
+    }
+
     return true;
   }
 
@@ -422,6 +716,11 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
     if (present_gatewayId)
       list.add(gatewayId);
 
+    boolean present_gatewayApprovalStatus = true && (isSetGatewayApprovalStatus());
+    list.add(present_gatewayApprovalStatus);
+    if (present_gatewayApprovalStatus)
+      list.add(gatewayApprovalStatus.getValue());
+
     boolean present_gatewayName = true && (isSetGatewayName());
     list.add(present_gatewayName);
     if (present_gatewayName)
@@ -437,6 +736,26 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
     if (present_emailAddress)
       list.add(emailAddress);
 
+    boolean present_gatewayAcronym = true && (isSetGatewayAcronym());
+    list.add(present_gatewayAcronym);
+    if (present_gatewayAcronym)
+      list.add(gatewayAcronym);
+
+    boolean present_gatewayURL = true && (isSetGatewayURL());
+    list.add(present_gatewayURL);
+    if (present_gatewayURL)
+      list.add(gatewayURL);
+
+    boolean present_gatewayPublicAbstract = true && (isSetGatewayPublicAbstract());
+    list.add(present_gatewayPublicAbstract);
+    if (present_gatewayPublicAbstract)
+      list.add(gatewayPublicAbstract);
+
+    boolean present_reviewProposalDescription = true && (isSetReviewProposalDescription());
+    list.add(present_reviewProposalDescription);
+    if (present_reviewProposalDescription)
+      list.add(reviewProposalDescription);
+
     return list.hashCode();
   }
 
@@ -458,6 +777,16 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
         return lastComparison;
       }
     }
+    lastComparison = Boolean.valueOf(isSetGatewayApprovalStatus()).compareTo(other.isSetGatewayApprovalStatus());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetGatewayApprovalStatus()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gatewayApprovalStatus, other.gatewayApprovalStatus);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
     lastComparison = Boolean.valueOf(isSetGatewayName()).compareTo(other.isSetGatewayName());
     if (lastComparison != 0) {
       return lastComparison;
@@ -488,6 +817,46 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
         return lastComparison;
       }
     }
+    lastComparison = Boolean.valueOf(isSetGatewayAcronym()).compareTo(other.isSetGatewayAcronym());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetGatewayAcronym()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gatewayAcronym, other.gatewayAcronym);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetGatewayURL()).compareTo(other.isSetGatewayURL());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetGatewayURL()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gatewayURL, other.gatewayURL);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetGatewayPublicAbstract()).compareTo(other.isSetGatewayPublicAbstract());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetGatewayPublicAbstract()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gatewayPublicAbstract, other.gatewayPublicAbstract);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetReviewProposalDescription()).compareTo(other.isSetReviewProposalDescription());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetReviewProposalDescription()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.reviewProposalDescription, other.reviewProposalDescription);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
     return 0;
   }
 
@@ -515,6 +884,14 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
       sb.append(this.gatewayId);
     }
     first = false;
+    if (!first) sb.append(", ");
+    sb.append("gatewayApprovalStatus:");
+    if (this.gatewayApprovalStatus == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.gatewayApprovalStatus);
+    }
+    first = false;
     if (isSetGatewayName()) {
       if (!first) sb.append(", ");
       sb.append("gatewayName:");
@@ -545,6 +922,46 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
       }
       first = false;
     }
+    if (isSetGatewayAcronym()) {
+      if (!first) sb.append(", ");
+      sb.append("gatewayAcronym:");
+      if (this.gatewayAcronym == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.gatewayAcronym);
+      }
+      first = false;
+    }
+    if (isSetGatewayURL()) {
+      if (!first) sb.append(", ");
+      sb.append("gatewayURL:");
+      if (this.gatewayURL == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.gatewayURL);
+      }
+      first = false;
+    }
+    if (isSetGatewayPublicAbstract()) {
+      if (!first) sb.append(", ");
+      sb.append("gatewayPublicAbstract:");
+      if (this.gatewayPublicAbstract == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.gatewayPublicAbstract);
+      }
+      first = false;
+    }
+    if (isSetReviewProposalDescription()) {
+      if (!first) sb.append(", ");
+      sb.append("reviewProposalDescription:");
+      if (this.reviewProposalDescription == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.reviewProposalDescription);
+      }
+      first = false;
+    }
     sb.append(")");
     return sb.toString();
   }
@@ -555,6 +972,10 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
       throw new org.apache.thrift.protocol.TProtocolException("Required field 'gatewayId' is unset! Struct:" + toString());
     }
 
+    if (!isSetGatewayApprovalStatus()) {
+      throw new org.apache.thrift.protocol.TProtocolException("Required field 'gatewayApprovalStatus' is unset! Struct:" + toString());
+    }
+
     // check for sub-struct validity
   }
 
@@ -600,7 +1021,15 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 2: // GATEWAY_NAME
+          case 2: // GATEWAY_APPROVAL_STATUS
+            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+              struct.gatewayApprovalStatus = org.apache.airavata.model.workspace.GatewayApprovalStatus.findByValue(iprot.readI32());
+              struct.setGatewayApprovalStatusIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 3: // GATEWAY_NAME
             if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
               struct.gatewayName = iprot.readString();
               struct.setGatewayNameIsSet(true);
@@ -608,7 +1037,7 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 3: // DOMAIN
+          case 4: // DOMAIN
             if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
               struct.domain = iprot.readString();
               struct.setDomainIsSet(true);
@@ -616,7 +1045,7 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 4: // EMAIL_ADDRESS
+          case 5: // EMAIL_ADDRESS
             if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
               struct.emailAddress = iprot.readString();
               struct.setEmailAddressIsSet(true);
@@ -624,6 +1053,38 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
+          case 6: // GATEWAY_ACRONYM
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.gatewayAcronym = iprot.readString();
+              struct.setGatewayAcronymIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 7: // GATEWAY_URL
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.gatewayURL = iprot.readString();
+              struct.setGatewayURLIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 8: // GATEWAY_PUBLIC_ABSTRACT
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.gatewayPublicAbstract = iprot.readString();
+              struct.setGatewayPublicAbstractIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 9: // REVIEW_PROPOSAL_DESCRIPTION
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.reviewProposalDescription = iprot.readString();
+              struct.setReviewProposalDescriptionIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
           default:
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
         }
@@ -642,6 +1103,11 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
         oprot.writeString(struct.gatewayId);
         oprot.writeFieldEnd();
       }
+      if (struct.gatewayApprovalStatus != null) {
+        oprot.writeFieldBegin(GATEWAY_APPROVAL_STATUS_FIELD_DESC);
+        oprot.writeI32(struct.gatewayApprovalStatus.getValue());
+        oprot.writeFieldEnd();
+      }
       if (struct.gatewayName != null) {
         if (struct.isSetGatewayName()) {
           oprot.writeFieldBegin(GATEWAY_NAME_FIELD_DESC);
@@ -663,6 +1129,34 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
           oprot.writeFieldEnd();
         }
       }
+      if (struct.gatewayAcronym != null) {
+        if (struct.isSetGatewayAcronym()) {
+          oprot.writeFieldBegin(GATEWAY_ACRONYM_FIELD_DESC);
+          oprot.writeString(struct.gatewayAcronym);
+          oprot.writeFieldEnd();
+        }
+      }
+      if (struct.gatewayURL != null) {
+        if (struct.isSetGatewayURL()) {
+          oprot.writeFieldBegin(GATEWAY_URL_FIELD_DESC);
+          oprot.writeString(struct.gatewayURL);
+          oprot.writeFieldEnd();
+        }
+      }
+      if (struct.gatewayPublicAbstract != null) {
+        if (struct.isSetGatewayPublicAbstract()) {
+          oprot.writeFieldBegin(GATEWAY_PUBLIC_ABSTRACT_FIELD_DESC);
+          oprot.writeString(struct.gatewayPublicAbstract);
+          oprot.writeFieldEnd();
+        }
+      }
+      if (struct.reviewProposalDescription != null) {
+        if (struct.isSetReviewProposalDescription()) {
+          oprot.writeFieldBegin(REVIEW_PROPOSAL_DESCRIPTION_FIELD_DESC);
+          oprot.writeString(struct.reviewProposalDescription);
+          oprot.writeFieldEnd();
+        }
+      }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
@@ -681,6 +1175,7 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
     public void write(org.apache.thrift.protocol.TProtocol prot, Gateway struct) throws org.apache.thrift.TException {
       TTupleProtocol oprot = (TTupleProtocol) prot;
       oprot.writeString(struct.gatewayId);
+      oprot.writeI32(struct.gatewayApprovalStatus.getValue());
       BitSet optionals = new BitSet();
       if (struct.isSetGatewayName()) {
         optionals.set(0);
@@ -691,7 +1186,19 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
       if (struct.isSetEmailAddress()) {
         optionals.set(2);
       }
-      oprot.writeBitSet(optionals, 3);
+      if (struct.isSetGatewayAcronym()) {
+        optionals.set(3);
+      }
+      if (struct.isSetGatewayURL()) {
+        optionals.set(4);
+      }
+      if (struct.isSetGatewayPublicAbstract()) {
+        optionals.set(5);
+      }
+      if (struct.isSetReviewProposalDescription()) {
+        optionals.set(6);
+      }
+      oprot.writeBitSet(optionals, 7);
       if (struct.isSetGatewayName()) {
         oprot.writeString(struct.gatewayName);
       }
@@ -701,6 +1208,18 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
       if (struct.isSetEmailAddress()) {
         oprot.writeString(struct.emailAddress);
       }
+      if (struct.isSetGatewayAcronym()) {
+        oprot.writeString(struct.gatewayAcronym);
+      }
+      if (struct.isSetGatewayURL()) {
+        oprot.writeString(struct.gatewayURL);
+      }
+      if (struct.isSetGatewayPublicAbstract()) {
+        oprot.writeString(struct.gatewayPublicAbstract);
+      }
+      if (struct.isSetReviewProposalDescription()) {
+        oprot.writeString(struct.reviewProposalDescription);
+      }
     }
 
     @Override
@@ -708,7 +1227,9 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
       TTupleProtocol iprot = (TTupleProtocol) prot;
       struct.gatewayId = iprot.readString();
       struct.setGatewayIdIsSet(true);
-      BitSet incoming = iprot.readBitSet(3);
+      struct.gatewayApprovalStatus = org.apache.airavata.model.workspace.GatewayApprovalStatus.findByValue(iprot.readI32());
+      struct.setGatewayApprovalStatusIsSet(true);
+      BitSet incoming = iprot.readBitSet(7);
       if (incoming.get(0)) {
         struct.gatewayName = iprot.readString();
         struct.setGatewayNameIsSet(true);
@@ -721,6 +1242,22 @@ public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields
         struct.emailAddress = iprot.readString();
         struct.setEmailAddressIsSet(true);
       }
+      if (incoming.get(3)) {
+        struct.gatewayAcronym = iprot.readString();
+        struct.setGatewayAcronymIsSet(true);
+      }
+      if (incoming.get(4)) {
+        struct.gatewayURL = iprot.readString();
+        struct.setGatewayURLIsSet(true);
+      }
+      if (incoming.get(5)) {
+        struct.gatewayPublicAbstract = iprot.readString();
+        struct.setGatewayPublicAbstractIsSet(true);
+      }
+      if (incoming.get(6)) {
+        struct.reviewProposalDescription = iprot.readString();
+        struct.setReviewProposalDescriptionIsSet(true);
+      }
     }
   }
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/fd5d8369/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
index c493a32..8a997e9 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.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-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
 public class Group implements org.apache.thrift.TBase<Group, Group._Fields>, java.io.Serializable, Cloneable, Comparable<Group> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Group");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/fd5d8369/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.java
index 5d7a764..ca209e5 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.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-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
 public class Notification implements org.apache.thrift.TBase<Notification, Notification._Fields>, java.io.Serializable, Cloneable, Comparable<Notification> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Notification");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/fd5d8369/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java
index 3b09f70..015f17e 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.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-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
 public class Project implements org.apache.thrift.TBase<Project, Project._Fields>, java.io.Serializable, Cloneable, Comparable<Project> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Project");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/fd5d8369/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java
index ddf6b84..27818ce 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.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-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-11")
 public class User implements org.apache.thrift.TBase<User, User._Fields>, java.io.Serializable, Cloneable, Comparable<User> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("User");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/fd5d8369/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/GatewayRegistry.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/GatewayRegistry.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/GatewayRegistry.java
index eb2f221..337b655 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/GatewayRegistry.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/GatewayRegistry.java
@@ -52,12 +52,10 @@ public class GatewayRegistry {
             resource.setGatewayName(gateway.getGatewayName());
             resource.setEmailAddress(gateway.getEmailAddress());
             resource.setDomain(gateway.getDomain());
-//            resource.setGatewayAcronym(gateway.getG);
-//
-//            gateway.setGatewayAcronym(gatewayAcronym);
-//            gateway.setGatewayUrl(gatewayUrl);
-//            gateway.setGatewayPublicAbstract(gatewayPublicAbstract);
-//            gateway.setReviewProposalDescription(reviewProposalDescription);
+            resource.setGatewayAcronym(gateway.getGatewayAcronym());
+            resource.setGatewayUrl(gateway.getGatewayURL());
+            resource.setGatewayPublicAbstract(gateway.getGatewayPublicAbstract());
+            resource.setReviewProposalDescription(gateway.getReviewProposalDescription());
             resource.save();
             return gateway.getGatewayId();
         }catch (RegistryException e){
@@ -72,6 +70,10 @@ public class GatewayRegistry {
             existingGateway.setGatewayName(updatedGateway.getGatewayName());
             existingGateway.setEmailAddress(updatedGateway.getEmailAddress());
             existingGateway.setDomain(updatedGateway.getDomain());
+            existingGateway.setGatewayAcronym(updatedGateway.getGatewayAcronym());
+            existingGateway.setGatewayUrl(updatedGateway.getGatewayURL());
+            existingGateway.setGatewayPublicAbstract(updatedGateway.getGatewayPublicAbstract());
+            existingGateway.setReviewProposalDescription(updatedGateway.getReviewProposalDescription());
             existingGateway.save();
         }catch (RegistryException e){
             logger.error("Error while updating gateway to registry", e);

http://git-wip-us.apache.org/repos/asf/airavata/blob/fd5d8369/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
index a95b85e..54329d5 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
@@ -82,6 +82,10 @@ public class ThriftDataModelConversion {
         gateway.setGatewayName(resource.getGatewayName());
         gateway.setDomain(resource.getDomain());
         gateway.setEmailAddress(resource.getEmailAddress());
+        gateway.setGatewayAcronym(resource.getGatewayAcronym());
+        gateway.setGatewayURL(resource.getGatewayUrl());
+        gateway.setGatewayPublicAbstract(resource.getGatewayPublicAbstract());
+        gateway.setReviewProposalDescription(resource.getReviewProposalDescription());
         return gateway;
     }
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/fd5d8369/thrift-interface-descriptions/data-models/experiment-catalog-models/workspace_model.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/data-models/experiment-catalog-models/workspace_model.thrift b/thrift-interface-descriptions/data-models/experiment-catalog-models/workspace_model.thrift
index ebc6d4a..1caeeec 100644
--- a/thrift-interface-descriptions/data-models/experiment-catalog-models/workspace_model.thrift
+++ b/thrift-interface-descriptions/data-models/experiment-catalog-models/workspace_model.thrift
@@ -58,7 +58,6 @@ struct User {
 enum GatewayApprovalStatus {
     REQUESTED,
     APPROVED,
-    APPROVED,
     ACTIVE,
     DEACTIVATED
 }


Mime
View raw message