http://git-wip-us.apache.org/repos/asf/airavata/blob/8e775660/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java
index 65ad6ad..9b804da 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java
@@ -16,41 +16,14 @@
  */
 
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.airavata.model.appcatalog.computeresource;
 
-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"})
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 /**
  * Computational Resource Description
  * 
@@ -80,7 +53,7 @@ import org.slf4j.LoggerFactory;
  *  Map of file systems type and the path.
  * 
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
 public class ComputeResourceDescription implements 
org.apache.thrift.TBase<ComputeResourceDescription, 
ComputeResourceDescription._Fields>, java.io.Serializable, Cloneable, 
Comparable<ComputeResourceDescription> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("ComputeResourceDescription");
 
@@ -103,26 +76,23 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
   private static final org.apache.thrift.protocol.TField 
DEFAULT_CPUCOUNT_FIELD_DESC = new 
org.apache.thrift.protocol.TField("defaultCPUCount", 
org.apache.thrift.protocol.TType.I32, (short)17);
   private static final org.apache.thrift.protocol.TField 
DEFAULT_WALLTIME_FIELD_DESC = new 
org.apache.thrift.protocol.TField("defaultWalltime", 
org.apache.thrift.protocol.TType.I32, (short)18);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = 
new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new 
ComputeResourceDescriptionStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new 
ComputeResourceDescriptionTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory 
STANDARD_SCHEME_FACTORY = new ComputeResourceDescriptionStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory 
TUPLE_SCHEME_FACTORY = new ComputeResourceDescriptionTupleSchemeFactory();
 
-  private String computeResourceId; // required
-  private String hostName; // required
-  private List<String> hostAliases; // optional
-  private List<String> ipAddresses; // optional
-  private String resourceDescription; // optional
+  private java.lang.String computeResourceId; // required
+  private java.lang.String hostName; // required
+  private java.util.List<java.lang.String> hostAliases; // optional
+  private java.util.List<java.lang.String> ipAddresses; // optional
+  private java.lang.String resourceDescription; // optional
   private boolean enabled; // optional
-  private List<BatchQueue> batchQueues; // optional
-  private Map<FileSystems,String> fileSystems; // optional
-  private List<JobSubmissionInterface> jobSubmissionInterfaces; // optional
-  private List<org.apache.airavata.model.data.movement.DataMovementInterface> 
dataMovementInterfaces; // optional
+  private java.util.List<BatchQueue> batchQueues; // optional
+  private java.util.Map<FileSystems,java.lang.String> fileSystems; // optional
+  private java.util.List<JobSubmissionInterface> jobSubmissionInterfaces; // 
optional
+  private 
java.util.List<org.apache.airavata.model.data.movement.DataMovementInterface> 
dataMovementInterfaces; // optional
   private int maxMemoryPerNode; // optional
   private boolean gatewayUsageReporting; // optional
-  private String gatewayUsageModuleLoadCommand; // optional
-  private String gatewayUsageExecutable; // optional
+  private java.lang.String gatewayUsageModuleLoadCommand; // optional
+  private java.lang.String gatewayUsageExecutable; // optional
   private int cpusPerNode; // optional
   private int defaultNodeCount; // optional
   private int defaultCPUCount; // optional
@@ -149,10 +119,10 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
     DEFAULT_CPUCOUNT((short)17, "defaultCPUCount"),
     DEFAULT_WALLTIME((short)18, "defaultWalltime");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, 
_Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new 
java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -209,21 +179,21 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + 
fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.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) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -232,7 +202,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -247,9 +217,9 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
   private static final int __DEFAULTWALLTIME_ISSET_ID = 6;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = 
{_Fields.HOST_ALIASES,_Fields.IP_ADDRESSES,_Fields.RESOURCE_DESCRIPTION,_Fields.ENABLED,_Fields.BATCH_QUEUES,_Fields.FILE_SYSTEMS,_Fields.JOB_SUBMISSION_INTERFACES,_Fields.DATA_MOVEMENT_INTERFACES,_Fields.MAX_MEMORY_PER_NODE,_Fields.GATEWAY_USAGE_REPORTING,_Fields.GATEWAY_USAGE_MODULE_LOAD_COMMAND,_Fields.GATEWAY_USAGE_EXECUTABLE,_Fields.CPUS_PER_NODE,_Fields.DEFAULT_NODE_COUNT,_Fields.DEFAULT_CPUCOUNT,_Fields.DEFAULT_WALLTIME};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> 
metaDataMap;
+  public static final java.util.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);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = 
new java.util.EnumMap<_Fields, 
org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.COMPUTE_RESOURCE_ID, new 
org.apache.thrift.meta_data.FieldMetaData("computeResourceId", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.HOST_NAME, new 
org.apache.thrift.meta_data.FieldMetaData("hostName", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
@@ -293,7 +263,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
         new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
     tmpMap.put(_Fields.DEFAULT_WALLTIME, new 
org.apache.thrift.meta_data.FieldMetaData("defaultWalltime", 
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ComputeResourceDescription.class,
 metaDataMap);
   }
 
@@ -303,8 +273,8 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
   }
 
   public ComputeResourceDescription(
-    String computeResourceId,
-    String hostName)
+    java.lang.String computeResourceId,
+    java.lang.String hostName)
   {
     this();
     this.computeResourceId = computeResourceId;
@@ -323,11 +293,11 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
       this.hostName = other.hostName;
     }
     if (other.isSetHostAliases()) {
-      List<String> __this__hostAliases = new 
ArrayList<String>(other.hostAliases);
+      java.util.List<java.lang.String> __this__hostAliases = new 
java.util.ArrayList<java.lang.String>(other.hostAliases);
       this.hostAliases = __this__hostAliases;
     }
     if (other.isSetIpAddresses()) {
-      List<String> __this__ipAddresses = new 
ArrayList<String>(other.ipAddresses);
+      java.util.List<java.lang.String> __this__ipAddresses = new 
java.util.ArrayList<java.lang.String>(other.ipAddresses);
       this.ipAddresses = __this__ipAddresses;
     }
     if (other.isSetResourceDescription()) {
@@ -335,36 +305,36 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
     }
     this.enabled = other.enabled;
     if (other.isSetBatchQueues()) {
-      List<BatchQueue> __this__batchQueues = new 
ArrayList<BatchQueue>(other.batchQueues.size());
+      java.util.List<BatchQueue> __this__batchQueues = new 
java.util.ArrayList<BatchQueue>(other.batchQueues.size());
       for (BatchQueue other_element : other.batchQueues) {
         __this__batchQueues.add(new BatchQueue(other_element));
       }
       this.batchQueues = __this__batchQueues;
     }
     if (other.isSetFileSystems()) {
-      Map<FileSystems,String> __this__fileSystems = new 
HashMap<FileSystems,String>(other.fileSystems.size());
-      for (Map.Entry<FileSystems, String> other_element : 
other.fileSystems.entrySet()) {
+      java.util.Map<FileSystems,java.lang.String> __this__fileSystems = new 
java.util.HashMap<FileSystems,java.lang.String>(other.fileSystems.size());
+      for (java.util.Map.Entry<FileSystems, java.lang.String> other_element : 
other.fileSystems.entrySet()) {
 
         FileSystems other_element_key = other_element.getKey();
-        String other_element_value = other_element.getValue();
+        java.lang.String other_element_value = other_element.getValue();
 
         FileSystems __this__fileSystems_copy_key = other_element_key;
 
-        String __this__fileSystems_copy_value = other_element_value;
+        java.lang.String __this__fileSystems_copy_value = other_element_value;
 
         __this__fileSystems.put(__this__fileSystems_copy_key, 
__this__fileSystems_copy_value);
       }
       this.fileSystems = __this__fileSystems;
     }
     if (other.isSetJobSubmissionInterfaces()) {
-      List<JobSubmissionInterface> __this__jobSubmissionInterfaces = new 
ArrayList<JobSubmissionInterface>(other.jobSubmissionInterfaces.size());
+      java.util.List<JobSubmissionInterface> __this__jobSubmissionInterfaces = 
new 
java.util.ArrayList<JobSubmissionInterface>(other.jobSubmissionInterfaces.size());
       for (JobSubmissionInterface other_element : 
other.jobSubmissionInterfaces) {
         __this__jobSubmissionInterfaces.add(new 
JobSubmissionInterface(other_element));
       }
       this.jobSubmissionInterfaces = __this__jobSubmissionInterfaces;
     }
     if (other.isSetDataMovementInterfaces()) {
-      List<org.apache.airavata.model.data.movement.DataMovementInterface> 
__this__dataMovementInterfaces = new 
ArrayList<org.apache.airavata.model.data.movement.DataMovementInterface>(other.dataMovementInterfaces.size());
+      
java.util.List<org.apache.airavata.model.data.movement.DataMovementInterface> 
__this__dataMovementInterfaces = new 
java.util.ArrayList<org.apache.airavata.model.data.movement.DataMovementInterface>(other.dataMovementInterfaces.size());
       for (org.apache.airavata.model.data.movement.DataMovementInterface 
other_element : other.dataMovementInterfaces) {
         __this__dataMovementInterfaces.add(new 
org.apache.airavata.model.data.movement.DataMovementInterface(other_element));
       }
@@ -418,11 +388,11 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
     this.defaultWalltime = 0;
   }
 
-  public String getComputeResourceId() {
+  public java.lang.String getComputeResourceId() {
     return this.computeResourceId;
   }
 
-  public void setComputeResourceId(String computeResourceId) {
+  public void setComputeResourceId(java.lang.String computeResourceId) {
     this.computeResourceId = computeResourceId;
   }
 
@@ -441,11 +411,11 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
     }
   }
 
-  public String getHostName() {
+  public java.lang.String getHostName() {
     return this.hostName;
   }
 
-  public void setHostName(String hostName) {
+  public void setHostName(java.lang.String hostName) {
     this.hostName = hostName;
   }
 
@@ -468,22 +438,22 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
     return (this.hostAliases == null) ? 0 : this.hostAliases.size();
   }
 
-  public java.util.Iterator<String> getHostAliasesIterator() {
+  public java.util.Iterator<java.lang.String> getHostAliasesIterator() {
     return (this.hostAliases == null) ? null : this.hostAliases.iterator();
   }
 
-  public void addToHostAliases(String elem) {
+  public void addToHostAliases(java.lang.String elem) {
     if (this.hostAliases == null) {
-      this.hostAliases = new ArrayList<String>();
+      this.hostAliases = new java.util.ArrayList<java.lang.String>();
     }
     this.hostAliases.add(elem);
   }
 
-  public List<String> getHostAliases() {
+  public java.util.List<java.lang.String> getHostAliases() {
     return this.hostAliases;
   }
 
-  public void setHostAliases(List<String> hostAliases) {
+  public void setHostAliases(java.util.List<java.lang.String> hostAliases) {
     this.hostAliases = hostAliases;
   }
 
@@ -506,22 +476,22 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
     return (this.ipAddresses == null) ? 0 : this.ipAddresses.size();
   }
 
-  public java.util.Iterator<String> getIpAddressesIterator() {
+  public java.util.Iterator<java.lang.String> getIpAddressesIterator() {
     return (this.ipAddresses == null) ? null : this.ipAddresses.iterator();
   }
 
-  public void addToIpAddresses(String elem) {
+  public void addToIpAddresses(java.lang.String elem) {
     if (this.ipAddresses == null) {
-      this.ipAddresses = new ArrayList<String>();
+      this.ipAddresses = new java.util.ArrayList<java.lang.String>();
     }
     this.ipAddresses.add(elem);
   }
 
-  public List<String> getIpAddresses() {
+  public java.util.List<java.lang.String> getIpAddresses() {
     return this.ipAddresses;
   }
 
-  public void setIpAddresses(List<String> ipAddresses) {
+  public void setIpAddresses(java.util.List<java.lang.String> ipAddresses) {
     this.ipAddresses = ipAddresses;
   }
 
@@ -540,11 +510,11 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
     }
   }
 
-  public String getResourceDescription() {
+  public java.lang.String getResourceDescription() {
     return this.resourceDescription;
   }
 
-  public void setResourceDescription(String resourceDescription) {
+  public void setResourceDescription(java.lang.String resourceDescription) {
     this.resourceDescription = resourceDescription;
   }
 
@@ -573,16 +543,16 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
   }
 
   public void unsetEnabled() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, 
__ENABLED_ISSET_ID);
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ENABLED_ISSET_ID);
   }
 
   /** Returns true if field enabled is set (has been assigned a value) and 
false otherwise */
   public boolean isSetEnabled() {
-    return EncodingUtils.testBit(__isset_bitfield, __ENABLED_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, 
__ENABLED_ISSET_ID);
   }
 
   public void setEnabledIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, 
