Repository: airavata
Updated Branches:
  refs/heads/airavata-gov-registry 1b9c731a3 -> d07017a38


http://git-wip-us.apache.org/repos/asf/airavata/blob/d07017a3/airavata-gov-registry/airavata-gov-registry-stubs/src/main/java/org/apache/airavata/gov/registry/models/UserGroup.java
----------------------------------------------------------------------
diff --git 
a/airavata-gov-registry/airavata-gov-registry-stubs/src/main/java/org/apache/airavata/gov/registry/models/UserGroup.java
 
b/airavata-gov-registry/airavata-gov-registry-stubs/src/main/java/org/apache/airavata/gov/registry/models/UserGroup.java
new file mode 100644
index 0000000..96758d5
--- /dev/null
+++ 
b/airavata-gov-registry/airavata-gov-registry-stubs/src/main/java/org/apache/airavata/gov/registry/models/UserGroup.java
@@ -0,0 +1,1154 @@
+/**
+ * Autogenerated by Thrift Compiler (0.9.3)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+package org.apache.airavata.gov.registry.models;
+
+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.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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-09-21")
+public class UserGroup implements org.apache.thrift.TBase<UserGroup, 
UserGroup._Fields>, java.io.Serializable, Cloneable, Comparable<UserGroup> {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("UserGroup");
+
+  private static final org.apache.thrift.protocol.TField GROUP_ID_FIELD_DESC = 
new org.apache.thrift.protocol.TField("groupId", 
org.apache.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.thrift.protocol.TField DOMAIN_ID_FIELD_DESC 
= new org.apache.thrift.protocol.TField("domainId", 
org.apache.thrift.protocol.TType.STRING, (short)2);
+  private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new 
org.apache.thrift.protocol.TField("name", 
org.apache.thrift.protocol.TType.STRING, (short)3);
+  private static final org.apache.thrift.protocol.TField 
DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("description", 
org.apache.thrift.protocol.TType.STRING, (short)6);
+  private static final org.apache.thrift.protocol.TField OWNER_ID_FIELD_DESC = 
new org.apache.thrift.protocol.TField("ownerId", 
org.apache.thrift.protocol.TType.STRING, (short)7);
+  private static final org.apache.thrift.protocol.TField 
CREATED_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("createdTime", 
org.apache.thrift.protocol.TType.I64, (short)8);
+  private static final org.apache.thrift.protocol.TField 
UPDATED_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("updatedTime", 
org.apache.thrift.protocol.TType.I64, (short)9);
+  private static final org.apache.thrift.protocol.TField GROUP_TYPE_FIELD_DESC 
= new org.apache.thrift.protocol.TField("groupType", 
org.apache.thrift.protocol.TType.I32, (short)10);
+
+  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = 
new HashMap<Class<? extends IScheme>, SchemeFactory>();
+  static {
+    schemes.put(StandardScheme.class, new UserGroupStandardSchemeFactory());
+    schemes.put(TupleScheme.class, new UserGroupTupleSchemeFactory());
+  }
+
+  public String groupId; // optional
+  public String domainId; // optional
+  public String name; // optional
+  public String description; // optional
+  public String ownerId; // optional
+  public long createdTime; // optional
+  public long updatedTime; // optional
+  /**
+   * 
+   * @see GroupType
+   */
+  public GroupType groupType; // 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 {
+    GROUP_ID((short)1, "groupId"),
+    DOMAIN_ID((short)2, "domainId"),
+    NAME((short)3, "name"),
+    DESCRIPTION((short)6, "description"),
+    OWNER_ID((short)7, "ownerId"),
+    CREATED_TIME((short)8, "createdTime"),
+    UPDATED_TIME((short)9, "updatedTime"),
+    /**
+     * 
+     * @see GroupType
+     */
+    GROUP_TYPE((short)10, "groupType");
+
+    private static final Map<String, _Fields> byName = new HashMap<String, 
_Fields>();
+
+    static {
+      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        byName.put(field.getFieldName(), field);
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, or null if its not 
found.
+     */
+    public static _Fields findByThriftId(int fieldId) {
+      switch(fieldId) {
+        case 1: // GROUP_ID
+          return GROUP_ID;
+        case 2: // DOMAIN_ID
+          return DOMAIN_ID;
+        case 3: // NAME
+          return NAME;
+        case 6: // DESCRIPTION
+          return DESCRIPTION;
+        case 7: // OWNER_ID
+          return OWNER_ID;
+        case 8: // CREATED_TIME
+          return CREATED_TIME;
+        case 9: // UPDATED_TIME
+          return UPDATED_TIME;
+        case 10: // GROUP_TYPE
+          return GROUP_TYPE;
+        default:
+          return null;
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, throwing an exception
+     * if it is not found.
+     */
+    public static _Fields findByThriftIdOrThrow(int fieldId) {
+      _Fields fields = findByThriftId(fieldId);
+      if (fields == null) throw new IllegalArgumentException("Field " + 
fieldId + " doesn't exist!");
+      return fields;
+    }
+
+    /**
+     * Find the _Fields constant that matches name, or null if its not found.
+     */
+    public static _Fields findByName(String name) {
+      return byName.get(name);
+    }
+
+    private final short _thriftId;
+    private final String _fieldName;
+
+    _Fields(short thriftId, String fieldName) {
+      _thriftId = thriftId;
+      _fieldName = fieldName;
+    }
+
+    public short getThriftFieldId() {
+      return _thriftId;
+    }
+
+    public String getFieldName() {
+      return _fieldName;
+    }
+  }
+
+  // isset id assignments
+  private static final int __CREATEDTIME_ISSET_ID = 0;
+  private static final int __UPDATEDTIME_ISSET_ID = 1;
+  private byte __isset_bitfield = 0;
+  private static final _Fields optionals[] = 
{_Fields.GROUP_ID,_Fields.DOMAIN_ID,_Fields.NAME,_Fields.DESCRIPTION,_Fields.OWNER_ID,_Fields.CREATED_TIME,_Fields.UPDATED_TIME,_Fields.GROUP_TYPE};
+  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.GROUP_ID, new 
org.apache.thrift.meta_data.FieldMetaData("groupId", 
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.DOMAIN_ID, new 
org.apache.thrift.meta_data.FieldMetaData("domainId", 
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.NAME, new 
org.apache.thrift.meta_data.FieldMetaData("name", 
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.DESCRIPTION, new 
org.apache.thrift.meta_data.FieldMetaData("description", 
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.OWNER_ID, new 
org.apache.thrift.meta_data.FieldMetaData("ownerId", 
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.CREATED_TIME, new 
org.apache.thrift.meta_data.FieldMetaData("createdTime", 
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+    tmpMap.put(_Fields.UPDATED_TIME, new 
org.apache.thrift.meta_data.FieldMetaData("updatedTime", 
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+    tmpMap.put(_Fields.GROUP_TYPE, new 
org.apache.thrift.meta_data.FieldMetaData("groupType", 
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new 
org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, 
GroupType.class)));
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(UserGroup.class, 
metaDataMap);
+  }
+
+  public UserGroup() {
+    this.groupId = "DO_NOT_SET_AT_CLIENTS_ID";
+
+  }
+
+  /**
+   * Performs a deep copy on <i>other</i>.
+   */
+  public UserGroup(UserGroup other) {
+    __isset_bitfield = other.__isset_bitfield;
+    if (other.isSetGroupId()) {
+      this.groupId = other.groupId;
+    }
+    if (other.isSetDomainId()) {
+      this.domainId = other.domainId;
+    }
+    if (other.isSetName()) {
+      this.name = other.name;
+    }
+    if (other.isSetDescription()) {
+      this.description = other.description;
+    }
+    if (other.isSetOwnerId()) {
+      this.ownerId = other.ownerId;
+    }
+    this.createdTime = other.createdTime;
+    this.updatedTime = other.updatedTime;
+    if (other.isSetGroupType()) {
+      this.groupType = other.groupType;
+    }
+  }
+
+  public UserGroup deepCopy() {
+    return new UserGroup(this);
+  }
+
+  @Override
+  public void clear() {
+    this.groupId = "DO_NOT_SET_AT_CLIENTS_ID";
+
+    this.domainId = null;
+    this.name = null;
+    this.description = null;
+    this.ownerId = null;
+    setCreatedTimeIsSet(false);
+    this.createdTime = 0;
+    setUpdatedTimeIsSet(false);
+    this.updatedTime = 0;
+    this.groupType = null;
+  }
+
+  public String getGroupId() {
+    return this.groupId;
+  }
+
+  public UserGroup setGroupId(String groupId) {
+    this.groupId = groupId;
+    return this;
+  }
+
+  public void unsetGroupId() {
+    this.groupId = null;
+  }
+
+  /** Returns true if field groupId is set (has been assigned a value) and 
false otherwise */
+  public boolean isSetGroupId() {
+    return this.groupId != null;
+  }
+
+  public void setGroupIdIsSet(boolean value) {
+    if (!value) {
+      this.groupId = null;
+    }
+  }
+
+  public String getDomainId() {
+    return this.domainId;
+  }
+
+  public UserGroup setDomainId(String domainId) {
+    this.domainId = domainId;
+    return this;
+  }
+
+  public void unsetDomainId() {
+    this.domainId = null;
+  }
+
+  /** Returns true if field domainId is set (has been assigned a value) and 
false otherwise */
+  public boolean isSetDomainId() {
+    return this.domainId != null;
+  }
+
+  public void setDomainIdIsSet(boolean value) {
+    if (!value) {
+      this.domainId = null;
+    }
+  }
+
+  public String getName() {
+    return this.name;
+  }
+
+  public UserGroup setName(String name) {
+    this.name = name;
+    return this;
+  }
+
+  public void unsetName() {
+    this.name = null;
+  }
+
+  /** Returns true if field name is set (has been assigned a value) and false 
otherwise */
+  public boolean isSetName() {
+    return this.name != null;
+  }
+
+  public void setNameIsSet(boolean value) {
+    if (!value) {
+      this.name = null;
+    }
+  }
+
+  public String getDescription() {
+    return this.description;
+  }
+
+  public UserGroup setDescription(String description) {
+    this.description = description;
+    return this;
+  }
+
+  public void unsetDescription() {
+    this.description = null;
+  }
+
+  /** Returns true if field description is set (has been assigned a value) and 
false otherwise */
+  public boolean isSetDescription() {
+    return this.description != null;
+  }
+
+  public void setDescriptionIsSet(boolean value) {
+    if (!value) {
+      this.description = null;
+    }
+  }
+
+  public String getOwnerId() {
+    return this.ownerId;
+  }
+
+  public UserGroup setOwnerId(String ownerId) {
+    this.ownerId = ownerId;
+    return this;
+  }
+
+  public void unsetOwnerId() {
+    this.ownerId = null;
+  }
+
+  /** Returns true if field ownerId is set (has been assigned a value) and 
false otherwise */
+  public boolean isSetOwnerId() {
+    return this.ownerId != null;
+  }
+
+  public void setOwnerIdIsSet(boolean value) {
+    if (!value) {
+      this.ownerId = null;
+    }
+  }
+
+  public long getCreatedTime() {
+    return this.createdTime;
+  }
+
+  public UserGroup setCreatedTime(long createdTime) {
+    this.createdTime = createdTime;
+    setCreatedTimeIsSet(true);
+    return this;
+  }
+
+  public void unsetCreatedTime() {
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, 
__CREATEDTIME_ISSET_ID);
+  }
+
+  /** Returns true if field createdTime is set (has been assigned a value) and 
false otherwise */
+  public boolean isSetCreatedTime() {
+    return EncodingUtils.testBit(__isset_bitfield, __CREATEDTIME_ISSET_ID);
+  }
+
+  public void setCreatedTimeIsSet(boolean value) {
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, 
__CREATEDTIME_ISSET_ID, value);
+  }
+
+  public long getUpdatedTime() {
+    return this.updatedTime;
+  }
+
+  public UserGroup setUpdatedTime(long updatedTime) {
+    this.updatedTime = updatedTime;
+    setUpdatedTimeIsSet(true);
+    return this;
+  }
+
+  public void unsetUpdatedTime() {
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, 
__UPDATEDTIME_ISSET_ID);
+  }
+
+  /** Returns true if field updatedTime is set (has been assigned a value) and 
false otherwise */
+  public boolean isSetUpdatedTime() {
+    return EncodingUtils.testBit(__isset_bitfield, __UPDATEDTIME_ISSET_ID);
+  }
+
+  public void setUpdatedTimeIsSet(boolean value) {
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, 
__UPDATEDTIME_ISSET_ID, value);
+  }
+
+  /**
+   * 
+   * @see GroupType
+   */
+  public GroupType getGroupType() {
+    return this.groupType;
+  }
+
+  /**
+   * 
+   * @see GroupType
+   */
+  public UserGroup setGroupType(GroupType groupType) {
+    this.groupType = groupType;
+    return this;
+  }
+
+  public void unsetGroupType() {
+    this.groupType = null;
+  }
+
+  /** Returns true if field groupType is set (has been assigned a value) and 
false otherwise */
+  public boolean isSetGroupType() {
+    return this.groupType != null;
+  }
+
+  public void setGroupTypeIsSet(boolean value) {
+    if (!value) {
+      this.groupType = null;
+    }
+  }
+
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
+    case GROUP_ID:
+      if (value == null) {
+        unsetGroupId();
+      } else {
+        setGroupId((String)value);
+      }
+      break;
+
+    case DOMAIN_ID:
+      if (value == null) {
+        unsetDomainId();
+      } else {
+        setDomainId((String)value);
+      }
+      break;
+
+    case NAME:
+      if (value == null) {
+        unsetName();
+      } else {
+        setName((String)value);
+      }
+      break;
+
+    case DESCRIPTION:
+      if (value == null) {
+        unsetDescription();
+      } else {
+        setDescription((String)value);
+      }
+      break;
+
+    case OWNER_ID:
+      if (value == null) {
+        unsetOwnerId();
+      } else {
+        setOwnerId((String)value);
+      }
+      break;
+
+    case CREATED_TIME:
+      if (value == null) {
+        unsetCreatedTime();
+      } else {
+        setCreatedTime((Long)value);
+      }
+      break;
+
+    case UPDATED_TIME:
+      if (value == null) {
+        unsetUpdatedTime();
+      } else {
+        setUpdatedTime((Long)value);
+      }
+      break;
+
+    case GROUP_TYPE:
+      if (value == null) {
+        unsetGroupType();
+      } else {
+        setGroupType((GroupType)value);
+      }
+      break;
+
+    }
+  }
+
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
+    case GROUP_ID:
+      return getGroupId();
+
+    case DOMAIN_ID:
+      return getDomainId();
+
+    case NAME:
+      return getName();
+
+    case DESCRIPTION:
+      return getDescription();
+
+    case OWNER_ID:
+      return getOwnerId();
+
+    case CREATED_TIME:
+      return getCreatedTime();
+
+    case UPDATED_TIME:
+      return getUpdatedTime();
+
+    case GROUP_TYPE:
+      return getGroupType();
+
+    }
+    throw new IllegalStateException();
+  }
+
+  /** Returns true if field corresponding to fieldID is set (has been assigned 
a value) and false otherwise */
+  public boolean isSet(_Fields field) {
+    if (field == null) {
+      throw new IllegalArgumentException();
+    }
+
+    switch (field) {
+    case GROUP_ID:
+      return isSetGroupId();
+    case DOMAIN_ID:
+      return isSetDomainId();
+    case NAME:
+      return isSetName();
+    case DESCRIPTION:
+      return isSetDescription();
+    case OWNER_ID:
+      return isSetOwnerId();
+    case CREATED_TIME:
+      return isSetCreatedTime();
+    case UPDATED_TIME:
+      return isSetUpdatedTime();
+    case GROUP_TYPE:
+      return isSetGroupType();
+    }
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof UserGroup)
+      return this.equals((UserGroup)that);
+    return false;
+  }
+
+  public boolean equals(UserGroup that) {
+    if (that == null)
+      return false;
+
+    boolean this_present_groupId = true && this.isSetGroupId();
+    boolean that_present_groupId = true && that.isSetGroupId();
+    if (this_present_groupId || that_present_groupId) {
+      if (!(this_present_groupId && that_present_groupId))
+        return false;
+      if (!this.groupId.equals(that.groupId))
+        return false;
+    }
+
+    boolean this_present_domainId = true && this.isSetDomainId();
+    boolean that_present_domainId = true && that.isSetDomainId();
+    if (this_present_domainId || that_present_domainId) {
+      if (!(this_present_domainId && that_present_domainId))
+        return false;
+      if (!this.domainId.equals(that.domainId))
+        return false;
+    }
+
+    boolean this_present_name = true && this.isSetName();
+    boolean that_present_name = true && that.isSetName();
+    if (this_present_name || that_present_name) {
+      if (!(this_present_name && that_present_name))
+        return false;
+      if (!this.name.equals(that.name))
+        return false;
+    }
+
+    boolean this_present_description = true && this.isSetDescription();
+    boolean that_present_description = true && that.isSetDescription();
+    if (this_present_description || that_present_description) {
+      if (!(this_present_description && that_present_description))
+        return false;
+      if (!this.description.equals(that.description))
+        return false;
+    }
+
+    boolean this_present_ownerId = true && this.isSetOwnerId();
+    boolean that_present_ownerId = true && that.isSetOwnerId();
+    if (this_present_ownerId || that_present_ownerId) {
+      if (!(this_present_ownerId && that_present_ownerId))
+        return false;
+      if (!this.ownerId.equals(that.ownerId))
+        return false;
+    }
+
+    boolean this_present_createdTime = true && this.isSetCreatedTime();
+    boolean that_present_createdTime = true && that.isSetCreatedTime();
+    if (this_present_createdTime || that_present_createdTime) {
+      if (!(this_present_createdTime && that_present_createdTime))
+        return false;
+      if (this.createdTime != that.createdTime)
+        return false;
+    }
+
+    boolean this_present_updatedTime = true && this.isSetUpdatedTime();
+    boolean that_present_updatedTime = true && that.isSetUpdatedTime();
+    if (this_present_updatedTime || that_present_updatedTime) {
+      if (!(this_present_updatedTime && that_present_updatedTime))
+        return false;
+      if (this.updatedTime != that.updatedTime)
+        return false;
+    }
+
+    boolean this_present_groupType = true && this.isSetGroupType();
+    boolean that_present_groupType = true && that.isSetGroupType();
+    if (this_present_groupType || that_present_groupType) {
+      if (!(this_present_groupType && that_present_groupType))
+        return false;
+      if (!this.groupType.equals(that.groupType))
+        return false;
+    }
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_groupId = true && (isSetGroupId());
+    list.add(present_groupId);
+    if (present_groupId)
+      list.add(groupId);
+
+    boolean present_domainId = true && (isSetDomainId());
+    list.add(present_domainId);
+    if (present_domainId)
+      list.add(domainId);
+
+    boolean present_name = true && (isSetName());
+    list.add(present_name);
+    if (present_name)
+      list.add(name);
+
+    boolean present_description = true && (isSetDescription());
+    list.add(present_description);
+    if (present_description)
+      list.add(description);
+
+    boolean present_ownerId = true && (isSetOwnerId());
+    list.add(present_ownerId);
+    if (present_ownerId)
+      list.add(ownerId);
+
+    boolean present_createdTime = true && (isSetCreatedTime());
+    list.add(present_createdTime);
+    if (present_createdTime)
+      list.add(createdTime);
+
+    boolean present_updatedTime = true && (isSetUpdatedTime());
+    list.add(present_updatedTime);
+    if (present_updatedTime)
+      list.add(updatedTime);
+
+    boolean present_groupType = true && (isSetGroupType());
+    list.add(present_groupType);
+    if (present_groupType)
+      list.add(groupType.getValue());
+
+    return list.hashCode();
+  }
+
+  @Override
+  public int compareTo(UserGroup other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+
+    lastComparison = 
Boolean.valueOf(isSetGroupId()).compareTo(other.isSetGroupId());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetGroupId()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.groupId, 
other.groupId);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = 
Boolean.valueOf(isSetDomainId()).compareTo(other.isSetDomainId());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetDomainId()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.domainId, 
other.domainId);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetName()).compareTo(other.isSetName());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetName()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, 
other.name);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = 
Boolean.valueOf(isSetDescription()).compareTo(other.isSetDescription());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetDescription()) {
+      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.description, other.description);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = 
Boolean.valueOf(isSetOwnerId()).compareTo(other.isSetOwnerId());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetOwnerId()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ownerId, 
other.ownerId);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = 
Boolean.valueOf(isSetCreatedTime()).compareTo(other.isSetCreatedTime());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetCreatedTime()) {
+      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.createdTime, other.createdTime);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = 
Boolean.valueOf(isSetUpdatedTime()).compareTo(other.isSetUpdatedTime());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetUpdatedTime()) {
+      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.updatedTime, other.updatedTime);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = 
Boolean.valueOf(isSetGroupType()).compareTo(other.isSetGroupType());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetGroupType()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.groupType, 
other.groupType);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    return 0;
+  }
+
+  public _Fields fieldForId(int fieldId) {
+    return _Fields.findByThriftId(fieldId);
+  }
+
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws 
org.apache.thrift.TException {
+    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+  }
+
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws 
org.apache.thrift.TException {
+    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder("UserGroup(");
+    boolean first = true;
+
+    if (isSetGroupId()) {
+      sb.append("groupId:");
+      if (this.groupId == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.groupId);
+      }
+      first = false;
+    }
+    if (isSetDomainId()) {
+      if (!first) sb.append(", ");
+      sb.append("domainId:");
+      if (this.domainId == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.domainId);
+      }
+      first = false;
+    }
+    if (isSetName()) {
+      if (!first) sb.append(", ");
+      sb.append("name:");
+      if (this.name == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.name);
+      }
+      first = false;
+    }
+    if (isSetDescription()) {
+      if (!first) sb.append(", ");
+      sb.append("description:");
+      if (this.description == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.description);
+      }
+      first = false;
+    }
+    if (isSetOwnerId()) {
+      if (!first) sb.append(", ");
+      sb.append("ownerId:");
+      if (this.ownerId == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.ownerId);
+      }
+      first = false;
+    }
+    if (isSetCreatedTime()) {
+      if (!first) sb.append(", ");
+      sb.append("createdTime:");
+      sb.append(this.createdTime);
+      first = false;
+    }
+    if (isSetUpdatedTime()) {
+      if (!first) sb.append(", ");
+      sb.append("updatedTime:");
+      sb.append(this.updatedTime);
+      first = false;
+    }
+    if (isSetGroupType()) {
+      if (!first) sb.append(", ");
+      sb.append("groupType:");
+      if (this.groupType == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.groupType);
+      }
+      first = false;
+    }
+    sb.append(")");
+    return sb.toString();
+  }
+
+  public void validate() throws org.apache.thrift.TException {
+    // check for required fields
+    // check for sub-struct validity
+  }
+
+  private void writeObject(java.io.ObjectOutputStream out) throws 
java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new 
org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws 
java.io.IOException, ClassNotFoundException {
+    try {
+      // it doesn't seem like you should have to do this, but java 
serialization is wacky, and doesn't call the default constructor.
+      __isset_bitfield = 0;
+      read(new org.apache.thrift.protocol.TCompactProtocol(new 
org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private static class UserGroupStandardSchemeFactory implements SchemeFactory 
{
+    public UserGroupStandardScheme getScheme() {
+      return new UserGroupStandardScheme();
+    }
+  }
+
+  private static class UserGroupStandardScheme extends 
StandardScheme<UserGroup> {
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot, UserGroup 
struct) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField schemeField;
+      iprot.readStructBegin();
+      while (true)
+      {
+        schemeField = iprot.readFieldBegin();
+        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (schemeField.id) {
+          case 1: // GROUP_ID
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.groupId = iprot.readString();
+              struct.setGroupIdIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
+            }
+            break;
+          case 2: // DOMAIN_ID
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.domainId = iprot.readString();
+              struct.setDomainIdIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
+            }
+            break;
+          case 3: // NAME
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.name = iprot.readString();
+              struct.setNameIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
+            }
+            break;
+          case 6: // DESCRIPTION
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.description = iprot.readString();
+              struct.setDescriptionIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
+            }
+            break;
+          case 7: // OWNER_ID
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.ownerId = iprot.readString();
+              struct.setOwnerIdIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
+            }
+            break;
+          case 8: // CREATED_TIME
+            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+              struct.createdTime = iprot.readI64();
+              struct.setCreatedTimeIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
+            }
+            break;
+          case 9: // UPDATED_TIME
+            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+              struct.updatedTime = iprot.readI64();
+              struct.setUpdatedTimeIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
+            }
+            break;
+          case 10: // GROUP_TYPE
+            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+              struct.groupType = 
org.apache.airavata.gov.registry.models.GroupType.findByValue(iprot.readI32());
+              struct.setGroupTypeIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked 
in the validate method
+      struct.validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot, UserGroup 
struct) throws org.apache.thrift.TException {
+      struct.validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (struct.groupId != null) {
+        if (struct.isSetGroupId()) {
+          oprot.writeFieldBegin(GROUP_ID_FIELD_DESC);
+          oprot.writeString(struct.groupId);
+          oprot.writeFieldEnd();
+        }
+      }
+      if (struct.domainId != null) {
+        if (struct.isSetDomainId()) {
+          oprot.writeFieldBegin(DOMAIN_ID_FIELD_DESC);
+          oprot.writeString(struct.domainId);
+          oprot.writeFieldEnd();
+        }
+      }
+      if (struct.name != null) {
+        if (struct.isSetName()) {
+          oprot.writeFieldBegin(NAME_FIELD_DESC);
+          oprot.writeString(struct.name);
+          oprot.writeFieldEnd();
+        }
+      }
+      if (struct.description != null) {
+        if (struct.isSetDescription()) {
+          oprot.writeFieldBegin(DESCRIPTION_FIELD_DESC);
+          oprot.writeString(struct.description);
+          oprot.writeFieldEnd();
+        }
+      }
+      if (struct.ownerId != null) {
+        if (struct.isSetOwnerId()) {
+          oprot.writeFieldBegin(OWNER_ID_FIELD_DESC);
+          oprot.writeString(struct.ownerId);
+          oprot.writeFieldEnd();
+        }
+      }
+      if (struct.isSetCreatedTime()) {
+        oprot.writeFieldBegin(CREATED_TIME_FIELD_DESC);
+        oprot.writeI64(struct.createdTime);
+        oprot.writeFieldEnd();
+      }
+      if (struct.isSetUpdatedTime()) {
+        oprot.writeFieldBegin(UPDATED_TIME_FIELD_DESC);
+        oprot.writeI64(struct.updatedTime);
+        oprot.writeFieldEnd();
+      }
+      if (struct.groupType != null) {
+        if (struct.isSetGroupType()) {
+          oprot.writeFieldBegin(GROUP_TYPE_FIELD_DESC);
+          oprot.writeI32(struct.groupType.getValue());
+          oprot.writeFieldEnd();
+        }
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+  }
+
+  private static class UserGroupTupleSchemeFactory implements SchemeFactory {
+    public UserGroupTupleScheme getScheme() {
+      return new UserGroupTupleScheme();
+    }
+  }
+
+  private static class UserGroupTupleScheme extends TupleScheme<UserGroup> {
+
+    @Override
+    public void write(org.apache.thrift.protocol.TProtocol prot, UserGroup 
struct) throws org.apache.thrift.TException {
+      TTupleProtocol oprot = (TTupleProtocol) prot;
+      BitSet optionals = new BitSet();
+      if (struct.isSetGroupId()) {
+        optionals.set(0);
+      }
+      if (struct.isSetDomainId()) {
+        optionals.set(1);
+      }
+      if (struct.isSetName()) {
+        optionals.set(2);
+      }
+      if (struct.isSetDescription()) {
+        optionals.set(3);
+      }
+      if (struct.isSetOwnerId()) {
+        optionals.set(4);
+      }
+      if (struct.isSetCreatedTime()) {
+        optionals.set(5);
+      }
+      if (struct.isSetUpdatedTime()) {
+        optionals.set(6);
+      }
+      if (struct.isSetGroupType()) {
+        optionals.set(7);
+      }
+      oprot.writeBitSet(optionals, 8);
+      if (struct.isSetGroupId()) {
+        oprot.writeString(struct.groupId);
+      }
+      if (struct.isSetDomainId()) {
+        oprot.writeString(struct.domainId);
+      }
+      if (struct.isSetName()) {
+        oprot.writeString(struct.name);
+      }
+      if (struct.isSetDescription()) {
+        oprot.writeString(struct.description);
+      }
+      if (struct.isSetOwnerId()) {
+        oprot.writeString(struct.ownerId);
+      }
+      if (struct.isSetCreatedTime()) {
+        oprot.writeI64(struct.createdTime);
+      }
+      if (struct.isSetUpdatedTime()) {
+        oprot.writeI64(struct.updatedTime);
+      }
+      if (struct.isSetGroupType()) {
+        oprot.writeI32(struct.groupType.getValue());
+      }
+    }
+
+    @Override
+    public void read(org.apache.thrift.protocol.TProtocol prot, UserGroup 
struct) throws org.apache.thrift.TException {
+      TTupleProtocol iprot = (TTupleProtocol) prot;
+      BitSet incoming = iprot.readBitSet(8);
+      if (incoming.get(0)) {
+        struct.groupId = iprot.readString();
+        struct.setGroupIdIsSet(true);
+      }
+      if (incoming.get(1)) {
+        struct.domainId = iprot.readString();
+        struct.setDomainIdIsSet(true);
+      }
+      if (incoming.get(2)) {
+        struct.name = iprot.readString();
+        struct.setNameIsSet(true);
+      }
+      if (incoming.get(3)) {
+        struct.description = iprot.readString();
+        struct.setDescriptionIsSet(true);
+      }
+      if (incoming.get(4)) {
+        struct.ownerId = iprot.readString();
+        struct.setOwnerIdIsSet(true);
+      }
+      if (incoming.get(5)) {
+        struct.createdTime = iprot.readI64();
+        struct.setCreatedTimeIsSet(true);
+      }
+      if (incoming.get(6)) {
+        struct.updatedTime = iprot.readI64();
+        struct.setUpdatedTimeIsSet(true);
+      }
+      if (incoming.get(7)) {
+        struct.groupType = 
org.apache.airavata.gov.registry.models.GroupType.findByValue(iprot.readI32());
+        struct.setGroupTypeIsSet(true);
+      }
+    }
+  }
+
+}
+

