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/ResourceJobManager.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java
index bca1b6f..0293141 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.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"})
 /**
  * Resource Job Manager Information
  * 
@@ -68,7 +41,7 @@ import org.slf4j.LoggerFactory;
  *  An enumeration of commonly used manager commands.
  * 
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
 public class ResourceJobManager implements 
org.apache.thrift.TBase<ResourceJobManager, ResourceJobManager._Fields>, 
java.io.Serializable, Cloneable, Comparable<ResourceJobManager> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("ResourceJobManager");
 
@@ -79,18 +52,15 @@ public class ResourceJobManager implements 
org.apache.thrift.TBase<ResourceJobMa
   private static final org.apache.thrift.protocol.TField 
JOB_MANAGER_COMMANDS_FIELD_DESC = new 
org.apache.thrift.protocol.TField("jobManagerCommands", 
org.apache.thrift.protocol.TType.MAP, (short)5);
   private static final org.apache.thrift.protocol.TField 
PARALLELISM_PREFIX_FIELD_DESC = new 
org.apache.thrift.protocol.TField("parallelismPrefix", 
org.apache.thrift.protocol.TType.MAP, (short)6);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = 
new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new 
ResourceJobManagerStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new ResourceJobManagerTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory 
STANDARD_SCHEME_FACTORY = new ResourceJobManagerStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory 
TUPLE_SCHEME_FACTORY = new ResourceJobManagerTupleSchemeFactory();
 
-  private String resourceJobManagerId; // required
+  private java.lang.String resourceJobManagerId; // required
   private ResourceJobManagerType resourceJobManagerType; // required
-  private String pushMonitoringEndpoint; // optional
-  private String jobManagerBinPath; // optional
-  private Map<JobManagerCommand,String> jobManagerCommands; // optional
-  private 
Map<org.apache.airavata.model.parallelism.ApplicationParallelismType,String> 
parallelismPrefix; // optional
+  private java.lang.String pushMonitoringEndpoint; // optional
+  private java.lang.String jobManagerBinPath; // optional
+  private java.util.Map<JobManagerCommand,java.lang.String> 
jobManagerCommands; // optional
+  private 
java.util.Map<org.apache.airavata.model.parallelism.ApplicationParallelismType,java.lang.String>
 parallelismPrefix; // 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 {
@@ -105,10 +75,10 @@ public class ResourceJobManager implements 
org.apache.thrift.TBase<ResourceJobMa
     JOB_MANAGER_COMMANDS((short)5, "jobManagerCommands"),
     PARALLELISM_PREFIX((short)6, "parallelismPrefix");
 
-    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);
       }
     }
@@ -141,21 +111,21 @@ public class ResourceJobManager implements 
org.apache.thrift.TBase<ResourceJobMa
      */
     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;
     }
@@ -164,16 +134,16 @@ public class ResourceJobManager implements 
org.apache.thrift.TBase<ResourceJobMa
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
   private static final _Fields optionals[] = 
{_Fields.PUSH_MONITORING_ENDPOINT,_Fields.JOB_MANAGER_BIN_PATH,_Fields.JOB_MANAGER_COMMANDS,_Fields.PARALLELISM_PREFIX};
-  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.RESOURCE_JOB_MANAGER_ID, new 
org.apache.thrift.meta_data.FieldMetaData("resourceJobManagerId", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.RESOURCE_JOB_MANAGER_TYPE, new 
org.apache.thrift.meta_data.FieldMetaData("resourceJobManagerType", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
@@ -190,7 +160,7 @@ public class ResourceJobManager implements 
org.apache.thrift.TBase<ResourceJobMa
         new 
org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
             new 
org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, 
org.apache.airavata.model.parallelism.ApplicationParallelismType.class), 
             new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ResourceJobManager.class,
 metaDataMap);
   }
 