__ENABLED_ISSET_ID, value);
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ENABLED_ISSET_ID, 
value);
   }
 
   public int getBatchQueuesSize() {
@@ -595,16 +565,16 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
 
   public void addToBatchQueues(BatchQueue elem) {
     if (this.batchQueues == null) {
-      this.batchQueues = new ArrayList<BatchQueue>();
+      this.batchQueues = new java.util.ArrayList<BatchQueue>();
     }
     this.batchQueues.add(elem);
   }
 
-  public List<BatchQueue> getBatchQueues() {
+  public java.util.List<BatchQueue> getBatchQueues() {
     return this.batchQueues;
   }
 
-  public void setBatchQueues(List<BatchQueue> batchQueues) {
+  public void setBatchQueues(java.util.List<BatchQueue> batchQueues) {
     this.batchQueues = batchQueues;
   }
 
@@ -627,18 +597,18 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
     return (this.fileSystems == null) ? 0 : this.fileSystems.size();
   }
 
-  public void putToFileSystems(FileSystems key, String val) {
+  public void putToFileSystems(FileSystems key, java.lang.String val) {
     if (this.fileSystems == null) {
-      this.fileSystems = new HashMap<FileSystems,String>();
+      this.fileSystems = new java.util.HashMap<FileSystems,java.lang.String>();
     }
     this.fileSystems.put(key, val);
   }
 
-  public Map<FileSystems,String> getFileSystems() {
+  public java.util.Map<FileSystems,java.lang.String> getFileSystems() {
     return this.fileSystems;
   }
 
-  public void setFileSystems(Map<FileSystems,String> fileSystems) {
+  public void setFileSystems(java.util.Map<FileSystems,java.lang.String> 
fileSystems) {
     this.fileSystems = fileSystems;
   }
 
@@ -667,16 +637,16 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
 
   public void addToJobSubmissionInterfaces(JobSubmissionInterface elem) {
     if (this.jobSubmissionInterfaces == null) {
-      this.jobSubmissionInterfaces = new ArrayList<JobSubmissionInterface>();
+      this.jobSubmissionInterfaces = new 
java.util.ArrayList<JobSubmissionInterface>();
     }
     this.jobSubmissionInterfaces.add(elem);
   }
 
-  public List<JobSubmissionInterface> getJobSubmissionInterfaces() {
+  public java.util.List<JobSubmissionInterface> getJobSubmissionInterfaces() {
     return this.jobSubmissionInterfaces;
   }
 
-  public void setJobSubmissionInterfaces(List<JobSubmissionInterface> 
jobSubmissionInterfaces) {
+  public void 
setJobSubmissionInterfaces(java.util.List<JobSubmissionInterface> 
jobSubmissionInterfaces) {
     this.jobSubmissionInterfaces = jobSubmissionInterfaces;
   }
 
@@ -705,16 +675,16 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
 
   public void 
addToDataMovementInterfaces(org.apache.airavata.model.data.movement.DataMovementInterface
 elem) {
     if (this.dataMovementInterfaces == null) {
-      this.dataMovementInterfaces = new 
ArrayList<org.apache.airavata.model.data.movement.DataMovementInterface>();
+      this.dataMovementInterfaces = new 
java.util.ArrayList<org.apache.airavata.model.data.movement.DataMovementInterface>();
     }
     this.dataMovementInterfaces.add(elem);
   }
 
-  public List<org.apache.airavata.model.data.movement.DataMovementInterface> 
getDataMovementInterfaces() {
+  public 
java.util.List<org.apache.airavata.model.data.movement.DataMovementInterface> 
getDataMovementInterfaces() {
     return this.dataMovementInterfaces;
   }
 
-  public void 
setDataMovementInterfaces(List<org.apache.airavata.model.data.movement.DataMovementInterface>
 dataMovementInterfaces) {
+  public void 
setDataMovementInterfaces(java.util.List<org.apache.airavata.model.data.movement.DataMovementInterface>
 dataMovementInterfaces) {
     this.dataMovementInterfaces = dataMovementInterfaces;
   }
 
@@ -743,16 +713,16 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
   }
 
   public void unsetMaxMemoryPerNode() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, 
__MAXMEMORYPERNODE_ISSET_ID);
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, 
__MAXMEMORYPERNODE_ISSET_ID);
   }
 
   /** Returns true if field maxMemoryPerNode is set (has been assigned a 
value) and false otherwise */
   public boolean isSetMaxMemoryPerNode() {
-    return EncodingUtils.testBit(__isset_bitfield, 
__MAXMEMORYPERNODE_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, 
__MAXMEMORYPERNODE_ISSET_ID);
   }
 
   public void setMaxMemoryPerNodeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, 
__MAXMEMORYPERNODE_ISSET_ID, value);
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, 
__MAXMEMORYPERNODE_ISSET_ID, value);
   }
 
   public boolean isGatewayUsageReporting() {
@@ -765,23 +735,23 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
   }
 
   public void unsetGatewayUsageReporting() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, 
__GATEWAYUSAGEREPORTING_ISSET_ID);
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, 
__GATEWAYUSAGEREPORTING_ISSET_ID);
   }
 
   /** Returns true if field gatewayUsageReporting is set (has been assigned a 
value) and false otherwise */
   public boolean isSetGatewayUsageReporting() {
-    return EncodingUtils.testBit(__isset_bitfield, 
__GATEWAYUSAGEREPORTING_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, 
__GATEWAYUSAGEREPORTING_ISSET_ID);
   }
 
   public void setGatewayUsageReportingIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, 
