http://git-wip-us.apache.org/repos/asf/airavata/blob/b490671e/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java
 
b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java
deleted file mode 100644
index fde8e55..0000000
--- 
a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java
+++ /dev/null
@@ -1,688 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Autogenerated by Thrift Compiler (0.9.2)
- *
- * 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"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = 
"2015-12-2")
-public class GlobusJobSubmission implements 
org.apache.thrift.TBase<GlobusJobSubmission, GlobusJobSubmission._Fields>, 
java.io.Serializable, Cloneable, Comparable<GlobusJobSubmission> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("GlobusJobSubmission");
-
-  private static final org.apache.thrift.protocol.TField 
JOB_SUBMISSION_INTERFACE_ID_FIELD_DESC = new 
org.apache.thrift.protocol.TField("jobSubmissionInterfaceId", 
org.apache.thrift.protocol.TType.STRING, (short)1);
-  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 
GLOBUS_GATE_KEEPER_END_POINT_FIELD_DESC = new 
org.apache.thrift.protocol.TField("globusGateKeeperEndPoint", 
org.apache.thrift.protocol.TType.LIST, (short)3);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = 
new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new 
GlobusJobSubmissionStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new 
GlobusJobSubmissionTupleSchemeFactory());
-  }
-
-  public String jobSubmissionInterfaceId; // required
-  /**
-   * 
-   * @see org.apache.airavata.model.data.movement.SecurityProtocol
-   */
-  public org.apache.airavata.model.data.movement.SecurityProtocol 
securityProtocol; // required
-  public List<String> globusGateKeeperEndPoint; // 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 {
-    JOB_SUBMISSION_INTERFACE_ID((short)1, "jobSubmissionInterfaceId"),
-    /**
-     * 
-     * @see org.apache.airavata.model.data.movement.SecurityProtocol
-     */
-    SECURITY_PROTOCOL((short)2, "securityProtocol"),
-    GLOBUS_GATE_KEEPER_END_POINT((short)3, "globusGateKeeperEndPoint");
-
-    private static final Map<String, _Fields> byName = new HashMap<String, 
_Fields>();
-
-    static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
-        byName.put(field.getFieldName(), field);
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, or null if its not 
found.
-     */
-    public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
-        case 1: // JOB_SUBMISSION_INTERFACE_ID
-          return JOB_SUBMISSION_INTERFACE_ID;
-        case 2: // SECURITY_PROTOCOL
-          return SECURITY_PROTOCOL;
-        case 3: // GLOBUS_GATE_KEEPER_END_POINT
-          return GLOBUS_GATE_KEEPER_END_POINT;
-        default:
-          return null;
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
-     */
-    public static _Fields findByThriftIdOrThrow(int fieldId) {
-      _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + 
fieldId + " doesn't exist!");
-      return fields;
-    }
-
-    /**
-     * Find the _Fields constant that matches name, or null if its not found.
-     */
-    public static _Fields findByName(String name) {
-      return byName.get(name);
-    }
-
-    private final short _thriftId;
-    private final String _fieldName;
-
-    _Fields(short thriftId, String fieldName) {
-      _thriftId = thriftId;
-      _fieldName = fieldName;
-    }
-
-    public short getThriftFieldId() {
-      return _thriftId;
-    }
-
-    public String getFieldName() {
-      return _fieldName;
-    }
-  }
-
-  // isset id assignments
-  private static final _Fields optionals[] = 
{_Fields.GLOBUS_GATE_KEEPER_END_POINT};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> 
metaDataMap;
-  static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new 
EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.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.GLOBUS_GATE_KEEPER_END_POINT, new 
org.apache.thrift.meta_data.FieldMetaData("globusGateKeeperEndPoint", 
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);
-    
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(GlobusJobSubmission.class,
 metaDataMap);