@@ -200,7 +170,7 @@ public class ResourceJobManager implements 
org.apache.thrift.TBase<ResourceJobMa
   }
 
   public ResourceJobManager(
-    String resourceJobManagerId,
+    java.lang.String resourceJobManagerId,
     ResourceJobManagerType resourceJobManagerType)
   {
     this();
@@ -225,30 +195,30 @@ public class ResourceJobManager implements 
org.apache.thrift.TBase<ResourceJobMa
       this.jobManagerBinPath = other.jobManagerBinPath;
     }
     if (other.isSetJobManagerCommands()) {
-      Map<JobManagerCommand,String> __this__jobManagerCommands = new 
HashMap<JobManagerCommand,String>(other.jobManagerCommands.size());
-      for (Map.Entry<JobManagerCommand, String> other_element : 
other.jobManagerCommands.entrySet()) {
+      java.util.Map<JobManagerCommand,java.lang.String> 
__this__jobManagerCommands = new 
java.util.HashMap<JobManagerCommand,java.lang.String>(other.jobManagerCommands.size());
+      for (java.util.Map.Entry<JobManagerCommand, java.lang.String> 
other_element : other.jobManagerCommands.entrySet()) {
 
         JobManagerCommand other_element_key = other_element.getKey();
-        String other_element_value = other_element.getValue();
+        java.lang.String other_element_value = other_element.getValue();
 
         JobManagerCommand __this__jobManagerCommands_copy_key = 
other_element_key;
 
-        String __this__jobManagerCommands_copy_value = other_element_value;
+        java.lang.String __this__jobManagerCommands_copy_value = 
other_element_value;
 
         __this__jobManagerCommands.put(__this__jobManagerCommands_copy_key, 
__this__jobManagerCommands_copy_value);
       }
       this.jobManagerCommands = __this__jobManagerCommands;
     }
     if (other.isSetParallelismPrefix()) {
-      
Map<org.apache.airavata.model.parallelism.ApplicationParallelismType,String> 
__this__parallelismPrefix = new 
HashMap<org.apache.airavata.model.parallelism.ApplicationParallelismType,String>(other.parallelismPrefix.size());
-      for 
(Map.Entry<org.apache.airavata.model.parallelism.ApplicationParallelismType, 
String> other_element : other.parallelismPrefix.entrySet()) {
+      
java.util.Map<org.apache.airavata.model.parallelism.ApplicationParallelismType,java.lang.String>
 __this__parallelismPrefix = new 
java.util.HashMap<org.apache.airavata.model.parallelism.ApplicationParallelismType,java.lang.String>(other.parallelismPrefix.size());
+      for 
(java.util.Map.Entry<org.apache.airavata.model.parallelism.ApplicationParallelismType,
 java.lang.String> other_element : other.parallelismPrefix.entrySet()) {
 
         org.apache.airavata.model.parallelism.ApplicationParallelismType 
other_element_key = other_element.getKey();
-        String other_element_value = other_element.getValue();
+        java.lang.String other_element_value = other_element.getValue();
 
         org.apache.airavata.model.parallelism.ApplicationParallelismType 
__this__parallelismPrefix_copy_key = other_element_key;
 
-        String __this__parallelismPrefix_copy_value = other_element_value;
+        java.lang.String __this__parallelismPrefix_copy_value = 
other_element_value;
 
         __this__parallelismPrefix.put(__this__parallelismPrefix_copy_key, 
__this__parallelismPrefix_copy_value);
       }
@@ -271,11 +241,11 @@ public class ResourceJobManager implements 
org.apache.thrift.TBase<ResourceJobMa
     this.parallelismPrefix = null;
   }
 
-  public String getResourceJobManagerId() {
+  public java.lang.String getResourceJobManagerId() {
     return this.resourceJobManagerId;
   }
 
-  public void setResourceJobManagerId(String resourceJobManagerId) {
+  public void setResourceJobManagerId(java.lang.String resourceJobManagerId) {
     this.resourceJobManagerId = resourceJobManagerId;
   }
 
@@ -325,11 +295,11 @@ public class ResourceJobManager implements 
org.apache.thrift.TBase<ResourceJobMa
     }
   }
 
-  public String getPushMonitoringEndpoint() {
+  public java.lang.String getPushMonitoringEndpoint() {
     return this.pushMonitoringEndpoint;
   }
 
-  public void setPushMonitoringEndpoint(String pushMonitoringEndpoint) {
+  public void setPushMonitoringEndpoint(java.lang.String 
pushMonitoringEndpoint) {
     this.pushMonitoringEndpoint = pushMonitoringEndpoint;
   }
 
@@ -348,11 +318,11 @@ public class ResourceJobManager implements 
org.apache.thrift.TBase<ResourceJobMa
     }
   }
 
-  public String getJobManagerBinPath() {
+  public java.lang.String getJobManagerBinPath() {
     return this.jobManagerBinPath;
   }
 
-  public void setJobManagerBinPath(String jobManagerBinPath) {
+  public void setJobManagerBinPath(java.lang.String jobManagerBinPath) {
     this.jobManagerBinPath = jobManagerBinPath;
   }
 
@@ -375,18 +345,18 @@ public class ResourceJobManager implements 
org.apache.thrift.TBase<ResourceJobMa
     return (this.jobManagerCommands == null) ? 0 : 
this.jobManagerCommands.size();
   }
 
-  public void putToJobManagerCommands(JobManagerCommand key, String val) {
+  public void putToJobManagerCommands(JobManagerCommand key, java.lang.String 
val) {
     if (this.jobManagerCommands == null) {
-      this.jobManagerCommands = new HashMap<JobManagerCommand,String>();
+      this.jobManagerCommands = new 
java.util.HashMap<JobManagerCommand,java.lang.String>();
     }
     this.jobManagerCommands.put(key, val);
   }
 
-  public Map<JobManagerCommand,String> getJobManagerCommands() {
+  public java.util.Map<JobManagerCommand,java.lang.String> 
getJobManagerCommands() {
     return this.jobManagerCommands;
   }
 
-  public void setJobManagerCommands(Map<JobManagerCommand,String> 
jobManagerCommands) {
+  public void 
setJobManagerCommands(java.util.Map<JobManagerCommand,java.lang.String> 
jobManagerCommands) {
     this.jobManagerCommands = jobManagerCommands;
   }
 
@@ -409,18 +379,18 @@ public class ResourceJobManager implements 
org.apache.thrift.TBase<ResourceJobMa
     return (this.parallelismPrefix == null) ? 0 : 
this.parallelismPrefix.size();
   }
 
-  public void 
putToParallelismPrefix(org.apache.airavata.model.parallelism.ApplicationParallelismType
 key, String val) {
+  public void 
putToParallelismPrefix(org.apache.airavata.model.parallelism.ApplicationParallelismType
 key, java.lang.String val) {
     if (this.parallelismPrefix == null) {
-      this.parallelismPrefix = new 
HashMap<org.apache.airavata.model.parallelism.ApplicationParallelismType,String>();
+      this.parallelismPrefix = new 
java.util.HashMap<org.apache.airavata.model.parallelism.ApplicationParallelismType,java.lang.String>();
     }
     this.parallelismPrefix.put(key, val);
   }
 
-  public 
Map<org.apache.airavata.model.parallelism.ApplicationParallelismType,String> 
getParallelismPrefix() {
+  public 
java.util.Map<org.apache.airavata.model.parallelism.ApplicationParallelismType,java.lang.String>
 getParallelismPrefix() {
     return this.parallelismPrefix;
   }
 
-  public void 
setParallelismPrefix(Map<org.apache.airavata.model.parallelism.ApplicationParallelismType,String>
 parallelismPrefix) {
+  public void 
setParallelismPrefix(java.util.Map<org.apache.airavata.model.parallelism.ApplicationParallelismType,java.lang.String>
 parallelismPrefix) {
     this.parallelismPrefix = parallelismPrefix;
   }
 
@@ -439,13 +409,13 @@ public class ResourceJobManager implements 
org.apache.thrift.TBase<ResourceJobMa
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case RESOURCE_JOB_MANAGER_ID:
       if (value == null) {
         unsetResourceJobManagerId();
       } else {
-        setResourceJobManagerId((String)value);
+        setResourceJobManagerId((java.lang.String)value);
       }
       break;
 
@@ -461,7 +431,7 @@ public class ResourceJobManager implements 
org.apache.thrift.TBase<ResourceJobMa
       if (value == null) {
         unsetPushMonitoringEndpoint();
       } else {
-        setPushMonitoringEndpoint((String)value);
+        setPushMonitoringEndpoint((java.lang.String)value);
       }
       break;
 
@@ -469,7 +439,7 @@ public class ResourceJobManager implements 
org.apache.thrift.TBase<ResourceJobMa
       if (value == null) {
         unsetJobManagerBinPath();
       } else {
-        setJobManagerBinPath((String)value);
+        setJobManagerBinPath((java.lang.String)value);
       }
       break;
 
@@ -477,7 +447,7 @@ public class ResourceJobManager implements 
org.apache.thrift.TBase<ResourceJobMa
       if (value == null) {
         unsetJobManagerCommands();
       } else {
-        setJobManagerCommands((Map<JobManagerCommand,String>)value);
+        
setJobManagerCommands((java.util.Map<JobManagerCommand,java.lang.String>)value);
       }
       break;
 
@@ -485,14 +455,14 @@ public class ResourceJobManager implements 
org.apache.thrift.TBase<ResourceJobMa
       if (value == null) {
         unsetParallelismPrefix();
       } else {
-        
setParallelismPrefix((Map<org.apache.airavata.model.parallelism.ApplicationParallelismType,String>)value);
+        
setParallelismPrefix((java.util.Map<org.apache.airavata.model.parallelism.ApplicationParallelismType,java.lang.String>)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case RESOURCE_JOB_MANAGER_ID:
       return getResourceJobManagerId();
@@ -513,13 +483,13 @@ public class ResourceJobManager implements 
org.apache.thrift.TBase<ResourceJobMa
       return getParallelismPrefix();
 
     }
-    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) {
@@ -536,11 +506,11 @@ public class ResourceJobManager implements 
org.apache.thrift.TBase<ResourceJobMa
     case PARALLELISM_PREFIX:
       return isSetParallelismPrefix();
     }
-    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 ResourceJobManager)
@@ -551,6 +521,8 @@ public class ResourceJobManager implements 
org.apache.thrift.TBase<ResourceJobMa
   public boolean equals(ResourceJobManager that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_resourceJobManagerId = true && 
this.isSetResourceJobManagerId();
     boolean that_present_resourceJobManagerId = true && 
that.isSetResourceJobManagerId();
@@ -611,39 +583,33 @@ public class ResourceJobManager implements 
org.apache.thrift.TBase<ResourceJobMa
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_resourceJobManagerId = true && 
(isSetResourceJobManagerId());
-    list.add(present_resourceJobManagerId);
-    if (present_resourceJobManagerId)
-      list.add(resourceJobManagerId);
-
-    boolean present_resourceJobManagerType = true && 
(isSetResourceJobManagerType());
-    list.add(present_resourceJobManagerType);
-    if (present_resourceJobManagerType)
-      list.add(resourceJobManagerType.getValue());
-
-    boolean present_pushMonitoringEndpoint = true && 
(isSetPushMonitoringEndpoint());
-    list.add(present_pushMonitoringEndpoint);
-    if (present_pushMonitoringEndpoint)
-      list.add(pushMonitoringEndpoint);
-
-    boolean present_jobManagerBinPath = true && (isSetJobManagerBinPath());
-    list.add(present_jobManagerBinPath);
-    if (present_jobManagerBinPath)
-      list.add(jobManagerBinPath);
-
-    boolean present_jobManagerCommands = true && (isSetJobManagerCommands());
-    list.add(present_jobManagerCommands);
-    if (present_jobManagerCommands)
-      list.add(jobManagerCommands);
-
-    boolean present_parallelismPrefix = true && (isSetParallelismPrefix());
-    list.add(present_parallelismPrefix);
-    if (present_parallelismPrefix)
-      list.add(parallelismPrefix);
-
-    return list.hashCode();
+    int hashCode = 1;
+
+    hashCode = hashCode * 8191 + ((isSetResourceJobManagerId()) ? 131071 : 
524287);
+    if (isSetResourceJobManagerId())
+      hashCode = hashCode * 8191 + resourceJobManagerId.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetResourceJobManagerType()) ? 131071 : 
524287);
+    if (isSetResourceJobManagerType())
+      hashCode = hashCode * 8191 + resourceJobManagerType.getValue();
+
+    hashCode = hashCode * 8191 + ((isSetPushMonitoringEndpoint()) ? 131071 : 
524287);
+    if (isSetPushMonitoringEndpoint())
+      hashCode = hashCode * 8191 + pushMonitoringEndpoint.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetJobManagerBinPath()) ? 131071 : 
524287);
+    if (isSetJobManagerBinPath())
+      hashCode = hashCode * 8191 + jobManagerBinPath.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetJobManagerCommands()) ? 131071 : 
524287);
+    if (isSetJobManagerCommands())
+      hashCode = hashCode * 8191 + jobManagerCommands.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetParallelismPrefix()) ? 131071 : 
524287);
+    if (isSetParallelismPrefix())
+      hashCode = hashCode * 8191 + parallelismPrefix.hashCode();
+
+    return hashCode;
   }
 
   @Override