__GATEWAYUSAGEREPORTING_ISSET_ID, value);
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, 
__GATEWAYUSAGEREPORTING_ISSET_ID, value);
   }
 
-  public String getGatewayUsageModuleLoadCommand() {
+  public java.lang.String getGatewayUsageModuleLoadCommand() {
     return this.gatewayUsageModuleLoadCommand;
   }
 
-  public void setGatewayUsageModuleLoadCommand(String 
gatewayUsageModuleLoadCommand) {
+  public void setGatewayUsageModuleLoadCommand(java.lang.String 
gatewayUsageModuleLoadCommand) {
     this.gatewayUsageModuleLoadCommand = gatewayUsageModuleLoadCommand;
   }
 
@@ -800,11 +770,11 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
     }
   }
 
-  public String getGatewayUsageExecutable() {
+  public java.lang.String getGatewayUsageExecutable() {
     return this.gatewayUsageExecutable;
   }
 
-  public void setGatewayUsageExecutable(String gatewayUsageExecutable) {
+  public void setGatewayUsageExecutable(java.lang.String 
gatewayUsageExecutable) {
     this.gatewayUsageExecutable = gatewayUsageExecutable;
   }
 
@@ -833,16 +803,16 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
   }
 
   public void unsetCpusPerNode() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, 
__CPUSPERNODE_ISSET_ID);
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, 
__CPUSPERNODE_ISSET_ID);
   }
 
   /** Returns true if field cpusPerNode is set (has been assigned a value) and 
false otherwise */
   public boolean isSetCpusPerNode() {
-    return EncodingUtils.testBit(__isset_bitfield, __CPUSPERNODE_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, 
__CPUSPERNODE_ISSET_ID);
   }
 
   public void setCpusPerNodeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, 
