airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sma...@apache.org
Subject [2/6] Updating ComputeResource Namespace to align with application descrrptions - AIRAVATA-1203
Date Thu, 03 Jul 2014 14:10:26 GMT
http://git-wip-us.apache.org/repos/asf/airavata/blob/169e6f9d/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/GridFTPDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/GridFTPDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/GridFTPDataMovement.java
deleted file mode 100644
index 1cc4328..0000000
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/GridFTPDataMovement.java
+++ /dev/null
@@ -1,651 +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.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.airavata.model.computehost;
-
-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 org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings("all") public class GridFTPDataMovement implements org.apache.thrift.TBase<GridFTPDataMovement, GridFTPDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<GridFTPDataMovement> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GridFTPDataMovement");
-
-  private static final org.apache.thrift.protocol.TField DATA_MOVEMENT_DATA_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("dataMovementDataID", 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 GRID_FTPEND_POINT_FIELD_DESC = new org.apache.thrift.protocol.TField("gridFTPEndPoint", 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 GridFTPDataMovementStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new GridFTPDataMovementTupleSchemeFactory());
-  }
-
-  private String dataMovementDataID; // required
-  private SecurityProtocol securityProtocol; // required
-  private List<String> gridFTPEndPoint; // required
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    DATA_MOVEMENT_DATA_ID((short)1, "dataMovementDataID"),
-    /**
-     * 
-     * @see SecurityProtocol
-     */
-    SECURITY_PROTOCOL((short)2, "securityProtocol"),
-    GRID_FTPEND_POINT((short)3, "gridFTPEndPoint");
-
-    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: // DATA_MOVEMENT_DATA_ID
-          return DATA_MOVEMENT_DATA_ID;
-        case 2: // SECURITY_PROTOCOL
-          return SECURITY_PROTOCOL;
-        case 3: // GRID_FTPEND_POINT
-          return GRID_FTPEND_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
-  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.DATA_MOVEMENT_DATA_ID, new org.apache.thrift.meta_data.FieldMetaData("dataMovementDataID", 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, SecurityProtocol.class)));
-    tmpMap.put(_Fields.GRID_FTPEND_POINT, new org.apache.thrift.meta_data.FieldMetaData("gridFTPEndPoint", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        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(GridFTPDataMovement.class, metaDataMap);
-  }
-
-  public GridFTPDataMovement() {
-    this.dataMovementDataID = "DO_NOT_SET_AT_CLIENTS";
-
-  }
-
-  public GridFTPDataMovement(
-    String dataMovementDataID,
-    SecurityProtocol securityProtocol,
-    List<String> gridFTPEndPoint)
-  {
-    this();
-    this.dataMovementDataID = dataMovementDataID;
-    this.securityProtocol = securityProtocol;
-    this.gridFTPEndPoint = gridFTPEndPoint;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public GridFTPDataMovement(GridFTPDataMovement other) {
-    if (other.isSetDataMovementDataID()) {
-      this.dataMovementDataID = other.dataMovementDataID;
-    }
-    if (other.isSetSecurityProtocol()) {
-      this.securityProtocol = other.securityProtocol;
-    }
-    if (other.isSetGridFTPEndPoint()) {
-      List<String> __this__gridFTPEndPoint = new ArrayList<String>(other.gridFTPEndPoint);
-      this.gridFTPEndPoint = __this__gridFTPEndPoint;
-    }
-  }
-
-  public GridFTPDataMovement deepCopy() {
-    return new GridFTPDataMovement(this);
-  }
-
-  @Override
-  public void clear() {
-    this.dataMovementDataID = "DO_NOT_SET_AT_CLIENTS";
-
-    this.securityProtocol = null;
-    this.gridFTPEndPoint = null;
-  }
-
-  public String getDataMovementDataID() {
-    return this.dataMovementDataID;
-  }
-
-  public void setDataMovementDataID(String dataMovementDataID) {
-    this.dataMovementDataID = dataMovementDataID;
-  }
-
-  public void unsetDataMovementDataID() {
-    this.dataMovementDataID = null;
-  }
-
-  /** Returns true if field dataMovementDataID is set (has been assigned a value) and false otherwise */
-  public boolean isSetDataMovementDataID() {
-    return this.dataMovementDataID != null;
-  }
-
-  public void setDataMovementDataIDIsSet(boolean value) {
-    if (!value) {
-      this.dataMovementDataID = null;
-    }
-  }
-
-  /**
-   * 
-   * @see SecurityProtocol
-   */
-  public SecurityProtocol getSecurityProtocol() {
-    return this.securityProtocol;
-  }
-
-  /**
-   * 
-   * @see SecurityProtocol
-   */
-  public void setSecurityProtocol(SecurityProtocol securityProtocol) {
-    this.securityProtocol = securityProtocol;
-  }
-
-  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 getGridFTPEndPointSize() {
-    return (this.gridFTPEndPoint == null) ? 0 : this.gridFTPEndPoint.size();
-  }
-
-  public java.util.Iterator<String> getGridFTPEndPointIterator() {
-    return (this.gridFTPEndPoint == null) ? null : this.gridFTPEndPoint.iterator();
-  }
-
-  public void addToGridFTPEndPoint(String elem) {
-    if (this.gridFTPEndPoint == null) {
-      this.gridFTPEndPoint = new ArrayList<String>();
-    }
-    this.gridFTPEndPoint.add(elem);
-  }
-
-  public List<String> getGridFTPEndPoint() {
-    return this.gridFTPEndPoint;
-  }
-
-  public void setGridFTPEndPoint(List<String> gridFTPEndPoint) {
-    this.gridFTPEndPoint = gridFTPEndPoint;
-  }
-
-  public void unsetGridFTPEndPoint() {
-    this.gridFTPEndPoint = null;
-  }
-
-  /** Returns true if field gridFTPEndPoint is set (has been assigned a value) and false otherwise */
-  public boolean isSetGridFTPEndPoint() {
-    return this.gridFTPEndPoint != null;
-  }
-
-  public void setGridFTPEndPointIsSet(boolean value) {
-    if (!value) {
-      this.gridFTPEndPoint = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case DATA_MOVEMENT_DATA_ID:
-      if (value == null) {
-        unsetDataMovementDataID();
-      } else {
-        setDataMovementDataID((String)value);
-      }
-      break;
-
-    case SECURITY_PROTOCOL:
-      if (value == null) {
-        unsetSecurityProtocol();
-      } else {
-        setSecurityProtocol((SecurityProtocol)value);
-      }
-      break;
-
-    case GRID_FTPEND_POINT:
-      if (value == null) {
-        unsetGridFTPEndPoint();
-      } else {
-        setGridFTPEndPoint((List<String>)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case DATA_MOVEMENT_DATA_ID:
-      return getDataMovementDataID();
-
-    case SECURITY_PROTOCOL:
-      return getSecurityProtocol();
-
-    case GRID_FTPEND_POINT:
-      return getGridFTPEndPoint();
-
-    }
-    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 DATA_MOVEMENT_DATA_ID:
-      return isSetDataMovementDataID();
-    case SECURITY_PROTOCOL:
-      return isSetSecurityProtocol();
-    case GRID_FTPEND_POINT:
-      return isSetGridFTPEndPoint();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof GridFTPDataMovement)
-      return this.equals((GridFTPDataMovement)that);
-    return false;
-  }
-
-  public boolean equals(GridFTPDataMovement that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_dataMovementDataID = true && this.isSetDataMovementDataID();
-    boolean that_present_dataMovementDataID = true && that.isSetDataMovementDataID();
-    if (this_present_dataMovementDataID || that_present_dataMovementDataID) {
-      if (!(this_present_dataMovementDataID && that_present_dataMovementDataID))
-        return false;
-      if (!this.dataMovementDataID.equals(that.dataMovementDataID))
-        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_gridFTPEndPoint = true && this.isSetGridFTPEndPoint();
-    boolean that_present_gridFTPEndPoint = true && that.isSetGridFTPEndPoint();
-    if (this_present_gridFTPEndPoint || that_present_gridFTPEndPoint) {
-      if (!(this_present_gridFTPEndPoint && that_present_gridFTPEndPoint))
-        return false;
-      if (!this.gridFTPEndPoint.equals(that.gridFTPEndPoint))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return 0;
-  }
-
-  @Override
-  public int compareTo(GridFTPDataMovement other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetDataMovementDataID()).compareTo(other.isSetDataMovementDataID());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetDataMovementDataID()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dataMovementDataID, other.dataMovementDataID);
-      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(isSetGridFTPEndPoint()).compareTo(other.isSetGridFTPEndPoint());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetGridFTPEndPoint()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gridFTPEndPoint, other.gridFTPEndPoint);
-      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("GridFTPDataMovement(");
-    boolean first = true;
-
-    sb.append("dataMovementDataID:");
-    if (this.dataMovementDataID == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.dataMovementDataID);
-    }
-    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("gridFTPEndPoint:");
-    if (this.gridFTPEndPoint == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.gridFTPEndPoint);
-    }
-    first = false;
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    if (!isSetDataMovementDataID()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'dataMovementDataID' is unset! Struct:" + toString());
-    }
-
-    if (!isSetSecurityProtocol()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'securityProtocol' is unset! Struct:" + toString());
-    }
-
-    if (!isSetGridFTPEndPoint()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'gridFTPEndPoint' is unset! 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 GridFTPDataMovementStandardSchemeFactory implements SchemeFactory {
-    public GridFTPDataMovementStandardScheme getScheme() {
-      return new GridFTPDataMovementStandardScheme();
-    }
-  }
-
-  private static class GridFTPDataMovementStandardScheme extends StandardScheme<GridFTPDataMovement> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, GridFTPDataMovement 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: // DATA_MOVEMENT_DATA_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.dataMovementDataID = iprot.readString();
-              struct.setDataMovementDataIDIsSet(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 = SecurityProtocol.findByValue(iprot.readI32());
-              struct.setSecurityProtocolIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // GRID_FTPEND_POINT
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
-                struct.gridFTPEndPoint = new ArrayList<String>(_list0.size);
-                for (int _i1 = 0; _i1 < _list0.size; ++_i1)
-                {
-                  String _elem2;
-                  _elem2 = iprot.readString();
-                  struct.gridFTPEndPoint.add(_elem2);
-                }
-                iprot.readListEnd();
-              }
-              struct.setGridFTPEndPointIsSet(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();
-      struct.validate();
-    }
-
-    public void write(org.apache.thrift.protocol.TProtocol oprot, GridFTPDataMovement struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.dataMovementDataID != null) {
-        oprot.writeFieldBegin(DATA_MOVEMENT_DATA_ID_FIELD_DESC);
-        oprot.writeString(struct.dataMovementDataID);
-        oprot.writeFieldEnd();
-      }
-      if (struct.securityProtocol != null) {
-        oprot.writeFieldBegin(SECURITY_PROTOCOL_FIELD_DESC);
-        oprot.writeI32(struct.securityProtocol.getValue());
-        oprot.writeFieldEnd();
-      }
-      if (struct.gridFTPEndPoint != null) {
-        oprot.writeFieldBegin(GRID_FTPEND_POINT_FIELD_DESC);
-        {
-          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.gridFTPEndPoint.size()));
-          for (String _iter3 : struct.gridFTPEndPoint)
-          {
-            oprot.writeString(_iter3);
-          }
-          oprot.writeListEnd();
-        }
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class GridFTPDataMovementTupleSchemeFactory implements SchemeFactory {
-    public GridFTPDataMovementTupleScheme getScheme() {
-      return new GridFTPDataMovementTupleScheme();
-    }
-  }
-
-  private static class GridFTPDataMovementTupleScheme extends TupleScheme<GridFTPDataMovement> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, GridFTPDataMovement struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      oprot.writeString(struct.dataMovementDataID);
-      oprot.writeI32(struct.securityProtocol.getValue());
-      {
-        oprot.writeI32(struct.gridFTPEndPoint.size());
-        for (String _iter4 : struct.gridFTPEndPoint)
-        {
-          oprot.writeString(_iter4);
-        }
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, GridFTPDataMovement struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      struct.dataMovementDataID = iprot.readString();
-      struct.setDataMovementDataIDIsSet(true);
-      struct.securityProtocol = SecurityProtocol.findByValue(iprot.readI32());
-      struct.setSecurityProtocolIsSet(true);
-      {
-        org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-        struct.gridFTPEndPoint = new ArrayList<String>(_list5.size);
-        for (int _i6 = 0; _i6 < _list5.size; ++_i6)
-        {
-          String _elem7;
-          _elem7 = iprot.readString();
-          struct.gridFTPEndPoint.add(_elem7);
-        }
-      }
-      struct.setGridFTPEndPointIsSet(true);
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/airavata/blob/169e6f9d/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/JobSubmissionProtocol.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/JobSubmissionProtocol.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/JobSubmissionProtocol.java
deleted file mode 100644
index be3b6e1..0000000
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/JobSubmissionProtocol.java
+++ /dev/null
@@ -1,80 +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.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.airavata.model.computehost;
-
-
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.thrift.TEnum;
-
-/**
- * Enumeration of Airavata supported Job Submission Mechanisms for High Perforamance 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
- * 
- */
-@SuppressWarnings("all") public enum JobSubmissionProtocol implements org.apache.thrift.TEnum {
-  SSH(0),
-  GSISSH(1),
-  GRAM(2),
-  UNICORE(3);
-
-  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 SSH;
-      case 1:
-        return GSISSH;
-      case 2:
-        return GRAM;
-      case 3:
-        return UNICORE;
-      default:
-        return null;
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/169e6f9d/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/ResourceJobManager.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/ResourceJobManager.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/ResourceJobManager.java
deleted file mode 100644
index 49c5581..0000000
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/ResourceJobManager.java
+++ /dev/null
@@ -1,83 +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.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.airavata.model.computehost;
-
-
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.thrift.TEnum;
-
-/**
- * Enumeration of local resource job managers supported by Airavata
- * 
- * FORK:
- *  Forking of commands without any job manager
- * 
- * PBS:
- *  Job manager supporting the Portal Batch System (PBS) protocol. Some examples include TORQUE, PBSPro, Grid Engine.
- * 
- * UGE:
- *  Univa Grid Engine, a variation of PBS implementation.
- * 
- * SLURM:
- *  The Simple Linux Utility for Resource Management is a open source workload manager.
- * 
- */
-@SuppressWarnings("all") public enum ResourceJobManager implements org.apache.thrift.TEnum {
-  FORK(0),
-  PBS(1),
-  UGE(2),
-  SLURM(3);
-
-  private final int value;
-
-  private ResourceJobManager(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 ResourceJobManager findByValue(int value) { 
-    switch (value) {
-      case 0:
-        return FORK;
-      case 1:
-        return PBS;
-      case 2:
-        return UGE;
-      case 3:
-        return SLURM;
-      default:
-        return null;
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/169e6f9d/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/SCPDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/SCPDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/SCPDataMovement.java
deleted file mode 100644
index 699dfaf..0000000
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/SCPDataMovement.java
+++ /dev/null
@@ -1,610 +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.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.airavata.model.computehost;
-
-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 org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings("all") public class SCPDataMovement implements org.apache.thrift.TBase<SCPDataMovement, SCPDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<SCPDataMovement> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SCPDataMovement");
-
-  private static final org.apache.thrift.protocol.TField DATA_MOVEMENT_DATA_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("dataMovementDataID", 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 SSH_PORT_FIELD_DESC = new org.apache.thrift.protocol.TField("sshPort", 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 SCPDataMovementStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new SCPDataMovementTupleSchemeFactory());
-  }
-
-  private String dataMovementDataID; // required
-  private SecurityProtocol securityProtocol; // required
-  private int sshPort; // optional
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    DATA_MOVEMENT_DATA_ID((short)1, "dataMovementDataID"),
-    /**
-     * 
-     * @see SecurityProtocol
-     */
-    SECURITY_PROTOCOL((short)2, "securityProtocol"),
-    SSH_PORT((short)3, "sshPort");
-
-    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: // DATA_MOVEMENT_DATA_ID
-          return DATA_MOVEMENT_DATA_ID;
-        case 2: // SECURITY_PROTOCOL
-          return SECURITY_PROTOCOL;
-        case 3: // SSH_PORT
-          return SSH_PORT;
-        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 __SSHPORT_ISSET_ID = 0;
-  private byte __isset_bitfield = 0;
-  private _Fields optionals[] = {_Fields.SSH_PORT};
-  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.DATA_MOVEMENT_DATA_ID, new org.apache.thrift.meta_data.FieldMetaData("dataMovementDataID", 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, SecurityProtocol.class)));
-    tmpMap.put(_Fields.SSH_PORT, new org.apache.thrift.meta_data.FieldMetaData("sshPort", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SCPDataMovement.class, metaDataMap);
-  }
-
-  public SCPDataMovement() {
-    this.dataMovementDataID = "DO_NOT_SET_AT_CLIENTS";
-
-    this.sshPort = 22;
-
-  }
-
-  public SCPDataMovement(
-    String dataMovementDataID,
-    SecurityProtocol securityProtocol)
-  {
-    this();
-    this.dataMovementDataID = dataMovementDataID;
-    this.securityProtocol = securityProtocol;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public SCPDataMovement(SCPDataMovement other) {
-    __isset_bitfield = other.__isset_bitfield;
-    if (other.isSetDataMovementDataID()) {
-      this.dataMovementDataID = other.dataMovementDataID;
-    }
-    if (other.isSetSecurityProtocol()) {
-      this.securityProtocol = other.securityProtocol;
-    }
-    this.sshPort = other.sshPort;
-  }
-
-  public SCPDataMovement deepCopy() {
-    return new SCPDataMovement(this);
-  }
-
-  @Override
-  public void clear() {
-    this.dataMovementDataID = "DO_NOT_SET_AT_CLIENTS";
-
-    this.securityProtocol = null;
-    this.sshPort = 22;
-
-  }
-
-  public String getDataMovementDataID() {
-    return this.dataMovementDataID;
-  }
-
-  public void setDataMovementDataID(String dataMovementDataID) {
-    this.dataMovementDataID = dataMovementDataID;
-  }
-
-  public void unsetDataMovementDataID() {
-    this.dataMovementDataID = null;
-  }
-
-  /** Returns true if field dataMovementDataID is set (has been assigned a value) and false otherwise */
-  public boolean isSetDataMovementDataID() {
-    return this.dataMovementDataID != null;
-  }
-
-  public void setDataMovementDataIDIsSet(boolean value) {
-    if (!value) {
-      this.dataMovementDataID = null;
-    }
-  }
-
-  /**
-   * 
-   * @see SecurityProtocol
-   */
-  public SecurityProtocol getSecurityProtocol() {
-    return this.securityProtocol;
-  }
-
-  /**
-   * 
-   * @see SecurityProtocol
-   */
-  public void setSecurityProtocol(SecurityProtocol securityProtocol) {
-    this.securityProtocol = securityProtocol;
-  }
-
-  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 getSshPort() {
-    return this.sshPort;
-  }
-
-  public void setSshPort(int sshPort) {
-    this.sshPort = sshPort;
-    setSshPortIsSet(true);
-  }
-
-  public void unsetSshPort() {
-    __isset_bitfield = 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);
-  }
-
-  public void setSshPortIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SSHPORT_ISSET_ID, value);
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case DATA_MOVEMENT_DATA_ID:
-      if (value == null) {
-        unsetDataMovementDataID();
-      } else {
-        setDataMovementDataID((String)value);
-      }
-      break;
-
-    case SECURITY_PROTOCOL:
-      if (value == null) {
-        unsetSecurityProtocol();
-      } else {
-        setSecurityProtocol((SecurityProtocol)value);
-      }
-      break;
-
-    case SSH_PORT:
-      if (value == null) {
-        unsetSshPort();
-      } else {
-        setSshPort((Integer)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case DATA_MOVEMENT_DATA_ID:
-      return getDataMovementDataID();
-
-    case SECURITY_PROTOCOL:
-      return getSecurityProtocol();
-
-    case SSH_PORT:
-      return Integer.valueOf(getSshPort());
-
-    }
-    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 DATA_MOVEMENT_DATA_ID:
-      return isSetDataMovementDataID();
-    case SECURITY_PROTOCOL:
-      return isSetSecurityProtocol();
-    case SSH_PORT:
-      return isSetSshPort();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof SCPDataMovement)
-      return this.equals((SCPDataMovement)that);
-    return false;
-  }
-
-  public boolean equals(SCPDataMovement that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_dataMovementDataID = true && this.isSetDataMovementDataID();
-    boolean that_present_dataMovementDataID = true && that.isSetDataMovementDataID();
-    if (this_present_dataMovementDataID || that_present_dataMovementDataID) {
-      if (!(this_present_dataMovementDataID && that_present_dataMovementDataID))
-        return false;
-      if (!this.dataMovementDataID.equals(that.dataMovementDataID))
-        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_sshPort = true && this.isSetSshPort();
-    boolean that_present_sshPort = true && that.isSetSshPort();
-    if (this_present_sshPort || that_present_sshPort) {
-      if (!(this_present_sshPort && that_present_sshPort))
-        return false;
-      if (this.sshPort != that.sshPort)
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return 0;
-  }
-
-  @Override
-  public int compareTo(SCPDataMovement other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetDataMovementDataID()).compareTo(other.isSetDataMovementDataID());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetDataMovementDataID()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dataMovementDataID, other.dataMovementDataID);
-      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(isSetSshPort()).compareTo(other.isSetSshPort());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetSshPort()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sshPort, other.sshPort);
-      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("SCPDataMovement(");
-    boolean first = true;
-
-    sb.append("dataMovementDataID:");
-    if (this.dataMovementDataID == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.dataMovementDataID);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("securityProtocol:");
-    if (this.securityProtocol == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.securityProtocol);
-    }
-    first = false;
-    if (isSetSshPort()) {
-      if (!first) sb.append(", ");
-      sb.append("sshPort:");
-      sb.append(this.sshPort);
-      first = false;
-    }
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    if (!isSetDataMovementDataID()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'dataMovementDataID' is unset! Struct:" + toString());
-    }
-
-    if (!isSetSecurityProtocol()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'securityProtocol' is unset! 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 {
-      // 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 SCPDataMovementStandardSchemeFactory implements SchemeFactory {
-    public SCPDataMovementStandardScheme getScheme() {
-      return new SCPDataMovementStandardScheme();
-    }
-  }
-
-  private static class SCPDataMovementStandardScheme extends StandardScheme<SCPDataMovement> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, SCPDataMovement 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: // DATA_MOVEMENT_DATA_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.dataMovementDataID = iprot.readString();
-              struct.setDataMovementDataIDIsSet(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 = SecurityProtocol.findByValue(iprot.readI32());
-              struct.setSecurityProtocolIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // SSH_PORT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.sshPort = iprot.readI32();
-              struct.setSshPortIsSet(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();
-      struct.validate();
-    }
-
-    public void write(org.apache.thrift.protocol.TProtocol oprot, SCPDataMovement struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.dataMovementDataID != null) {
-        oprot.writeFieldBegin(DATA_MOVEMENT_DATA_ID_FIELD_DESC);
-        oprot.writeString(struct.dataMovementDataID);
-        oprot.writeFieldEnd();
-      }
-      if (struct.securityProtocol != null) {
-        oprot.writeFieldBegin(SECURITY_PROTOCOL_FIELD_DESC);
-        oprot.writeI32(struct.securityProtocol.getValue());
-        oprot.writeFieldEnd();
-      }
-      if (struct.isSetSshPort()) {
-        oprot.writeFieldBegin(SSH_PORT_FIELD_DESC);
-        oprot.writeI32(struct.sshPort);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class SCPDataMovementTupleSchemeFactory implements SchemeFactory {
-    public SCPDataMovementTupleScheme getScheme() {
-      return new SCPDataMovementTupleScheme();
-    }
-  }
-
-  private static class SCPDataMovementTupleScheme extends TupleScheme<SCPDataMovement> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, SCPDataMovement struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      oprot.writeString(struct.dataMovementDataID);
-      oprot.writeI32(struct.securityProtocol.getValue());
-      BitSet optionals = new BitSet();
-      if (struct.isSetSshPort()) {
-        optionals.set(0);
-      }
-      oprot.writeBitSet(optionals, 1);
-      if (struct.isSetSshPort()) {
-        oprot.writeI32(struct.sshPort);
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, SCPDataMovement struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      struct.dataMovementDataID = iprot.readString();
-      struct.setDataMovementDataIDIsSet(true);
-      struct.securityProtocol = SecurityProtocol.findByValue(iprot.readI32());
-      struct.setSecurityProtocolIsSet(true);
-      BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.sshPort = iprot.readI32();
-        struct.setSshPortIsSet(true);
-      }
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/airavata/blob/169e6f9d/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/SSHJobSubmission.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/SSHJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/SSHJobSubmission.java
deleted file mode 100644
index 127dc27..0000000
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/SSHJobSubmission.java
+++ /dev/null
@@ -1,610 +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.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.airavata.model.computehost;
-
-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 org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings("all") 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");
-
-  private static final org.apache.thrift.protocol.TField JOB_SUBMISSION_DATA_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("jobSubmissionDataID", org.apache.thrift.protocol.TType.STRING, (short)1);
-  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.I32, (short)2);
-  private static final org.apache.thrift.protocol.TField SSH_PORT_FIELD_DESC = new org.apache.thrift.protocol.TField("sshPort", 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 SSHJobSubmissionStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new SSHJobSubmissionTupleSchemeFactory());
-  }
-
-  private String jobSubmissionDataID; // required
-  private ResourceJobManager resourceJobManager; // required
-  private int sshPort; // optional
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    JOB_SUBMISSION_DATA_ID((short)1, "jobSubmissionDataID"),
-    /**
-     * 
-     * @see ResourceJobManager
-     */
-    RESOURCE_JOB_MANAGER((short)2, "resourceJobManager"),
-    SSH_PORT((short)3, "sshPort");
-
-    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_DATA_ID
-          return JOB_SUBMISSION_DATA_ID;
-        case 2: // RESOURCE_JOB_MANAGER
-          return RESOURCE_JOB_MANAGER;
-        case 3: // SSH_PORT
-          return SSH_PORT;
-        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 __SSHPORT_ISSET_ID = 0;
-  private byte __isset_bitfield = 0;
-  private _Fields optionals[] = {_Fields.SSH_PORT};
-  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_DATA_ID, new org.apache.thrift.meta_data.FieldMetaData("jobSubmissionDataID", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    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.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, ResourceJobManager.class)));
-    tmpMap.put(_Fields.SSH_PORT, new org.apache.thrift.meta_data.FieldMetaData("sshPort", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SSHJobSubmission.class, metaDataMap);
-  }
-
-  public SSHJobSubmission() {
-    this.jobSubmissionDataID = "DO_NOT_SET_AT_CLIENTS";
-
-    this.sshPort = 22;
-
-  }
-
-  public SSHJobSubmission(
-    String jobSubmissionDataID,
-    ResourceJobManager resourceJobManager)
-  {
-    this();
-    this.jobSubmissionDataID = jobSubmissionDataID;
-    this.resourceJobManager = resourceJobManager;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public SSHJobSubmission(SSHJobSubmission other) {
-    __isset_bitfield = other.__isset_bitfield;
-    if (other.isSetJobSubmissionDataID()) {
-      this.jobSubmissionDataID = other.jobSubmissionDataID;
-    }
-    if (other.isSetResourceJobManager()) {
-      this.resourceJobManager = other.resourceJobManager;
-    }
-    this.sshPort = other.sshPort;
-  }
-
-  public SSHJobSubmission deepCopy() {
-    return new SSHJobSubmission(this);
-  }
-
-  @Override
-  public void clear() {
-    this.jobSubmissionDataID = "DO_NOT_SET_AT_CLIENTS";
-
-    this.resourceJobManager = null;
-    this.sshPort = 22;
-
-  }
-
-  public String getJobSubmissionDataID() {
-    return this.jobSubmissionDataID;
-  }
-
-  public void setJobSubmissionDataID(String jobSubmissionDataID) {
-    this.jobSubmissionDataID = jobSubmissionDataID;
-  }
-
-  public void unsetJobSubmissionDataID() {
-    this.jobSubmissionDataID = null;
-  }
-
-  /** Returns true if field jobSubmissionDataID is set (has been assigned a value) and false otherwise */
-  public boolean isSetJobSubmissionDataID() {
-    return this.jobSubmissionDataID != null;
-  }
-
-  public void setJobSubmissionDataIDIsSet(boolean value) {
-    if (!value) {
-      this.jobSubmissionDataID = null;
-    }
-  }
-
-  /**
-   * 
-   * @see ResourceJobManager
-   */
-  public ResourceJobManager getResourceJobManager() {
-    return this.resourceJobManager;
-  }
-
-  /**
-   * 
-   * @see ResourceJobManager
-   */
-  public void setResourceJobManager(ResourceJobManager resourceJobManager) {
-    this.resourceJobManager = resourceJobManager;
-  }
-
-  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 int getSshPort() {
-    return this.sshPort;
-  }
-
-  public void setSshPort(int sshPort) {
-    this.sshPort = sshPort;
-    setSshPortIsSet(true);
-  }
-
-  public void unsetSshPort() {
-    __isset_bitfield = 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);
-  }
-
-  public void setSshPortIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SSHPORT_ISSET_ID, value);
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case JOB_SUBMISSION_DATA_ID:
-      if (value == null) {
-        unsetJobSubmissionDataID();
-      } else {
-        setJobSubmissionDataID((String)value);
-      }
-      break;
-
-    case RESOURCE_JOB_MANAGER:
-      if (value == null) {
-        unsetResourceJobManager();
-      } else {
-        setResourceJobManager((ResourceJobManager)value);
-      }
-      break;
-
-    case SSH_PORT:
-      if (value == null) {
-        unsetSshPort();
-      } else {
-        setSshPort((Integer)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case JOB_SUBMISSION_DATA_ID:
-      return getJobSubmissionDataID();
-
-    case RESOURCE_JOB_MANAGER:
-      return getResourceJobManager();
-
-    case SSH_PORT:
-      return Integer.valueOf(getSshPort());
-
-    }
-    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_DATA_ID:
-      return isSetJobSubmissionDataID();
-    case RESOURCE_JOB_MANAGER:
-      return isSetResourceJobManager();
-    case SSH_PORT:
-      return isSetSshPort();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof SSHJobSubmission)
-      return this.equals((SSHJobSubmission)that);
-    return false;
-  }
-
-  public boolean equals(SSHJobSubmission that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_jobSubmissionDataID = true && this.isSetJobSubmissionDataID();
-    boolean that_present_jobSubmissionDataID = true && that.isSetJobSubmissionDataID();
-    if (this_present_jobSubmissionDataID || that_present_jobSubmissionDataID) {
-      if (!(this_present_jobSubmissionDataID && that_present_jobSubmissionDataID))
-        return false;
-      if (!this.jobSubmissionDataID.equals(that.jobSubmissionDataID))
-        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;
-    }
-
-    boolean this_present_sshPort = true && this.isSetSshPort();
-    boolean that_present_sshPort = true && that.isSetSshPort();
-    if (this_present_sshPort || that_present_sshPort) {
-      if (!(this_present_sshPort && that_present_sshPort))
-        return false;
-      if (this.sshPort != that.sshPort)
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return 0;
-  }
-
-  @Override
-  public int compareTo(SSHJobSubmission other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetJobSubmissionDataID()).compareTo(other.isSetJobSubmissionDataID());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetJobSubmissionDataID()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.jobSubmissionDataID, other.jobSubmissionDataID);
-      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;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetSshPort()).compareTo(other.isSetSshPort());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetSshPort()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sshPort, other.sshPort);
-      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("SSHJobSubmission(");
-    boolean first = true;
-
-    sb.append("jobSubmissionDataID:");
-    if (this.jobSubmissionDataID == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.jobSubmissionDataID);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("resourceJobManager:");
-    if (this.resourceJobManager == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.resourceJobManager);
-    }
-    first = false;
-    if (isSetSshPort()) {
-      if (!first) sb.append(", ");
-      sb.append("sshPort:");
-      sb.append(this.sshPort);
-      first = false;
-    }
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    if (!isSetJobSubmissionDataID()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'jobSubmissionDataID' is unset! Struct:" + toString());
-    }
-
-    if (!isSetResourceJobManager()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'resourceJobManager' is unset! 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 {
-      // 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 SSHJobSubmissionStandardSchemeFactory implements SchemeFactory {
-    public SSHJobSubmissionStandardScheme getScheme() {
-      return new SSHJobSubmissionStandardScheme();
-    }
-  }
-
-  private static class SSHJobSubmissionStandardScheme extends StandardScheme<SSHJobSubmission> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, SSHJobSubmission 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_DATA_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.jobSubmissionDataID = iprot.readString();
-              struct.setJobSubmissionDataIDIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // RESOURCE_JOB_MANAGER
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.resourceJobManager = ResourceJobManager.findByValue(iprot.readI32());
-              struct.setResourceJobManagerIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // SSH_PORT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.sshPort = iprot.readI32();
-              struct.setSshPortIsSet(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();
-      struct.validate();
-    }
-
-    public void write(org.apache.thrift.protocol.TProtocol oprot, SSHJobSubmission struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.jobSubmissionDataID != null) {
-        oprot.writeFieldBegin(JOB_SUBMISSION_DATA_ID_FIELD_DESC);
-        oprot.writeString(struct.jobSubmissionDataID);
-        oprot.writeFieldEnd();
-      }
-      if (struct.resourceJobManager != null) {
-        oprot.writeFieldBegin(RESOURCE_JOB_MANAGER_FIELD_DESC);
-        oprot.writeI32(struct.resourceJobManager.getValue());
-        oprot.writeFieldEnd();
-      }
-      if (struct.isSetSshPort()) {
-        oprot.writeFieldBegin(SSH_PORT_FIELD_DESC);
-        oprot.writeI32(struct.sshPort);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class SSHJobSubmissionTupleSchemeFactory implements SchemeFactory {
-    public SSHJobSubmissionTupleScheme getScheme() {
-      return new SSHJobSubmissionTupleScheme();
-    }
-  }
-
-  private static class SSHJobSubmissionTupleScheme extends TupleScheme<SSHJobSubmission> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, SSHJobSubmission struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      oprot.writeString(struct.jobSubmissionDataID);
-      oprot.writeI32(struct.resourceJobManager.getValue());
-      BitSet optionals = new BitSet();
-      if (struct.isSetSshPort()) {
-        optionals.set(0);
-      }
-      oprot.writeBitSet(optionals, 1);
-      if (struct.isSetSshPort()) {
-        oprot.writeI32(struct.sshPort);
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, SSHJobSubmission struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      struct.jobSubmissionDataID = iprot.readString();
-      struct.setJobSubmissionDataIDIsSet(true);
-      struct.resourceJobManager = ResourceJobManager.findByValue(iprot.readI32());
-      struct.setResourceJobManagerIsSet(true);
-      BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.sshPort = iprot.readI32();
-        struct.setSshPortIsSet(true);
-      }
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/airavata/blob/169e6f9d/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/SecurityProtocol.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/SecurityProtocol.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/SecurityProtocol.java
deleted file mode 100644
index 0f6673a..0000000
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/SecurityProtocol.java
+++ /dev/null
@@ -1,82 +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.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.airavata.model.computehost;
-
-
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.thrift.TEnum;
-
-/**
- * Enumeration of security authentication and authorization mechanisms supported by Airavata. This enumeration just
- *  describes the supported mechanism. The corresponding security credentials are registered with Airavata Credential
- *  store.
- * 
- * USERNAME_PASSWORD:
- *  A User Name.
- * 
- * SSH_KEYS:
- *  SSH Keys
- * 
- */
-@SuppressWarnings("all") public enum SecurityProtocol implements org.apache.thrift.TEnum {
-  USERNAME_PASSWORD(0),
-  SSH_KEYS(1),
-  GSI(2),
-  KERBEROS(3),
-  OAUTH(4);
-
-  private final int value;
-
-  private SecurityProtocol(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 SecurityProtocol findByValue(int value) { 
-    switch (value) {
-      case 0:
-        return USERNAME_PASSWORD;
-      case 1:
-        return SSH_KEYS;
-      case 2:
-        return GSI;
-      case 3:
-        return KERBEROS;
-      case 4:
-        return OAUTH;
-      default:
-        return null;
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/169e6f9d/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/computeHostModelConstants.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/computeHostModelConstants.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/computeHostModelConstants.java
deleted file mode 100644
index fa923f3..0000000
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/computehost/computeHostModelConstants.java
+++ /dev/null
@@ -1,55 +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.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.airavata.model.computehost;
-
-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 org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings("all") public class computeHostModelConstants {
-
-  public static final String DEFAULT_ID = "DO_NOT_SET_AT_CLIENTS";
-
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/169e6f9d/airavata-api/airavata-model-utils/src/main/java/org/apache/airavata/model/util/ComputeResourceUtil.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-model-utils/src/main/java/org/apache/airavata/model/util/ComputeResourceUtil.java b/airavata-api/airavata-model-utils/src/main/java/org/apache/airavata/model/util/ComputeResourceUtil.java
index 49d80b0..8a885b6 100644
--- a/airavata-api/airavata-model-utils/src/main/java/org/apache/airavata/model/util/ComputeResourceUtil.java
+++ b/airavata-api/airavata-model-utils/src/main/java/org/apache/airavata/model/util/ComputeResourceUtil.java
@@ -21,7 +21,7 @@
 
 package org.apache.airavata.model.util;
 
-import org.apache.airavata.model.computehost.*;
+import org.apache.airavata.model.appcatalog.computeresource.*;
 
 import java.util.List;
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/169e6f9d/airavata-api/thrift-interface-descriptions/airavataAPI.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/airavataAPI.thrift b/airavata-api/thrift-interface-descriptions/airavataAPI.thrift
index 4bf2d04..98693e1 100644
--- a/airavata-api/thrift-interface-descriptions/airavataAPI.thrift
+++ b/airavata-api/thrift-interface-descriptions/airavataAPI.thrift
@@ -28,7 +28,7 @@ include "airavataErrors.thrift"
 include "airavataDataModel.thrift"
 include "experimentModel.thrift"
 include "workspaceModel.thrift"
-include "computeHostModel.thrift"
+include "computeResourceModel.thrift"
 include "applicationDeploymentModel.thrift"
 include "applicationInterfaceModel.thrift"
 include "gatewayProfileModel.thrift"

http://git-wip-us.apache.org/repos/asf/airavata/blob/169e6f9d/airavata-api/thrift-interface-descriptions/appCatalogModels.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/appCatalogModels.thrift b/airavata-api/thrift-interface-descriptions/appCatalogModels.thrift
index 7397e33..2e9a6c0 100644
--- a/airavata-api/thrift-interface-descriptions/appCatalogModels.thrift
+++ b/airavata-api/thrift-interface-descriptions/appCatalogModels.thrift
@@ -18,7 +18,7 @@
  *
  */
 
-include "computeHostModel.thrift"
+include "computeResourceModel.thrift"
 include "applicationDeploymentModel.thrift"
 include "applicationInterfaceModel.thrift"
 include "gatewayProfileModel.thrift"
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/169e6f9d/airavata-api/thrift-interface-descriptions/computeHostModel.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/computeHostModel.thrift b/airavata-api/thrift-interface-descriptions/computeHostModel.thrift
deleted file mode 100644
index 01754d8..0000000
--- a/airavata-api/thrift-interface-descriptions/computeHostModel.thrift
+++ /dev/null
@@ -1,180 +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.
- *
- */
-
-namespace java org.apache.airavata.model.computehost
-namespace php Airavata.Model.ComputeHost
-
-const string DEFAULT_ID = "DO_NOT_SET_AT_CLIENTS"
-
-/**
- * Enumeration of local resource job managers supported by Airavata
- *
- * FORK:
- *  Forking of commands without any job manager
- *
- * PBS:
- *  Job manager supporting the Portal Batch System (PBS) protocol. Some examples include TORQUE, PBSPro, Grid Engine.
- *
- * UGE:
- *  Univa Grid Engine, a variation of PBS implementation.
- *
- * SLURM:
- *  The Simple Linux Utility for Resource Management is a open source workload manager.
- *
-*/
-enum ResourceJobManager {
-    FORK,
-    PBS,
-    UGE,
-    SLURM
-}
-
-/**
- * Enumeration of Airavata supported Job Submission Mechanisms for High Perforamance 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
- *
-*/
-enum JobSubmissionProtocol {
-    SSH,
-    GSISSH,
-    GRAM,
-    UNICORE
-}
-
-/**
- * Enumeration of data movement supported by Airavata
- *
- * SCP:
- *  Job manager supporting the Portal Batch System (PBS) protocol. Some examples include TORQUE, PBSPro, Grid Engine.
- *
- * SFTP:
- *  The Simple Linux Utility for Resource Management is a open source workload manager.
- *
- * GridFTP:
- *  Globus File Transfer Protocol
- *
- * UNICORE_STORAGE_SERVICE:
- *  Storage Service Provided by Unicore
- *
-*/
-enum DataMovementProtocol {
-    SCP,
-    SFTP,
-    GridFTP,
-    UNICORE_STORAGE_SERVICE
-}
-
-/**
- * Enumeration of security authentication and authorization mechanisms supported by Airavata. This enumeration just
- *  describes the supported mechanism. The corresponding security credentials are registered with Airavata Credential
- *  store.
- *
- * USERNAME_PASSWORD:
- *  A User Name.
- *
- * SSH_KEYS:
- *  SSH Keys
- *
-*/
-enum SecurityProtocol {
-    USERNAME_PASSWORD,
-    SSH_KEYS,
-    GSI,
-    KERBEROS,
-    OAUTH
-}
-
-struct SCPDataMovement {
-    1: required string dataMovementDataID = DEFAULT_ID,
-    2: required SecurityProtocol securityProtocol,
-    3: optional i32 sshPort = 22
-}
-
-struct GridFTPDataMovement {
-    1: required string dataMovementDataID = DEFAULT_ID,
-    2: required SecurityProtocol securityProtocol,
-    3: required list<string>  gridFTPEndPoint
-}
-
-struct SSHJobSubmission {
-    1: required string jobSubmissionDataID = DEFAULT_ID,
-    2: required ResourceJobManager resourceJobManager,
-    3: optional i32 sshPort = 22
-}
-
-struct GlobusJobSubmission {
-    1: required string jobSubmissionDataID = DEFAULT_ID,
-    2: required SecurityProtocol securityProtocol,
-    3: required ResourceJobManager resourceJobManager,
-    4: optional list<string> globusGateKeeperEndPoint
-}
-
-struct GSISSHJobSubmission {
-    1: required string jobSubmissionDataID = DEFAULT_ID,
-    2: required ResourceJobManager resourceJobManager,
-    3: optional i32 sshPort = 22,
-    4: optional set<string> exports,
-    5: optional list<string> preJobCommands,
-    6: optional list<string> postJobCommands,
-    7: optional string installedPath,
-    8: optional string monitorMode
-}
-
-/**
- * Computational Resource Description
- *
- * resourceId: Airavata Internal Unique Job ID. This is set by the registry.
- *
- * hostName:
- *   Fully Qualified Host Name.
- *
- * ipAddress:
- *   IP Addresse of the Hostname.
- *
- * resourceDescription:
- *  A user friendly description of the hostname.
- *
- * JobSubmissionProtocols:
- *  A computational resources may have one or more ways of submitting Jobs. This structure
- *  will hold all available mechanisms to interact with the resource.
- *
- * DataMovementProtocol:
- *  Option to specify a prefered data movement mechanism of the available options.
- *
-*/
-struct ComputeResourceDescription {
-    1: required bool isEmpty = 0,
-    2: required string resourceId = DEFAULT_ID,
-    3: required string hostName,
-    4: optional set<string> hostAliases,
-    5: optional set<string> ipAddresses,
-    6: optional string resourceDescription,
-    8: optional string preferredJobSubmissionProtocol,
-    9: required map<string, JobSubmissionProtocol> jobSubmissionProtocols,
-    10: required map<string, DataMovementProtocol> dataMovementProtocols
-}
\ No newline at end of file


Mime
View raw message