@@ -654,7 +620,7 @@ public class ResourceJobManager implements 
org.apache.thrift.TBase<ResourceJobMa
 
     int lastComparison = 0;
 
-    lastComparison = 
Boolean.valueOf(isSetResourceJobManagerId()).compareTo(other.isSetResourceJobManagerId());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetResourceJobManagerId()).compareTo(other.isSetResourceJobManagerId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -664,7 +630,7 @@ public class ResourceJobManager implements 
org.apache.thrift.TBase<ResourceJobMa
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetResourceJobManagerType()).compareTo(other.isSetResourceJobManagerType());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetResourceJobManagerType()).compareTo(other.isSetResourceJobManagerType());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -674,7 +640,7 @@ public class ResourceJobManager implements 
org.apache.thrift.TBase<ResourceJobMa
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetPushMonitoringEndpoint()).compareTo(other.isSetPushMonitoringEndpoint());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetPushMonitoringEndpoint()).compareTo(other.isSetPushMonitoringEndpoint());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -684,7 +650,7 @@ public class ResourceJobManager implements 
org.apache.thrift.TBase<ResourceJobMa
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetJobManagerBinPath()).compareTo(other.isSetJobManagerBinPath());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetJobManagerBinPath()).compareTo(other.isSetJobManagerBinPath());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -694,7 +660,7 @@ public class ResourceJobManager implements 
org.apache.thrift.TBase<ResourceJobMa
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetJobManagerCommands()).compareTo(other.isSetJobManagerCommands());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetJobManagerCommands()).compareTo(other.isSetJobManagerCommands());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -704,7 +670,7 @@ public class ResourceJobManager implements 
org.apache.thrift.TBase<ResourceJobMa
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetParallelismPrefix()).compareTo(other.isSetParallelismPrefix());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetParallelismPrefix()).compareTo(other.isSetParallelismPrefix());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -722,16 +688,16 @@ public class ResourceJobManager implements 
org.apache.thrift.TBase<ResourceJobMa
   }
 
   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("ResourceJobManager(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new 
java.lang.StringBuilder("ResourceJobManager(");
     boolean first = true;
 
     sb.append("resourceJobManagerId:");
@@ -814,7 +780,7 @@ public class ResourceJobManager implements 
org.apache.thrift.TBase<ResourceJobMa
     }
   }
 
-  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 {
       read(new org.apache.thrift.protocol.TCompactProtocol(new 
org.apache.thrift.transport.TIOStreamTransport(in)));
     } catch (org.apache.thrift.TException te) {
@@ -822,13 +788,13 @@ public class ResourceJobManager implements 
org.apache.thrift.TBase<ResourceJobMa
     }
   }
 