__CPUSPERNODE_ISSET_ID, value);
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, 
__CPUSPERNODE_ISSET_ID, value);
   }
 
   public int getDefaultNodeCount() {
@@ -855,16 +825,16 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
   }
 
   public void unsetDefaultNodeCount() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, 
__DEFAULTNODECOUNT_ISSET_ID);
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, 
__DEFAULTNODECOUNT_ISSET_ID);
   }
 
   /** Returns true if field defaultNodeCount is set (has been assigned a 
value) and false otherwise */
   public boolean isSetDefaultNodeCount() {
-    return EncodingUtils.testBit(__isset_bitfield, 
__DEFAULTNODECOUNT_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, 
__DEFAULTNODECOUNT_ISSET_ID);
   }
 
   public void setDefaultNodeCountIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, 
__DEFAULTNODECOUNT_ISSET_ID, value);
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, 
__DEFAULTNODECOUNT_ISSET_ID, value);
   }
 
   public int getDefaultCPUCount() {
@@ -877,16 +847,16 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
   }
 
   public void unsetDefaultCPUCount() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, 
__DEFAULTCPUCOUNT_ISSET_ID);
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, 
__DEFAULTCPUCOUNT_ISSET_ID);
   }
 
   /** Returns true if field defaultCPUCount is set (has been assigned a value) 
and false otherwise */
   public boolean isSetDefaultCPUCount() {
-    return EncodingUtils.testBit(__isset_bitfield, __DEFAULTCPUCOUNT_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, 
__DEFAULTCPUCOUNT_ISSET_ID);
   }
 
   public void setDefaultCPUCountIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, 
__DEFAULTCPUCOUNT_ISSET_ID, value);
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, 
__DEFAULTCPUCOUNT_ISSET_ID, value);
   }
 
   public int getDefaultWalltime() {
@@ -899,25 +869,25 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
   }
 
   public void unsetDefaultWalltime() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, 
__DEFAULTWALLTIME_ISSET_ID);
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, 
__DEFAULTWALLTIME_ISSET_ID);
   }
 
   /** Returns true if field defaultWalltime is set (has been assigned a value) 
and false otherwise */
   public boolean isSetDefaultWalltime() {
-    return EncodingUtils.testBit(__isset_bitfield, __DEFAULTWALLTIME_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, 
__DEFAULTWALLTIME_ISSET_ID);
   }
 
   public void setDefaultWalltimeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, 
__DEFAULTWALLTIME_ISSET_ID, value);
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, 
__DEFAULTWALLTIME_ISSET_ID, value);
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case COMPUTE_RESOURCE_ID:
       if (value == null) {
         unsetComputeResourceId();
       } else {
-        setComputeResourceId((String)value);
+        setComputeResourceId((java.lang.String)value);
       }
       break;
 
@@ -925,7 +895,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
       if (value == null) {
         unsetHostName();
       } else {
-        setHostName((String)value);
+        setHostName((java.lang.String)value);
       }
       break;
 
@@ -933,7 +903,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
       if (value == null) {
         unsetHostAliases();
       } else {
-        setHostAliases((List<String>)value);
+        setHostAliases((java.util.List<java.lang.String>)value);
       }
       break;
 
@@ -941,7 +911,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
       if (value == null) {
         unsetIpAddresses();
       } else {
-        setIpAddresses((List<String>)value);
+        setIpAddresses((java.util.List<java.lang.String>)value);
       }
       break;
 
@@ -949,7 +919,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
       if (value == null) {
         unsetResourceDescription();
       } else {
-        setResourceDescription((String)value);
+        setResourceDescription((java.lang.String)value);
       }
       break;
 
@@ -957,7 +927,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
       if (value == null) {
         unsetEnabled();
       } else {
-        setEnabled((Boolean)value);
+        setEnabled((java.lang.Boolean)value);
       }
       break;
 
@@ -965,7 +935,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
       if (value == null) {
         unsetBatchQueues();
       } else {
-        setBatchQueues((List<BatchQueue>)value);
+        setBatchQueues((java.util.List<BatchQueue>)value);
       }
       break;
 
@@ -973,7 +943,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
       if (value == null) {
         unsetFileSystems();
       } else {
-        setFileSystems((Map<FileSystems,String>)value);
+        setFileSystems((java.util.Map<FileSystems,java.lang.String>)value);
       }
       break;
 
@@ -981,7 +951,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
       if (value == null) {
         unsetJobSubmissionInterfaces();
       } else {
-        setJobSubmissionInterfaces((List<JobSubmissionInterface>)value);
+        
setJobSubmissionInterfaces((java.util.List<JobSubmissionInterface>)value);
       }
       break;
 
@@ -989,7 +959,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
       if (value == null) {
         unsetDataMovementInterfaces();
       } else {
-        
setDataMovementInterfaces((List<org.apache.airavata.model.data.movement.DataMovementInterface>)value);
+        
setDataMovementInterfaces((java.util.List<org.apache.airavata.model.data.movement.DataMovementInterface>)value);
       }
       break;
 