-  }
-
-  public GlobusJobSubmission() {
-    this.jobSubmissionInterfaceId = "DO_NOT_SET_AT_CLIENTS";
-
-  }
-
-  public GlobusJobSubmission(
-    String jobSubmissionInterfaceId,
-    org.apache.airavata.model.data.movement.SecurityProtocol securityProtocol)
-  {
-    this();
-    this.jobSubmissionInterfaceId = jobSubmissionInterfaceId;
-    this.securityProtocol = securityProtocol;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public GlobusJobSubmission(GlobusJobSubmission other) {
-    if (other.isSetJobSubmissionInterfaceId()) {
-      this.jobSubmissionInterfaceId = other.jobSubmissionInterfaceId;
-    }
-    if (other.isSetSecurityProtocol()) {
-      this.securityProtocol = other.securityProtocol;
-    }
-    if (other.isSetGlobusGateKeeperEndPoint()) {
-      List<String> __this__globusGateKeeperEndPoint = new 
ArrayList<String>(other.globusGateKeeperEndPoint);
-      this.globusGateKeeperEndPoint = __this__globusGateKeeperEndPoint;
-    }
-  }
-
-  public GlobusJobSubmission deepCopy() {
-    return new GlobusJobSubmission(this);
-  }
-
-  @Override
-  public void clear() {
-    this.jobSubmissionInterfaceId = "DO_NOT_SET_AT_CLIENTS";
-
-    this.securityProtocol = null;
-    this.globusGateKeeperEndPoint = null;
-  }
-
-  public String getJobSubmissionInterfaceId() {
-    return this.jobSubmissionInterfaceId;
-  }
-
-  public GlobusJobSubmission setJobSubmissionInterfaceId(String 
jobSubmissionInterfaceId) {
-    this.jobSubmissionInterfaceId = jobSubmissionInterfaceId;
-    return this;
-  }
-
-  public void unsetJobSubmissionInterfaceId() {
-    this.jobSubmissionInterfaceId = null;
-  }
-
-  /** Returns true if field jobSubmissionInterfaceId is set (has been assigned 
a value) and false otherwise */
-  public boolean isSetJobSubmissionInterfaceId() {
-    return this.jobSubmissionInterfaceId != null;
-  }
-
-  public void setJobSubmissionInterfaceIdIsSet(boolean value) {
-    if (!value) {
-      this.jobSubmissionInterfaceId = null;
-    }
-  }
-
-  /**
-   * 
-   * @see org.apache.airavata.model.data.movement.SecurityProtocol
-   */
-  public org.apache.airavata.model.data.movement.SecurityProtocol 
getSecurityProtocol() {
-    return this.securityProtocol;
-  }
-
-  /**
-   * 
-   * @see org.apache.airavata.model.data.movement.SecurityProtocol
-   */
-  public GlobusJobSubmission 
setSecurityProtocol(org.apache.airavata.model.data.movement.SecurityProtocol 
securityProtocol) {
-    this.securityProtocol = securityProtocol;
-    return this;
-  }
-
-  public void unsetSecurityProtocol() {
-    this.securityProtocol = null;
-  }
-
-  /** Returns true if field securityProtocol is set (has been assigned a 
value) and false otherwise */
-  public boolean isSetSecurityProtocol() {
-    return this.securityProtocol != null;
-  }
-
-  public void setSecurityProtocolIsSet(boolean value) {
-    if (!value) {
-      this.securityProtocol = null;
-    }
-  }
-
-  public int getGlobusGateKeeperEndPointSize() {
-    return (this.globusGateKeeperEndPoint == null) ? 0 : 
this.globusGateKeeperEndPoint.size();
-  }
-
-  public java.util.Iterator<String> getGlobusGateKeeperEndPointIterator() {
-    return (this.globusGateKeeperEndPoint == null) ? null : 
this.globusGateKeeperEndPoint.iterator();
-  }
-
-  public void addToGlobusGateKeeperEndPoint(String elem) {
-    if (this.globusGateKeeperEndPoint == null) {
-      this.globusGateKeeperEndPoint = new ArrayList<String>();
-    }
-    this.globusGateKeeperEndPoint.add(elem);
-  }
-
-  public List<String> getGlobusGateKeeperEndPoint() {
-    return this.globusGateKeeperEndPoint;
-  }
-
-  public GlobusJobSubmission setGlobusGateKeeperEndPoint(List<String> 
globusGateKeeperEndPoint) {
-    this.globusGateKeeperEndPoint = globusGateKeeperEndPoint;
-    return this;
-  }
-
-  public void unsetGlobusGateKeeperEndPoint() {
-    this.globusGateKeeperEndPoint = null;
-  }
-
-  /** Returns true if field globusGateKeeperEndPoint is set (has been assigned 
a value) and false otherwise */
-  public boolean isSetGlobusGateKeeperEndPoint() {
-    return this.globusGateKeeperEndPoint != null;
-  }
-
-  public void setGlobusGateKeeperEndPointIsSet(boolean value) {
-    if (!value) {
-      this.globusGateKeeperEndPoint = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case JOB_SUBMISSION_INTERFACE_ID:
-      if (value == null) {
-        unsetJobSubmissionInterfaceId();
-      } else {
-        setJobSubmissionInterfaceId((String)value);
-      }
-      break;
-
-    case SECURITY_PROTOCOL:
-      if (value == null) {
-        unsetSecurityProtocol();
-      } else {
-        
setSecurityProtocol((org.apache.airavata.model.data.movement.SecurityProtocol)value);
-      }
-      break;
-
-    case GLOBUS_GATE_KEEPER_END_POINT:
-      if (value == null) {
-        unsetGlobusGateKeeperEndPoint();
-      } else {
-        setGlobusGateKeeperEndPoint((List<String>)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case JOB_SUBMISSION_INTERFACE_ID:
-      return getJobSubmissionInterfaceId();
-
-    case SECURITY_PROTOCOL:
-      return getSecurityProtocol();
-
-    case GLOBUS_GATE_KEEPER_END_POINT:
-      return getGlobusGateKeeperEndPoint();
-
-    }
-    throw new IllegalStateException();
-  }
-
-  /** Returns true if field corresponding to fieldID is set (has been assigned 
a value) and false otherwise */
-  public boolean isSet(_Fields field) {
-    if (field == null) {
-      throw new IllegalArgumentException();
-    }
-
-    switch (field) {
-    case JOB_SUBMISSION_INTERFACE_ID:
-      return isSetJobSubmissionInterfaceId();
-    case SECURITY_PROTOCOL:
-      return isSetSecurityProtocol();
-    case GLOBUS_GATE_KEEPER_END_POINT:
-      return isSetGlobusGateKeeperEndPoint();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof GlobusJobSubmission)
-      return this.equals((GlobusJobSubmission)that);
-    return false;
-  }
-
-  public boolean equals(GlobusJobSubmission that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_jobSubmissionInterfaceId = true && 
this.isSetJobSubmissionInterfaceId();
-    boolean that_present_jobSubmissionInterfaceId = true && 
that.isSetJobSubmissionInterfaceId();
-    if (this_present_jobSubmissionInterfaceId || 
that_present_jobSubmissionInterfaceId) {
-      if (!(this_present_jobSubmissionInterfaceId && 
that_present_jobSubmissionInterfaceId))
-        return false;
-      if (!this.jobSubmissionInterfaceId.equals(that.jobSubmissionInterfaceId))
-        return false;
-    }
-
-    boolean this_present_securityProtocol = true && 
this.isSetSecurityProtocol();
-    boolean that_present_securityProtocol = true && 
that.isSetSecurityProtocol();
-    if (this_present_securityProtocol || that_present_securityProtocol) {
-      if (!(this_present_securityProtocol && that_present_securityProtocol))
-        return false;
-      if (!this.securityProtocol.equals(that.securityProtocol))
-        return false;
-    }
-
-    boolean this_present_globusGateKeeperEndPoint = true && 
this.isSetGlobusGateKeeperEndPoint();
-    boolean that_present_globusGateKeeperEndPoint = true && 
that.isSetGlobusGateKeeperEndPoint();
-    if (this_present_globusGateKeeperEndPoint || 
that_present_globusGateKeeperEndPoint) {
-      if (!(this_present_globusGateKeeperEndPoint && 
that_present_globusGateKeeperEndPoint))
-        return false;
-      if (!this.globusGateKeeperEndPoint.equals(that.globusGateKeeperEndPoint))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_jobSubmissionInterfaceId = true && 
(isSetJobSubmissionInterfaceId());
-    list.add(present_jobSubmissionInterfaceId);
-    if (present_jobSubmissionInterfaceId)
-      list.add(jobSubmissionInterfaceId);
-
-    boolean present_securityProtocol = true && (isSetSecurityProtocol());
-    list.add(present_securityProtocol);
-    if (present_securityProtocol)
-      list.add(securityProtocol.getValue());
-
-    boolean present_globusGateKeeperEndPoint = true && 
(isSetGlobusGateKeeperEndPoint());
-    list.add(present_globusGateKeeperEndPoint);
-    if (present_globusGateKeeperEndPoint)
-      list.add(globusGateKeeperEndPoint);
-
-    return list.hashCode();
-  }
-
-  @Override
-  public int compareTo(GlobusJobSubmission other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = 
Boolean.valueOf(isSetJobSubmissionInterfaceId()).compareTo(other.isSetJobSubmissionInterfaceId());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetJobSubmissionInterfaceId()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.jobSubmissionInterfaceId, 
other.jobSubmissionInterfaceId);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = 
Boolean.valueOf(isSetSecurityProtocol()).compareTo(other.isSetSecurityProtocol());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetSecurityProtocol()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.securityProtocol, 
other.securityProtocol);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = 
Boolean.valueOf(isSetGlobusGateKeeperEndPoint()).compareTo(other.isSetGlobusGateKeeperEndPoint());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetGlobusGateKeeperEndPoint()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.globusGateKeeperEndPoint, 
other.globusGateKeeperEndPoint);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws 
org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
-  }
-
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws 
org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("GlobusJobSubmission(");
-    boolean first = true;
-
-    sb.append("jobSubmissionInterfaceId:");
-    if (this.jobSubmissionInterfaceId == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.jobSubmissionInterfaceId);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("securityProtocol:");
-    if (this.securityProtocol == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.securityProtocol);
-    }
-    first = false;
-    if (isSetGlobusGateKeeperEndPoint()) {
-      if (!first) sb.append(", ");
-      sb.append("globusGateKeeperEndPoint:");
-      if (this.globusGateKeeperEndPoint == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.globusGateKeeperEndPoint);
-      }
-      first = false;
-    }
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    if (jobSubmissionInterfaceId == null) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 
'jobSubmissionInterfaceId' was not present! Struct: " + toString());
-    }
-    if (securityProtocol == null) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 
'securityProtocol' was not present! Struct: " + toString());
-    }
-    // check for sub-struct validity
-  }
-
-  private void writeObject(java.io.ObjectOutputStream out) throws 
java.io.IOException {
-    try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new 
org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private void readObject(java.io.ObjectInputStream in) throws 
java.io.IOException, ClassNotFoundException {
-    try {
-      read(new org.apache.thrift.protocol.TCompactProtocol(new 
org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private static class GlobusJobSubmissionStandardSchemeFactory implements 
SchemeFactory {
-    public GlobusJobSubmissionStandardScheme getScheme() {
-      return new GlobusJobSubmissionStandardScheme();
-    }
-  }
-
-  private static class GlobusJobSubmissionStandardScheme extends 
StandardScheme<GlobusJobSubmission> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, 
GlobusJobSubmission struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
-      iprot.readStructBegin();
-      while (true)
-      {
-        schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-          break;
-        }
-        switch (schemeField.id) {
-          case 1: // JOB_SUBMISSION_INTERFACE_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.jobSubmissionInterfaceId = iprot.readString();
-              struct.setJobSubmissionInterfaceIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
-            }
-            break;
-          case 2: // SECURITY_PROTOCOL
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.securityProtocol = 
org.apache.airavata.model.data.movement.SecurityProtocol.findByValue(iprot.readI32());
-              struct.setSecurityProtocolIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
-            }
-            break;
-          case 3: // GLOBUS_GATE_KEEPER_END_POINT
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list18 = 
iprot.readListBegin();
-                struct.globusGateKeeperEndPoint = new 
ArrayList<String>(_list18.size);
-                String _elem19;
-                for (int _i20 = 0; _i20 < _list18.size; ++_i20)
-                {
-                  _elem19 = iprot.readString();
-                  struct.globusGateKeeperEndPoint.add(_elem19);
-                }
-                iprot.readListEnd();
-              }
-              struct.setGlobusGateKeeperEndPointIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
-        }
-        iprot.readFieldEnd();
-      }
-      iprot.readStructEnd();
-
-      // check for required fields of primitive type, which can't be checked 
in the validate method
-      struct.validate();
-    }
-
-    public void write(org.apache.thrift.protocol.TProtocol oprot, 
GlobusJobSubmission struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.jobSubmissionInterfaceId != null) {
-        oprot.writeFieldBegin(JOB_SUBMISSION_INTERFACE_ID_FIELD_DESC);
-        oprot.writeString(struct.jobSubmissionInterfaceId);
-        oprot.writeFieldEnd();
-      }
-      if (struct.securityProtocol != null) {
-        oprot.writeFieldBegin(SECURITY_PROTOCOL_FIELD_DESC);
-        oprot.writeI32(struct.securityProtocol.getValue());
-        oprot.writeFieldEnd();
-      }
-      if (struct.globusGateKeeperEndPoint != null) {
-        if (struct.isSetGlobusGateKeeperEndPoint()) {
-          oprot.writeFieldBegin(GLOBUS_GATE_KEEPER_END_POINT_FIELD_DESC);
-          {
-            oprot.writeListBegin(new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, 
struct.globusGateKeeperEndPoint.size()));
-            for (String _iter21 : struct.globusGateKeeperEndPoint)
-            {
-              oprot.writeString(_iter21);
-            }
-            oprot.writeListEnd();
-          }
-          oprot.writeFieldEnd();
-        }
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class GlobusJobSubmissionTupleSchemeFactory implements 
SchemeFactory {
-    public GlobusJobSubmissionTupleScheme getScheme() {
-      return new GlobusJobSubmissionTupleScheme();
-    }
-  }
-
-  private static class GlobusJobSubmissionTupleScheme extends 
TupleScheme<GlobusJobSubmission> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, 
GlobusJobSubmission struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      oprot.writeString(struct.jobSubmissionInterfaceId);
-      oprot.writeI32(struct.securityProtocol.getValue());
-      BitSet optionals = new BitSet();
-      if (struct.isSetGlobusGateKeeperEndPoint()) {
-        optionals.set(0);
-      }
-      oprot.writeBitSet(optionals, 1);
-      if (struct.isSetGlobusGateKeeperEndPoint()) {
-        {
-          oprot.writeI32(struct.globusGateKeeperEndPoint.size());
-          for (String _iter22 : struct.globusGateKeeperEndPoint)
-          {
-            oprot.writeString(_iter22);
-          }
-        }
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, 
GlobusJobSubmission struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      struct.jobSubmissionInterfaceId = iprot.readString();
-      struct.setJobSubmissionInterfaceIdIsSet(true);
-      struct.securityProtocol = 
org.apache.airavata.model.data.movement.SecurityProtocol.findByValue(iprot.readI32());
-      struct.setSecurityProtocolIsSet(true);
-      BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        {
-          org.apache.thrift.protocol.TList _list23 = new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, 
iprot.readI32());
-          struct.globusGateKeeperEndPoint = new 
ArrayList<String>(_list23.size);
-          String _elem24;
-          for (int _i25 = 0; _i25 < _list23.size; ++_i25)
-          {
-            _elem24 = iprot.readString();
-            struct.globusGateKeeperEndPoint.add(_elem24);
-          }
-        }
-        struct.setGlobusGateKeeperEndPointIsSet(true);
-      }
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/airavata/blob/b490671e/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobManagerCommand.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobManagerCommand.java
 