-  private static class ResourceJobManagerStandardSchemeFactory implements 
SchemeFactory {
+  private static class ResourceJobManagerStandardSchemeFactory implements 
org.apache.thrift.scheme.SchemeFactory {
     public ResourceJobManagerStandardScheme getScheme() {
       return new ResourceJobManagerStandardScheme();
     }
   }
 
-  private static class ResourceJobManagerStandardScheme extends 
StandardScheme<ResourceJobManager> {
+  private static class ResourceJobManagerStandardScheme extends 
org.apache.thrift.scheme.StandardScheme<ResourceJobManager> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, 
ResourceJobManager struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -876,9 +842,9 @@ public class ResourceJobManager implements 
org.apache.thrift.TBase<ResourceJobMa
             if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
               {
                 org.apache.thrift.protocol.TMap _map0 = iprot.readMapBegin();
-                struct.jobManagerCommands = new 
HashMap<JobManagerCommand,String>(2*_map0.size);
+                struct.jobManagerCommands = new 
java.util.HashMap<JobManagerCommand,java.lang.String>(2*_map0.size);
                 JobManagerCommand _key1;
-                String _val2;
+                java.lang.String _val2;
                 for (int _i3 = 0; _i3 < _map0.size; ++_i3)
                 {
                   _key1 = 
org.apache.airavata.model.appcatalog.computeresource.JobManagerCommand.findByValue(iprot.readI32());
@@ -896,9 +862,9 @@ public class ResourceJobManager implements 
org.apache.thrift.TBase<ResourceJobMa
             if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
               {
                 org.apache.thrift.protocol.TMap _map4 = iprot.readMapBegin();
-                struct.parallelismPrefix = new 
HashMap<org.apache.airavata.model.parallelism.ApplicationParallelismType,String>(2*_map4.size);
+                struct.parallelismPrefix = new 
java.util.HashMap<org.apache.airavata.model.parallelism.ApplicationParallelismType,java.lang.String>(2*_map4.size);
                 
org.apache.airavata.model.parallelism.ApplicationParallelismType _key5;
-                String _val6;
+                java.lang.String _val6;
                 for (int _i7 = 0; _i7 < _map4.size; ++_i7)
                 {
                   _key5 = 
org.apache.airavata.model.parallelism.ApplicationParallelismType.findByValue(iprot.readI32());
@@ -954,7 +920,7 @@ public class ResourceJobManager implements 
org.apache.thrift.TBase<ResourceJobMa
           oprot.writeFieldBegin(JOB_MANAGER_COMMANDS_FIELD_DESC);
           {
             oprot.writeMapBegin(new 
org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, 
org.apache.thrift.protocol.TType.STRING, struct.jobManagerCommands.size()));
-            for (Map.Entry<JobManagerCommand, String> _iter8 : 
struct.jobManagerCommands.entrySet())
+            for (java.util.Map.Entry<JobManagerCommand, java.lang.String> 
_iter8 : struct.jobManagerCommands.entrySet())
             {
               oprot.writeI32(_iter8.getKey().getValue());
               oprot.writeString(_iter8.getValue());
@@ -969,7 +935,7 @@ public class ResourceJobManager implements 
org.apache.thrift.TBase<ResourceJobMa
           oprot.writeFieldBegin(PARALLELISM_PREFIX_FIELD_DESC);
           {
             oprot.writeMapBegin(new 
org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, 
org.apache.thrift.protocol.TType.STRING, struct.parallelismPrefix.size()));
-            for 
(Map.Entry<org.apache.airavata.model.parallelism.ApplicationParallelismType, 
String> _iter9 : struct.parallelismPrefix.entrySet())
+            for 
(java.util.Map.Entry<org.apache.airavata.model.parallelism.ApplicationParallelismType,
 java.lang.String> _iter9 : struct.parallelismPrefix.entrySet())
             {
               oprot.writeI32(_iter9.getKey().getValue());
               oprot.writeString(_iter9.getValue());
@@ -985,20 +951,20 @@ public class ResourceJobManager implements 
org.apache.thrift.TBase<ResourceJobMa
 
   }
 
-  private static class ResourceJobManagerTupleSchemeFactory implements 
SchemeFactory {
+  private static class ResourceJobManagerTupleSchemeFactory implements 
org.apache.thrift.scheme.SchemeFactory {
     public ResourceJobManagerTupleScheme getScheme() {
       return new ResourceJobManagerTupleScheme();
     }
   }
 
-  private static class ResourceJobManagerTupleScheme extends 
TupleScheme<ResourceJobManager> {
+  private static class ResourceJobManagerTupleScheme extends 
org.apache.thrift.scheme.TupleScheme<ResourceJobManager> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, 
ResourceJobManager 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.resourceJobManagerId);
       oprot.writeI32(struct.resourceJobManagerType.getValue());
-      BitSet optionals = new BitSet();
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetPushMonitoringEndpoint()) {
         optionals.set(0);
       }
@@ -1021,7 +987,7 @@ public class ResourceJobManager implements 
org.apache.thrift.TBase<ResourceJobMa
       if (struct.isSetJobManagerCommands()) {
         {
           oprot.writeI32(struct.jobManagerCommands.size());
-          for (Map.Entry<JobManagerCommand, String> _iter10 : 
struct.jobManagerCommands.entrySet())
+          for (java.util.Map.Entry<JobManagerCommand, java.lang.String> 
_iter10 : struct.jobManagerCommands.entrySet())
           {
             oprot.writeI32(_iter10.getKey().getValue());
             oprot.writeString(_iter10.getValue());
@@ -1031,7 +997,7 @@ public class ResourceJobManager implements 
org.apache.thrift.TBase<ResourceJobMa
       if (struct.isSetParallelismPrefix()) {
         {
           oprot.writeI32(struct.parallelismPrefix.size());
-          for 
(Map.Entry<org.apache.airavata.model.parallelism.ApplicationParallelismType, 
String> _iter11 : struct.parallelismPrefix.entrySet())
+          for 
(java.util.Map.Entry<org.apache.airavata.model.parallelism.ApplicationParallelismType,
 java.lang.String> _iter11 : struct.parallelismPrefix.entrySet())
           {
             oprot.writeI32(_iter11.getKey().getValue());
             oprot.writeString(_iter11.getValue());
@@ -1042,12 +1008,12 @@ public class ResourceJobManager implements 
org.apache.thrift.TBase<ResourceJobMa
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, 
ResourceJobManager struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
+      org.apache.thrift.protocol.TTupleProtocol iprot = 
(org.apache.thrift.protocol.TTupleProtocol) prot;
       struct.resourceJobManagerId = iprot.readString();
       struct.setResourceJobManagerIdIsSet(true);
       struct.resourceJobManagerType = 
org.apache.airavata.model.appcatalog.computeresource.ResourceJobManagerType.findByValue(iprot.readI32());
       struct.setResourceJobManagerTypeIsSet(true);
-      BitSet incoming = iprot.readBitSet(4);
+      java.util.BitSet incoming = iprot.readBitSet(4);
       if (incoming.get(0)) {
         struct.pushMonitoringEndpoint = iprot.readString();
         struct.setPushMonitoringEndpointIsSet(true);
@@ -1059,9 +1025,9 @@ public class ResourceJobManager implements 
org.apache.thrift.TBase<ResourceJobMa
       if (incoming.get(2)) {
         {
           org.apache.thrift.protocol.TMap _map12 = new 
org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, 
org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.jobManagerCommands = new 
HashMap<JobManagerCommand,String>(2*_map12.size);
+          struct.jobManagerCommands = new 
java.util.HashMap<JobManagerCommand,java.lang.String>(2*_map12.size);
           JobManagerCommand _key13;
-          String _val14;
+          java.lang.String _val14;
           for (int _i15 = 0; _i15 < _map12.size; ++_i15)
           {
             _key13 = 
org.apache.airavata.model.appcatalog.computeresource.JobManagerCommand.findByValue(iprot.readI32());
@@ -1074,9 +1040,9 @@ public class ResourceJobManager implements 
org.apache.thrift.TBase<ResourceJobMa
       if (incoming.get(3)) {
         {
           org.apache.thrift.protocol.TMap _map16 = new 
org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, 
org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.parallelismPrefix = new 
HashMap<org.apache.airavata.model.parallelism.ApplicationParallelismType,String>(2*_map16.size);
+          struct.parallelismPrefix = new 
java.util.HashMap<org.apache.airavata.model.parallelism.ApplicationParallelismType,java.lang.String>(2*_map16.size);
           org.apache.airavata.model.parallelism.ApplicationParallelismType 
_key17;
-          String _val18;
+          java.lang.String _val18;
           for (int _i19 = 0; _i19 < _map16.size; ++_i19)
           {
             _key17 = 
org.apache.airavata.model.parallelism.ApplicationParallelismType.findByValue(iprot.readI32());
@@ -1089,5 +1055,8 @@ public class ResourceJobManager implements 
org.apache.thrift.TBase<ResourceJobMa
     }
   }
 
+  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/ResourceJobManagerType.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManagerType.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManagerType.java
index 04dfb74..e1a336c 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManagerType.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManagerType.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/SSHJobSubmission.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java
index 8a9007a..7d6aecf 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.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"})
 /**
  * Authenticate using Secured Shell
  * 
@@ -67,7 +40,7 @@ import org.slf4j.LoggerFactory;
  *    the same. Example: *@*.example.com or *@example.com
  * 
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
 public class SSHJobSubmission implements 
org.apache.thrift.TBase<SSHJobSubmission, SSHJobSubmission._Fields>, 
java.io.Serializable, Cloneable, Comparable<SSHJobSubmission> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("SSHJobSubmission");
 
@@ -79,19 +52,16 @@ public class SSHJobSubmission implements 
org.apache.thrift.TBase<SSHJobSubmissio
   private static final org.apache.thrift.protocol.TField 
MONITOR_MODE_FIELD_DESC = new org.apache.thrift.protocol.TField("monitorMode", 
org.apache.thrift.protocol.TType.I32, (short)6);
   private static final org.apache.thrift.protocol.TField 
BATCH_QUEUE_EMAIL_SENDERS_FIELD_DESC = new 
org.apache.thrift.protocol.TField("batchQueueEmailSenders", 
org.apache.thrift.protocol.TType.LIST, (short)7);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = 
new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new 
SSHJobSubmissionStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new SSHJobSubmissionTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory 
STANDARD_SCHEME_FACTORY = new SSHJobSubmissionStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory 
TUPLE_SCHEME_FACTORY = new SSHJobSubmissionTupleSchemeFactory();
 
-  private String jobSubmissionInterfaceId; // required
+  private java.lang.String jobSubmissionInterfaceId; // required
   private org.apache.airavata.model.data.movement.SecurityProtocol 
securityProtocol; // required
   private ResourceJobManager resourceJobManager; // required
-  private String alternativeSSHHostName; // optional
+  private java.lang.String alternativeSSHHostName; // optional
   private int sshPort; // optional
   private MonitorMode monitorMode; // optional
-  private List<String> batchQueueEmailSenders; // optional
+  private java.util.List<java.lang.String> batchQueueEmailSenders; // 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 {
@@ -111,10 +81,10 @@ public class SSHJobSubmission implements 
org.apache.thrift.TBase<SSHJobSubmissio
     MONITOR_MODE((short)6, "monitorMode"),
     BATCH_QUEUE_EMAIL_SENDERS((short)7, "batchQueueEmailSenders");
 
-    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);
       }
     }
@@ -149,21 +119,21 @@ public class SSHJobSubmission implements 
org.apache.thrift.TBase<SSHJobSubmissio
      */
     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;
     }
@@ -172,7 +142,7 @@ public class SSHJobSubmission implements 
org.apache.thrift.TBase<SSHJobSubmissio
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -181,9 +151,9 @@ public class SSHJobSubmission implements 
org.apache.thrift.TBase<SSHJobSubmissio
   private static final int __SSHPORT_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = 
{_Fields.ALTERNATIVE_SSHHOST_NAME,_Fields.SSH_PORT,_Fields.MONITOR_MODE,_Fields.BATCH_QUEUE_EMAIL_SENDERS};
-  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.JOB_SUBMISSION_INTERFACE_ID, new 
org.apache.thrift.meta_data.FieldMetaData("jobSubmissionInterfaceId", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.SECURITY_PROTOCOL, new 
org.apache.thrift.meta_data.FieldMetaData("securityProtocol", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
@@ -199,7 +169,7 @@ public class SSHJobSubmission implements 
org.apache.thrift.TBase<SSHJobSubmissio
     tmpMap.put(_Fields.BATCH_QUEUE_EMAIL_SENDERS, new 
org.apache.thrift.meta_data.FieldMetaData("batchQueueEmailSenders", 
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new 
org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
             new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SSHJobSubmission.class,
 metaDataMap);
   }
 
@@ -211,7 +181,7 @@ public class SSHJobSubmission implements 
org.apache.thrift.TBase<SSHJobSubmissio
   }
 
   public SSHJobSubmission(
-    String jobSubmissionInterfaceId,
+    java.lang.String jobSubmissionInterfaceId,
     org.apache.airavata.model.data.movement.SecurityProtocol securityProtocol,
     ResourceJobManager resourceJobManager)
   {
@@ -243,7 +213,7 @@ public class SSHJobSubmission implements 
org.apache.thrift.TBase<SSHJobSubmissio
       this.monitorMode = other.monitorMode;
     }
     if (other.isSetBatchQueueEmailSenders()) {
-      List<String> __this__batchQueueEmailSenders = new 
ArrayList<String>(other.batchQueueEmailSenders);
+      java.util.List<java.lang.String> __this__batchQueueEmailSenders = new 
java.util.ArrayList<java.lang.String>(other.batchQueueEmailSenders);
       this.batchQueueEmailSenders = __this__batchQueueEmailSenders;
     }
   }
@@ -265,11 +235,11 @@ public class SSHJobSubmission implements 
org.apache.thrift.TBase<SSHJobSubmissio
     this.batchQueueEmailSenders = null;
   }
 
-  public String getJobSubmissionInterfaceId() {
+  public java.lang.String getJobSubmissionInterfaceId() {
     return this.jobSubmissionInterfaceId;
   }
 
-  public void setJobSubmissionInterfaceId(String jobSubmissionInterfaceId) {
+  public void setJobSubmissionInterfaceId(java.lang.String 
jobSubmissionInterfaceId) {
     this.jobSubmissionInterfaceId = jobSubmissionInterfaceId;
   }
 
@@ -342,11 +312,11 @@ public class SSHJobSubmission implements 
org.apache.thrift.TBase<SSHJobSubmissio
     }
   }
 
-  public String getAlternativeSSHHostName() {
+  public java.lang.String getAlternativeSSHHostName() {
     return this.alternativeSSHHostName;
   }
 
-  public void setAlternativeSSHHostName(String alternativeSSHHostName) {
+  public void setAlternativeSSHHostName(java.lang.String 
alternativeSSHHostName) {
     this.alternativeSSHHostName = alternativeSSHHostName;
   }
 
@@ -375,16 +345,16 @@ public class SSHJobSubmission implements 
org.apache.thrift.TBase<SSHJobSubmissio
   }
 
   public void unsetSshPort() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, 
__SSHPORT_ISSET_ID);
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SSHPORT_ISSET_ID);
   }
 
   /** Returns true if field sshPort is set (has been assigned a value) and 
false otherwise */
   public boolean isSetSshPort() {
-    return EncodingUtils.testBit(__isset_bitfield, __SSHPORT_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, 
__SSHPORT_ISSET_ID);
   }
 
   public void setSshPortIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, 
__SSHPORT_ISSET_ID, value);
+    __isset_bitfield = 
org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SSHPORT_ISSET_ID, 
value);
   }
 
   /**
@@ -422,22 +392,22 @@ public class SSHJobSubmission implements 
org.apache.thrift.TBase<SSHJobSubmissio
     return (this.batchQueueEmailSenders == null) ? 0 : 
this.batchQueueEmailSenders.size();
   }
 
-  public java.util.Iterator<String> getBatchQueueEmailSendersIterator() {
+  public java.util.Iterator<java.lang.String> 
getBatchQueueEmailSendersIterator() {
     return (this.batchQueueEmailSenders == null) ? null : 
this.batchQueueEmailSenders.iterator();
   }
 
-  public void addToBatchQueueEmailSenders(String elem) {
+  public void addToBatchQueueEmailSenders(java.lang.String elem) {
     if (this.batchQueueEmailSenders == null) {
-      this.batchQueueEmailSenders = new ArrayList<String>();
+      this.batchQueueEmailSenders = new 
java.util.ArrayList<java.lang.String>();
     }
     this.batchQueueEmailSenders.add(elem);
   }
 
-  public List<String> getBatchQueueEmailSenders() {
+  public java.util.List<java.lang.String> getBatchQueueEmailSenders() {
     return this.batchQueueEmailSenders;
   }
 
-  public void setBatchQueueEmailSenders(List<String> batchQueueEmailSenders) {
+  public void setBatchQueueEmailSenders(java.util.List<java.lang.String> 
batchQueueEmailSenders) {
     this.batchQueueEmailSenders = batchQueueEmailSenders;
   }
 
@@ -456,13 +426,13 @@ public class SSHJobSubmission implements 
org.apache.thrift.TBase<SSHJobSubmissio
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case JOB_SUBMISSION_INTERFACE_ID:
       if (value == null) {
         unsetJobSubmissionInterfaceId();
       } else {
-        setJobSubmissionInterfaceId((String)value);
+        setJobSubmissionInterfaceId((java.lang.String)value);
       }
       break;
 
@@ -486,7 +456,7 @@ public class SSHJobSubmission implements 
org.apache.thrift.TBase<SSHJobSubmissio
       if (value == null) {
         unsetAlternativeSSHHostName();
       } else {
-        setAlternativeSSHHostName((String)value);
+        setAlternativeSSHHostName((java.lang.String)value);
       }
       break;
 
@@ -494,7 +464,7 @@ public class SSHJobSubmission implements 
org.apache.thrift.TBase<SSHJobSubmissio
       if (value == null) {
         unsetSshPort();
       } else {
-        setSshPort((Integer)value);
+        setSshPort((java.lang.Integer)value);
       }
       break;
 
@@ -510,14 +480,14 @@ public class SSHJobSubmission implements 
org.apache.thrift.TBase<SSHJobSubmissio
       if (value == null) {
         unsetBatchQueueEmailSenders();
       } else {
-        setBatchQueueEmailSenders((List<String>)value);
+        setBatchQueueEmailSenders((java.util.List<java.lang.String>)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case JOB_SUBMISSION_INTERFACE_ID:
       return getJobSubmissionInterfaceId();
@@ -541,13 +511,13 @@ public class SSHJobSubmission implements 
org.apache.thrift.TBase<SSHJobSubmissio
       return getBatchQueueEmailSenders();
 
     }
-    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) {
@@ -566,11 +536,11 @@ public class SSHJobSubmission implements 
org.apache.thrift.TBase<SSHJobSubmissio
     case BATCH_QUEUE_EMAIL_SENDERS:
       return isSetBatchQueueEmailSenders();
     }
-    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 SSHJobSubmission)
@@ -581,6 +551,8 @@ public class SSHJobSubmission implements 
org.apache.thrift.TBase<SSHJobSubmissio
   public boolean equals(SSHJobSubmission that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_jobSubmissionInterfaceId = true && 
this.isSetJobSubmissionInterfaceId();
     boolean that_present_jobSubmissionInterfaceId = true && 
that.isSetJobSubmissionInterfaceId();
@@ -650,44 +622,37 @@ public class SSHJobSubmission implements 
org.apache.thrift.TBase<SSHJobSubmissio
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_jobSubmissionInterfaceId = true && 
(isSetJobSubmissionInterfaceId());
-    list.add(present_jobSubmissionInterfaceId);
-    if (present_jobSubmissionInterfaceId)
-      list.add(jobSubmissionInterfaceId);
+    hashCode = hashCode * 8191 + ((isSetJobSubmissionInterfaceId()) ? 131071 : 
524287);
+    if (isSetJobSubmissionInterfaceId())
+      hashCode = hashCode * 8191 + jobSubmissionInterfaceId.hashCode();
 
-    boolean present_securityProtocol = true && (isSetSecurityProtocol());
-    list.add(present_securityProtocol);
-    if (present_securityProtocol)
-      list.add(securityProtocol.getValue());
+    hashCode = hashCode * 8191 + ((isSetSecurityProtocol()) ? 131071 : 524287);
+    if (isSetSecurityProtocol())
+      hashCode = hashCode * 8191 + securityProtocol.getValue();
 
-    boolean present_resourceJobManager = true && (isSetResourceJobManager());
-    list.add(present_resourceJobManager);
-    if (present_resourceJobManager)
-      list.add(resourceJobManager);
+    hashCode = hashCode * 8191 + ((isSetResourceJobManager()) ? 131071 : 
524287);
+    if (isSetResourceJobManager())
+      hashCode = hashCode * 8191 + resourceJobManager.hashCode();
 
-    boolean present_alternativeSSHHostName = true && 
(isSetAlternativeSSHHostName());
-    list.add(present_alternativeSSHHostName);
-    if (present_alternativeSSHHostName)
-      list.add(alternativeSSHHostName);
+    hashCode = hashCode * 8191 + ((isSetAlternativeSSHHostName()) ? 131071 : 
524287);
+    if (isSetAlternativeSSHHostName())
+      hashCode = hashCode * 8191 + alternativeSSHHostName.hashCode();
 
-    boolean present_sshPort = true && (isSetSshPort());
-    list.add(present_sshPort);
-    if (present_sshPort)
-      list.add(sshPort);
+    hashCode = hashCode * 8191 + ((isSetSshPort()) ? 131071 : 524287);
+    if (isSetSshPort())
+      hashCode = hashCode * 8191 + sshPort;
 
-    boolean present_monitorMode = true && (isSetMonitorMode());
-    list.add(present_monitorMode);
-    if (present_monitorMode)
-      list.add(monitorMode.getValue());
+    hashCode = hashCode * 8191 + ((isSetMonitorMode()) ? 131071 : 524287);
+    if (isSetMonitorMode())
+      hashCode = hashCode * 8191 + monitorMode.getValue();
 
-    boolean present_batchQueueEmailSenders = true && 
(isSetBatchQueueEmailSenders());
-    list.add(present_batchQueueEmailSenders);
-    if (present_batchQueueEmailSenders)
-      list.add(batchQueueEmailSenders);
+    hashCode = hashCode * 8191 + ((isSetBatchQueueEmailSenders()) ? 131071 : 
524287);
+    if (isSetBatchQueueEmailSenders())
+      hashCode = hashCode * 8191 + batchQueueEmailSenders.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -698,7 +663,7 @@ public class SSHJobSubmission implements 
org.apache.thrift.TBase<SSHJobSubmissio
 
     int lastComparison = 0;
 
-    lastComparison = 
Boolean.valueOf(isSetJobSubmissionInterfaceId()).compareTo(other.isSetJobSubmissionInterfaceId());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetJobSubmissionInterfaceId()).compareTo(other.isSetJobSubmissionInterfaceId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -708,7 +673,7 @@ public class SSHJobSubmission implements 
org.apache.thrift.TBase<SSHJobSubmissio
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetSecurityProtocol()).compareTo(other.isSetSecurityProtocol());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetSecurityProtocol()).compareTo(other.isSetSecurityProtocol());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -718,7 +683,7 @@ public class SSHJobSubmission implements 
org.apache.thrift.TBase<SSHJobSubmissio
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetResourceJobManager()).compareTo(other.isSetResourceJobManager());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetResourceJobManager()).compareTo(other.isSetResourceJobManager());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -728,7 +693,7 @@ public class SSHJobSubmission implements 
org.apache.thrift.TBase<SSHJobSubmissio
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetAlternativeSSHHostName()).compareTo(other.isSetAlternativeSSHHostName());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetAlternativeSSHHostName()).compareTo(other.isSetAlternativeSSHHostName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -738,7 +703,7 @@ public class SSHJobSubmission implements 
org.apache.thrift.TBase<SSHJobSubmissio
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetSshPort()).compareTo(other.isSetSshPort());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetSshPort()).compareTo(other.isSetSshPort());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -748,7 +713,7 @@ public class SSHJobSubmission implements 
org.apache.thrift.TBase<SSHJobSubmissio
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetMonitorMode()).compareTo(other.isSetMonitorMode());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetMonitorMode()).compareTo(other.isSetMonitorMode());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -758,7 +723,7 @@ public class SSHJobSubmission implements 
org.apache.thrift.TBase<SSHJobSubmissio
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetBatchQueueEmailSenders()).compareTo(other.isSetBatchQueueEmailSenders());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetBatchQueueEmailSenders()).compareTo(other.isSetBatchQueueEmailSenders());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -776,16 +741,16 @@ public class SSHJobSubmission implements 
org.apache.thrift.TBase<SSHJobSubmissio
   }
 
   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("SSHJobSubmission(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new 
java.lang.StringBuilder("SSHJobSubmission(");
     boolean first = true;
 
     sb.append("jobSubmissionInterfaceId:");
@@ -879,7 +844,7 @@ public class SSHJobSubmission implements 
org.apache.thrift.TBase<SSHJobSubmissio
     }
   }
 
-  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;
@@ -889,13 +854,13 @@ public class SSHJobSubmission implements 
org.apache.thrift.TBase<SSHJobSubmissio
     }
   }
 
-  private static class SSHJobSubmissionStandardSchemeFactory implements 
SchemeFactory {
+  private static class SSHJobSubmissionStandardSchemeFactory implements 
org.apache.thrift.scheme.SchemeFactory {
     public SSHJobSubmissionStandardScheme getScheme() {
       return new SSHJobSubmissionStandardScheme();
     }
   }
 
-  private static class SSHJobSubmissionStandardScheme extends 
StandardScheme<SSHJobSubmission> {
+  private static class SSHJobSubmissionStandardScheme extends 
org.apache.thrift.scheme.StandardScheme<SSHJobSubmission> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, 
SSHJobSubmission struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -960,8 +925,8 @@ public class SSHJobSubmission implements 
org.apache.thrift.TBase<SSHJobSubmissio
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list20 = 
iprot.readListBegin();
-                struct.batchQueueEmailSenders = new 
ArrayList<String>(_list20.size);
-                String _elem21;
+                struct.batchQueueEmailSenders = new 
java.util.ArrayList<java.lang.String>(_list20.size);
+                java.lang.String _elem21;
                 for (int _i22 = 0; _i22 < _list20.size; ++_i22)
                 {
                   _elem21 = iprot.readString();
@@ -1026,7 +991,7 @@ public class SSHJobSubmission implements 
org.apache.thrift.TBase<SSHJobSubmissio
           oprot.writeFieldBegin(BATCH_QUEUE_EMAIL_SENDERS_FIELD_DESC);
           {
             oprot.writeListBegin(new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, 
struct.batchQueueEmailSenders.size()));
-            for (String _iter23 : struct.batchQueueEmailSenders)
+            for (java.lang.String _iter23 : struct.batchQueueEmailSenders)
             {
               oprot.writeString(_iter23);
             }
@@ -1041,21 +1006,21 @@ public class SSHJobSubmission implements 
org.apache.thrift.TBase<SSHJobSubmissio
 
   }
 
-  private static class SSHJobSubmissionTupleSchemeFactory implements 
SchemeFactory {
+  private static class SSHJobSubmissionTupleSchemeFactory implements 
org.apache.thrift.scheme.SchemeFactory {
     public SSHJobSubmissionTupleScheme getScheme() {
       return new SSHJobSubmissionTupleScheme();
     }
   }
 
-  private static class SSHJobSubmissionTupleScheme extends 
TupleScheme<SSHJobSubmission> {
+  private static class SSHJobSubmissionTupleScheme extends 
org.apache.thrift.scheme.TupleScheme<SSHJobSubmission> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, 
SSHJobSubmission 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.jobSubmissionInterfaceId);
       oprot.writeI32(struct.securityProtocol.getValue());
       struct.resourceJobManager.write(oprot);
-      BitSet optionals = new BitSet();
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetAlternativeSSHHostName()) {
         optionals.set(0);
       }
@@ -1081,7 +1046,7 @@ public class SSHJobSubmission implements 
org.apache.thrift.TBase<SSHJobSubmissio
       if (struct.isSetBatchQueueEmailSenders()) {
         {
           oprot.writeI32(struct.batchQueueEmailSenders.size());
-          for (String _iter24 : struct.batchQueueEmailSenders)
+          for (java.lang.String _iter24 : struct.batchQueueEmailSenders)
           {
             oprot.writeString(_iter24);
           }
@@ -1091,7 +1056,7 @@ public class SSHJobSubmission implements 
org.apache.thrift.TBase<SSHJobSubmissio
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, 
SSHJobSubmission struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
+      org.apache.thrift.protocol.TTupleProtocol iprot = 
(org.apache.thrift.protocol.TTupleProtocol) prot;
       struct.jobSubmissionInterfaceId = iprot.readString();
       struct.setJobSubmissionInterfaceIdIsSet(true);
       struct.securityProtocol = 
org.apache.airavata.model.data.movement.SecurityProtocol.findByValue(iprot.readI32());
@@ -1099,7 +1064,7 @@ public class SSHJobSubmission implements 
org.apache.thrift.TBase<SSHJobSubmissio
       struct.resourceJobManager = new ResourceJobManager();
       struct.resourceJobManager.read(iprot);
       struct.setResourceJobManagerIsSet(true);
-      BitSet incoming = iprot.readBitSet(4);
+      java.util.BitSet incoming = iprot.readBitSet(4);
       if (incoming.get(0)) {
         struct.alternativeSSHHostName = iprot.readString();
         struct.setAlternativeSSHHostNameIsSet(true);
@@ -1115,8 +1080,8 @@ public class SSHJobSubmission implements 
org.apache.thrift.TBase<SSHJobSubmissio
       if (incoming.get(3)) {
         {
           org.apache.thrift.protocol.TList _list25 = new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, 
iprot.readI32());
-          struct.batchQueueEmailSenders = new ArrayList<String>(_list25.size);
-          String _elem26;
+          struct.batchQueueEmailSenders = new 
java.util.ArrayList<java.lang.String>(_list25.size);
+          java.lang.String _elem26;
           for (int _i27 = 0; _i27 < _list25.size; ++_i27)
           {
             _elem26 = iprot.readString();
@@ -1128,5 +1093,8 @@ public class SSHJobSubmission implements 
org.apache.thrift.TBase<SSHJobSubmissio
     }
   }
 
+  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/UnicoreJobSubmission.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java
 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java
index 1d367fb..54fc0ae 100644
--- 
a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java
+++ 
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.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"})
 /**
  * Unicore Job Submission
  * 
@@ -59,7 +32,7 @@ import org.slf4j.LoggerFactory;
  * authenticationMode
  *  The authenticationMode defines the way certificate is fetched.
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
 public class UnicoreJobSubmission implements 
org.apache.thrift.TBase<UnicoreJobSubmission, UnicoreJobSubmission._Fields>, 
java.io.Serializable, Cloneable, Comparable<UnicoreJobSubmission> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("UnicoreJobSubmission");
 
@@ -67,15 +40,12 @@ public class UnicoreJobSubmission implements 
org.apache.thrift.TBase<UnicoreJobS
   private static final org.apache.thrift.protocol.TField 
SECURITY_PROTOCOL_FIELD_DESC = new 
org.apache.thrift.protocol.TField("securityProtocol", 
org.apache.thrift.protocol.TType.I32, (short)2);
   private static final org.apache.thrift.protocol.TField 
UNICORE_END_POINT_URL_FIELD_DESC = new 
org.apache.thrift.protocol.TField("unicoreEndPointURL", 
org.apache.thrift.protocol.TType.STRING, (short)3);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = 
new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new 
UnicoreJobSubmissionStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new 
UnicoreJobSubmissionTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory 
STANDARD_SCHEME_FACTORY = new UnicoreJobSubmissionStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory 
TUPLE_SCHEME_FACTORY = new UnicoreJobSubmissionTupleSchemeFactory();
 
-  private String jobSubmissionInterfaceId; // required
+  private java.lang.String jobSubmissionInterfaceId; // required
   private org.apache.airavata.model.data.movement.SecurityProtocol 
securityProtocol; // required
-  private String unicoreEndPointURL; // required
+  private java.lang.String unicoreEndPointURL; // 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 {
@@ -87,10 +57,10 @@ public class UnicoreJobSubmission implements 
org.apache.thrift.TBase<UnicoreJobS
     SECURITY_PROTOCOL((short)2, "securityProtocol"),
     UNICORE_END_POINT_URL((short)3, "unicoreEndPointURL");
 
-    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);
       }
     }
@@ -117,21 +87,21 @@ public class UnicoreJobSubmission implements 
org.apache.thrift.TBase<UnicoreJobS
      */
     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;
     }
@@ -140,22 +110,22 @@ public class UnicoreJobSubmission implements 
org.apache.thrift.TBase<UnicoreJobS
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  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.JOB_SUBMISSION_INTERFACE_ID, new 
org.apache.thrift.meta_data.FieldMetaData("jobSubmissionInterfaceId", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.SECURITY_PROTOCOL, new 
org.apache.thrift.meta_data.FieldMetaData("securityProtocol", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new 
org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, 
org.apache.airavata.model.data.movement.SecurityProtocol.class)));
     tmpMap.put(_Fields.UNICORE_END_POINT_URL, new 
org.apache.thrift.meta_data.FieldMetaData("unicoreEndPointURL", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(UnicoreJobSubmission.class,
 metaDataMap);
   }
 
@@ -165,9 +135,9 @@ public class UnicoreJobSubmission implements 
org.apache.thrift.TBase<UnicoreJobS
   }
 
   public UnicoreJobSubmission(
-    String jobSubmissionInterfaceId,
+    java.lang.String jobSubmissionInterfaceId,
     org.apache.airavata.model.data.movement.SecurityProtocol securityProtocol,
-    String unicoreEndPointURL)
+    java.lang.String unicoreEndPointURL)
   {
     this();
     this.jobSubmissionInterfaceId = jobSubmissionInterfaceId;
@@ -202,11 +172,11 @@ public class UnicoreJobSubmission implements 
org.apache.thrift.TBase<UnicoreJobS
     this.unicoreEndPointURL = null;
   }
 
-  public String getJobSubmissionInterfaceId() {
+  public java.lang.String getJobSubmissionInterfaceId() {
     return this.jobSubmissionInterfaceId;
   }
 
-  public void setJobSubmissionInterfaceId(String jobSubmissionInterfaceId) {
+  public void setJobSubmissionInterfaceId(java.lang.String 
jobSubmissionInterfaceId) {
     this.jobSubmissionInterfaceId = jobSubmissionInterfaceId;
   }
 
@@ -256,11 +226,11 @@ public class UnicoreJobSubmission implements 
org.apache.thrift.TBase<UnicoreJobS
     }
   }
 
-  public String getUnicoreEndPointURL() {
+  public java.lang.String getUnicoreEndPointURL() {
     return this.unicoreEndPointURL;
   }
 
-  public void setUnicoreEndPointURL(String unicoreEndPointURL) {
+  public void setUnicoreEndPointURL(java.lang.String unicoreEndPointURL) {
     this.unicoreEndPointURL = unicoreEndPointURL;
   }
 
@@ -279,13 +249,13 @@ public class UnicoreJobSubmission implements 
org.apache.thrift.TBase<UnicoreJobS
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case JOB_SUBMISSION_INTERFACE_ID:
       if (value == null) {
         unsetJobSubmissionInterfaceId();
       } else {
-        setJobSubmissionInterfaceId((String)value);
+        setJobSubmissionInterfaceId((java.lang.String)value);
       }
       break;
 
@@ -301,14 +271,14 @@ public class UnicoreJobSubmission implements 
org.apache.thrift.TBase<UnicoreJobS
       if (value == null) {
         unsetUnicoreEndPointURL();
       } else {
-        setUnicoreEndPointURL((String)value);
+        setUnicoreEndPointURL((java.lang.String)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case JOB_SUBMISSION_INTERFACE_ID:
       return getJobSubmissionInterfaceId();
@@ -320,13 +290,13 @@ public class UnicoreJobSubmission implements 
org.apache.thrift.TBase<UnicoreJobS
       return getUnicoreEndPointURL();
 
     }
-    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) {
@@ -337,11 +307,11 @@ public class UnicoreJobSubmission implements 
org.apache.thrift.TBase<UnicoreJobS
     case UNICORE_END_POINT_URL:
       return isSetUnicoreEndPointURL();
     }
-    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 UnicoreJobSubmission)
@@ -352,6 +322,8 @@ public class UnicoreJobSubmission implements 
org.apache.thrift.TBase<UnicoreJobS
   public boolean equals(UnicoreJobSubmission that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_jobSubmissionInterfaceId = true && 
this.isSetJobSubmissionInterfaceId();
     boolean that_present_jobSubmissionInterfaceId = true && 
that.isSetJobSubmissionInterfaceId();
@@ -385,24 +357,21 @@ public class UnicoreJobSubmission implements 
org.apache.thrift.TBase<UnicoreJobS
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_jobSubmissionInterfaceId = true && 
(isSetJobSubmissionInterfaceId());
-    list.add(present_jobSubmissionInterfaceId);
-    if (present_jobSubmissionInterfaceId)
-      list.add(jobSubmissionInterfaceId);
+    hashCode = hashCode * 8191 + ((isSetJobSubmissionInterfaceId()) ? 131071 : 
524287);
+    if (isSetJobSubmissionInterfaceId())
+      hashCode = hashCode * 8191 + jobSubmissionInterfaceId.hashCode();
 
-    boolean present_securityProtocol = true && (isSetSecurityProtocol());
-    list.add(present_securityProtocol);
-    if (present_securityProtocol)
-      list.add(securityProtocol.getValue());
+    hashCode = hashCode * 8191 + ((isSetSecurityProtocol()) ? 131071 : 524287);
+    if (isSetSecurityProtocol())
+      hashCode = hashCode * 8191 + securityProtocol.getValue();
 
-    boolean present_unicoreEndPointURL = true && (isSetUnicoreEndPointURL());
-    list.add(present_unicoreEndPointURL);
-    if (present_unicoreEndPointURL)
-      list.add(unicoreEndPointURL);
+    hashCode = hashCode * 8191 + ((isSetUnicoreEndPointURL()) ? 131071 : 
524287);
+    if (isSetUnicoreEndPointURL())
+      hashCode = hashCode * 8191 + unicoreEndPointURL.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -413,7 +382,7 @@ public class UnicoreJobSubmission implements 
org.apache.thrift.TBase<UnicoreJobS
 
     int lastComparison = 0;
 
-    lastComparison = 
Boolean.valueOf(isSetJobSubmissionInterfaceId()).compareTo(other.isSetJobSubmissionInterfaceId());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetJobSubmissionInterfaceId()).compareTo(other.isSetJobSubmissionInterfaceId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -423,7 +392,7 @@ public class UnicoreJobSubmission implements 
org.apache.thrift.TBase<UnicoreJobS
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetSecurityProtocol()).compareTo(other.isSetSecurityProtocol());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetSecurityProtocol()).compareTo(other.isSetSecurityProtocol());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -433,7 +402,7 @@ public class UnicoreJobSubmission implements 
org.apache.thrift.TBase<UnicoreJobS
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetUnicoreEndPointURL()).compareTo(other.isSetUnicoreEndPointURL());
+    lastComparison = 
java.lang.Boolean.valueOf(isSetUnicoreEndPointURL()).compareTo(other.isSetUnicoreEndPointURL());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -451,16 +420,16 @@ public class UnicoreJobSubmission implements 
org.apache.thrift.TBase<UnicoreJobS
   }
 
   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("UnicoreJobSubmission(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new 
java.lang.StringBuilder("UnicoreJobSubmission(");
     boolean first = true;
 
     sb.append("jobSubmissionInterfaceId:");
@@ -515,7 +484,7 @@ public class UnicoreJobSubmission implements 
org.apache.thrift.TBase<UnicoreJobS
     }
   }
 
-  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 {
       read(new org.apache.thrift.protocol.TCompactProtocol(new 
org.apache.thrift.transport.TIOStreamTransport(in)));
     } catch (org.apache.thrift.TException te) {
@@ -523,13 +492,13 @@ public class UnicoreJobSubmission implements 
org.apache.thrift.TBase<UnicoreJobS
     }
   }
 
-  private static class UnicoreJobSubmissionStandardSchemeFactory implements 
SchemeFactory {
+  private static class UnicoreJobSubmissionStandardSchemeFactory implements 
org.apache.thrift.scheme.SchemeFactory {
     public UnicoreJobSubmissionStandardScheme getScheme() {
       return new UnicoreJobSubmissionStandardScheme();
     }
   }
 
-  private static class UnicoreJobSubmissionStandardScheme extends 
StandardScheme<UnicoreJobSubmission> {
+  private static class UnicoreJobSubmissionStandardScheme extends 
org.apache.thrift.scheme.StandardScheme<UnicoreJobSubmission> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, 
UnicoreJobSubmission struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -599,17 +568,17 @@ public class UnicoreJobSubmission implements 
org.apache.thrift.TBase<UnicoreJobS
 
   }
 
-  private static class UnicoreJobSubmissionTupleSchemeFactory implements 
SchemeFactory {
+  private static class UnicoreJobSubmissionTupleSchemeFactory implements 
org.apache.thrift.scheme.SchemeFactory {
     public UnicoreJobSubmissionTupleScheme getScheme() {
       return new UnicoreJobSubmissionTupleScheme();
     }
   }
 
-  private static class UnicoreJobSubmissionTupleScheme extends 
TupleScheme<UnicoreJobSubmission> {
+  private static class UnicoreJobSubmissionTupleScheme extends 
org.apache.thrift.scheme.TupleScheme<UnicoreJobSubmission> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, 
UnicoreJobSubmission 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.jobSubmissionInterfaceId);
       oprot.writeI32(struct.securityProtocol.getValue());
       oprot.writeString(struct.unicoreEndPointURL);
@@ -617,7 +586,7 @@ public class UnicoreJobSubmission implements 
org.apache.thrift.TBase<UnicoreJobS
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, 
UnicoreJobSubmission struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
+      org.apache.thrift.protocol.TTupleProtocol iprot = 
(org.apache.thrift.protocol.TTupleProtocol) prot;
       struct.jobSubmissionInterfaceId = iprot.readString();
       struct.setJobSubmissionInterfaceIdIsSet(true);
       struct.securityProtocol = 
org.apache.airavata.model.data.movement.SecurityProtocol.findByValue(iprot.readI32());
@@ -627,5 +596,8 @@ public class UnicoreJobSubmission implements 
org.apache.thrift.TBase<UnicoreJobS
     }
   }
 
+  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();
+  }
 }
 

Reply via email to