@@ -997,7 +967,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
       if (value == null) {
         unsetMaxMemoryPerNode();
       } else {
-        setMaxMemoryPerNode((Integer)value);
+        setMaxMemoryPerNode((java.lang.Integer)value);
       }
       break;
 
@@ -1005,7 +975,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
       if (value == null) {
         unsetGatewayUsageReporting();
       } else {
-        setGatewayUsageReporting((Boolean)value);
+        setGatewayUsageReporting((java.lang.Boolean)value);
       }
       break;
 
@@ -1013,7 +983,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
       if (value == null) {
         unsetGatewayUsageModuleLoadCommand();
       } else {
-        setGatewayUsageModuleLoadCommand((String)value);
+        setGatewayUsageModuleLoadCommand((java.lang.String)value);
       }
       break;
 
@@ -1021,7 +991,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
       if (value == null) {
         unsetGatewayUsageExecutable();
       } else {
-        setGatewayUsageExecutable((String)value);
+        setGatewayUsageExecutable((java.lang.String)value);
       }
       break;
 
@@ -1029,7 +999,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
       if (value == null) {
         unsetCpusPerNode();
       } else {
-        setCpusPerNode((Integer)value);
+        setCpusPerNode((java.lang.Integer)value);
       }
       break;
 
@@ -1037,7 +1007,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
       if (value == null) {
         unsetDefaultNodeCount();
       } else {
-        setDefaultNodeCount((Integer)value);
+        setDefaultNodeCount((java.lang.Integer)value);
       }
       break;
 
@@ -1045,7 +1015,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
       if (value == null) {
         unsetDefaultCPUCount();
       } else {
-        setDefaultCPUCount((Integer)value);
+        setDefaultCPUCount((java.lang.Integer)value);
       }
       break;
 
@@ -1053,14 +1023,14 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
       if (value == null) {
         unsetDefaultWalltime();
       } else {
-        setDefaultWalltime((Integer)value);
+        setDefaultWalltime((java.lang.Integer)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case COMPUTE_RESOURCE_ID:
       return getComputeResourceId();
@@ -1117,13 +1087,13 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
       return getDefaultWalltime();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.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();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -1164,11 +1134,11 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
     case DEFAULT_WALLTIME:
       return isSetDefaultWalltime();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof ComputeResourceDescription)
@@ -1179,6 +1149,8 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
   public boolean equals(ComputeResourceDescription that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_computeResourceId = true && 
this.isSetComputeResourceId();
     boolean that_present_computeResourceId = true && 
that.isSetComputeResourceId();
@@ -1347,99 +1319,81 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_computeResourceId = true && (isSetComputeResourceId());
-    list.add(present_computeResourceId);
-    if (present_computeResourceId)
-      list.add(computeResourceId);
-
-    boolean present_hostName = true && (isSetHostName());
-    list.add(present_hostName);
-    if (present_hostName)
-      list.add(hostName);
-
-    boolean present_hostAliases = true && (isSetHostAliases());
-    list.add(present_hostAliases);
-    if (present_hostAliases)
-      list.add(hostAliases);
-
-    boolean present_ipAddresses = true && (isSetIpAddresses());
-    list.add(present_ipAddresses);
-    if (present_ipAddresses)
-      list.add(ipAddresses);
-
-    boolean present_resourceDescription = true && (isSetResourceDescription());
-    list.add(present_resourceDescription);
-    if (present_resourceDescription)
-      list.add(resourceDescription);
-
-    boolean present_enabled = true && (isSetEnabled());
-    list.add(present_enabled);
-    if (present_enabled)
-      list.add(enabled);
-
-    boolean present_batchQueues = true && (isSetBatchQueues());
-    list.add(present_batchQueues);
-    if (present_batchQueues)
-      list.add(batchQueues);
-
-    boolean present_fileSystems = true && (isSetFileSystems());
-    list.add(present_fileSystems);
-    if (present_fileSystems)
-      list.add(fileSystems);
-
-    boolean present_jobSubmissionInterfaces = true && 
(isSetJobSubmissionInterfaces());
-    list.add(present_jobSubmissionInterfaces);
-    if (present_jobSubmissionInterfaces)
-      list.add(jobSubmissionInterfaces);
-
-    boolean present_dataMovementInterfaces = true && 
(isSetDataMovementInterfaces());
-    list.add(present_dataMovementInterfaces);
-    if (present_dataMovementInterfaces)
-      list.add(dataMovementInterfaces);
-
-    boolean present_maxMemoryPerNode = true && (isSetMaxMemoryPerNode());
-    list.add(present_maxMemoryPerNode);
-    if (present_maxMemoryPerNode)
-      list.add(maxMemoryPerNode);
-
-    boolean present_gatewayUsageReporting = true && 
(isSetGatewayUsageReporting());
-    list.add(present_gatewayUsageReporting);
-    if (present_gatewayUsageReporting)
-      list.add(gatewayUsageReporting);
-
-    boolean present_gatewayUsageModuleLoadCommand = true && 
(isSetGatewayUsageModuleLoadCommand());
-    list.add(present_gatewayUsageModuleLoadCommand);
-    if (present_gatewayUsageModuleLoadCommand)
-      list.add(gatewayUsageModuleLoadCommand);
-
-    boolean present_gatewayUsageExecutable = true && 
(isSetGatewayUsageExecutable());
-    list.add(present_gatewayUsageExecutable);
-    if (present_gatewayUsageExecutable)
-      list.add(gatewayUsageExecutable);
-
-    boolean present_cpusPerNode = true && (isSetCpusPerNode());
-    list.add(present_cpusPerNode);
-    if (present_cpusPerNode)
-      list.add(cpusPerNode);
-
-    boolean present_defaultNodeCount = true && (isSetDefaultNodeCount());
-    list.add(present_defaultNodeCount);
-    if (present_defaultNodeCount)
-      list.add(defaultNodeCount);
-
-    boolean present_defaultCPUCount = true && (isSetDefaultCPUCount());
-    list.add(present_defaultCPUCount);
-    if (present_defaultCPUCount)
-      list.add(defaultCPUCount);
-
-    boolean present_defaultWalltime = true && (isSetDefaultWalltime());
-    list.add(present_defaultWalltime);
-    if (present_defaultWalltime)
-      list.add(defaultWalltime);
-
-    return list.hashCode();
+    int hashCode = 1;
+
+    hashCode = hashCode * 8191 + ((isSetComputeResourceId()) ? 131071 : 
524287);
+    if (isSetComputeResourceId())
+      hashCode = hashCode * 8191 + computeResourceId.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetHostName()) ? 131071 : 524287);
+    if (isSetHostName())
+      hashCode = hashCode * 8191 + hostName.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetHostAliases()) ? 131071 : 524287);
+    if (isSetHostAliases())
+      hashCode = hashCode * 8191 + hostAliases.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetIpAddresses()) ? 131071 : 524287);
+    if (isSetIpAddresses())
+      hashCode = hashCode * 8191 + ipAddresses.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetResourceDescription()) ? 131071 : 
524287);
+    if (isSetResourceDescription())
+      hashCode = hashCode * 8191 + resourceDescription.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetEnabled()) ? 131071 : 524287);
+    if (isSetEnabled())
+      hashCode = hashCode * 8191 + ((enabled) ? 131071 : 524287);
+
+    hashCode = hashCode * 8191 + ((isSetBatchQueues()) ? 131071 : 524287);
+    if (isSetBatchQueues())
+      hashCode = hashCode * 8191 + batchQueues.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetFileSystems()) ? 131071 : 524287);
+    if (isSetFileSystems())
+      hashCode = hashCode * 8191 + fileSystems.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetJobSubmissionInterfaces()) ? 131071 : 
524287);
+    if (isSetJobSubmissionInterfaces())
+      hashCode = hashCode * 8191 + jobSubmissionInterfaces.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetDataMovementInterfaces()) ? 131071 : 
524287);
+    if (isSetDataMovementInterfaces())
+      hashCode = hashCode * 8191 + dataMovementInterfaces.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetMaxMemoryPerNode()) ? 131071 : 524287);
+    if (isSetMaxMemoryPerNode())
+      hashCode = hashCode * 8191 + maxMemoryPerNode;
+
+    hashCode = hashCode * 8191 + ((isSetGatewayUsageReporting()) ? 131071 : 
524287);
+    if (isSetGatewayUsageReporting())
+      hashCode = hashCode * 8191 + ((gatewayUsageReporting) ? 131071 : 524287);
+
+    hashCode = hashCode * 8191 + ((isSetGatewayUsageModuleLoadCommand()) ? 
131071 : 524287);
+    if (isSetGatewayUsageModuleLoadCommand())
+      hashCode = hashCode * 8191 + gatewayUsageModuleLoadCommand.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetGatewayUsageExecutable()) ? 131071 : 
524287);
+    if (isSetGatewayUsageExecutable())
+      hashCode = hashCode * 8191 + gatewayUsageExecutable.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetCpusPerNode()) ? 131071 : 524287);
+    if (isSetCpusPerNode())
+      hashCode = hashCode * 8191 + cpusPerNode;
+
+    hashCode = hashCode * 8191 + ((isSetDefaultNodeCount()) ? 131071 : 524287);
+    if (isSetDefaultNodeCount())
+      hashCode = hashCode * 8191 + defaultNodeCount;
+
+    hashCode = hashCode * 8191 + ((isSetDefaultCPUCount()) ? 131071 : 524287);
+    if (isSetDefaultCPUCount())
+      hashCode = hashCode * 8191 + defaultCPUCount;
+
+    hashCode = hashCode * 8191 + ((isSetDefaultWalltime()) ? 131071 : 524287);
+    if (isSetDefaultWalltime())
+      hashCode = hashCode * 8191 + defaultWalltime;
+
+    return hashCode;
   }
 
   @Override