b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobManagerCommand.java
deleted file mode 100644
index 735ed22..0000000
--- 
a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobManagerCommand.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Autogenerated by Thrift Compiler (0.9.2)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.airavata.model.appcatalog.computeresource;
-
-
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.thrift.TEnum;
-
-/**
- * Enumeration of resource job manager commands
- * 
- * SUBMISSION:
- *  Ex: qsub, sbatch
- * 
- * JOBMONITORING:
- *  Ex: qstat, squeue
- * 
- * DELETION:
- *  Ex: qdel, scancel
- * 
- * CHECK_JOB:
- *  Detailed Status about the Job. Ex: checkjob
- * 
- * SHOW_QUEUE:
- *  List of Queued Job by the schedular. Ex: showq
- * 
- * SHOW_RESERVATION:
- *  List all reservations. Ex:showres, show_res
- * 
- * SHOW_START:
- *  Display the start time of the specified job. Ex: showstart
- * 
- */
-public enum JobManagerCommand implements org.apache.thrift.TEnum {
-  SUBMISSION(0),
-  JOB_MONITORING(1),
-  DELETION(2),
-  CHECK_JOB(3),
-  SHOW_QUEUE(4),
-  SHOW_RESERVATION(5),
-  SHOW_START(6);
-
-  private final int value;
-
-  private JobManagerCommand(int value) {
-    this.value = value;
-  }
-
-  /**
-   * Get the integer value of this enum value, as defined in the Thrift IDL.
-   */
-  public int getValue() {
-    return value;
-  }
-
-  /**
-   * Find a the enum type by its integer value, as defined in the Thrift IDL.
-   * @return null if the value is not found.
-   */
-  public static JobManagerCommand findByValue(int value) { 
-    switch (value) {
-      case 0:
-        return SUBMISSION;
-      case 1:
-        return JOB_MONITORING;
-      case 2:
-        return DELETION;
-      case 3:
-        return CHECK_JOB;
-      case 4:
-        return SHOW_QUEUE;
-      case 5:
-        return SHOW_RESERVATION;
-      case 6:
-        return SHOW_START;
-      default:
-        return null;
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/b490671e/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java
 
b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java
deleted file mode 100644
index c9fd6cd..0000000
--- 
a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java
+++ /dev/null
@@ -1,637 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Autogenerated by Thrift Compiler (0.9.2)
- *
- * 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"})
-/**
- * Job Submission Interfaces
- * 
- * jobSubmissionInterfaceId: The Job Submission Interface has to be previously 
registered and referenced here.
- * 
- * priorityOrder:
- *  For resources with multiple interfaces, the priority order should be 
selected.
- *   Lower the numerical number, higher the priority
- * 
- */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = 
"2015-12-2")
-public class JobSubmissionInterface implements 
org.apache.thrift.TBase<JobSubmissionInterface, 
JobSubmissionInterface._Fields>, java.io.Serializable, Cloneable, 
Comparable<JobSubmissionInterface> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("JobSubmissionInterface");
-
-  private static final org.apache.thrift.protocol.TField 
JOB_SUBMISSION_INTERFACE_ID_FIELD_DESC = new 
org.apache.thrift.protocol.TField("jobSubmissionInterfaceId", 
org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField 
JOB_SUBMISSION_PROTOCOL_FIELD_DESC = new 
org.apache.thrift.protocol.TField("jobSubmissionProtocol", 
org.apache.thrift.protocol.TType.I32, (short)2);
-  private static final org.apache.thrift.protocol.TField 
PRIORITY_ORDER_FIELD_DESC = new 
org.apache.thrift.protocol.TField("priorityOrder", 
org.apache.thrift.protocol.TType.I32, (short)3);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = 
new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new 
JobSubmissionInterfaceStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new 
JobSubmissionInterfaceTupleSchemeFactory());
-  }
-
-  public String jobSubmissionInterfaceId; // required
-  /**
-   * 
-   * @see JobSubmissionProtocol
-   */
-  public JobSubmissionProtocol jobSubmissionProtocol; // required
-  public int priorityOrder; // 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 {
-    JOB_SUBMISSION_INTERFACE_ID((short)1, "jobSubmissionInterfaceId"),
-    /**
-     * 
-     * @see JobSubmissionProtocol
-     */
-    JOB_SUBMISSION_PROTOCOL((short)2, "jobSubmissionProtocol"),
-    PRIORITY_ORDER((short)3, "priorityOrder");
-
-    private static final Map<String, _Fields> byName = new HashMap<String, 
_Fields>();
-
-    static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
-        byName.put(field.getFieldName(), field);
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, or null if its not 
found.
-     */
-    public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
-        case 1: // JOB_SUBMISSION_INTERFACE_ID
-          return JOB_SUBMISSION_INTERFACE_ID;
-        case 2: // JOB_SUBMISSION_PROTOCOL
-          return JOB_SUBMISSION_PROTOCOL;
-        case 3: // PRIORITY_ORDER
-          return PRIORITY_ORDER;
-        default:
-          return null;
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
-     */
-    public static _Fields findByThriftIdOrThrow(int fieldId) {
-      _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + 
fieldId + " doesn't exist!");
-      return fields;
-    }
-
-    /**
-     * Find the _Fields constant that matches name, or null if its not found.
-     */
-    public static _Fields findByName(String name) {
-      return byName.get(name);
-    }
-
-    private final short _thriftId;
-    private final String _fieldName;
-
-    _Fields(short thriftId, String fieldName) {
-      _thriftId = thriftId;
-      _fieldName = fieldName;
-    }
-
-    public short getThriftFieldId() {
-      return _thriftId;
-    }
-
-    public String getFieldName() {
-      return _fieldName;
-    }
-  }
-
-  // isset id assignments
-  private static final int __PRIORITYORDER_ISSET_ID = 0;
-  private byte __isset_bitfield = 0;
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> 
metaDataMap;
-  static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new 
EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.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.JOB_SUBMISSION_PROTOCOL, new 
org.apache.thrift.meta_data.FieldMetaData("jobSubmissionProtocol", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new 
org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, 
JobSubmissionProtocol.class)));
-    tmpMap.put(_Fields.PRIORITY_ORDER, new 
org.apache.thrift.meta_data.FieldMetaData("priorityOrder", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(JobSubmissionInterface.class,
 metaDataMap);
-  }
-
-  public JobSubmissionInterface() {
-    this.priorityOrder = 0;
-
-  }
-
-  public JobSubmissionInterface(
-    String jobSubmissionInterfaceId,
-    JobSubmissionProtocol jobSubmissionProtocol,
-    int priorityOrder)
-  {
-    this();
-    this.jobSubmissionInterfaceId = jobSubmissionInterfaceId;
-    this.jobSubmissionProtocol = jobSubmissionProtocol;
-    this.priorityOrder = priorityOrder;
-    setPriorityOrderIsSet(true);
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public JobSubmissionInterface(JobSubmissionInterface other) {
-    __isset_bitfield = other.__isset_bitfield;
-    if (other.isSetJobSubmissionInterfaceId()) {
-      this.jobSubmissionInterfaceId = other.jobSubmissionInterfaceId;
-    }
-    if (other.isSetJobSubmissionProtocol()) {
-      this.jobSubmissionProtocol = other.jobSubmissionProtocol;
-    }
-    this.priorityOrder = other.priorityOrder;
-  }
-
-  public JobSubmissionInterface deepCopy() {
-    return new JobSubmissionInterface(this);
-  }
-
-  @Override
-  public void clear() {
-    this.jobSubmissionInterfaceId = null;
-    this.jobSubmissionProtocol = null;
-    this.priorityOrder = 0;
-
-  }
-
-  public String getJobSubmissionInterfaceId() {
-    return this.jobSubmissionInterfaceId;
-  }
-
-  public JobSubmissionInterface setJobSubmissionInterfaceId(String 
jobSubmissionInterfaceId) {
-    this.jobSubmissionInterfaceId = jobSubmissionInterfaceId;
-    return this;
-  }
-
-  public void unsetJobSubmissionInterfaceId() {
-    this.jobSubmissionInterfaceId = null;
-  }
-
-  /** Returns true if field jobSubmissionInterfaceId is set (has been assigned 
a value) and false otherwise */
-  public boolean isSetJobSubmissionInterfaceId() {
-    return this.jobSubmissionInterfaceId != null;
-  }
-
-  public void setJobSubmissionInterfaceIdIsSet(boolean value) {
-    if (!value) {
-      this.jobSubmissionInterfaceId = null;
-    }
-  }
-
-  /**
-   * 
-   * @see JobSubmissionProtocol
-   */
-  public JobSubmissionProtocol getJobSubmissionProtocol() {
-    return this.jobSubmissionProtocol;
-  }
-
-  /**
-   * 
-   * @see JobSubmissionProtocol
-   */
-  public JobSubmissionInterface setJobSubmissionProtocol(JobSubmissionProtocol 
jobSubmissionProtocol) {
-    this.jobSubmissionProtocol = jobSubmissionProtocol;
-    return this;
-  }
-
-  public void unsetJobSubmissionProtocol() {
-    this.jobSubmissionProtocol = null;
-  }
-
-  /** Returns true if field jobSubmissionProtocol is set (has been assigned a 
value) and false otherwise */
-  public boolean isSetJobSubmissionProtocol() {
-    return this.jobSubmissionProtocol != null;
-  }
-
-  public void setJobSubmissionProtocolIsSet(boolean value) {
-    if (!value) {
-      this.jobSubmissionProtocol = null;
-    }
-  }
-
-  public int getPriorityOrder() {
-    return this.priorityOrder;
-  }
-
-  public JobSubmissionInterface setPriorityOrder(int priorityOrder) {
-    this.priorityOrder = priorityOrder;
-    setPriorityOrderIsSet(true);
-    return this;
-  }
-
-  public void unsetPriorityOrder() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, 
__PRIORITYORDER_ISSET_ID);
-  }
-
-  /** Returns true if field priorityOrder is set (has been assigned a value) 
and false otherwise */
-  public boolean isSetPriorityOrder() {
-    return EncodingUtils.testBit(__isset_bitfield, __PRIORITYORDER_ISSET_ID);
-  }
-
-  public void setPriorityOrderIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, 
__PRIORITYORDER_ISSET_ID, value);
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case JOB_SUBMISSION_INTERFACE_ID:
-      if (value == null) {
-        unsetJobSubmissionInterfaceId();
-      } else {
-        setJobSubmissionInterfaceId((String)value);
-      }
-      break;
-
-    case JOB_SUBMISSION_PROTOCOL:
-      if (value == null) {
-        unsetJobSubmissionProtocol();
-      } else {
-        setJobSubmissionProtocol((JobSubmissionProtocol)value);
-      }
-      break;
-
-    case PRIORITY_ORDER:
-      if (value == null) {
-        unsetPriorityOrder();
-      } else {
-        setPriorityOrder((Integer)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case JOB_SUBMISSION_INTERFACE_ID:
-      return getJobSubmissionInterfaceId();
-
-    case JOB_SUBMISSION_PROTOCOL:
-      return getJobSubmissionProtocol();
-
-    case PRIORITY_ORDER:
-      return Integer.valueOf(getPriorityOrder());
-
-    }
-    throw new IllegalStateException();
-  }
-
-  /** Returns true if field corresponding to fieldID is set (has been assigned 
a value) and false otherwise */
-  public boolean isSet(_Fields field) {
-    if (field == null) {
-      throw new IllegalArgumentException();
-    }
-
-    switch (field) {
-    case JOB_SUBMISSION_INTERFACE_ID:
-      return isSetJobSubmissionInterfaceId();
-    case JOB_SUBMISSION_PROTOCOL:
-      return isSetJobSubmissionProtocol();
-    case PRIORITY_ORDER:
-      return isSetPriorityOrder();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof JobSubmissionInterface)
-      return this.equals((JobSubmissionInterface)that);
-    return false;
-  }
-
-  public boolean equals(JobSubmissionInterface that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_jobSubmissionInterfaceId = true && 
this.isSetJobSubmissionInterfaceId();
-    boolean that_present_jobSubmissionInterfaceId = true && 
that.isSetJobSubmissionInterfaceId();
-    if (this_present_jobSubmissionInterfaceId || 
that_present_jobSubmissionInterfaceId) {
-      if (!(this_present_jobSubmissionInterfaceId && 
that_present_jobSubmissionInterfaceId))
-        return false;
-      if (!this.jobSubmissionInterfaceId.equals(that.jobSubmissionInterfaceId))
-        return false;
-    }
-
-    boolean this_present_jobSubmissionProtocol = true && 
this.isSetJobSubmissionProtocol();
-    boolean that_present_jobSubmissionProtocol = true && 
that.isSetJobSubmissionProtocol();
-    if (this_present_jobSubmissionProtocol || 
that_present_jobSubmissionProtocol) {
-      if (!(this_present_jobSubmissionProtocol && 
that_present_jobSubmissionProtocol))
-        return false;
-      if (!this.jobSubmissionProtocol.equals(that.jobSubmissionProtocol))
-        return false;
-    }
-
-    boolean this_present_priorityOrder = true;
-    boolean that_present_priorityOrder = true;
-    if (this_present_priorityOrder || that_present_priorityOrder) {
-      if (!(this_present_priorityOrder && that_present_priorityOrder))
-        return false;
-      if (this.priorityOrder != that.priorityOrder)
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_jobSubmissionInterfaceId = true && 
(isSetJobSubmissionInterfaceId());
-    list.add(present_jobSubmissionInterfaceId);
-    if (present_jobSubmissionInterfaceId)
-      list.add(jobSubmissionInterfaceId);
-
-    boolean present_jobSubmissionProtocol = true && 
(isSetJobSubmissionProtocol());
-    list.add(present_jobSubmissionProtocol);
-    if (present_jobSubmissionProtocol)
-      list.add(jobSubmissionProtocol.getValue());
-
-    boolean present_priorityOrder = true;
-    list.add(present_priorityOrder);
-    if (present_priorityOrder)
-      list.add(priorityOrder);
-
-    return list.hashCode();
-  }
-
-  @Override
-  public int compareTo(JobSubmissionInterface other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = 
Boolean.valueOf(isSetJobSubmissionInterfaceId()).compareTo(other.isSetJobSubmissionInterfaceId());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetJobSubmissionInterfaceId()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.jobSubmissionInterfaceId, 
other.jobSubmissionInterfaceId);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = 
Boolean.valueOf(isSetJobSubmissionProtocol()).compareTo(other.isSetJobSubmissionProtocol());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetJobSubmissionProtocol()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.jobSubmissionProtocol, 
other.jobSubmissionProtocol);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = 
Boolean.valueOf(isSetPriorityOrder()).compareTo(other.isSetPriorityOrder());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetPriorityOrder()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.priorityOrder, 
other.priorityOrder);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws 
org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
-  }
-
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws 
org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("JobSubmissionInterface(");
-    boolean first = true;
-
-    sb.append("jobSubmissionInterfaceId:");
-    if (this.jobSubmissionInterfaceId == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.jobSubmissionInterfaceId);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("jobSubmissionProtocol:");
-    if (this.jobSubmissionProtocol == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.jobSubmissionProtocol);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("priorityOrder:");
-    sb.append(this.priorityOrder);
-    first = false;
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    if (jobSubmissionInterfaceId == null) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 
'jobSubmissionInterfaceId' was not present! Struct: " + toString());
-    }
-    if (jobSubmissionProtocol == null) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 
'jobSubmissionProtocol' was not present! Struct: " + toString());
-    }
-    // alas, we cannot check 'priorityOrder' because it's a primitive and you 
chose the non-beans generator.
-    // check for sub-struct validity
-  }
-
-  private void writeObject(java.io.ObjectOutputStream out) throws 
java.io.IOException {
-    try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new 
org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private void readObject(java.io.ObjectInputStream in) throws 
java.io.IOException, ClassNotFoundException {
-    try {
-      // it doesn't seem like you should have to do this, but java 
serialization is wacky, and doesn't call the default constructor.
-      __isset_bitfield = 0;
-      read(new org.apache.thrift.protocol.TCompactProtocol(new 
org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private static class JobSubmissionInterfaceStandardSchemeFactory implements 
SchemeFactory {
-    public JobSubmissionInterfaceStandardScheme getScheme() {
-      return new JobSubmissionInterfaceStandardScheme();
-    }
-  }
-
-  private static class JobSubmissionInterfaceStandardScheme extends 
StandardScheme<JobSubmissionInterface> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, 
JobSubmissionInterface struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
-      iprot.readStructBegin();
-      while (true)
-      {
-        schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-          break;
-        }
-        switch (schemeField.id) {
-          case 1: // JOB_SUBMISSION_INTERFACE_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.jobSubmissionInterfaceId = iprot.readString();
-              struct.setJobSubmissionInterfaceIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
-            }
-            break;
-          case 2: // JOB_SUBMISSION_PROTOCOL
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.jobSubmissionProtocol = 
org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol.findByValue(iprot.readI32());
-              struct.setJobSubmissionProtocolIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
-            }
-            break;
-          case 3: // PRIORITY_ORDER
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.priorityOrder = iprot.readI32();
-              struct.setPriorityOrderIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
-        }
-        iprot.readFieldEnd();
-      }
-      iprot.readStructEnd();
-
-      // check for required fields of primitive type, which can't be checked 
in the validate method
-      if (!struct.isSetPriorityOrder()) {
-        throw new org.apache.thrift.protocol.TProtocolException("Required 
field 'priorityOrder' was not found in serialized data! Struct: " + toString());
-      }
-      struct.validate();
-    }
-
-    public void write(org.apache.thrift.protocol.TProtocol oprot, 
JobSubmissionInterface struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.jobSubmissionInterfaceId != null) {
-        oprot.writeFieldBegin(JOB_SUBMISSION_INTERFACE_ID_FIELD_DESC);
-        oprot.writeString(struct.jobSubmissionInterfaceId);
-        oprot.writeFieldEnd();
-      }
-      if (struct.jobSubmissionProtocol != null) {
-        oprot.writeFieldBegin(JOB_SUBMISSION_PROTOCOL_FIELD_DESC);
-        oprot.writeI32(struct.jobSubmissionProtocol.getValue());
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldBegin(PRIORITY_ORDER_FIELD_DESC);
-      oprot.writeI32(struct.priorityOrder);
-      oprot.writeFieldEnd();
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class JobSubmissionInterfaceTupleSchemeFactory implements 
SchemeFactory {
-    public JobSubmissionInterfaceTupleScheme getScheme() {
-      return new JobSubmissionInterfaceTupleScheme();
-    }
-  }
-
-  private static class JobSubmissionInterfaceTupleScheme extends 
TupleScheme<JobSubmissionInterface> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, 
JobSubmissionInterface struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      oprot.writeString(struct.jobSubmissionInterfaceId);
-      oprot.writeI32(struct.jobSubmissionProtocol.getValue());
-      oprot.writeI32(struct.priorityOrder);
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, 
JobSubmissionInterface struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      struct.jobSubmissionInterfaceId = iprot.readString();
-      struct.setJobSubmissionInterfaceIdIsSet(true);
-      struct.jobSubmissionProtocol = 
org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol.findByValue(iprot.readI32());
-      struct.setJobSubmissionProtocolIsSet(true);
-      struct.priorityOrder = iprot.readI32();
-      struct.setPriorityOrderIsSet(true);
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/airavata/blob/b490671e/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionProtocol.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionProtocol.java
 
b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionProtocol.java
deleted file mode 100644
index d76821e..0000000
--- 
a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionProtocol.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Autogenerated by Thrift Compiler (0.9.2)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.airavata.model.appcatalog.computeresource;
-
-
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.thrift.TEnum;
-
-/**
- * Enumeration of Airavata supported Job Submission Mechanisms for High 
Performance Computing Clusters.
- * 
- * SSH:
- *  Execute remote job submission commands using via secure shell protocol.
- * 
- * GRAM:
- *  Execute remote jobs via Globus GRAM service.
- * 
- * UNICORE:
- *  Execute remote jobs via Unicore services
- * 
- */
-public enum JobSubmissionProtocol implements org.apache.thrift.TEnum {
-  LOCAL(0),
-  SSH(1),
-  GLOBUS(2),
-  UNICORE(3),
-  CLOUD(4),
-  SSH_FORK(5),
-  LOCAL_FORK(6);
-
-  private final int value;
-
-  private JobSubmissionProtocol(int value) {
-    this.value = value;
-  }
-
-  /**
-   * Get the integer value of this enum value, as defined in the Thrift IDL.
-   */
-  public int getValue() {
-    return value;
-  }
-
-  /**
-   * Find a the enum type by its integer value, as defined in the Thrift IDL.
-   * @return null if the value is not found.
-   */
-  public static JobSubmissionProtocol findByValue(int value) { 
-    switch (value) {
-      case 0:
-        return LOCAL;
-      case 1:
-        return SSH;
-      case 2:
-        return GLOBUS;
-      case 3:
-        return UNICORE;
-      case 4:
-        return CLOUD;
-      case 5:
-        return SSH_FORK;
-      case 6:
-        return LOCAL_FORK;
-      default:
-        return null;
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/b490671e/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java
 
b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java
deleted file mode 100644
index 74911be..0000000
--- 
a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java
+++ /dev/null
@@ -1,643 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Autogenerated by Thrift Compiler (0.9.2)
- *
- * 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"})
-/**
- * Locally Fork Jobs as OS processes
- * 
- * alternativeSSHHostName:
- *  If the login to ssh is different than the hostname itself, specify it here
- * 
- * sshPort:
- *  If a non-default port needs to used, specify it.
- */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = 
"2015-12-2")
-public class LOCALSubmission implements 
org.apache.thrift.TBase<LOCALSubmission, LOCALSubmission._Fields>, 
java.io.Serializable, Cloneable, Comparable<LOCALSubmission> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("LOCALSubmission");
-
-  private static final org.apache.thrift.protocol.TField 
JOB_SUBMISSION_INTERFACE_ID_FIELD_DESC = new 
org.apache.thrift.protocol.TField("jobSubmissionInterfaceId", 
org.apache.thrift.protocol.TType.STRING, (short)1);
-  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 
RESOURCE_JOB_MANAGER_FIELD_DESC = new 
org.apache.thrift.protocol.TField("resourceJobManager", 
org.apache.thrift.protocol.TType.STRUCT, (short)3);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = 
new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new 
LOCALSubmissionStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new LOCALSubmissionTupleSchemeFactory());
-  }
-
-  public String jobSubmissionInterfaceId; // required
-  /**
-   * 
-   * @see org.apache.airavata.model.data.movement.SecurityProtocol
-   */
-  public org.apache.airavata.model.data.movement.SecurityProtocol 
securityProtocol; // required
-  public ResourceJobManager resourceJobManager; // 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 {
-    JOB_SUBMISSION_INTERFACE_ID((short)1, "jobSubmissionInterfaceId"),
-    /**
-     * 
-     * @see org.apache.airavata.model.data.movement.SecurityProtocol
-     */
-    SECURITY_PROTOCOL((short)2, "securityProtocol"),
-    RESOURCE_JOB_MANAGER((short)3, "resourceJobManager");
-
-    private static final Map<String, _Fields> byName = new HashMap<String, 
_Fields>();
-
-    static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
-        byName.put(field.getFieldName(), field);
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, or null if its not 
found.
-     */
-    public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
-        case 1: // JOB_SUBMISSION_INTERFACE_ID
-          return JOB_SUBMISSION_INTERFACE_ID;
-        case 2: // SECURITY_PROTOCOL
-          return SECURITY_PROTOCOL;
-        case 3: // RESOURCE_JOB_MANAGER
-          return RESOURCE_JOB_MANAGER;
-        default:
-          return null;
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
-     */
-    public static _Fields findByThriftIdOrThrow(int fieldId) {
-      _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + 
fieldId + " doesn't exist!");
-      return fields;
-    }
-
-    /**
-     * Find the _Fields constant that matches name, or null if its not found.
-     */
-    public static _Fields findByName(String name) {
-      return byName.get(name);
-    }
-
-    private final short _thriftId;
-    private final String _fieldName;
-
-    _Fields(short thriftId, String fieldName) {
-      _thriftId = thriftId;
-      _fieldName = fieldName;
-    }
-
-    public short getThriftFieldId() {
-      return _thriftId;
-    }
-
-    public String getFieldName() {
-      return _fieldName;
-    }
-  }
-
-  // isset id assignments
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> 
metaDataMap;
-  static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new 
EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.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.RESOURCE_JOB_MANAGER, new 
org.apache.thrift.meta_data.FieldMetaData("resourceJobManager", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new 
org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
 ResourceJobManager.class)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LOCALSubmission.class,
 metaDataMap);