http://git-wip-us.apache.org/repos/asf/airavata/blob/d07017a3/airavata-gov-registry/airavata-gov-registry-stubs/src/main/java/org/apache/airavata/gov/registry/service/cpi/GovRegistryService.java
----------------------------------------------------------------------
diff --git 
a/airavata-gov-registry/airavata-gov-registry-stubs/src/main/java/org/apache/airavata/gov/registry/service/cpi/GovRegistryService.java
 
b/airavata-gov-registry/airavata-gov-registry-stubs/src/main/java/org/apache/airavata/gov/registry/service/cpi/GovRegistryService.java
index 3bd763f..0fb6325 100644
--- 
a/airavata-gov-registry/airavata-gov-registry-stubs/src/main/java/org/apache/airavata/gov/registry/service/cpi/GovRegistryService.java
+++ 
b/airavata-gov-registry/airavata-gov-registry-stubs/src/main/java/org/apache/airavata/gov/registry/service/cpi/GovRegistryService.java
@@ -34,7 +34,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-09-20")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-09-21")
 public class GovRegistryService {
 
   public interface Iface {
@@ -77,15 +77,15 @@ public class GovRegistryService {
      * 
      * @param group
      */
-    public boolean createGroup(org.apache.airavata.gov.registry.models.Group 
group) throws org.apache.airavata.gov.registry.models.GovRegistryException, 
org.apache.thrift.TException;
+    public boolean 
createGroup(org.apache.airavata.gov.registry.models.UserGroup group) throws 
org.apache.airavata.gov.registry.models.GovRegistryException, 
org.apache.thrift.TException;
 
-    public boolean updateGroup(org.apache.airavata.gov.registry.models.Group 
group) throws org.apache.airavata.gov.registry.models.GovRegistryException, 
org.apache.thrift.TException;
+    public boolean 
updateGroup(org.apache.airavata.gov.registry.models.UserGroup group) throws 
org.apache.airavata.gov.registry.models.GovRegistryException, 
org.apache.thrift.TException;
 
     public boolean deleteGroup(String groupId) throws 
org.apache.airavata.gov.registry.models.GovRegistryException, 
org.apache.thrift.TException;
 
-    public org.apache.airavata.gov.registry.models.Group getGroup(String 
groupId) throws org.apache.airavata.gov.registry.models.GovRegistryException, 
org.apache.thrift.TException;
+    public org.apache.airavata.gov.registry.models.UserGroup getGroup(String 
groupId) throws org.apache.airavata.gov.registry.models.GovRegistryException, 
org.apache.thrift.TException;
 
-    public List<org.apache.airavata.gov.registry.models.Group> 
getGroups(String domain, int offset, int limit) throws 
org.apache.thrift.TException;
+    public List<org.apache.airavata.gov.registry.models.UserGroup> 
getGroups(String domain, int offset, int limit) throws 
org.apache.thrift.TException;
 
     public boolean addUsersToGroup(List<String> userIds, String groupId) 
throws org.apache.airavata.gov.registry.models.GovRegistryException, 
org.apache.thrift.TException;
 
@@ -165,9 +165,9 @@ public class GovRegistryService {
 
     public void getUsers(String domain, int offset, int limit, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
-    public void createGroup(org.apache.airavata.gov.registry.models.Group 
group, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void createGroup(org.apache.airavata.gov.registry.models.UserGroup 
group, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
-    public void updateGroup(org.apache.airavata.gov.registry.models.Group 
group, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void updateGroup(org.apache.airavata.gov.registry.models.UserGroup 
group, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
     public void deleteGroup(String groupId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
@@ -490,13 +490,13 @@ public class GovRegistryService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getUsers failed: unknown result");
     }
 
-    public boolean createGroup(org.apache.airavata.gov.registry.models.Group 
group) throws org.apache.airavata.gov.registry.models.GovRegistryException, 
org.apache.thrift.TException
+    public boolean 
createGroup(org.apache.airavata.gov.registry.models.UserGroup group) throws 
org.apache.airavata.gov.registry.models.GovRegistryException, 
org.apache.thrift.TException
     {
       send_createGroup(group);
       return recv_createGroup();
     }
 
-    public void send_createGroup(org.apache.airavata.gov.registry.models.Group 
group) throws org.apache.thrift.TException
+    public void 
send_createGroup(org.apache.airavata.gov.registry.models.UserGroup group) 
throws org.apache.thrift.TException
     {
       createGroup_args args = new createGroup_args();
       args.setGroup(group);
@@ -516,13 +516,13 @@ public class GovRegistryService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "createGroup failed: unknown result");
     }
 
-    public boolean updateGroup(org.apache.airavata.gov.registry.models.Group 
group) throws org.apache.airavata.gov.registry.models.GovRegistryException, 
org.apache.thrift.TException
+    public boolean 
updateGroup(org.apache.airavata.gov.registry.models.UserGroup group) throws 
org.apache.airavata.gov.registry.models.GovRegistryException, 
org.apache.thrift.TException
     {
       send_updateGroup(group);
       return recv_updateGroup();
     }
 
-    public void send_updateGroup(org.apache.airavata.gov.registry.models.Group 
group) throws org.apache.thrift.TException
+    public void 
send_updateGroup(org.apache.airavata.gov.registry.models.UserGroup group) 
throws org.apache.thrift.TException
     {
       updateGroup_args args = new updateGroup_args();
       args.setGroup(group);
@@ -568,7 +568,7 @@ public class GovRegistryService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "deleteGroup failed: unknown result");
     }
 
-    public org.apache.airavata.gov.registry.models.Group getGroup(String 
groupId) throws org.apache.airavata.gov.registry.models.GovRegistryException, 
org.apache.thrift.TException
+    public org.apache.airavata.gov.registry.models.UserGroup getGroup(String 
groupId) throws org.apache.airavata.gov.registry.models.GovRegistryException, 
org.apache.thrift.TException
     {
       send_getGroup(groupId);
       return recv_getGroup();
@@ -581,7 +581,7 @@ public class GovRegistryService {
       sendBase("getGroup", args);
     }
 
-    public org.apache.airavata.gov.registry.models.Group recv_getGroup() 
throws org.apache.airavata.gov.registry.models.GovRegistryException, 
org.apache.thrift.TException
+    public org.apache.airavata.gov.registry.models.UserGroup recv_getGroup() 
throws org.apache.airavata.gov.registry.models.GovRegistryException, 
org.apache.thrift.TException
     {
       getGroup_result result = new getGroup_result();
       receiveBase(result, "getGroup");
@@ -594,7 +594,7 @@ public class GovRegistryService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getGroup failed: unknown result");
     }
 
-    public List<org.apache.airavata.gov.registry.models.Group> 
getGroups(String domain, int offset, int limit) throws 
org.apache.thrift.TException
+    public List<org.apache.airavata.gov.registry.models.UserGroup> 
getGroups(String domain, int offset, int limit) throws 
org.apache.thrift.TException
     {
       send_getGroups(domain, offset, limit);
       return recv_getGroups();
@@ -609,7 +609,7 @@ public class GovRegistryService {
       sendBase("getGroups", args);
     }
 
-    public List<org.apache.airavata.gov.registry.models.Group> 
recv_getGroups() throws org.apache.thrift.TException
+    public List<org.apache.airavata.gov.registry.models.UserGroup> 
recv_getGroups() throws org.apache.thrift.TException
     {
       getGroups_result result = new getGroups_result();
       receiveBase(result, "getGroups");
@@ -1438,7 +1438,7 @@ public class GovRegistryService {
       }
     }
 
-    public void createGroup(org.apache.airavata.gov.registry.models.Group 
group, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
+    public void createGroup(org.apache.airavata.gov.registry.models.UserGroup 
group, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
       checkReady();
       createGroup_call method_call = new createGroup_call(group, 
resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -1446,8 +1446,8 @@ public class GovRegistryService {
     }
 
     public static class createGroup_call extends 
org.apache.thrift.async.TAsyncMethodCall {
-      private org.apache.airavata.gov.registry.models.Group group;
-      public createGroup_call(org.apache.airavata.gov.registry.models.Group 
group, org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+      private org.apache.airavata.gov.registry.models.UserGroup group;
+      public 
createGroup_call(org.apache.airavata.gov.registry.models.UserGroup group, 
org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.group = group;
       }
@@ -1470,7 +1470,7 @@ public class GovRegistryService {
       }
     }
 
-    public void updateGroup(org.apache.airavata.gov.registry.models.Group 
group, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
+    public void updateGroup(org.apache.airavata.gov.registry.models.UserGroup 
group, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
       checkReady();
       updateGroup_call method_call = new updateGroup_call(group, 
resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -1478,8 +1478,8 @@ public class GovRegistryService {
     }
 
     public static class updateGroup_call extends 
org.apache.thrift.async.TAsyncMethodCall {
-      private org.apache.airavata.gov.registry.models.Group group;
-      public updateGroup_call(org.apache.airavata.gov.registry.models.Group 
group, org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+      private org.apache.airavata.gov.registry.models.UserGroup group;
+      public 
updateGroup_call(org.apache.airavata.gov.registry.models.UserGroup group, 
org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.group = group;
       }
@@ -1556,7 +1556,7 @@ public class GovRegistryService {
         prot.writeMessageEnd();
       }
 
-      public org.apache.airavata.gov.registry.models.Group getResult() throws 
org.apache.airavata.gov.registry.models.GovRegistryException, 
org.apache.thrift.TException {
+      public org.apache.airavata.gov.registry.models.UserGroup getResult() 
throws org.apache.airavata.gov.registry.models.GovRegistryException, 
org.apache.thrift.TException {
         if (getState() != 
org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -1594,7 +1594,7 @@ public class GovRegistryService {
         prot.writeMessageEnd();
       }
 
-      public List<org.apache.airavata.gov.registry.models.Group> getResult() 
throws org.apache.thrift.TException {
+      public List<org.apache.airavata.gov.registry.models.UserGroup> 
getResult() throws org.apache.thrift.TException {
         if (getState() != 
org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -3838,7 +3838,7 @@ public class GovRegistryService {
       }
     }
 
-    public static class getGroup<I extends AsyncIface> extends 
org.apache.thrift.AsyncProcessFunction<I, getGroup_args, 
org.apache.airavata.gov.registry.models.Group> {
+    public static class getGroup<I extends AsyncIface> extends 
org.apache.thrift.AsyncProcessFunction<I, getGroup_args, 
org.apache.airavata.gov.registry.models.UserGroup> {
       public getGroup() {
         super("getGroup");
       }
@@ -3847,10 +3847,10 @@ public class GovRegistryService {
         return new getGroup_args();
       }
 
-      public 
AsyncMethodCallback<org.apache.airavata.gov.registry.models.Group> 
getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public 
AsyncMethodCallback<org.apache.airavata.gov.registry.models.UserGroup> 
getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new 
AsyncMethodCallback<org.apache.airavata.gov.registry.models.Group>() { 
-          public void onComplete(org.apache.airavata.gov.registry.models.Group 
o) {
+        return new 
AsyncMethodCallback<org.apache.airavata.gov.registry.models.UserGroup>() { 
+          public void 
onComplete(org.apache.airavata.gov.registry.models.UserGroup o) {
             getGroup_result result = new getGroup_result();
             result.success = o;
             try {
@@ -3890,12 +3890,12 @@ public class GovRegistryService {
         return false;
       }
 
-      public void start(I iface, getGroup_args args, 
org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.gov.registry.models.Group>
 resultHandler) throws TException {
+      public void start(I iface, getGroup_args args, 
org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.gov.registry.models.UserGroup>
 resultHandler) throws TException {
         iface.getGroup(args.groupId,resultHandler);
       }
     }
 
-    public static class getGroups<I extends AsyncIface> extends 
org.apache.thrift.AsyncProcessFunction<I, getGroups_args, 
List<org.apache.airavata.gov.registry.models.Group>> {
+    public static class getGroups<I extends AsyncIface> extends 
org.apache.thrift.AsyncProcessFunction<I, getGroups_args, 
List<org.apache.airavata.gov.registry.models.UserGroup>> {
       public getGroups() {
         super("getGroups");
       }
@@ -3904,10 +3904,10 @@ public class GovRegistryService {
         return new getGroups_args();
       }
 
-      public 
AsyncMethodCallback<List<org.apache.airavata.gov.registry.models.Group>> 
getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public 
AsyncMethodCallback<List<org.apache.airavata.gov.registry.models.UserGroup>> 
getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new 
AsyncMethodCallback<List<org.apache.airavata.gov.registry.models.Group>>() { 
-          public void 
onComplete(List<org.apache.airavata.gov.registry.models.Group> o) {
+        return new 
AsyncMethodCallback<List<org.apache.airavata.gov.registry.models.UserGroup>>() 
{ 
+          public void 
onComplete(List<org.apache.airavata.gov.registry.models.UserGroup> o) {
             getGroups_result result = new getGroups_result();
             result.success = o;
             try {
@@ -3941,7 +3941,7 @@ public class GovRegistryService {
         return false;
       }
 
-      public void start(I iface, getGroups_args args, 
org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.gov.registry.models.Group>>
 resultHandler) throws TException {
+      public void start(I iface, getGroups_args args, 
org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.gov.registry.models.UserGroup>>
 resultHandler) throws TException {
         iface.getGroups(args.domain, args.offset, args.limit,resultHandler);
       }
     }
@@ -13419,7 +13419,7 @@ public class GovRegistryService {
       schemes.put(TupleScheme.class, new createGroup_argsTupleSchemeFactory());
     }
 
-    public org.apache.airavata.gov.registry.models.Group group; // required
+    public org.apache.airavata.gov.registry.models.UserGroup group; // required
 
     /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -13484,7 +13484,7 @@ public class GovRegistryService {
     static {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new 
EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.GROUP, new 
org.apache.thrift.meta_data.FieldMetaData("group", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
-          new 
org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
 org.apache.airavata.gov.registry.models.Group.class)));
+          new 
org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
 org.apache.airavata.gov.registry.models.UserGroup.class)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(createGroup_args.class,
 metaDataMap);
     }
@@ -13493,7 +13493,7 @@ public class GovRegistryService {
     }
 
     public createGroup_args(
-      org.apache.airavata.gov.registry.models.Group group)
+      org.apache.airavata.gov.registry.models.UserGroup group)
     {
       this();
       this.group = group;
@@ -13504,7 +13504,7 @@ public class GovRegistryService {
      */
     public createGroup_args(createGroup_args other) {
       if (other.isSetGroup()) {
-        this.group = new 
org.apache.airavata.gov.registry.models.Group(other.group);
+        this.group = new 
org.apache.airavata.gov.registry.models.UserGroup(other.group);
       }
     }
 
@@ -13517,11 +13517,11 @@ public class GovRegistryService {
       this.group = null;
     }
 
-    public org.apache.airavata.gov.registry.models.Group getGroup() {
+    public org.apache.airavata.gov.registry.models.UserGroup getGroup() {
       return this.group;
     }
 
-    public createGroup_args 
setGroup(org.apache.airavata.gov.registry.models.Group group) {
+    public createGroup_args 
setGroup(org.apache.airavata.gov.registry.models.UserGroup group) {
       this.group = group;
       return this;
     }
@@ -13547,7 +13547,7 @@ public class GovRegistryService {
         if (value == null) {
           unsetGroup();
         } else {
-          setGroup((org.apache.airavata.gov.registry.models.Group)value);
+          setGroup((org.apache.airavata.gov.registry.models.UserGroup)value);
         }
         break;
 
@@ -13709,7 +13709,7 @@ public class GovRegistryService {
           switch (schemeField.id) {
             case 1: // GROUP
               if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) 
{
-                struct.group = new 
org.apache.airavata.gov.registry.models.Group();
+                struct.group = new 
org.apache.airavata.gov.registry.models.UserGroup();
                 struct.group.read(iprot);
                 struct.setGroupIsSet(true);
               } else { 
@@ -13759,7 +13759,7 @@ public class GovRegistryService {
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, 
createGroup_args struct) throws org.apache.thrift.TException {
         TTupleProtocol iprot = (TTupleProtocol) prot;
-        struct.group = new org.apache.airavata.gov.registry.models.Group();
+        struct.group = new org.apache.airavata.gov.registry.models.UserGroup();
         struct.group.read(iprot);
         struct.setGroupIsSet(true);
       }
@@ -14246,7 +14246,7 @@ public class GovRegistryService {
       schemes.put(TupleScheme.class, new updateGroup_argsTupleSchemeFactory());
     }
 
-    public org.apache.airavata.gov.registry.models.Group group; // required
+    public org.apache.airavata.gov.registry.models.UserGroup group; // required
 
     /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -14311,7 +14311,7 @@ public class GovRegistryService {
     static {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new 
EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.GROUP, new 
org.apache.thrift.meta_data.FieldMetaData("group", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
-          new 
org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
 org.apache.airavata.gov.registry.models.Group.class)));
+          new 
org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
 org.apache.airavata.gov.registry.models.UserGroup.class)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(updateGroup_args.class,
 metaDataMap);
     }
@@ -14320,7 +14320,7 @@ public class GovRegistryService {
     }
 
     public updateGroup_args(
-      org.apache.airavata.gov.registry.models.Group group)
+      org.apache.airavata.gov.registry.models.UserGroup group)
     {
       this();
       this.group = group;
@@ -14331,7 +14331,7 @@ public class GovRegistryService {
      */
     public updateGroup_args(updateGroup_args other) {
       if (other.isSetGroup()) {
-        this.group = new 
org.apache.airavata.gov.registry.models.Group(other.group);
+        this.group = new 
org.apache.airavata.gov.registry.models.UserGroup(other.group);
       }
     }
 
@@ -14344,11 +14344,11 @@ public class GovRegistryService {
       this.group = null;
     }
 
-    public org.apache.airavata.gov.registry.models.Group getGroup() {
+    public org.apache.airavata.gov.registry.models.UserGroup getGroup() {
       return this.group;
     }
 
-    public updateGroup_args 
setGroup(org.apache.airavata.gov.registry.models.Group group) {
+    public updateGroup_args 
setGroup(org.apache.airavata.gov.registry.models.UserGroup group) {
       this.group = group;
       return this;
     }
@@ -14374,7 +14374,7 @@ public class GovRegistryService {
         if (value == null) {
           unsetGroup();
         } else {
-          setGroup((org.apache.airavata.gov.registry.models.Group)value);
+          setGroup((org.apache.airavata.gov.registry.models.UserGroup)value);
         }
         break;
 
@@ -14536,7 +14536,7 @@ public class GovRegistryService {
           switch (schemeField.id) {
             case 1: // GROUP
               if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) 
{
-                struct.group = new 
org.apache.airavata.gov.registry.models.Group();
+                struct.group = new 
org.apache.airavata.gov.registry.models.UserGroup();
                 struct.group.read(iprot);
                 struct.setGroupIsSet(true);
               } else { 
@@ -14586,7 +14586,7 @@ public class GovRegistryService {
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, 
updateGroup_args struct) throws org.apache.thrift.TException {
         TTupleProtocol iprot = (TTupleProtocol) prot;
-        struct.group = new org.apache.airavata.gov.registry.models.Group();
+        struct.group = new org.apache.airavata.gov.registry.models.UserGroup();
         struct.group.read(iprot);
         struct.setGroupIsSet(true);
       }
@@ -16250,7 +16250,7 @@ public class GovRegistryService {
       schemes.put(TupleScheme.class, new getGroup_resultTupleSchemeFactory());
     }
 
-    public org.apache.airavata.gov.registry.models.Group success; // required
+    public org.apache.airavata.gov.registry.models.UserGroup success; // 
required
     public org.apache.airavata.gov.registry.models.GovRegistryException gre; 
// required
 
     /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
@@ -16319,7 +16319,7 @@ public class GovRegistryService {
     static {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new 
EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new 
org.apache.thrift.meta_data.FieldMetaData("success", 
org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new 
org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
 org.apache.airavata.gov.registry.models.Group.class)));
+          new 
org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
 org.apache.airavata.gov.registry.models.UserGroup.class)));
       tmpMap.put(_Fields.GRE, new 
org.apache.thrift.meta_data.FieldMetaData("gre", 
org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
@@ -16330,7 +16330,7 @@ public class GovRegistryService {
     }
 
     public getGroup_result(
-      org.apache.airavata.gov.registry.models.Group success,
+      org.apache.airavata.gov.registry.models.UserGroup success,
       org.apache.airavata.gov.registry.models.GovRegistryException gre)
     {
       this();
@@ -16343,7 +16343,7 @@ public class GovRegistryService {
      */
     public getGroup_result(getGroup_result other) {
       if (other.isSetSuccess()) {
-        this.success = new 
org.apache.airavata.gov.registry.models.Group(other.success);
+        this.success = new 
org.apache.airavata.gov.registry.models.UserGroup(other.success);
       }
       if (other.isSetGre()) {
         this.gre = new 
org.apache.airavata.gov.registry.models.GovRegistryException(other.gre);
@@ -16360,11 +16360,11 @@ public class GovRegistryService {
       this.gre = null;
     }
 
-    public org.apache.airavata.gov.registry.models.Group getSuccess() {
+    public org.apache.airavata.gov.registry.models.UserGroup getSuccess() {
       return this.success;
     }
 
-    public getGroup_result 
setSuccess(org.apache.airavata.gov.registry.models.Group success) {
+    public getGroup_result 
setSuccess(org.apache.airavata.gov.registry.models.UserGroup success) {
       this.success = success;
       return this;
     }
@@ -16414,7 +16414,7 @@ public class GovRegistryService {
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((org.apache.airavata.gov.registry.models.Group)value);
+          setSuccess((org.apache.airavata.gov.registry.models.UserGroup)value);
         }
         break;
 
@@ -16618,7 +16618,7 @@ public class GovRegistryService {
           switch (schemeField.id) {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) 
{
-                struct.success = new 
org.apache.airavata.gov.registry.models.Group();
+                struct.success = new 
org.apache.airavata.gov.registry.models.UserGroup();
                 struct.success.read(iprot);
                 struct.setSuccessIsSet(true);
               } else { 
@@ -16697,7 +16697,7 @@ public class GovRegistryService {
         TTupleProtocol iprot = (TTupleProtocol) prot;
         BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
-          struct.success = new org.apache.airavata.gov.registry.models.Group();
+          struct.success = new 
org.apache.airavata.gov.registry.models.UserGroup();
           struct.success.read(iprot);
           struct.setSuccessIsSet(true);
         }
@@ -17272,7 +17272,7 @@ public class GovRegistryService {
       schemes.put(TupleScheme.class, new getGroups_resultTupleSchemeFactory());
     }
 
-    public List<org.apache.airavata.gov.registry.models.Group> success; // 
required
+    public List<org.apache.airavata.gov.registry.models.UserGroup> success; // 
required
 
     /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -17338,7 +17338,7 @@ public class GovRegistryService {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new 
EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new 
org.apache.thrift.meta_data.FieldMetaData("success", 
org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new 
org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-              new 
org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
 org.apache.airavata.gov.registry.models.Group.class))));
+              new 
org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
 org.apache.airavata.gov.registry.models.UserGroup.class))));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getGroups_result.class,
 metaDataMap);
     }
@@ -17347,7 +17347,7 @@ public class GovRegistryService {
     }
 
     public getGroups_result(
-      List<org.apache.airavata.gov.registry.models.Group> success)
+      List<org.apache.airavata.gov.registry.models.UserGroup> success)
     {
       this();
       this.success = success;
@@ -17358,9 +17358,9 @@ public class GovRegistryService {
      */
     public getGroups_result(getGroups_result other) {
       if (other.isSetSuccess()) {
-        List<org.apache.airavata.gov.registry.models.Group> __this__success = 
new 
ArrayList<org.apache.airavata.gov.registry.models.Group>(other.success.size());
-        for (org.apache.airavata.gov.registry.models.Group other_element : 
other.success) {
-          __this__success.add(new 
org.apache.airavata.gov.registry.models.Group(other_element));
+        List<org.apache.airavata.gov.registry.models.UserGroup> 
__this__success = new 
ArrayList<org.apache.airavata.gov.registry.models.UserGroup>(other.success.size());
+        for (org.apache.airavata.gov.registry.models.UserGroup other_element : 
other.success) {
+          __this__success.add(new 
org.apache.airavata.gov.registry.models.UserGroup(other_element));
         }
         this.success = __this__success;
       }
@@ -17379,22 +17379,22 @@ public class GovRegistryService {
       return (this.success == null) ? 0 : this.success.size();
     }
 
-    public java.util.Iterator<org.apache.airavata.gov.registry.models.Group> 
getSuccessIterator() {
+    public 
java.util.Iterator<org.apache.airavata.gov.registry.models.UserGroup> 
getSuccessIterator() {
       return (this.success == null) ? null : this.success.iterator();
     }
 
-    public void addToSuccess(org.apache.airavata.gov.registry.models.Group 
elem) {
+    public void addToSuccess(org.apache.airavata.gov.registry.models.UserGroup 
elem) {
       if (this.success == null) {
-        this.success = new 
ArrayList<org.apache.airavata.gov.registry.models.Group>();
+        this.success = new 
ArrayList<org.apache.airavata.gov.registry.models.UserGroup>();
       }
       this.success.add(elem);
     }
 
-    public List<org.apache.airavata.gov.registry.models.Group> getSuccess() {
+    public List<org.apache.airavata.gov.registry.models.UserGroup> 
getSuccess() {
       return this.success;
     }
 
-    public getGroups_result 
setSuccess(List<org.apache.airavata.gov.registry.models.Group> success) {
+    public getGroups_result 
setSuccess(List<org.apache.airavata.gov.registry.models.UserGroup> success) {
       this.success = success;
       return this;
     }
@@ -17420,7 +17420,7 @@ public class GovRegistryService {
         if (value == null) {
           unsetSuccess();
         } else {
-          
setSuccess((List<org.apache.airavata.gov.registry.models.Group>)value);
+          
setSuccess((List<org.apache.airavata.gov.registry.models.UserGroup>)value);
         }
         break;
 
@@ -17578,11 +17578,11 @@ public class GovRegistryService {
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
                   org.apache.thrift.protocol.TList _list16 = 
iprot.readListBegin();
-                  struct.success = new 
ArrayList<org.apache.airavata.gov.registry.models.Group>(_list16.size);
-                  org.apache.airavata.gov.registry.models.Group _elem17;
+                  struct.success = new 
ArrayList<org.apache.airavata.gov.registry.models.UserGroup>(_list16.size);
+                  org.apache.airavata.gov.registry.models.UserGroup _elem17;
                   for (int _i18 = 0; _i18 < _list16.size; ++_i18)
                   {
-                    _elem17 = new 
org.apache.airavata.gov.registry.models.Group();
+                    _elem17 = new 
org.apache.airavata.gov.registry.models.UserGroup();
                     _elem17.read(iprot);
                     struct.success.add(_elem17);
                   }
@@ -17612,7 +17612,7 @@ public class GovRegistryService {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, 
struct.success.size()));
-            for (org.apache.airavata.gov.registry.models.Group _iter19 : 
struct.success)
+            for (org.apache.airavata.gov.registry.models.UserGroup _iter19 : 
struct.success)
             {
               _iter19.write(oprot);
             }
@@ -17645,7 +17645,7 @@ public class GovRegistryService {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (org.apache.airavata.gov.registry.models.Group _iter20 : 
struct.success)
+            for (org.apache.airavata.gov.registry.models.UserGroup _iter20 : 
struct.success)
             {
               _iter20.write(oprot);
             }
@@ -17660,11 +17660,11 @@ public class GovRegistryService {
         if (incoming.get(0)) {
           {
             org.apache.thrift.protocol.TList _list21 = new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, 
iprot.readI32());
-            struct.success = new 
ArrayList<org.apache.airavata.gov.registry.models.Group>(_list21.size);
-            org.apache.airavata.gov.registry.models.Group _elem22;
+            struct.success = new 
ArrayList<org.apache.airavata.gov.registry.models.UserGroup>(_list21.size);
+            org.apache.airavata.gov.registry.models.UserGroup _elem22;
             for (int _i23 = 0; _i23 < _list21.size; ++_i23)
             {
-              _elem22 = new org.apache.airavata.gov.registry.models.Group();
+              _elem22 = new 
org.apache.airavata.gov.registry.models.UserGroup();
               _elem22.read(iprot);
               struct.success.add(_elem22);
             }

http://git-wip-us.apache.org/repos/asf/airavata/blob/d07017a3/airavata-gov-registry/pom.xml
----------------------------------------------------------------------
diff --git a/airavata-gov-registry/pom.xml b/airavata-gov-registry/pom.xml
index fb65085..46f801f 100644
--- a/airavata-gov-registry/pom.xml
+++ b/airavata-gov-registry/pom.xml
@@ -17,5 +17,4 @@
         <module>airavata-gov-registry-stubs</module>
         <module>airavata-gov-registry-core</module>
     </modules>
-
 </project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/d07017a3/airavata-gov-registry/thrift_models/gov_reg_cpi.thrift
----------------------------------------------------------------------
diff --git a/airavata-gov-registry/thrift_models/gov_reg_cpi.thrift 
b/airavata-gov-registry/thrift_models/gov_reg_cpi.thrift
index f7289e2..bbf2e89 100644
--- a/airavata-gov-registry/thrift_models/gov_reg_cpi.thrift
+++ b/airavata-gov-registry/thrift_models/gov_reg_cpi.thrift
@@ -45,11 +45,11 @@ service GovRegistryService {
     /**
      * Group Operations
     **/
-    bool createGroup(1: required gov_reg_models.Group group) throws (1: 
gov_reg_models.GovRegistryException gre)
-    bool updateGroup(1: required gov_reg_models.Group group) throws (1: 
gov_reg_models.GovRegistryException gre)
+    bool createGroup(1: required gov_reg_models.UserGroup group) throws (1: 
gov_reg_models.GovRegistryException gre)
+    bool updateGroup(1: required gov_reg_models.UserGroup group) throws (1: 
gov_reg_models.GovRegistryException gre)
     bool deleteGroup(1: required string groupId) throws (1: 
gov_reg_models.GovRegistryException gre)
-    gov_reg_models.Group getGroup(1: required string groupId) throws (1: 
gov_reg_models.GovRegistryException gre)
-    list<gov_reg_models.Group> getGroups(1: required string domain, 2: 
required i32 offset, 3: required i32 limit)
+    gov_reg_models.UserGroup getGroup(1: required string groupId) throws (1: 
gov_reg_models.GovRegistryException gre)
+    list<gov_reg_models.UserGroup> getGroups(1: required string domain, 2: 
required i32 offset, 3: required i32 limit)
 
     bool addUsersToGroup(1: required list<string> userIds, 2: required string 
groupId) throws (1: gov_reg_models.GovRegistryException gre);
     bool removeUsersFromGroup(1: required list<string> userIds, 2: required 
string groupId) throws (1: gov_reg_models.GovRegistryException gre);

http://git-wip-us.apache.org/repos/asf/airavata/blob/d07017a3/airavata-gov-registry/thrift_models/gov_reg_models.thrift
----------------------------------------------------------------------
diff --git a/airavata-gov-registry/thrift_models/gov_reg_models.thrift 
b/airavata-gov-registry/thrift_models/gov_reg_models.thrift
index ad081ae..c2d64eb 100644
--- a/airavata-gov-registry/thrift_models/gov_reg_models.thrift
+++ b/airavata-gov-registry/thrift_models/gov_reg_models.thrift
@@ -43,7 +43,7 @@ enum GroupType {
     MULTI_USER
 }
 
- struct Group {
+ struct UserGroup {
      1: optional string groupId = DO_NOT_SET_AT_CLIENTS_ID,
      2: optional string domainId,
      3: optional string name,

Reply via email to