@@ -1450,7 +1404,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
 
     int lastComparison = 0;
 
-    lastComparison = 
Boolean.valueOf(isSetComputeResourceId()).compareTo(other.isSetComputeResourceId());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetComputeResourceId()).compareTo(other.isSetComputeResourceId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1460,7 +1414,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetHostName()).compareTo(other.isSetHostName());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetHostName()).compareTo(other.isSetHostName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1470,7 +1424,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetHostAliases()).compareTo(other.isSetHostAliases());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetHostAliases()).compareTo(other.isSetHostAliases());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1480,7 +1434,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetIpAddresses()).compareTo(other.isSetIpAddresses());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetIpAddresses()).compareTo(other.isSetIpAddresses());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1490,7 +1444,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetResourceDescription()).compareTo(other.isSetResourceDescription());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetResourceDescription()).compareTo(other.isSetResourceDescription());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1500,7 +1454,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetEnabled()).compareTo(other.isSetEnabled());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetEnabled()).compareTo(other.isSetEnabled());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1510,7 +1464,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetBatchQueues()).compareTo(other.isSetBatchQueues());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetBatchQueues()).compareTo(other.isSetBatchQueues());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1520,7 +1474,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetFileSystems()).compareTo(other.isSetFileSystems());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetFileSystems()).compareTo(other.isSetFileSystems());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1530,7 +1484,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetJobSubmissionInterfaces()).compareTo(other.isSetJobSubmissionInterfaces());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetJobSubmissionInterfaces()).compareTo(other.isSetJobSubmissionInterfaces());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1540,7 +1494,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetDataMovementInterfaces()).compareTo(other.isSetDataMovementInterfaces());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetDataMovementInterfaces()).compareTo(other.isSetDataMovementInterfaces());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1550,7 +1504,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetMaxMemoryPerNode()).compareTo(other.isSetMaxMemoryPerNode());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetMaxMemoryPerNode()).compareTo(other.isSetMaxMemoryPerNode());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1560,7 +1514,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetGatewayUsageReporting()).compareTo(other.isSetGatewayUsageReporting());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetGatewayUsageReporting()).compareTo(other.isSetGatewayUsageReporting());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1570,7 +1524,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetGatewayUsageModuleLoadCommand()).compareTo(other.isSetGatewayUsageModuleLoadCommand());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetGatewayUsageModuleLoadCommand()).compareTo(other.isSetGatewayUsageModuleLoadCommand());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1580,7 +1534,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetGatewayUsageExecutable()).compareTo(other.isSetGatewayUsageExecutable());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetGatewayUsageExecutable()).compareTo(other.isSetGatewayUsageExecutable());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1590,7 +1544,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetCpusPerNode()).compareTo(other.isSetCpusPerNode());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetCpusPerNode()).compareTo(other.isSetCpusPerNode());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1600,7 +1554,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetDefaultNodeCount()).compareTo(other.isSetDefaultNodeCount());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetDefaultNodeCount()).compareTo(other.isSetDefaultNodeCount());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1610,7 +1564,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetDefaultCPUCount()).compareTo(other.isSetDefaultCPUCount());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetDefaultCPUCount()).compareTo(other.isSetDefaultCPUCount());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1620,7 +1574,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetDefaultWalltime()).compareTo(other.isSetDefaultWalltime());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetDefaultWalltime()).compareTo(other.isSetDefaultWalltime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1638,16 +1592,16 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws 
org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).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);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("ComputeResourceDescription(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new 
java.lang.StringBuilder("ComputeResourceDescription(");
     boolean first = true;
 
     sb.append("computeResourceId:");
@@ -1822,7 +1776,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws 
java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws 
java.io.IOException, java.lang.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;
@@ -1832,13 +1786,13 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
     }
   }
 