-  }
-
-  public LOCALSubmission() {
-    this.jobSubmissionInterfaceId = "DO_NOT_SET_AT_CLIENTS";
-
-  }
-
-  public LOCALSubmission(
-    String jobSubmissionInterfaceId,
-    org.apache.airavata.model.data.movement.SecurityProtocol securityProtocol,
-    ResourceJobManager resourceJobManager)
-  {
-    this();
-    this.jobSubmissionInterfaceId = jobSubmissionInterfaceId;
-    this.securityProtocol = securityProtocol;
-    this.resourceJobManager = resourceJobManager;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public LOCALSubmission(LOCALSubmission other) {
-    if (other.isSetJobSubmissionInterfaceId()) {
-      this.jobSubmissionInterfaceId = other.jobSubmissionInterfaceId;
-    }
-    if (other.isSetSecurityProtocol()) {
-      this.securityProtocol = other.securityProtocol;
-    }
-    if (other.isSetResourceJobManager()) {
-      this.resourceJobManager = new 
ResourceJobManager(other.resourceJobManager);
-    }
-  }
-
-  public LOCALSubmission deepCopy() {
-    return new LOCALSubmission(this);
-  }
-
-  @Override
-  public void clear() {
-    this.jobSubmissionInterfaceId = "DO_NOT_SET_AT_CLIENTS";
-
-    this.securityProtocol = null;
-    this.resourceJobManager = null;
-  }
-
-  public String getJobSubmissionInterfaceId() {
-    return this.jobSubmissionInterfaceId;
-  }
-
-  public LOCALSubmission setJobSubmissionInterfaceId(String 
jobSubmissionInterfaceId) {
-    this.jobSubmissionInterfaceId = jobSubmissionInterfaceId;
-    return this;
-  }
-
-  public void unsetJobSubmissionInterfaceId() {
-    this.jobSubmissionInterfaceId = null;
-  }
-
-  /** Returns true if field jobSubmissionInterfaceId is set (has been assigned 
a value) and false otherwise */
-  public boolean isSetJobSubmissionInterfaceId() {
-    return this.jobSubmissionInterfaceId != null;
-  }
-
-  public void setJobSubmissionInterfaceIdIsSet(boolean value) {
-    if (!value) {
-      this.jobSubmissionInterfaceId = null;
-    }
-  }
-
-  /**
-   * 
-   * @see org.apache.airavata.model.data.movement.SecurityProtocol
-   */
-  public org.apache.airavata.model.data.movement.SecurityProtocol 
getSecurityProtocol() {
-    return this.securityProtocol;
-  }
-
-  /**
-   * 
-   * @see org.apache.airavata.model.data.movement.SecurityProtocol
-   */
-  public LOCALSubmission 
setSecurityProtocol(org.apache.airavata.model.data.movement.SecurityProtocol 
securityProtocol) {
-    this.securityProtocol = securityProtocol;
-    return this;
-  }
-
-  public void unsetSecurityProtocol() {
-    this.securityProtocol = null;
-  }
-
-  /** Returns true if field securityProtocol is set (has been assigned a 
value) and false otherwise */
-  public boolean isSetSecurityProtocol() {
-    return this.securityProtocol != null;
-  }
-
-  public void setSecurityProtocolIsSet(boolean value) {
-    if (!value) {
-      this.securityProtocol = null;
-    }
-  }
-
-  public ResourceJobManager getResourceJobManager() {
-    return this.resourceJobManager;
-  }
-
-  public LOCALSubmission setResourceJobManager(ResourceJobManager 
resourceJobManager) {
-    this.resourceJobManager = resourceJobManager;
-    return this;
-  }
-
-  public void unsetResourceJobManager() {
-    this.resourceJobManager = null;
-  }
-
-  /** Returns true if field resourceJobManager is set (has been assigned a 
value) and false otherwise */
-  public boolean isSetResourceJobManager() {
-    return this.resourceJobManager != null;
-  }
-
-  public void setResourceJobManagerIsSet(boolean value) {
-    if (!value) {
-      this.resourceJobManager = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case JOB_SUBMISSION_INTERFACE_ID:
-      if (value == null) {
-        unsetJobSubmissionInterfaceId();
-      } else {
-        setJobSubmissionInterfaceId((String)value);
-      }
-      break;
-
-    case SECURITY_PROTOCOL:
-      if (value == null) {
-        unsetSecurityProtocol();
-      } else {
-        
setSecurityProtocol((org.apache.airavata.model.data.movement.SecurityProtocol)value);
-      }
-      break;
-
-    case RESOURCE_JOB_MANAGER:
-      if (value == null) {
-        unsetResourceJobManager();
-      } else {
-        setResourceJobManager((ResourceJobManager)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case JOB_SUBMISSION_INTERFACE_ID:
-      return getJobSubmissionInterfaceId();
-
-    case SECURITY_PROTOCOL:
-      return getSecurityProtocol();
-
-    case RESOURCE_JOB_MANAGER:
-      return getResourceJobManager();
-
-    }
-    throw new IllegalStateException();
-  }
-
-  /** Returns true if field corresponding to fieldID is set (has been assigned 
a value) and false otherwise */
-  public boolean isSet(_Fields field) {
-    if (field == null) {
-      throw new IllegalArgumentException();
-    }
-
-    switch (field) {
-    case JOB_SUBMISSION_INTERFACE_ID:
-      return isSetJobSubmissionInterfaceId();
-    case SECURITY_PROTOCOL:
-      return isSetSecurityProtocol();
-    case RESOURCE_JOB_MANAGER:
-      return isSetResourceJobManager();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof LOCALSubmission)
-      return this.equals((LOCALSubmission)that);
-    return false;
-  }
-
-  public boolean equals(LOCALSubmission that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_jobSubmissionInterfaceId = true && 
this.isSetJobSubmissionInterfaceId();
-    boolean that_present_jobSubmissionInterfaceId = true && 
that.isSetJobSubmissionInterfaceId();
-    if (this_present_jobSubmissionInterfaceId || 
that_present_jobSubmissionInterfaceId) {
-      if (!(this_present_jobSubmissionInterfaceId && 
that_present_jobSubmissionInterfaceId))
-        return false;
-      if (!this.jobSubmissionInterfaceId.equals(that.jobSubmissionInterfaceId))
-        return false;
-    }
-
-    boolean this_present_securityProtocol = true && 
this.isSetSecurityProtocol();
-    boolean that_present_securityProtocol = true && 
that.isSetSecurityProtocol();
-    if (this_present_securityProtocol || that_present_securityProtocol) {
-      if (!(this_present_securityProtocol && that_present_securityProtocol))
-        return false;
-      if (!this.securityProtocol.equals(that.securityProtocol))
-        return false;
-    }
-
-    boolean this_present_resourceJobManager = true && 
this.isSetResourceJobManager();
-    boolean that_present_resourceJobManager = true && 
that.isSetResourceJobManager();
-    if (this_present_resourceJobManager || that_present_resourceJobManager) {
-      if (!(this_present_resourceJobManager && 
that_present_resourceJobManager))
-        return false;
-      if (!this.resourceJobManager.equals(that.resourceJobManager))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_jobSubmissionInterfaceId = true && 
(isSetJobSubmissionInterfaceId());
-    list.add(present_jobSubmissionInterfaceId);
-    if (present_jobSubmissionInterfaceId)
-      list.add(jobSubmissionInterfaceId);
-
-    boolean present_securityProtocol = true && (isSetSecurityProtocol());
-    list.add(present_securityProtocol);
-    if (present_securityProtocol)
-      list.add(securityProtocol.getValue());
-
-    boolean present_resourceJobManager = true && (isSetResourceJobManager());
-    list.add(present_resourceJobManager);
-    if (present_resourceJobManager)
-      list.add(resourceJobManager);
-
-    return list.hashCode();
-  }
-
-  @Override
-  public int compareTo(LOCALSubmission other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = 
Boolean.valueOf(isSetJobSubmissionInterfaceId()).compareTo(other.isSetJobSubmissionInterfaceId());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetJobSubmissionInterfaceId()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.jobSubmissionInterfaceId, 
other.jobSubmissionInterfaceId);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = 
Boolean.valueOf(isSetSecurityProtocol()).compareTo(other.isSetSecurityProtocol());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetSecurityProtocol()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.securityProtocol, 
other.securityProtocol);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = 
Boolean.valueOf(isSetResourceJobManager()).compareTo(other.isSetResourceJobManager());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetResourceJobManager()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.resourceJobManager, 
other.resourceJobManager);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws 
org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
-  }
-
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws 
org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("LOCALSubmission(");
-    boolean first = true;
-
-    sb.append("jobSubmissionInterfaceId:");
-    if (this.jobSubmissionInterfaceId == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.jobSubmissionInterfaceId);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("securityProtocol:");
-    if (this.securityProtocol == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.securityProtocol);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("resourceJobManager:");
-    if (this.resourceJobManager == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.resourceJobManager);
-    }
-    first = false;
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    if (jobSubmissionInterfaceId == null) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 
'jobSubmissionInterfaceId' was not present! Struct: " + toString());
-    }
-    if (securityProtocol == null) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 
'securityProtocol' was not present! Struct: " + toString());
-    }
-    if (resourceJobManager == null) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 
'resourceJobManager' was not present! Struct: " + toString());
-    }
-    // check for sub-struct validity
-    if (resourceJobManager != null) {
-      resourceJobManager.validate();
-    }
-  }
-
-  private void writeObject(java.io.ObjectOutputStream out) throws 
java.io.IOException {
-    try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new 
org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private void readObject(java.io.ObjectInputStream in) throws 
java.io.IOException, ClassNotFoundException {
-    try {
-      read(new org.apache.thrift.protocol.TCompactProtocol(new 
org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private static class LOCALSubmissionStandardSchemeFactory implements 
SchemeFactory {
-    public LOCALSubmissionStandardScheme getScheme() {
-      return new LOCALSubmissionStandardScheme();
-    }
-  }
-
-  private static class LOCALSubmissionStandardScheme extends 
StandardScheme<LOCALSubmission> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, 
LOCALSubmission struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
-      iprot.readStructBegin();
-      while (true)
-      {
-        schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-          break;
-        }
-        switch (schemeField.id) {
-          case 1: // JOB_SUBMISSION_INTERFACE_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.jobSubmissionInterfaceId = iprot.readString();
-              struct.setJobSubmissionInterfaceIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
-            }
-            break;
-          case 2: // SECURITY_PROTOCOL
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.securityProtocol = 
org.apache.airavata.model.data.movement.SecurityProtocol.findByValue(iprot.readI32());
-              struct.setSecurityProtocolIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
-            }
-            break;
-          case 3: // RESOURCE_JOB_MANAGER
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.resourceJobManager = new ResourceJobManager();
-              struct.resourceJobManager.read(iprot);
-              struct.setResourceJobManagerIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
-        }
-        iprot.readFieldEnd();
-      }
-      iprot.readStructEnd();
-
-      // check for required fields of primitive type, which can't be checked 
in the validate method
-      struct.validate();
-    }
-
-    public void write(org.apache.thrift.protocol.TProtocol oprot, 
LOCALSubmission struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.jobSubmissionInterfaceId != null) {
-        oprot.writeFieldBegin(JOB_SUBMISSION_INTERFACE_ID_FIELD_DESC);
-        oprot.writeString(struct.jobSubmissionInterfaceId);
-        oprot.writeFieldEnd();
-      }
-      if (struct.securityProtocol != null) {
-        oprot.writeFieldBegin(SECURITY_PROTOCOL_FIELD_DESC);
-        oprot.writeI32(struct.securityProtocol.getValue());
-        oprot.writeFieldEnd();
-      }
-      if (struct.resourceJobManager != null) {
-        oprot.writeFieldBegin(RESOURCE_JOB_MANAGER_FIELD_DESC);
-        struct.resourceJobManager.write(oprot);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class LOCALSubmissionTupleSchemeFactory implements 
SchemeFactory {
-    public LOCALSubmissionTupleScheme getScheme() {
-      return new LOCALSubmissionTupleScheme();
-    }
-  }
-
-  private static class LOCALSubmissionTupleScheme extends 
TupleScheme<LOCALSubmission> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, 
LOCALSubmission struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      oprot.writeString(struct.jobSubmissionInterfaceId);
-      oprot.writeI32(struct.securityProtocol.getValue());
-      struct.resourceJobManager.write(oprot);
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, 
LOCALSubmission struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      struct.jobSubmissionInterfaceId = iprot.readString();
-      struct.setJobSubmissionInterfaceIdIsSet(true);
-      struct.securityProtocol = 
org.apache.airavata.model.data.movement.SecurityProtocol.findByValue(iprot.readI32());
-      struct.setSecurityProtocolIsSet(true);
-      struct.resourceJobManager = new ResourceJobManager();
-      struct.resourceJobManager.read(iprot);
-      struct.setResourceJobManagerIsSet(true);
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/airavata/blob/b490671e/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/model/appcatalog/computeresource/MonitorMode.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/model/appcatalog/computeresource/MonitorMode.java
 
b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/model/appcatalog/computeresource/MonitorMode.java
deleted file mode 100644
index 3dc4cef..0000000
--- 
a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/model/appcatalog/computeresource/MonitorMode.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Autogenerated by Thrift Compiler (0.9.2)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.airavata.model.appcatalog.computeresource;
-
-
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.thrift.TEnum;
-
-/**
- * Monitoring modes
- * 
- * POLL_JOB_MANAGER:
- * GFac need to pull job status changes.
- * 
- * XSEDE_AMQP_SUBSCRIBE:
- * Server will publish job status changes to amqp servert.
- * 
- * 
- */
-public enum MonitorMode implements org.apache.thrift.TEnum {
-  POLL_JOB_MANAGER(0),
-  JOB_EMAIL_NOTIFICATION_MONITOR(1),
-  XSEDE_AMQP_SUBSCRIBE(2),
-  FORK(3);
-
-  private final int value;
-
-  private MonitorMode(int value) {
-    this.value = value;
-  }
-
-  /**
-   * Get the integer value of this enum value, as defined in the Thrift IDL.
-   */
-  public int getValue() {
-    return value;
-  }
-
-  /**
-   * Find a the enum type by its integer value, as defined in the Thrift IDL.
-   * @return null if the value is not found.
-   */
-  public static MonitorMode findByValue(int value) { 
-    switch (value) {
-      case 0:
-        return POLL_JOB_MANAGER;
-      case 1:
-        return JOB_EMAIL_NOTIFICATION_MONITOR;
-      case 2:
-        return XSEDE_AMQP_SUBSCRIBE;
-      case 3:
-        return FORK;
-      default:
-        return null;
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/b490671e/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ProviderName.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ProviderName.java
 
b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ProviderName.java
deleted file mode 100644
index 97a6b61..0000000
--- 
a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ProviderName.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Autogenerated by Thrift Compiler (0.9.2)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.airavata.model.appcatalog.computeresource;
-
-
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.thrift.TEnum;
-
-/**
- * Provider name
- * 
- */
-public enum ProviderName implements org.apache.thrift.TEnum {
-  EC2(0),
-  AWSEC2(1),
-  RACKSPACE(2);
-
-  private final int value;
-
-  private ProviderName(int value) {
-    this.value = value;
-  }
-
-  /**
-   * Get the integer value of this enum value, as defined in the Thrift IDL.
-   */
-  public int getValue() {
-    return value;
-  }
-
-  /**
-   * Find a the enum type by its integer value, as defined in the Thrift IDL.
-   * @return null if the value is not found.
-   */
-  public static ProviderName findByValue(int value) { 
-    switch (value) {
-      case 0:
-        return EC2;
-      case 1:
-        return AWSEC2;
-      case 2:
-        return RACKSPACE;
-      default:
-        return null;
-    }
-  }
-}

Reply via email to