http://git-wip-us.apache.org/repos/asf/airavata/blob/b490671e/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java
 
b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java
deleted file mode 100644
index e7a7891..0000000
--- 
a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java
+++ /dev/null
@@ -1,745 +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.appdeployment;
-
-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"})
-/**
- * Application Module Information. A module has to be registered before 
registering a deployment.
- * 
- * appModuleId: Airavata Internal Unique Job ID. This is set by the registry.
- * 
- * appModuleName:
- *   Name of the application module.
- * 
- * appModuleVersion:
- *   Version of the application.
- * 
- * appModuleDescription:
- *    Descriprion of the Module
- * 
- */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = 
"2015-12-2")
-public class ApplicationModule implements 
org.apache.thrift.TBase<ApplicationModule, ApplicationModule._Fields>, 
java.io.Serializable, Cloneable, Comparable<ApplicationModule> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("ApplicationModule");
-
-  private static final org.apache.thrift.protocol.TField 
APP_MODULE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("appModuleId", 
org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField 
APP_MODULE_NAME_FIELD_DESC = new 
org.apache.thrift.protocol.TField("appModuleName", 
org.apache.thrift.protocol.TType.STRING, (short)2);
-  private static final org.apache.thrift.protocol.TField 
APP_MODULE_VERSION_FIELD_DESC = new 
org.apache.thrift.protocol.TField("appModuleVersion", 
org.apache.thrift.protocol.TType.STRING, (short)3);
-  private static final org.apache.thrift.protocol.TField 
APP_MODULE_DESCRIPTION_FIELD_DESC = new 
org.apache.thrift.protocol.TField("appModuleDescription", 
org.apache.thrift.protocol.TType.STRING, (short)4);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = 
new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new 
ApplicationModuleStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new ApplicationModuleTupleSchemeFactory());
-  }
-
-  public String appModuleId; // required
-  public String appModuleName; // required
-  public String appModuleVersion; // optional
-  public String appModuleDescription; // 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 {
-    APP_MODULE_ID((short)1, "appModuleId"),
-    APP_MODULE_NAME((short)2, "appModuleName"),
-    APP_MODULE_VERSION((short)3, "appModuleVersion"),
-    APP_MODULE_DESCRIPTION((short)4, "appModuleDescription");
-
-    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: // APP_MODULE_ID
-          return APP_MODULE_ID;
-        case 2: // APP_MODULE_NAME
-          return APP_MODULE_NAME;
-        case 3: // APP_MODULE_VERSION
-          return APP_MODULE_VERSION;
-        case 4: // APP_MODULE_DESCRIPTION
-          return APP_MODULE_DESCRIPTION;
-        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.APP_MODULE_VERSION,_Fields.APP_MODULE_DESCRIPTION};
-  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.APP_MODULE_ID, new 
org.apache.thrift.meta_data.FieldMetaData("appModuleId", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.APP_MODULE_NAME, new 
org.apache.thrift.meta_data.FieldMetaData("appModuleName", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.APP_MODULE_VERSION, new 
org.apache.thrift.meta_data.FieldMetaData("appModuleVersion", 
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.APP_MODULE_DESCRIPTION, new 
org.apache.thrift.meta_data.FieldMetaData("appModuleDescription", 
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ApplicationModule.class,
 metaDataMap);
-  }
-
-  public ApplicationModule() {
-    this.appModuleId = "DO_NOT_SET_AT_CLIENTS";
-
-  }
-
-  public ApplicationModule(
-    String appModuleId,
-    String appModuleName)
-  {
-    this();
-    this.appModuleId = appModuleId;
-    this.appModuleName = appModuleName;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public ApplicationModule(ApplicationModule other) {
-    if (other.isSetAppModuleId()) {
-      this.appModuleId = other.appModuleId;
-    }
-    if (other.isSetAppModuleName()) {
-      this.appModuleName = other.appModuleName;
-    }
-    if (other.isSetAppModuleVersion()) {
-      this.appModuleVersion = other.appModuleVersion;
-    }
-    if (other.isSetAppModuleDescription()) {
-      this.appModuleDescription = other.appModuleDescription;
-    }
-  }
-
-  public ApplicationModule deepCopy() {
-    return new ApplicationModule(this);
-  }
-
-  @Override
-  public void clear() {
-    this.appModuleId = "DO_NOT_SET_AT_CLIENTS";
-
-    this.appModuleName = null;
-    this.appModuleVersion = null;
-    this.appModuleDescription = null;
-  }
-
-  public String getAppModuleId() {
-    return this.appModuleId;
-  }
-
-  public ApplicationModule setAppModuleId(String appModuleId) {
-    this.appModuleId = appModuleId;
-    return this;
-  }
-
-  public void unsetAppModuleId() {
-    this.appModuleId = null;
-  }
-
-  /** Returns true if field appModuleId is set (has been assigned a value) and 
false otherwise */
-  public boolean isSetAppModuleId() {
-    return this.appModuleId != null;
-  }
-
-  public void setAppModuleIdIsSet(boolean value) {
-    if (!value) {
-      this.appModuleId = null;
-    }
-  }
-
-  public String getAppModuleName() {
-    return this.appModuleName;
-  }
-
-  public ApplicationModule setAppModuleName(String appModuleName) {
-    this.appModuleName = appModuleName;
-    return this;
-  }
-
-  public void unsetAppModuleName() {
-    this.appModuleName = null;
-  }
-
-  /** Returns true if field appModuleName is set (has been assigned a value) 
and false otherwise */
-  public boolean isSetAppModuleName() {
-    return this.appModuleName != null;
-  }
-
-  public void setAppModuleNameIsSet(boolean value) {
-    if (!value) {
-      this.appModuleName = null;
-    }
-  }
-
-  public String getAppModuleVersion() {
-    return this.appModuleVersion;
-  }
-
-  public ApplicationModule setAppModuleVersion(String appModuleVersion) {
-    this.appModuleVersion = appModuleVersion;
-    return this;
-  }
-
-  public void unsetAppModuleVersion() {
-    this.appModuleVersion = null;
-  }
-
-  /** Returns true if field appModuleVersion is set (has been assigned a 
value) and false otherwise */
-  public boolean isSetAppModuleVersion() {
-    return this.appModuleVersion != null;
-  }
-
-  public void setAppModuleVersionIsSet(boolean value) {
-    if (!value) {
-      this.appModuleVersion = null;
-    }
-  }
-
-  public String getAppModuleDescription() {
-    return this.appModuleDescription;
-  }
-
-  public ApplicationModule setAppModuleDescription(String 
appModuleDescription) {
-    this.appModuleDescription = appModuleDescription;
-    return this;
-  }
-
-  public void unsetAppModuleDescription() {
-    this.appModuleDescription = null;
-  }
-
-  /** Returns true if field appModuleDescription is set (has been assigned a 
value) and false otherwise */
-  public boolean isSetAppModuleDescription() {
-    return this.appModuleDescription != null;
-  }
-
-  public void setAppModuleDescriptionIsSet(boolean value) {
-    if (!value) {
-      this.appModuleDescription = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case APP_MODULE_ID:
-      if (value == null) {
-        unsetAppModuleId();
-      } else {
-        setAppModuleId((String)value);
-      }
-      break;
-
-    case APP_MODULE_NAME:
-      if (value == null) {
-        unsetAppModuleName();
-      } else {
-        setAppModuleName((String)value);
-      }
-      break;
-
-    case APP_MODULE_VERSION:
-      if (value == null) {
-        unsetAppModuleVersion();
-      } else {
-        setAppModuleVersion((String)value);
-      }
-      break;
-
-    case APP_MODULE_DESCRIPTION:
-      if (value == null) {
-        unsetAppModuleDescription();
-      } else {
-        setAppModuleDescription((String)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case APP_MODULE_ID:
-      return getAppModuleId();
-
-    case APP_MODULE_NAME:
-      return getAppModuleName();
-
-    case APP_MODULE_VERSION:
-      return getAppModuleVersion();
-
-    case APP_MODULE_DESCRIPTION:
-      return getAppModuleDescription();
-
-    }
-    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 APP_MODULE_ID:
-      return isSetAppModuleId();
-    case APP_MODULE_NAME:
-      return isSetAppModuleName();
-    case APP_MODULE_VERSION:
-      return isSetAppModuleVersion();
-    case APP_MODULE_DESCRIPTION:
-      return isSetAppModuleDescription();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof ApplicationModule)
-      return this.equals((ApplicationModule)that);
-    return false;
-  }
-
-  public boolean equals(ApplicationModule that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_appModuleId = true && this.isSetAppModuleId();
-    boolean that_present_appModuleId = true && that.isSetAppModuleId();
-    if (this_present_appModuleId || that_present_appModuleId) {
-      if (!(this_present_appModuleId && that_present_appModuleId))
-        return false;
-      if (!this.appModuleId.equals(that.appModuleId))
-        return false;
-    }
-
-    boolean this_present_appModuleName = true && this.isSetAppModuleName();
-    boolean that_present_appModuleName = true && that.isSetAppModuleName();
-    if (this_present_appModuleName || that_present_appModuleName) {
-      if (!(this_present_appModuleName && that_present_appModuleName))
-        return false;
-      if (!this.appModuleName.equals(that.appModuleName))
-        return false;
-    }
-
-    boolean this_present_appModuleVersion = true && 
this.isSetAppModuleVersion();
-    boolean that_present_appModuleVersion = true && 
that.isSetAppModuleVersion();
-    if (this_present_appModuleVersion || that_present_appModuleVersion) {
-      if (!(this_present_appModuleVersion && that_present_appModuleVersion))
-        return false;
-      if (!this.appModuleVersion.equals(that.appModuleVersion))
-        return false;
-    }
-
-    boolean this_present_appModuleDescription = true && 
this.isSetAppModuleDescription();
-    boolean that_present_appModuleDescription = true && 
that.isSetAppModuleDescription();
-    if (this_present_appModuleDescription || 
that_present_appModuleDescription) {
-      if (!(this_present_appModuleDescription && 
that_present_appModuleDescription))
-        return false;
-      if (!this.appModuleDescription.equals(that.appModuleDescription))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_appModuleId = true && (isSetAppModuleId());
-    list.add(present_appModuleId);
-    if (present_appModuleId)
-      list.add(appModuleId);
-
-    boolean present_appModuleName = true && (isSetAppModuleName());
-    list.add(present_appModuleName);
-    if (present_appModuleName)
-      list.add(appModuleName);
-
-    boolean present_appModuleVersion = true && (isSetAppModuleVersion());
-    list.add(present_appModuleVersion);
-    if (present_appModuleVersion)
-      list.add(appModuleVersion);
-
-    boolean present_appModuleDescription = true && 
(isSetAppModuleDescription());
-    list.add(present_appModuleDescription);
-    if (present_appModuleDescription)
-      list.add(appModuleDescription);
-
-    return list.hashCode();
-  }
-
-  @Override
-  public int compareTo(ApplicationModule other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = 
Boolean.valueOf(isSetAppModuleId()).compareTo(other.isSetAppModuleId());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetAppModuleId()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.appModuleId, other.appModuleId);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = 
Boolean.valueOf(isSetAppModuleName()).compareTo(other.isSetAppModuleName());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetAppModuleName()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.appModuleName, 
other.appModuleName);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = 
Boolean.valueOf(isSetAppModuleVersion()).compareTo(other.isSetAppModuleVersion());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetAppModuleVersion()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.appModuleVersion, 
other.appModuleVersion);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = 
Boolean.valueOf(isSetAppModuleDescription()).compareTo(other.isSetAppModuleDescription());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetAppModuleDescription()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.appModuleDescription, 
other.appModuleDescription);
-      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("ApplicationModule(");
-    boolean first = true;
-
-    sb.append("appModuleId:");
-    if (this.appModuleId == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.appModuleId);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("appModuleName:");
-    if (this.appModuleName == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.appModuleName);
-    }
-    first = false;
-    if (isSetAppModuleVersion()) {
-      if (!first) sb.append(", ");
-      sb.append("appModuleVersion:");
-      if (this.appModuleVersion == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.appModuleVersion);
-      }
-      first = false;
-    }
-    if (isSetAppModuleDescription()) {
-      if (!first) sb.append(", ");
-      sb.append("appModuleDescription:");
-      if (this.appModuleDescription == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.appModuleDescription);
-      }
-      first = false;
-    }
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    if (appModuleId == null) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 
'appModuleId' was not present! Struct: " + toString());
-    }
-    if (appModuleName == null) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 
'appModuleName' 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 ApplicationModuleStandardSchemeFactory implements 
SchemeFactory {
-    public ApplicationModuleStandardScheme getScheme() {
-      return new ApplicationModuleStandardScheme();
-    }
-  }
-
-  private static class ApplicationModuleStandardScheme extends 
StandardScheme<ApplicationModule> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, 
ApplicationModule 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: // APP_MODULE_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.appModuleId = iprot.readString();
-              struct.setAppModuleIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
-            }
-            break;
-          case 2: // APP_MODULE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.appModuleName = iprot.readString();
-              struct.setAppModuleNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
-            }
-            break;
-          case 3: // APP_MODULE_VERSION
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.appModuleVersion = iprot.readString();
-              struct.setAppModuleVersionIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
-            }
-            break;
-          case 4: // APP_MODULE_DESCRIPTION
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.appModuleDescription = iprot.readString();
-              struct.setAppModuleDescriptionIsSet(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, 
ApplicationModule struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.appModuleId != null) {
-        oprot.writeFieldBegin(APP_MODULE_ID_FIELD_DESC);
-        oprot.writeString(struct.appModuleId);
-        oprot.writeFieldEnd();
-      }
-      if (struct.appModuleName != null) {
-        oprot.writeFieldBegin(APP_MODULE_NAME_FIELD_DESC);
-        oprot.writeString(struct.appModuleName);
-        oprot.writeFieldEnd();
-      }
-      if (struct.appModuleVersion != null) {
-        if (struct.isSetAppModuleVersion()) {
-          oprot.writeFieldBegin(APP_MODULE_VERSION_FIELD_DESC);
-          oprot.writeString(struct.appModuleVersion);
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.appModuleDescription != null) {
-        if (struct.isSetAppModuleDescription()) {
-          oprot.writeFieldBegin(APP_MODULE_DESCRIPTION_FIELD_DESC);
-          oprot.writeString(struct.appModuleDescription);
-          oprot.writeFieldEnd();
-        }
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class ApplicationModuleTupleSchemeFactory implements 
SchemeFactory {
-    public ApplicationModuleTupleScheme getScheme() {
-      return new ApplicationModuleTupleScheme();
-    }
-  }
-
-  private static class ApplicationModuleTupleScheme extends 
TupleScheme<ApplicationModule> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, 
ApplicationModule struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      oprot.writeString(struct.appModuleId);
-      oprot.writeString(struct.appModuleName);
-      BitSet optionals = new BitSet();
-      if (struct.isSetAppModuleVersion()) {
-        optionals.set(0);
-      }
-      if (struct.isSetAppModuleDescription()) {
-        optionals.set(1);
-      }
-      oprot.writeBitSet(optionals, 2);
-      if (struct.isSetAppModuleVersion()) {
-        oprot.writeString(struct.appModuleVersion);
-      }
-      if (struct.isSetAppModuleDescription()) {
-        oprot.writeString(struct.appModuleDescription);
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, 
ApplicationModule struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      struct.appModuleId = iprot.readString();
-      struct.setAppModuleIdIsSet(true);
-      struct.appModuleName = iprot.readString();
-      struct.setAppModuleNameIsSet(true);
-      BitSet incoming = iprot.readBitSet(2);
-      if (incoming.get(0)) {
-        struct.appModuleVersion = iprot.readString();
-        struct.setAppModuleVersionIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.appModuleDescription = iprot.readString();
-        struct.setAppModuleDescriptionIsSet(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/appdeployment/ApplicationParallelismType.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationParallelismType.java
 
b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationParallelismType.java
deleted file mode 100644
index 28c4003..0000000
--- 
a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationParallelismType.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.appdeployment;
-
-
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.thrift.TEnum;
-
-/**
- * Enumeration of application parallelism supported by Airavata
- * 
- * SERIAL:
- *  Single processor applications without any parallelization.
- * 
- * MPI:
- *  Messaging Passing Interface.
- * 
- * OPENMP:
- *  Shared Memory Implementtaion.
- * 
- * OPENMP_MPI:
- *  Hybrid Applications.
- * 
- */
-public enum ApplicationParallelismType implements org.apache.thrift.TEnum {
-  SERIAL(0),
-  MPI(1),
-  OPENMP(2),
-  OPENMP_MPI(3),
-  CCM(4),
-  CRAY_MPI(5);
-
-  private final int value;
-
-  private ApplicationParallelismType(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 ApplicationParallelismType findByValue(int value) { 
-    switch (value) {
-      case 0:
-        return SERIAL;
-      case 1:
-        return MPI;
-      case 2:
-        return OPENMP;
-      case 3:
-        return OPENMP_MPI;
-      case 4:
-        return CCM;
-      case 5:
-        return CRAY_MPI;
-      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/appdeployment/CommandObject.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java
 
b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java
deleted file mode 100644
index 80c44b4..0000000
--- 
a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java
+++ /dev/null
@@ -1,525 +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.appdeployment;
-
-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 commands to be used in Pre Job, Post Job and Module Load Commands
- * 
- * command:
- *   The actual command in string format
- * 
- * commandOrder:
- *   Order of the command in the multiple command situation
- */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = 
"2015-12-2")
-public class CommandObject implements org.apache.thrift.TBase<CommandObject, 
CommandObject._Fields>, java.io.Serializable, Cloneable, 
Comparable<CommandObject> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("CommandObject");
-
-  private static final org.apache.thrift.protocol.TField COMMAND_FIELD_DESC = 
new org.apache.thrift.protocol.TField("command", 
org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField 
COMMAND_ORDER_FIELD_DESC = new 
org.apache.thrift.protocol.TField("commandOrder", 
org.apache.thrift.protocol.TType.I32, (short)2);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = 
new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new 
CommandObjectStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new CommandObjectTupleSchemeFactory());
-  }
-
-  public String command; // required
-  public int commandOrder; // 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 {
-    COMMAND((short)1, "command"),
-    COMMAND_ORDER((short)2, "commandOrder");
-
-    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: // COMMAND
-          return COMMAND;
-        case 2: // COMMAND_ORDER
-          return COMMAND_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 __COMMANDORDER_ISSET_ID = 0;
-  private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.COMMAND_ORDER};
-  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.COMMAND, new 
org.apache.thrift.meta_data.FieldMetaData("command", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.COMMAND_ORDER, new 
org.apache.thrift.meta_data.FieldMetaData("commandOrder", 
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(CommandObject.class,
 metaDataMap);
-  }
-
-  public CommandObject() {
-  }
-
-  public CommandObject(
-    String command)
-  {
-    this();
-    this.command = command;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public CommandObject(CommandObject other) {
-    __isset_bitfield = other.__isset_bitfield;
-    if (other.isSetCommand()) {
-      this.command = other.command;
-    }
-    this.commandOrder = other.commandOrder;
-  }
-
-  public CommandObject deepCopy() {
-    return new CommandObject(this);
-  }
-
-  @Override
-  public void clear() {
-    this.command = null;
-    setCommandOrderIsSet(false);
-    this.commandOrder = 0;
-  }
-
-  public String getCommand() {
-    return this.command;
-  }
-
-  public CommandObject setCommand(String command) {
-    this.command = command;
-    return this;
-  }
-
-  public void unsetCommand() {
-    this.command = null;
-  }
-
-  /** Returns true if field command is set (has been assigned a value) and 
false otherwise */
-  public boolean isSetCommand() {
-    return this.command != null;
-  }
-
-  public void setCommandIsSet(boolean value) {
-    if (!value) {
-      this.command = null;
-    }
-  }
-
-  public int getCommandOrder() {
-    return this.commandOrder;
-  }
-
-  public CommandObject setCommandOrder(int commandOrder) {
-    this.commandOrder = commandOrder;
-    setCommandOrderIsSet(true);
-    return this;
-  }
-
-  public void unsetCommandOrder() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, 
__COMMANDORDER_ISSET_ID);
-  }
-
-  /** Returns true if field commandOrder is set (has been assigned a value) 
and false otherwise */
-  public boolean isSetCommandOrder() {
-    return EncodingUtils.testBit(__isset_bitfield, __COMMANDORDER_ISSET_ID);
-  }
-
-  public void setCommandOrderIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, 
__COMMANDORDER_ISSET_ID, value);
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case COMMAND:
-      if (value == null) {
-        unsetCommand();
-      } else {
-        setCommand((String)value);
-      }
-      break;
-
-    case COMMAND_ORDER:
-      if (value == null) {
-        unsetCommandOrder();
-      } else {
-        setCommandOrder((Integer)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case COMMAND:
-      return getCommand();
-
-    case COMMAND_ORDER:
-      return Integer.valueOf(getCommandOrder());
-
-    }
-    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 COMMAND:
-      return isSetCommand();
-    case COMMAND_ORDER:
-      return isSetCommandOrder();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof CommandObject)
-      return this.equals((CommandObject)that);
-    return false;
-  }
-
-  public boolean equals(CommandObject that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_command = true && this.isSetCommand();
-    boolean that_present_command = true && that.isSetCommand();
-    if (this_present_command || that_present_command) {
-      if (!(this_present_command && that_present_command))
-        return false;
-      if (!this.command.equals(that.command))
-        return false;
-    }
-
-    boolean this_present_commandOrder = true && this.isSetCommandOrder();
-    boolean that_present_commandOrder = true && that.isSetCommandOrder();
-    if (this_present_commandOrder || that_present_commandOrder) {
-      if (!(this_present_commandOrder && that_present_commandOrder))
-        return false;
-      if (this.commandOrder != that.commandOrder)
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_command = true && (isSetCommand());
-    list.add(present_command);
-    if (present_command)
-      list.add(command);
-
-    boolean present_commandOrder = true && (isSetCommandOrder());
-    list.add(present_commandOrder);
-    if (present_commandOrder)
-      list.add(commandOrder);
-
-    return list.hashCode();
-  }
-
-  @Override
-  public int compareTo(CommandObject other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = 
Boolean.valueOf(isSetCommand()).compareTo(other.isSetCommand());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetCommand()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.command, 
other.command);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = 
Boolean.valueOf(isSetCommandOrder()).compareTo(other.isSetCommandOrder());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetCommandOrder()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.commandOrder, other.commandOrder);
-      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("CommandObject(");
-    boolean first = true;
-
-    sb.append("command:");
-    if (this.command == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.command);
-    }
-    first = false;
-    if (isSetCommandOrder()) {
-      if (!first) sb.append(", ");
-      sb.append("commandOrder:");
-      sb.append(this.commandOrder);
-      first = false;
-    }
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    if (command == null) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 
'command' 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 {
-      // 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 CommandObjectStandardSchemeFactory implements 
SchemeFactory {
-    public CommandObjectStandardScheme getScheme() {
-      return new CommandObjectStandardScheme();
-    }
-  }
-
-  private static class CommandObjectStandardScheme extends 
StandardScheme<CommandObject> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, CommandObject 
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: // COMMAND
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.command = iprot.readString();
-              struct.setCommandIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
-            }
-            break;
-          case 2: // COMMAND_ORDER
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.commandOrder = iprot.readI32();
-              struct.setCommandOrderIsSet(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, 
CommandObject struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.command != null) {
-        oprot.writeFieldBegin(COMMAND_FIELD_DESC);
-        oprot.writeString(struct.command);
-        oprot.writeFieldEnd();
-      }
-      if (struct.isSetCommandOrder()) {
-        oprot.writeFieldBegin(COMMAND_ORDER_FIELD_DESC);
-        oprot.writeI32(struct.commandOrder);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class CommandObjectTupleSchemeFactory implements 
SchemeFactory {
-    public CommandObjectTupleScheme getScheme() {
-      return new CommandObjectTupleScheme();
-    }
-  }
-
-  private static class CommandObjectTupleScheme extends 
TupleScheme<CommandObject> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, CommandObject 
struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      oprot.writeString(struct.command);
-      BitSet optionals = new BitSet();
-      if (struct.isSetCommandOrder()) {
-        optionals.set(0);
-      }
-      oprot.writeBitSet(optionals, 1);
-      if (struct.isSetCommandOrder()) {
-        oprot.writeI32(struct.commandOrder);
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, CommandObject 
struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      struct.command = iprot.readString();
-      struct.setCommandIsSet(true);
-      BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.commandOrder = iprot.readI32();
-        struct.setCommandOrderIsSet(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/appdeployment/SetEnvPaths.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java
 
b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java
deleted file mode 100644
index 9fba942..0000000
--- 
a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java
+++ /dev/null
@@ -1,629 +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.appdeployment;
-
-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"})
-/**
- * Key Value pairs to be used to set environments
- * 
- * name:
- *   Name of the environment variable such as PATH, LD_LIBRARY_PATH, 
NETCDF_HOME.
- * 
- * value:
- *   Value of the environment variable to set
- * 
- * envPathOrder:
- *   The order of the setting of the env variables when there are multiple env 
variables
- */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = 
"2015-12-2")
-public class SetEnvPaths implements org.apache.thrift.TBase<SetEnvPaths, 
SetEnvPaths._Fields>, java.io.Serializable, Cloneable, Comparable<SetEnvPaths> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("SetEnvPaths");
-
-  private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new 
org.apache.thrift.protocol.TField("name", 
org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField VALUE_FIELD_DESC = 
new org.apache.thrift.protocol.TField("value", 
org.apache.thrift.protocol.TType.STRING, (short)2);
-  private static final org.apache.thrift.protocol.TField 
ENV_PATH_ORDER_FIELD_DESC = new 
org.apache.thrift.protocol.TField("envPathOrder", 
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 SetEnvPathsStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new SetEnvPathsTupleSchemeFactory());
-  }
-
-  public String name; // required
-  public String value; // required
-  public int envPathOrder; // 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 {
-    NAME((short)1, "name"),
-    VALUE((short)2, "value"),
-    ENV_PATH_ORDER((short)3, "envPathOrder");
-
-    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: // NAME
-          return NAME;
-        case 2: // VALUE
-          return VALUE;
-        case 3: // ENV_PATH_ORDER
-          return ENV_PATH_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 __ENVPATHORDER_ISSET_ID = 0;
-  private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.ENV_PATH_ORDER};
-  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.NAME, new 
org.apache.thrift.meta_data.FieldMetaData("name", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.VALUE, new 
org.apache.thrift.meta_data.FieldMetaData("value", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.ENV_PATH_ORDER, new 
org.apache.thrift.meta_data.FieldMetaData("envPathOrder", 
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(SetEnvPaths.class,
 metaDataMap);
-  }
-
-  public SetEnvPaths() {
-  }
-
-  public SetEnvPaths(
-    String name,
-    String value)
-  {
-    this();
-    this.name = name;
-    this.value = value;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public SetEnvPaths(SetEnvPaths other) {
-    __isset_bitfield = other.__isset_bitfield;
-    if (other.isSetName()) {
-      this.name = other.name;
-    }
-    if (other.isSetValue()) {
-      this.value = other.value;
-    }
-    this.envPathOrder = other.envPathOrder;
-  }
-
-  public SetEnvPaths deepCopy() {
-    return new SetEnvPaths(this);
-  }
-
-  @Override
-  public void clear() {
-    this.name = null;
-    this.value = null;
-    setEnvPathOrderIsSet(false);
-    this.envPathOrder = 0;
-  }
-
-  public String getName() {
-    return this.name;
-  }
-
-  public SetEnvPaths setName(String name) {
-    this.name = name;
-    return this;
-  }
-
-  public void unsetName() {
-    this.name = null;
-  }
-
-  /** Returns true if field name is set (has been assigned a value) and false 
otherwise */
-  public boolean isSetName() {
-    return this.name != null;
-  }
-
-  public void setNameIsSet(boolean value) {
-    if (!value) {
-      this.name = null;
-    }
-  }
-
-  public String getValue() {
-    return this.value;
-  }
-
-  public SetEnvPaths setValue(String value) {
-    this.value = value;
-    return this;
-  }
-
-  public void unsetValue() {
-    this.value = null;
-  }
-
-  /** Returns true if field value is set (has been assigned a value) and false 
otherwise */
-  public boolean isSetValue() {
-    return this.value != null;
-  }
-
-  public void setValueIsSet(boolean value) {
-    if (!value) {
-      this.value = null;
-    }
-  }
-
-  public int getEnvPathOrder() {
-    return this.envPathOrder;
-  }
-
-  public SetEnvPaths setEnvPathOrder(int envPathOrder) {
-    this.envPathOrder = envPathOrder;
-    setEnvPathOrderIsSet(true);
-    return this;
-  }
-
-  public void unsetEnvPathOrder() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, 
__ENVPATHORDER_ISSET_ID);
-  }
-
-  /** Returns true if field envPathOrder is set (has been assigned a value) 
and false otherwise */
-  public boolean isSetEnvPathOrder() {
-    return EncodingUtils.testBit(__isset_bitfield, __ENVPATHORDER_ISSET_ID);
-  }
-
-  public void setEnvPathOrderIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, 
__ENVPATHORDER_ISSET_ID, value);
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case NAME:
-      if (value == null) {
-        unsetName();
-      } else {
-        setName((String)value);
-      }
-      break;
-
-    case VALUE:
-      if (value == null) {
-        unsetValue();
-      } else {
-        setValue((String)value);
-      }
-      break;
-
-    case ENV_PATH_ORDER:
-      if (value == null) {
-        unsetEnvPathOrder();
-      } else {
-        setEnvPathOrder((Integer)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case NAME:
-      return getName();
-
-    case VALUE:
-      return getValue();
-
-    case ENV_PATH_ORDER:
-      return Integer.valueOf(getEnvPathOrder());
-
-    }
-    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 NAME:
-      return isSetName();
-    case VALUE:
-      return isSetValue();
-    case ENV_PATH_ORDER:
-      return isSetEnvPathOrder();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof SetEnvPaths)
-      return this.equals((SetEnvPaths)that);
-    return false;
-  }
-
-  public boolean equals(SetEnvPaths that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_name = true && this.isSetName();
-    boolean that_present_name = true && that.isSetName();
-    if (this_present_name || that_present_name) {
-      if (!(this_present_name && that_present_name))
-        return false;
-      if (!this.name.equals(that.name))
-        return false;
-    }
-
-    boolean this_present_value = true && this.isSetValue();
-    boolean that_present_value = true && that.isSetValue();
-    if (this_present_value || that_present_value) {
-      if (!(this_present_value && that_present_value))
-        return false;
-      if (!this.value.equals(that.value))
-        return false;
-    }
-
-    boolean this_present_envPathOrder = true && this.isSetEnvPathOrder();
-    boolean that_present_envPathOrder = true && that.isSetEnvPathOrder();
-    if (this_present_envPathOrder || that_present_envPathOrder) {
-      if (!(this_present_envPathOrder && that_present_envPathOrder))
-        return false;
-      if (this.envPathOrder != that.envPathOrder)
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_name = true && (isSetName());
-    list.add(present_name);
-    if (present_name)
-      list.add(name);
-
-    boolean present_value = true && (isSetValue());
-    list.add(present_value);
-    if (present_value)
-      list.add(value);
-
-    boolean present_envPathOrder = true && (isSetEnvPathOrder());
-    list.add(present_envPathOrder);
-    if (present_envPathOrder)
-      list.add(envPathOrder);
-
-    return list.hashCode();
-  }
-
-  @Override
-  public int compareTo(SetEnvPaths other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetName()).compareTo(other.isSetName());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, 
other.name);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = 
Boolean.valueOf(isSetValue()).compareTo(other.isSetValue());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetValue()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.value, 
other.value);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = 
Boolean.valueOf(isSetEnvPathOrder()).compareTo(other.isSetEnvPathOrder());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetEnvPathOrder()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.envPathOrder, other.envPathOrder);
-      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("SetEnvPaths(");
-    boolean first = true;
-
-    sb.append("name:");
-    if (this.name == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.name);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("value:");
-    if (this.value == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.value);
-    }
-    first = false;
-    if (isSetEnvPathOrder()) {
-      if (!first) sb.append(", ");
-      sb.append("envPathOrder:");
-      sb.append(this.envPathOrder);
-      first = false;
-    }
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    if (name == null) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 
'name' was not present! Struct: " + toString());
-    }
-    if (value == null) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 
'value' 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 {
-      // 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 SetEnvPathsStandardSchemeFactory implements 
SchemeFactory {
-    public SetEnvPathsStandardScheme getScheme() {
-      return new SetEnvPathsStandardScheme();
-    }
-  }
-
-  private static class SetEnvPathsStandardScheme extends 
StandardScheme<SetEnvPaths> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, SetEnvPaths 
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: // NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.name = iprot.readString();
-              struct.setNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
-            }
-            break;
-          case 2: // VALUE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.value = iprot.readString();
-              struct.setValueIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
-            }
-            break;
-          case 3: // ENV_PATH_ORDER
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.envPathOrder = iprot.readI32();
-              struct.setEnvPathOrderIsSet(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, SetEnvPaths 
struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.name != null) {
-        oprot.writeFieldBegin(NAME_FIELD_DESC);
-        oprot.writeString(struct.name);
-        oprot.writeFieldEnd();
-      }
-      if (struct.value != null) {
-        oprot.writeFieldBegin(VALUE_FIELD_DESC);
-        oprot.writeString(struct.value);
-        oprot.writeFieldEnd();
-      }
-      if (struct.isSetEnvPathOrder()) {
-        oprot.writeFieldBegin(ENV_PATH_ORDER_FIELD_DESC);
-        oprot.writeI32(struct.envPathOrder);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class SetEnvPathsTupleSchemeFactory implements SchemeFactory {
-    public SetEnvPathsTupleScheme getScheme() {
-      return new SetEnvPathsTupleScheme();
-    }
-  }
-
-  private static class SetEnvPathsTupleScheme extends TupleScheme<SetEnvPaths> 
{
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, SetEnvPaths 
struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      oprot.writeString(struct.name);
-      oprot.writeString(struct.value);
-      BitSet optionals = new BitSet();
-      if (struct.isSetEnvPathOrder()) {
-        optionals.set(0);
-      }
-      oprot.writeBitSet(optionals, 1);
-      if (struct.isSetEnvPathOrder()) {
-        oprot.writeI32(struct.envPathOrder);
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, SetEnvPaths 
struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      struct.name = iprot.readString();
-      struct.setNameIsSet(true);
-      struct.value = iprot.readString();
-      struct.setValueIsSet(true);
-      BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.envPathOrder = iprot.readI32();
-        struct.setEnvPathOrderIsSet(true);
-      }
-    }
-  }
-
-}
-

Reply via email to