-  private static class ComputeResourceDescriptionStandardSchemeFactory 
implements SchemeFactory {
+  private static class ComputeResourceDescriptionStandardSchemeFactory 
implements org.apache.thrift.scheme.SchemeFactory {
     public ComputeResourceDescriptionStandardScheme getScheme() {
       return new ComputeResourceDescriptionStandardScheme();
     }
   }
 
-  private static class ComputeResourceDescriptionStandardScheme extends 
StandardScheme<ComputeResourceDescription> {
+  private static class ComputeResourceDescriptionStandardScheme extends 
org.apache.thrift.scheme.StandardScheme<ComputeResourceDescription> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, 
ComputeResourceDescription struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -1870,8 +1824,8 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list36 = 
iprot.readListBegin();
-                struct.hostAliases = new ArrayList<String>(_list36.size);
-                String _elem37;
+                struct.hostAliases = new 
java.util.ArrayList<java.lang.String>(_list36.size);
+                java.lang.String _elem37;
                 for (int _i38 = 0; _i38 < _list36.size; ++_i38)
                 {
                   _elem37 = iprot.readString();
@@ -1888,8 +1842,8 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list39 = 
iprot.readListBegin();
-                struct.ipAddresses = new ArrayList<String>(_list39.size);
-                String _elem40;
+                struct.ipAddresses = new 
java.util.ArrayList<java.lang.String>(_list39.size);
+                java.lang.String _elem40;
                 for (int _i41 = 0; _i41 < _list39.size; ++_i41)
                 {
                   _elem40 = iprot.readString();
@@ -1922,7 +1876,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list42 = 
iprot.readListBegin();
-                struct.batchQueues = new ArrayList<BatchQueue>(_list42.size);
+                struct.batchQueues = new 
java.util.ArrayList<BatchQueue>(_list42.size);
                 BatchQueue _elem43;
                 for (int _i44 = 0; _i44 < _list42.size; ++_i44)
                 {
@@ -1941,9 +1895,9 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
             if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
               {
                 org.apache.thrift.protocol.TMap _map45 = iprot.readMapBegin();
-                struct.fileSystems = new 
HashMap<FileSystems,String>(2*_map45.size);
+                struct.fileSystems = new 
java.util.HashMap<FileSystems,java.lang.String>(2*_map45.size);
                 FileSystems _key46;
-                String _val47;
+                java.lang.String _val47;
                 for (int _i48 = 0; _i48 < _map45.size; ++_i48)
                 {
                   _key46 = 
org.apache.airavata.model.appcatalog.computeresource.FileSystems.findByValue(iprot.readI32());
@@ -1961,7 +1915,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list49 = 
iprot.readListBegin();
-                struct.jobSubmissionInterfaces = new 
ArrayList<JobSubmissionInterface>(_list49.size);
+                struct.jobSubmissionInterfaces = new 
java.util.ArrayList<JobSubmissionInterface>(_list49.size);
                 JobSubmissionInterface _elem50;
                 for (int _i51 = 0; _i51 < _list49.size; ++_i51)
                 {
@@ -1980,7 +1934,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list52 = 
iprot.readListBegin();
-                struct.dataMovementInterfaces = new 
ArrayList<org.apache.airavata.model.data.movement.DataMovementInterface>(_list52.size);
+                struct.dataMovementInterfaces = new 
java.util.ArrayList<org.apache.airavata.model.data.movement.DataMovementInterface>(_list52.size);
                 org.apache.airavata.model.data.movement.DataMovementInterface 
_elem53;
                 for (int _i54 = 0; _i54 < _list52.size; ++_i54)
                 {
@@ -2087,7 +2041,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
           oprot.writeFieldBegin(HOST_ALIASES_FIELD_DESC);
           {
             oprot.writeListBegin(new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, 
struct.hostAliases.size()));
-            for (String _iter55 : struct.hostAliases)
+            for (java.lang.String _iter55 : struct.hostAliases)
             {
               oprot.writeString(_iter55);
             }
@@ -2101,7 +2055,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
           oprot.writeFieldBegin(IP_ADDRESSES_FIELD_DESC);
           {
             oprot.writeListBegin(new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, 
struct.ipAddresses.size()));
-            for (String _iter56 : struct.ipAddresses)
+            for (java.lang.String _iter56 : struct.ipAddresses)
             {
               oprot.writeString(_iter56);
             }
@@ -2141,7 +2095,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
           oprot.writeFieldBegin(FILE_SYSTEMS_FIELD_DESC);
           {
             oprot.writeMapBegin(new 
org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, 
org.apache.thrift.protocol.TType.STRING, struct.fileSystems.size()));
-            for (Map.Entry<FileSystems, String> _iter58 : 
struct.fileSystems.entrySet())
+            for (java.util.Map.Entry<FileSystems, java.lang.String> _iter58 : 
struct.fileSystems.entrySet())
             {
               oprot.writeI32(_iter58.getKey().getValue());
               oprot.writeString(_iter58.getValue());
@@ -2229,20 +2183,20 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
 
   }
 
-  private static class ComputeResourceDescriptionTupleSchemeFactory implements 
SchemeFactory {
+  private static class ComputeResourceDescriptionTupleSchemeFactory implements 
org.apache.thrift.scheme.SchemeFactory {
     public ComputeResourceDescriptionTupleScheme getScheme() {
       return new ComputeResourceDescriptionTupleScheme();
     }
   }
 
-  private static class ComputeResourceDescriptionTupleScheme extends 
TupleScheme<ComputeResourceDescription> {
+  private static class ComputeResourceDescriptionTupleScheme extends 
org.apache.thrift.scheme.TupleScheme<ComputeResourceDescription> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, 
ComputeResourceDescription struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
+      org.apache.thrift.protocol.TTupleProtocol oprot = 
(org.apache.thrift.protocol.TTupleProtocol) prot;
       oprot.writeString(struct.computeResourceId);
       oprot.writeString(struct.hostName);
-      BitSet optionals = new BitSet();
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetHostAliases()) {
         optionals.set(0);
       }
@@ -2295,7 +2249,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
       if (struct.isSetHostAliases()) {
         {
           oprot.writeI32(struct.hostAliases.size());
-          for (String _iter61 : struct.hostAliases)
+          for (java.lang.String _iter61 : struct.hostAliases)
           {
             oprot.writeString(_iter61);
           }
@@ -2304,7 +2258,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
       if (struct.isSetIpAddresses()) {
         {
           oprot.writeI32(struct.ipAddresses.size());
-          for (String _iter62 : struct.ipAddresses)
+          for (java.lang.String _iter62 : struct.ipAddresses)
           {
             oprot.writeString(_iter62);
           }
@@ -2328,7 +2282,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
       if (struct.isSetFileSystems()) {
         {
           oprot.writeI32(struct.fileSystems.size());
-          for (Map.Entry<FileSystems, String> _iter64 : 
struct.fileSystems.entrySet())
+          for (java.util.Map.Entry<FileSystems, java.lang.String> _iter64 : 
struct.fileSystems.entrySet())
           {
             oprot.writeI32(_iter64.getKey().getValue());
             oprot.writeString(_iter64.getValue());
@@ -2381,17 +2335,17 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, 
ComputeResourceDescription struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
+      org.apache.thrift.protocol.TTupleProtocol iprot = 
(org.apache.thrift.protocol.TTupleProtocol) prot;
       struct.computeResourceId = iprot.readString();
       struct.setComputeResourceIdIsSet(true);
       struct.hostName = iprot.readString();
       struct.setHostNameIsSet(true);
-      BitSet incoming = iprot.readBitSet(16);
+      java.util.BitSet incoming = iprot.readBitSet(16);
       if (incoming.get(0)) {
         {
           org.apache.thrift.protocol.TList _list67 = new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, 
iprot.readI32());
-          struct.hostAliases = new ArrayList<String>(_list67.size);
-          String _elem68;
+          struct.hostAliases = new 
java.util.ArrayList<java.lang.String>(_list67.size);
+          java.lang.String _elem68;
           for (int _i69 = 0; _i69 < _list67.size; ++_i69)
           {
             _elem68 = iprot.readString();
@@ -2403,8 +2357,8 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
       if (incoming.get(1)) {
         {
           org.apache.thrift.protocol.TList _list70 = new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, 
iprot.readI32());
-          struct.ipAddresses = new ArrayList<String>(_list70.size);
-          String _elem71;
+          struct.ipAddresses = new 
java.util.ArrayList<java.lang.String>(_list70.size);
+          java.lang.String _elem71;
           for (int _i72 = 0; _i72 < _list70.size; ++_i72)
           {
             _elem71 = iprot.readString();
@@ -2424,7 +2378,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
       if (incoming.get(4)) {
         {
           org.apache.thrift.protocol.TList _list73 = new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, 
iprot.readI32());
-          struct.batchQueues = new ArrayList<BatchQueue>(_list73.size);
+          struct.batchQueues = new 
java.util.ArrayList<BatchQueue>(_list73.size);
           BatchQueue _elem74;
           for (int _i75 = 0; _i75 < _list73.size; ++_i75)
           {
@@ -2438,9 +2392,9 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
       if (incoming.get(5)) {
         {
           org.apache.thrift.protocol.TMap _map76 = new 
org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, 
org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.fileSystems = new HashMap<FileSystems,String>(2*_map76.size);
+          struct.fileSystems = new 
java.util.HashMap<FileSystems,java.lang.String>(2*_map76.size);
           FileSystems _key77;
-          String _val78;
+          java.lang.String _val78;
           for (int _i79 = 0; _i79 < _map76.size; ++_i79)
           {
             _key77 = 
org.apache.airavata.model.appcatalog.computeresource.FileSystems.findByValue(iprot.readI32());
@@ -2453,7 +2407,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
       if (incoming.get(6)) {
         {
           org.apache.thrift.protocol.TList _list80 = new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, 
iprot.readI32());
-          struct.jobSubmissionInterfaces = new 
ArrayList<JobSubmissionInterface>(_list80.size);
+          struct.jobSubmissionInterfaces = new 
java.util.ArrayList<JobSubmissionInterface>(_list80.size);
           JobSubmissionInterface _elem81;
           for (int _i82 = 0; _i82 < _list80.size; ++_i82)
           {
@@ -2467,7 +2421,7 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
       if (incoming.get(7)) {
         {
           org.apache.thrift.protocol.TList _list83 = new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, 
iprot.readI32());
-          struct.dataMovementInterfaces = new 
ArrayList<org.apache.airavata.model.data.movement.DataMovementInterface>(_list83.size);
+          struct.dataMovementInterfaces = new 
java.util.ArrayList<org.apache.airavata.model.data.movement.DataMovementInterface>(_list83.size);
           org.apache.airavata.model.data.movement.DataMovementInterface 
_elem84;
           for (int _i85 = 0; _i85 < _list83.size; ++_i85)
           {
@@ -2513,5 +2467,8 @@ public class ComputeResourceDescription implements 
org.apache.thrift.TBase<Compu
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S 
scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return 
(org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? 
STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/8e775660/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/DMType.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/DMType.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/DMType.java
index a434764..6f35b01 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/DMType.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/DMType.java
@@ -16,7 +16,7 @@
  */
 
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated

http://git-wip-us.apache.org/repos/asf/airavata/blob/8e775660/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/FileSystems.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/FileSystems.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/FileSystems.java
index ad1d6e4..7be1718 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/FileSystems.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/FileSystems.java
@@ -16,7 +16,7 @@
  */
 
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated

Reply via email to