airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shame...@apache.org
Subject [18/31] airavata git commit: generated new data model classes.
Date Fri, 12 Jun 2015 23:16:47 GMT
http://git-wip-us.apache.org/repos/asf/airavata/blob/51fa27b8/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.java
new file mode 100644
index 0000000..bd58d92
--- /dev/null
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.java
@@ -0,0 +1,1043 @@
+/**
+ * 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.job;
+
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import javax.annotation.Generated;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-12")
+public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fields>, java.io.Serializable, Cloneable, Comparable<JobModel> {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobModel");
+
+  private static final org.apache.thrift.protocol.TField JOB_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("jobId", org.apache.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.thrift.protocol.TField JOB_DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("jobDescription", org.apache.thrift.protocol.TType.STRING, (short)2);
+  private static final org.apache.thrift.protocol.TField CREATION_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("creationTime", org.apache.thrift.protocol.TType.I64, (short)3);
+  private static final org.apache.thrift.protocol.TField JOB_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("jobStatus", org.apache.thrift.protocol.TType.STRUCT, (short)4);
+  private static final org.apache.thrift.protocol.TField COMPUTE_RESOURCE_CONSUMED_FIELD_DESC = new org.apache.thrift.protocol.TField("computeResourceConsumed", org.apache.thrift.protocol.TType.STRING, (short)7);
+  private static final org.apache.thrift.protocol.TField JOB_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("jobName", org.apache.thrift.protocol.TType.STRING, (short)8);
+  private static final org.apache.thrift.protocol.TField WORKING_DIR_FIELD_DESC = new org.apache.thrift.protocol.TField("workingDir", org.apache.thrift.protocol.TType.STRING, (short)9);
+
+  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+  static {
+    schemes.put(StandardScheme.class, new JobModelStandardSchemeFactory());
+    schemes.put(TupleScheme.class, new JobModelTupleSchemeFactory());
+  }
+
+  private String jobId; // required
+  private String jobDescription; // required
+  private long creationTime; // optional
+  private org.apache.airavata.model.status.JobStatus jobStatus; // optional
+  private String computeResourceConsumed; // optional
+  private String jobName; // optional
+  private String workingDir; // optional
+
+  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+    JOB_ID((short)1, "jobId"),
+    JOB_DESCRIPTION((short)2, "jobDescription"),
+    CREATION_TIME((short)3, "creationTime"),
+    JOB_STATUS((short)4, "jobStatus"),
+    COMPUTE_RESOURCE_CONSUMED((short)7, "computeResourceConsumed"),
+    JOB_NAME((short)8, "jobName"),
+    WORKING_DIR((short)9, "workingDir");
+
+    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_ID
+          return JOB_ID;
+        case 2: // JOB_DESCRIPTION
+          return JOB_DESCRIPTION;
+        case 3: // CREATION_TIME
+          return CREATION_TIME;
+        case 4: // JOB_STATUS
+          return JOB_STATUS;
+        case 7: // COMPUTE_RESOURCE_CONSUMED
+          return COMPUTE_RESOURCE_CONSUMED;
+        case 8: // JOB_NAME
+          return JOB_NAME;
+        case 9: // WORKING_DIR
+          return WORKING_DIR;
+        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 __CREATIONTIME_ISSET_ID = 0;
+  private byte __isset_bitfield = 0;
+  private static final _Fields optionals[] = {_Fields.CREATION_TIME,_Fields.JOB_STATUS,_Fields.COMPUTE_RESOURCE_CONSUMED,_Fields.JOB_NAME,_Fields.WORKING_DIR};
+  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_ID, new org.apache.thrift.meta_data.FieldMetaData("jobId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.JOB_DESCRIPTION, new org.apache.thrift.meta_data.FieldMetaData("jobDescription", org.apache.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.CREATION_TIME, new org.apache.thrift.meta_data.FieldMetaData("creationTime", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+    tmpMap.put(_Fields.JOB_STATUS, new org.apache.thrift.meta_data.FieldMetaData("jobStatus", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.status.JobStatus.class)));
+    tmpMap.put(_Fields.COMPUTE_RESOURCE_CONSUMED, new org.apache.thrift.meta_data.FieldMetaData("computeResourceConsumed", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.JOB_NAME, new org.apache.thrift.meta_data.FieldMetaData("jobName", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.WORKING_DIR, new org.apache.thrift.meta_data.FieldMetaData("workingDir", 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(JobModel.class, metaDataMap);
+  }
+
+  public JobModel() {
+  }
+
+  public JobModel(
+    String jobId,
+    String jobDescription)
+  {
+    this();
+    this.jobId = jobId;
+    this.jobDescription = jobDescription;
+  }
+
+  /**
+   * Performs a deep copy on <i>other</i>.
+   */
+  public JobModel(JobModel other) {
+    __isset_bitfield = other.__isset_bitfield;
+    if (other.isSetJobId()) {
+      this.jobId = other.jobId;
+    }
+    if (other.isSetJobDescription()) {
+      this.jobDescription = other.jobDescription;
+    }
+    this.creationTime = other.creationTime;
+    if (other.isSetJobStatus()) {
+      this.jobStatus = new org.apache.airavata.model.status.JobStatus(other.jobStatus);
+    }
+    if (other.isSetComputeResourceConsumed()) {
+      this.computeResourceConsumed = other.computeResourceConsumed;
+    }
+    if (other.isSetJobName()) {
+      this.jobName = other.jobName;
+    }
+    if (other.isSetWorkingDir()) {
+      this.workingDir = other.workingDir;
+    }
+  }
+
+  public JobModel deepCopy() {
+    return new JobModel(this);
+  }
+
+  @Override
+  public void clear() {
+    this.jobId = null;
+    this.jobDescription = null;
+    setCreationTimeIsSet(false);
+    this.creationTime = 0;
+    this.jobStatus = null;
+    this.computeResourceConsumed = null;
+    this.jobName = null;
+    this.workingDir = null;
+  }
+
+  public String getJobId() {
+    return this.jobId;
+  }
+
+  public void setJobId(String jobId) {
+    this.jobId = jobId;
+  }
+
+  public void unsetJobId() {
+    this.jobId = null;
+  }
+
+  /** Returns true if field jobId is set (has been assigned a value) and false otherwise */
+  public boolean isSetJobId() {
+    return this.jobId != null;
+  }
+
+  public void setJobIdIsSet(boolean value) {
+    if (!value) {
+      this.jobId = null;
+    }
+  }
+
+  public String getJobDescription() {
+    return this.jobDescription;
+  }
+
+  public void setJobDescription(String jobDescription) {
+    this.jobDescription = jobDescription;
+  }
+
+  public void unsetJobDescription() {
+    this.jobDescription = null;
+  }
+
+  /** Returns true if field jobDescription is set (has been assigned a value) and false otherwise */
+  public boolean isSetJobDescription() {
+    return this.jobDescription != null;
+  }
+
+  public void setJobDescriptionIsSet(boolean value) {
+    if (!value) {
+      this.jobDescription = null;
+    }
+  }
+
+  public long getCreationTime() {
+    return this.creationTime;
+  }
+
+  public void setCreationTime(long creationTime) {
+    this.creationTime = creationTime;
+    setCreationTimeIsSet(true);
+  }
+
+  public void unsetCreationTime() {
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __CREATIONTIME_ISSET_ID);
+  }
+
+  /** Returns true if field creationTime is set (has been assigned a value) and false otherwise */
+  public boolean isSetCreationTime() {
+    return EncodingUtils.testBit(__isset_bitfield, __CREATIONTIME_ISSET_ID);
+  }
+
+  public void setCreationTimeIsSet(boolean value) {
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __CREATIONTIME_ISSET_ID, value);
+  }
+
+  public org.apache.airavata.model.status.JobStatus getJobStatus() {
+    return this.jobStatus;
+  }
+
+  public void setJobStatus(org.apache.airavata.model.status.JobStatus jobStatus) {
+    this.jobStatus = jobStatus;
+  }
+
+  public void unsetJobStatus() {
+    this.jobStatus = null;
+  }
+
+  /** Returns true if field jobStatus is set (has been assigned a value) and false otherwise */
+  public boolean isSetJobStatus() {
+    return this.jobStatus != null;
+  }
+
+  public void setJobStatusIsSet(boolean value) {
+    if (!value) {
+      this.jobStatus = null;
+    }
+  }
+
+  public String getComputeResourceConsumed() {
+    return this.computeResourceConsumed;
+  }
+
+  public void setComputeResourceConsumed(String computeResourceConsumed) {
+    this.computeResourceConsumed = computeResourceConsumed;
+  }
+
+  public void unsetComputeResourceConsumed() {
+    this.computeResourceConsumed = null;
+  }
+
+  /** Returns true if field computeResourceConsumed is set (has been assigned a value) and false otherwise */
+  public boolean isSetComputeResourceConsumed() {
+    return this.computeResourceConsumed != null;
+  }
+
+  public void setComputeResourceConsumedIsSet(boolean value) {
+    if (!value) {
+      this.computeResourceConsumed = null;
+    }
+  }
+
+  public String getJobName() {
+    return this.jobName;
+  }
+
+  public void setJobName(String jobName) {
+    this.jobName = jobName;
+  }
+
+  public void unsetJobName() {
+    this.jobName = null;
+  }
+
+  /** Returns true if field jobName is set (has been assigned a value) and false otherwise */
+  public boolean isSetJobName() {
+    return this.jobName != null;
+  }
+
+  public void setJobNameIsSet(boolean value) {
+    if (!value) {
+      this.jobName = null;
+    }
+  }
+
+  public String getWorkingDir() {
+    return this.workingDir;
+  }
+
+  public void setWorkingDir(String workingDir) {
+    this.workingDir = workingDir;
+  }
+
+  public void unsetWorkingDir() {
+    this.workingDir = null;
+  }
+
+  /** Returns true if field workingDir is set (has been assigned a value) and false otherwise */
+  public boolean isSetWorkingDir() {
+    return this.workingDir != null;
+  }
+
+  public void setWorkingDirIsSet(boolean value) {
+    if (!value) {
+      this.workingDir = null;
+    }
+  }
+
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
+    case JOB_ID:
+      if (value == null) {
+        unsetJobId();
+      } else {
+        setJobId((String)value);
+      }
+      break;
+
+    case JOB_DESCRIPTION:
+      if (value == null) {
+        unsetJobDescription();
+      } else {
+        setJobDescription((String)value);
+      }
+      break;
+
+    case CREATION_TIME:
+      if (value == null) {
+        unsetCreationTime();
+      } else {
+        setCreationTime((Long)value);
+      }
+      break;
+
+    case JOB_STATUS:
+      if (value == null) {
+        unsetJobStatus();
+      } else {
+        setJobStatus((org.apache.airavata.model.status.JobStatus)value);
+      }
+      break;
+
+    case COMPUTE_RESOURCE_CONSUMED:
+      if (value == null) {
+        unsetComputeResourceConsumed();
+      } else {
+        setComputeResourceConsumed((String)value);
+      }
+      break;
+
+    case JOB_NAME:
+      if (value == null) {
+        unsetJobName();
+      } else {
+        setJobName((String)value);
+      }
+      break;
+
+    case WORKING_DIR:
+      if (value == null) {
+        unsetWorkingDir();
+      } else {
+        setWorkingDir((String)value);
+      }
+      break;
+
+    }
+  }
+
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
+    case JOB_ID:
+      return getJobId();
+
+    case JOB_DESCRIPTION:
+      return getJobDescription();
+
+    case CREATION_TIME:
+      return Long.valueOf(getCreationTime());
+
+    case JOB_STATUS:
+      return getJobStatus();
+
+    case COMPUTE_RESOURCE_CONSUMED:
+      return getComputeResourceConsumed();
+
+    case JOB_NAME:
+      return getJobName();
+
+    case WORKING_DIR:
+      return getWorkingDir();
+
+    }
+    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_ID:
+      return isSetJobId();
+    case JOB_DESCRIPTION:
+      return isSetJobDescription();
+    case CREATION_TIME:
+      return isSetCreationTime();
+    case JOB_STATUS:
+      return isSetJobStatus();
+    case COMPUTE_RESOURCE_CONSUMED:
+      return isSetComputeResourceConsumed();
+    case JOB_NAME:
+      return isSetJobName();
+    case WORKING_DIR:
+      return isSetWorkingDir();
+    }
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof JobModel)
+      return this.equals((JobModel)that);
+    return false;
+  }
+
+  public boolean equals(JobModel that) {
+    if (that == null)
+      return false;
+
+    boolean this_present_jobId = true && this.isSetJobId();
+    boolean that_present_jobId = true && that.isSetJobId();
+    if (this_present_jobId || that_present_jobId) {
+      if (!(this_present_jobId && that_present_jobId))
+        return false;
+      if (!this.jobId.equals(that.jobId))
+        return false;
+    }
+
+    boolean this_present_jobDescription = true && this.isSetJobDescription();
+    boolean that_present_jobDescription = true && that.isSetJobDescription();
+    if (this_present_jobDescription || that_present_jobDescription) {
+      if (!(this_present_jobDescription && that_present_jobDescription))
+        return false;
+      if (!this.jobDescription.equals(that.jobDescription))
+        return false;
+    }
+
+    boolean this_present_creationTime = true && this.isSetCreationTime();
+    boolean that_present_creationTime = true && that.isSetCreationTime();
+    if (this_present_creationTime || that_present_creationTime) {
+      if (!(this_present_creationTime && that_present_creationTime))
+        return false;
+      if (this.creationTime != that.creationTime)
+        return false;
+    }
+
+    boolean this_present_jobStatus = true && this.isSetJobStatus();
+    boolean that_present_jobStatus = true && that.isSetJobStatus();
+    if (this_present_jobStatus || that_present_jobStatus) {
+      if (!(this_present_jobStatus && that_present_jobStatus))
+        return false;
+      if (!this.jobStatus.equals(that.jobStatus))
+        return false;
+    }
+
+    boolean this_present_computeResourceConsumed = true && this.isSetComputeResourceConsumed();
+    boolean that_present_computeResourceConsumed = true && that.isSetComputeResourceConsumed();
+    if (this_present_computeResourceConsumed || that_present_computeResourceConsumed) {
+      if (!(this_present_computeResourceConsumed && that_present_computeResourceConsumed))
+        return false;
+      if (!this.computeResourceConsumed.equals(that.computeResourceConsumed))
+        return false;
+    }
+
+    boolean this_present_jobName = true && this.isSetJobName();
+    boolean that_present_jobName = true && that.isSetJobName();
+    if (this_present_jobName || that_present_jobName) {
+      if (!(this_present_jobName && that_present_jobName))
+        return false;
+      if (!this.jobName.equals(that.jobName))
+        return false;
+    }
+
+    boolean this_present_workingDir = true && this.isSetWorkingDir();
+    boolean that_present_workingDir = true && that.isSetWorkingDir();
+    if (this_present_workingDir || that_present_workingDir) {
+      if (!(this_present_workingDir && that_present_workingDir))
+        return false;
+      if (!this.workingDir.equals(that.workingDir))
+        return false;
+    }
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_jobId = true && (isSetJobId());
+    list.add(present_jobId);
+    if (present_jobId)
+      list.add(jobId);
+
+    boolean present_jobDescription = true && (isSetJobDescription());
+    list.add(present_jobDescription);
+    if (present_jobDescription)
+      list.add(jobDescription);
+
+    boolean present_creationTime = true && (isSetCreationTime());
+    list.add(present_creationTime);
+    if (present_creationTime)
+      list.add(creationTime);
+
+    boolean present_jobStatus = true && (isSetJobStatus());
+    list.add(present_jobStatus);
+    if (present_jobStatus)
+      list.add(jobStatus);
+
+    boolean present_computeResourceConsumed = true && (isSetComputeResourceConsumed());
+    list.add(present_computeResourceConsumed);
+    if (present_computeResourceConsumed)
+      list.add(computeResourceConsumed);
+
+    boolean present_jobName = true && (isSetJobName());
+    list.add(present_jobName);
+    if (present_jobName)
+      list.add(jobName);
+
+    boolean present_workingDir = true && (isSetWorkingDir());
+    list.add(present_workingDir);
+    if (present_workingDir)
+      list.add(workingDir);
+
+    return list.hashCode();
+  }
+
+  @Override
+  public int compareTo(JobModel other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+
+    lastComparison = Boolean.valueOf(isSetJobId()).compareTo(other.isSetJobId());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetJobId()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.jobId, other.jobId);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetJobDescription()).compareTo(other.isSetJobDescription());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetJobDescription()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.jobDescription, other.jobDescription);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetCreationTime()).compareTo(other.isSetCreationTime());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetCreationTime()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.creationTime, other.creationTime);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetJobStatus()).compareTo(other.isSetJobStatus());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetJobStatus()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.jobStatus, other.jobStatus);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetComputeResourceConsumed()).compareTo(other.isSetComputeResourceConsumed());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetComputeResourceConsumed()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.computeResourceConsumed, other.computeResourceConsumed);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetJobName()).compareTo(other.isSetJobName());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetJobName()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.jobName, other.jobName);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetWorkingDir()).compareTo(other.isSetWorkingDir());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetWorkingDir()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.workingDir, other.workingDir);
+      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("JobModel(");
+    boolean first = true;
+
+    sb.append("jobId:");
+    if (this.jobId == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.jobId);
+    }
+    first = false;
+    if (!first) sb.append(", ");
+    sb.append("jobDescription:");
+    if (this.jobDescription == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.jobDescription);
+    }
+    first = false;
+    if (isSetCreationTime()) {
+      if (!first) sb.append(", ");
+      sb.append("creationTime:");
+      sb.append(this.creationTime);
+      first = false;
+    }
+    if (isSetJobStatus()) {
+      if (!first) sb.append(", ");
+      sb.append("jobStatus:");
+      if (this.jobStatus == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.jobStatus);
+      }
+      first = false;
+    }
+    if (isSetComputeResourceConsumed()) {
+      if (!first) sb.append(", ");
+      sb.append("computeResourceConsumed:");
+      if (this.computeResourceConsumed == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.computeResourceConsumed);
+      }
+      first = false;
+    }
+    if (isSetJobName()) {
+      if (!first) sb.append(", ");
+      sb.append("jobName:");
+      if (this.jobName == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.jobName);
+      }
+      first = false;
+    }
+    if (isSetWorkingDir()) {
+      if (!first) sb.append(", ");
+      sb.append("workingDir:");
+      if (this.workingDir == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.workingDir);
+      }
+      first = false;
+    }
+    sb.append(")");
+    return sb.toString();
+  }
+
+  public void validate() throws org.apache.thrift.TException {
+    // check for required fields
+    if (!isSetJobId()) {
+      throw new org.apache.thrift.protocol.TProtocolException("Required field 'jobId' is unset! Struct:" + toString());
+    }
+
+    if (!isSetJobDescription()) {
+      throw new org.apache.thrift.protocol.TProtocolException("Required field 'jobDescription' is unset! Struct:" + toString());
+    }
+
+    // check for sub-struct validity
+    if (jobStatus != null) {
+      jobStatus.validate();
+    }
+  }
+
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      // 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 JobModelStandardSchemeFactory implements SchemeFactory {
+    public JobModelStandardScheme getScheme() {
+      return new JobModelStandardScheme();
+    }
+  }
+
+  private static class JobModelStandardScheme extends StandardScheme<JobModel> {
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot, JobModel 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_ID
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.jobId = iprot.readString();
+              struct.setJobIdIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 2: // JOB_DESCRIPTION
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.jobDescription = iprot.readString();
+              struct.setJobDescriptionIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 3: // CREATION_TIME
+            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+              struct.creationTime = iprot.readI64();
+              struct.setCreationTimeIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 4: // JOB_STATUS
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+              struct.jobStatus = new org.apache.airavata.model.status.JobStatus();
+              struct.jobStatus.read(iprot);
+              struct.setJobStatusIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 7: // COMPUTE_RESOURCE_CONSUMED
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.computeResourceConsumed = iprot.readString();
+              struct.setComputeResourceConsumedIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 8: // JOB_NAME
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.jobName = iprot.readString();
+              struct.setJobNameIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 9: // WORKING_DIR
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.workingDir = iprot.readString();
+              struct.setWorkingDirIsSet(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, JobModel struct) throws org.apache.thrift.TException {
+      struct.validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (struct.jobId != null) {
+        oprot.writeFieldBegin(JOB_ID_FIELD_DESC);
+        oprot.writeString(struct.jobId);
+        oprot.writeFieldEnd();
+      }
+      if (struct.jobDescription != null) {
+        oprot.writeFieldBegin(JOB_DESCRIPTION_FIELD_DESC);
+        oprot.writeString(struct.jobDescription);
+        oprot.writeFieldEnd();
+      }
+      if (struct.isSetCreationTime()) {
+        oprot.writeFieldBegin(CREATION_TIME_FIELD_DESC);
+        oprot.writeI64(struct.creationTime);
+        oprot.writeFieldEnd();
+      }
+      if (struct.jobStatus != null) {
+        if (struct.isSetJobStatus()) {
+          oprot.writeFieldBegin(JOB_STATUS_FIELD_DESC);
+          struct.jobStatus.write(oprot);
+          oprot.writeFieldEnd();
+        }
+      }
+      if (struct.computeResourceConsumed != null) {
+        if (struct.isSetComputeResourceConsumed()) {
+          oprot.writeFieldBegin(COMPUTE_RESOURCE_CONSUMED_FIELD_DESC);
+          oprot.writeString(struct.computeResourceConsumed);
+          oprot.writeFieldEnd();
+        }
+      }
+      if (struct.jobName != null) {
+        if (struct.isSetJobName()) {
+          oprot.writeFieldBegin(JOB_NAME_FIELD_DESC);
+          oprot.writeString(struct.jobName);
+          oprot.writeFieldEnd();
+        }
+      }
+      if (struct.workingDir != null) {
+        if (struct.isSetWorkingDir()) {
+          oprot.writeFieldBegin(WORKING_DIR_FIELD_DESC);
+          oprot.writeString(struct.workingDir);
+          oprot.writeFieldEnd();
+        }
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+  }
+
+  private static class JobModelTupleSchemeFactory implements SchemeFactory {
+    public JobModelTupleScheme getScheme() {
+      return new JobModelTupleScheme();
+    }
+  }
+
+  private static class JobModelTupleScheme extends TupleScheme<JobModel> {
+
+    @Override
+    public void write(org.apache.thrift.protocol.TProtocol prot, JobModel struct) throws org.apache.thrift.TException {
+      TTupleProtocol oprot = (TTupleProtocol) prot;
+      oprot.writeString(struct.jobId);
+      oprot.writeString(struct.jobDescription);
+      BitSet optionals = new BitSet();
+      if (struct.isSetCreationTime()) {
+        optionals.set(0);
+      }
+      if (struct.isSetJobStatus()) {
+        optionals.set(1);
+      }
+      if (struct.isSetComputeResourceConsumed()) {
+        optionals.set(2);
+      }
+      if (struct.isSetJobName()) {
+        optionals.set(3);
+      }
+      if (struct.isSetWorkingDir()) {
+        optionals.set(4);
+      }
+      oprot.writeBitSet(optionals, 5);
+      if (struct.isSetCreationTime()) {
+        oprot.writeI64(struct.creationTime);
+      }
+      if (struct.isSetJobStatus()) {
+        struct.jobStatus.write(oprot);
+      }
+      if (struct.isSetComputeResourceConsumed()) {
+        oprot.writeString(struct.computeResourceConsumed);
+      }
+      if (struct.isSetJobName()) {
+        oprot.writeString(struct.jobName);
+      }
+      if (struct.isSetWorkingDir()) {
+        oprot.writeString(struct.workingDir);
+      }
+    }
+
+    @Override
+    public void read(org.apache.thrift.protocol.TProtocol prot, JobModel struct) throws org.apache.thrift.TException {
+      TTupleProtocol iprot = (TTupleProtocol) prot;
+      struct.jobId = iprot.readString();
+      struct.setJobIdIsSet(true);
+      struct.jobDescription = iprot.readString();
+      struct.setJobDescriptionIsSet(true);
+      BitSet incoming = iprot.readBitSet(5);
+      if (incoming.get(0)) {
+        struct.creationTime = iprot.readI64();
+        struct.setCreationTimeIsSet(true);
+      }
+      if (incoming.get(1)) {
+        struct.jobStatus = new org.apache.airavata.model.status.JobStatus();
+        struct.jobStatus.read(iprot);
+        struct.setJobStatusIsSet(true);
+      }
+      if (incoming.get(2)) {
+        struct.computeResourceConsumed = iprot.readString();
+        struct.setComputeResourceConsumedIsSet(true);
+      }
+      if (incoming.get(3)) {
+        struct.jobName = iprot.readString();
+        struct.setJobNameIsSet(true);
+      }
+      if (incoming.get(4)) {
+        struct.workingDir = iprot.readString();
+        struct.setWorkingDirIsSet(true);
+      }
+    }
+  }
+
+}
+

http://git-wip-us.apache.org/repos/asf/airavata/blob/51fa27b8/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.java
index 3dabc21..c15f7a8 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-12")
 public class ExperimentStatusChangeEvent implements org.apache.thrift.TBase<ExperimentStatusChangeEvent, ExperimentStatusChangeEvent._Fields>, java.io.Serializable, Cloneable, Comparable<ExperimentStatusChangeEvent> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentStatusChangeEvent");
 
@@ -65,7 +65,7 @@ public class ExperimentStatusChangeEvent implements org.apache.thrift.TBase<Expe
     schemes.put(TupleScheme.class, new ExperimentStatusChangeEventTupleSchemeFactory());
   }
 
-  private org.apache.airavata.model.workspace.experiment.ExperimentState state; // required
+  private org.apache.airavata.model.status.ExperimentState state; // required
   private String experimentId; // required
   private String gatewayId; // required
 
@@ -73,7 +73,7 @@ public class ExperimentStatusChangeEvent implements org.apache.thrift.TBase<Expe
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     /**
      * 
-     * @see org.apache.airavata.model.workspace.experiment.ExperimentState
+     * @see org.apache.airavata.model.status.ExperimentState
      */
     STATE((short)1, "state"),
     EXPERIMENT_ID((short)2, "experimentId"),
@@ -142,7 +142,7 @@ public class ExperimentStatusChangeEvent implements org.apache.thrift.TBase<Expe
   static {
     Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.STATE, new org.apache.thrift.meta_data.FieldMetaData("state", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.workspace.experiment.ExperimentState.class)));
+        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.status.ExperimentState.class)));
     tmpMap.put(_Fields.EXPERIMENT_ID, new org.apache.thrift.meta_data.FieldMetaData("experimentId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.GATEWAY_ID, new org.apache.thrift.meta_data.FieldMetaData("gatewayId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
@@ -155,7 +155,7 @@ public class ExperimentStatusChangeEvent implements org.apache.thrift.TBase<Expe
   }
 
   public ExperimentStatusChangeEvent(
-    org.apache.airavata.model.workspace.experiment.ExperimentState state,
+    org.apache.airavata.model.status.ExperimentState state,
     String experimentId,
     String gatewayId)
   {
@@ -193,17 +193,17 @@ public class ExperimentStatusChangeEvent implements org.apache.thrift.TBase<Expe
 
   /**
    * 
-   * @see org.apache.airavata.model.workspace.experiment.ExperimentState
+   * @see org.apache.airavata.model.status.ExperimentState
    */
-  public org.apache.airavata.model.workspace.experiment.ExperimentState getState() {
+  public org.apache.airavata.model.status.ExperimentState getState() {
     return this.state;
   }
 
   /**
    * 
-   * @see org.apache.airavata.model.workspace.experiment.ExperimentState
+   * @see org.apache.airavata.model.status.ExperimentState
    */
-  public void setState(org.apache.airavata.model.workspace.experiment.ExperimentState state) {
+  public void setState(org.apache.airavata.model.status.ExperimentState state) {
     this.state = state;
   }
 
@@ -274,7 +274,7 @@ public class ExperimentStatusChangeEvent implements org.apache.thrift.TBase<Expe
       if (value == null) {
         unsetState();
       } else {
-        setState((org.apache.airavata.model.workspace.experiment.ExperimentState)value);
+        setState((org.apache.airavata.model.status.ExperimentState)value);
       }
       break;
 
@@ -532,7 +532,7 @@ public class ExperimentStatusChangeEvent implements org.apache.thrift.TBase<Expe
         switch (schemeField.id) {
           case 1: // STATE
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.state = org.apache.airavata.model.workspace.experiment.ExperimentState.findByValue(iprot.readI32());
+              struct.state = org.apache.airavata.model.status.ExperimentState.findByValue(iprot.readI32());
               struct.setStateIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -607,7 +607,7 @@ public class ExperimentStatusChangeEvent implements org.apache.thrift.TBase<Expe
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ExperimentStatusChangeEvent struct) throws org.apache.thrift.TException {
       TTupleProtocol iprot = (TTupleProtocol) prot;
-      struct.state = org.apache.airavata.model.workspace.experiment.ExperimentState.findByValue(iprot.readI32());
+      struct.state = org.apache.airavata.model.status.ExperimentState.findByValue(iprot.readI32());
       struct.setStateIsSet(true);
       struct.experimentId = iprot.readString();
       struct.setExperimentIdIsSet(true);

http://git-wip-us.apache.org/repos/asf/airavata/blob/51fa27b8/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.java
index 51b8b92..d35f9ad 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-12")
 public class JobIdentifier implements org.apache.thrift.TBase<JobIdentifier, JobIdentifier._Fields>, java.io.Serializable, Cloneable, Comparable<JobIdentifier> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobIdentifier");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/51fa27b8/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeEvent.java
index 31f9a5d..4b7724a 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-12")
 public class JobStatusChangeEvent implements org.apache.thrift.TBase<JobStatusChangeEvent, JobStatusChangeEvent._Fields>, java.io.Serializable, Cloneable, Comparable<JobStatusChangeEvent> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobStatusChangeEvent");
 
@@ -64,14 +64,14 @@ public class JobStatusChangeEvent implements org.apache.thrift.TBase<JobStatusCh
     schemes.put(TupleScheme.class, new JobStatusChangeEventTupleSchemeFactory());
   }
 
-  private org.apache.airavata.model.workspace.experiment.JobState state; // required
+  private org.apache.airavata.model.status.JobState state; // required
   private JobIdentifier jobIdentity; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     /**
      * 
-     * @see org.apache.airavata.model.workspace.experiment.JobState
+     * @see org.apache.airavata.model.status.JobState
      */
     STATE((short)1, "state"),
     JOB_IDENTITY((short)2, "jobIdentity");
@@ -137,7 +137,7 @@ public class JobStatusChangeEvent implements org.apache.thrift.TBase<JobStatusCh
   static {
     Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.STATE, new org.apache.thrift.meta_data.FieldMetaData("state", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.workspace.experiment.JobState.class)));
+        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.status.JobState.class)));
     tmpMap.put(_Fields.JOB_IDENTITY, new org.apache.thrift.meta_data.FieldMetaData("jobIdentity", org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, JobIdentifier.class)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
@@ -148,7 +148,7 @@ public class JobStatusChangeEvent implements org.apache.thrift.TBase<JobStatusCh
   }
 
   public JobStatusChangeEvent(
-    org.apache.airavata.model.workspace.experiment.JobState state,
+    org.apache.airavata.model.status.JobState state,
     JobIdentifier jobIdentity)
   {
     this();
@@ -180,17 +180,17 @@ public class JobStatusChangeEvent implements org.apache.thrift.TBase<JobStatusCh
 
   /**
    * 
-   * @see org.apache.airavata.model.workspace.experiment.JobState
+   * @see org.apache.airavata.model.status.JobState
    */
-  public org.apache.airavata.model.workspace.experiment.JobState getState() {
+  public org.apache.airavata.model.status.JobState getState() {
     return this.state;
   }
 
   /**
    * 
-   * @see org.apache.airavata.model.workspace.experiment.JobState
+   * @see org.apache.airavata.model.status.JobState
    */
-  public void setState(org.apache.airavata.model.workspace.experiment.JobState state) {
+  public void setState(org.apache.airavata.model.status.JobState state) {
     this.state = state;
   }
 
@@ -238,7 +238,7 @@ public class JobStatusChangeEvent implements org.apache.thrift.TBase<JobStatusCh
       if (value == null) {
         unsetState();
       } else {
-        setState((org.apache.airavata.model.workspace.experiment.JobState)value);
+        setState((org.apache.airavata.model.status.JobState)value);
       }
       break;
 
@@ -450,7 +450,7 @@ public class JobStatusChangeEvent implements org.apache.thrift.TBase<JobStatusCh
         switch (schemeField.id) {
           case 1: // STATE
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.state = org.apache.airavata.model.workspace.experiment.JobState.findByValue(iprot.readI32());
+              struct.state = org.apache.airavata.model.status.JobState.findByValue(iprot.readI32());
               struct.setStateIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -512,7 +512,7 @@ public class JobStatusChangeEvent implements org.apache.thrift.TBase<JobStatusCh
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, JobStatusChangeEvent struct) throws org.apache.thrift.TException {
       TTupleProtocol iprot = (TTupleProtocol) prot;
-      struct.state = org.apache.airavata.model.workspace.experiment.JobState.findByValue(iprot.readI32());
+      struct.state = org.apache.airavata.model.status.JobState.findByValue(iprot.readI32());
       struct.setStateIsSet(true);
       struct.jobIdentity = new JobIdentifier();
       struct.jobIdentity.read(iprot);

http://git-wip-us.apache.org/repos/asf/airavata/blob/51fa27b8/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.java
index 4fa3477..7665820 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-12")
 public class JobStatusChangeRequestEvent implements org.apache.thrift.TBase<JobStatusChangeRequestEvent, JobStatusChangeRequestEvent._Fields>, java.io.Serializable, Cloneable, Comparable<JobStatusChangeRequestEvent> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobStatusChangeRequestEvent");
 
@@ -64,14 +64,14 @@ public class JobStatusChangeRequestEvent implements org.apache.thrift.TBase<JobS
     schemes.put(TupleScheme.class, new JobStatusChangeRequestEventTupleSchemeFactory());
   }
 
-  private org.apache.airavata.model.workspace.experiment.JobState state; // required
+  private org.apache.airavata.model.status.JobState state; // required
   private JobIdentifier jobIdentity; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     /**
      * 
-     * @see org.apache.airavata.model.workspace.experiment.JobState
+     * @see org.apache.airavata.model.status.JobState
      */
     STATE((short)1, "state"),
     JOB_IDENTITY((short)2, "jobIdentity");
@@ -137,7 +137,7 @@ public class JobStatusChangeRequestEvent implements org.apache.thrift.TBase<JobS
   static {
     Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.STATE, new org.apache.thrift.meta_data.FieldMetaData("state", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.workspace.experiment.JobState.class)));
+        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.status.JobState.class)));
     tmpMap.put(_Fields.JOB_IDENTITY, new org.apache.thrift.meta_data.FieldMetaData("jobIdentity", org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, JobIdentifier.class)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
@@ -148,7 +148,7 @@ public class JobStatusChangeRequestEvent implements org.apache.thrift.TBase<JobS
   }
 
   public JobStatusChangeRequestEvent(
-    org.apache.airavata.model.workspace.experiment.JobState state,
+    org.apache.airavata.model.status.JobState state,
     JobIdentifier jobIdentity)
   {
     this();
@@ -180,17 +180,17 @@ public class JobStatusChangeRequestEvent implements org.apache.thrift.TBase<JobS
 
   /**
    * 
-   * @see org.apache.airavata.model.workspace.experiment.JobState
+   * @see org.apache.airavata.model.status.JobState
    */
-  public org.apache.airavata.model.workspace.experiment.JobState getState() {
+  public org.apache.airavata.model.status.JobState getState() {
     return this.state;
   }
 
   /**
    * 
-   * @see org.apache.airavata.model.workspace.experiment.JobState
+   * @see org.apache.airavata.model.status.JobState
    */
-  public void setState(org.apache.airavata.model.workspace.experiment.JobState state) {
+  public void setState(org.apache.airavata.model.status.JobState state) {
     this.state = state;
   }
 
@@ -238,7 +238,7 @@ public class JobStatusChangeRequestEvent implements org.apache.thrift.TBase<JobS
       if (value == null) {
         unsetState();
       } else {
-        setState((org.apache.airavata.model.workspace.experiment.JobState)value);
+        setState((org.apache.airavata.model.status.JobState)value);
       }
       break;
 
@@ -450,7 +450,7 @@ public class JobStatusChangeRequestEvent implements org.apache.thrift.TBase<JobS
         switch (schemeField.id) {
           case 1: // STATE
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.state = org.apache.airavata.model.workspace.experiment.JobState.findByValue(iprot.readI32());
+              struct.state = org.apache.airavata.model.status.JobState.findByValue(iprot.readI32());
               struct.setStateIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -512,7 +512,7 @@ public class JobStatusChangeRequestEvent implements org.apache.thrift.TBase<JobS
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, JobStatusChangeRequestEvent struct) throws org.apache.thrift.TException {
       TTupleProtocol iprot = (TTupleProtocol) prot;
-      struct.state = org.apache.airavata.model.workspace.experiment.JobState.findByValue(iprot.readI32());
+      struct.state = org.apache.airavata.model.status.JobState.findByValue(iprot.readI32());
       struct.setStateIsSet(true);
       struct.jobIdentity = new JobIdentifier();
       struct.jobIdentity.read(iprot);

http://git-wip-us.apache.org/repos/asf/airavata/blob/51fa27b8/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.java
index 85760d6..184dbff 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-12")
 public class Message implements org.apache.thrift.TBase<Message, Message._Fields>, java.io.Serializable, Cloneable, Comparable<Message> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Message");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/51fa27b8/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java
index aed2397..130a4ea 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-12")
 public class ProcessSubmitEvent implements org.apache.thrift.TBase<ProcessSubmitEvent, ProcessSubmitEvent._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessSubmitEvent> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessSubmitEvent");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/51fa27b8/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java
index 3b7a7bc..14efa6d 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-12")
 public class TaskIdentifier implements org.apache.thrift.TBase<TaskIdentifier, TaskIdentifier._Fields>, java.io.Serializable, Cloneable, Comparable<TaskIdentifier> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskIdentifier");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/51fa27b8/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java
index 091921d..0971444 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-12")
 public class TaskOutputChangeEvent implements org.apache.thrift.TBase<TaskOutputChangeEvent, TaskOutputChangeEvent._Fields>, java.io.Serializable, Cloneable, Comparable<TaskOutputChangeEvent> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskOutputChangeEvent");
 
@@ -64,7 +64,7 @@ public class TaskOutputChangeEvent implements org.apache.thrift.TBase<TaskOutput
     schemes.put(TupleScheme.class, new TaskOutputChangeEventTupleSchemeFactory());
   }
 
-  private List<org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType> output; // required
+  private List<org.apache.airavata.model.application.io.OutputDataObjectType> output; // required
   private TaskIdentifier taskIdentity; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -134,7 +134,7 @@ public class TaskOutputChangeEvent implements org.apache.thrift.TBase<TaskOutput
     Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.OUTPUT, new org.apache.thrift.meta_data.FieldMetaData("output", org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType.class))));
+            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.application.io.OutputDataObjectType.class))));
     tmpMap.put(_Fields.TASK_IDENTITY, new org.apache.thrift.meta_data.FieldMetaData("taskIdentity", org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TaskIdentifier.class)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
@@ -145,7 +145,7 @@ public class TaskOutputChangeEvent implements org.apache.thrift.TBase<TaskOutput
   }
 
   public TaskOutputChangeEvent(
-    List<org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType> output,
+    List<org.apache.airavata.model.application.io.OutputDataObjectType> output,
     TaskIdentifier taskIdentity)
   {
     this();
@@ -158,9 +158,9 @@ public class TaskOutputChangeEvent implements org.apache.thrift.TBase<TaskOutput
    */
   public TaskOutputChangeEvent(TaskOutputChangeEvent other) {
     if (other.isSetOutput()) {
-      List<org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType> __this__output = new ArrayList<org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType>(other.output.size());
-      for (org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType other_element : other.output) {
-        __this__output.add(new org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType(other_element));
+      List<org.apache.airavata.model.application.io.OutputDataObjectType> __this__output = new ArrayList<org.apache.airavata.model.application.io.OutputDataObjectType>(other.output.size());
+      for (org.apache.airavata.model.application.io.OutputDataObjectType other_element : other.output) {
+        __this__output.add(new org.apache.airavata.model.application.io.OutputDataObjectType(other_element));
       }
       this.output = __this__output;
     }
@@ -183,22 +183,22 @@ public class TaskOutputChangeEvent implements org.apache.thrift.TBase<TaskOutput
     return (this.output == null) ? 0 : this.output.size();
   }
 
-  public java.util.Iterator<org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType> getOutputIterator() {
+  public java.util.Iterator<org.apache.airavata.model.application.io.OutputDataObjectType> getOutputIterator() {
     return (this.output == null) ? null : this.output.iterator();
   }
 
-  public void addToOutput(org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType elem) {
+  public void addToOutput(org.apache.airavata.model.application.io.OutputDataObjectType elem) {
     if (this.output == null) {
-      this.output = new ArrayList<org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType>();
+      this.output = new ArrayList<org.apache.airavata.model.application.io.OutputDataObjectType>();
     }
     this.output.add(elem);
   }
 
-  public List<org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType> getOutput() {
+  public List<org.apache.airavata.model.application.io.OutputDataObjectType> getOutput() {
     return this.output;
   }
 
-  public void setOutput(List<org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType> output) {
+  public void setOutput(List<org.apache.airavata.model.application.io.OutputDataObjectType> output) {
     this.output = output;
   }
 
@@ -246,7 +246,7 @@ public class TaskOutputChangeEvent implements org.apache.thrift.TBase<TaskOutput
       if (value == null) {
         unsetOutput();
       } else {
-        setOutput((List<org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType>)value);
+        setOutput((List<org.apache.airavata.model.application.io.OutputDataObjectType>)value);
       }
       break;
 
@@ -460,11 +460,11 @@ public class TaskOutputChangeEvent implements org.apache.thrift.TBase<TaskOutput
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
-                struct.output = new ArrayList<org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType>(_list0.size);
-                org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType _elem1;
+                struct.output = new ArrayList<org.apache.airavata.model.application.io.OutputDataObjectType>(_list0.size);
+                org.apache.airavata.model.application.io.OutputDataObjectType _elem1;
                 for (int _i2 = 0; _i2 < _list0.size; ++_i2)
                 {
-                  _elem1 = new org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType();
+                  _elem1 = new org.apache.airavata.model.application.io.OutputDataObjectType();
                   _elem1.read(iprot);
                   struct.output.add(_elem1);
                 }
@@ -501,7 +501,7 @@ public class TaskOutputChangeEvent implements org.apache.thrift.TBase<TaskOutput
         oprot.writeFieldBegin(OUTPUT_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.output.size()));
-          for (org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType _iter3 : struct.output)
+          for (org.apache.airavata.model.application.io.OutputDataObjectType _iter3 : struct.output)
           {
             _iter3.write(oprot);
           }
@@ -533,7 +533,7 @@ public class TaskOutputChangeEvent implements org.apache.thrift.TBase<TaskOutput
       TTupleProtocol oprot = (TTupleProtocol) prot;
       {
         oprot.writeI32(struct.output.size());
-        for (org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType _iter4 : struct.output)
+        for (org.apache.airavata.model.application.io.OutputDataObjectType _iter4 : struct.output)
         {
           _iter4.write(oprot);
         }
@@ -546,11 +546,11 @@ public class TaskOutputChangeEvent implements org.apache.thrift.TBase<TaskOutput
       TTupleProtocol iprot = (TTupleProtocol) prot;
       {
         org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-        struct.output = new ArrayList<org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType>(_list5.size);
-        org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType _elem6;
+        struct.output = new ArrayList<org.apache.airavata.model.application.io.OutputDataObjectType>(_list5.size);
+        org.apache.airavata.model.application.io.OutputDataObjectType _elem6;
         for (int _i7 = 0; _i7 < _list5.size; ++_i7)
         {
-          _elem6 = new org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType();
+          _elem6 = new org.apache.airavata.model.application.io.OutputDataObjectType();
           _elem6.read(iprot);
           struct.output.add(_elem6);
         }

http://git-wip-us.apache.org/repos/asf/airavata/blob/51fa27b8/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java
index 05562f3..74d56c9 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-12")
 public class TaskStatusChangeEvent implements org.apache.thrift.TBase<TaskStatusChangeEvent, TaskStatusChangeEvent._Fields>, java.io.Serializable, Cloneable, Comparable<TaskStatusChangeEvent> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskStatusChangeEvent");
 
@@ -64,14 +64,14 @@ public class TaskStatusChangeEvent implements org.apache.thrift.TBase<TaskStatus
     schemes.put(TupleScheme.class, new TaskStatusChangeEventTupleSchemeFactory());
   }
 
-  private org.apache.airavata.model.workspace.experiment.TaskState state; // required
+  private org.apache.airavata.model.status.TaskState state; // required
   private TaskIdentifier taskIdentity; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     /**
      * 
-     * @see org.apache.airavata.model.workspace.experiment.TaskState
+     * @see org.apache.airavata.model.status.TaskState
      */
     STATE((short)1, "state"),
     TASK_IDENTITY((short)2, "taskIdentity");
@@ -137,7 +137,7 @@ public class TaskStatusChangeEvent implements org.apache.thrift.TBase<TaskStatus
   static {
     Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.STATE, new org.apache.thrift.meta_data.FieldMetaData("state", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.workspace.experiment.TaskState.class)));
+        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.status.TaskState.class)));
     tmpMap.put(_Fields.TASK_IDENTITY, new org.apache.thrift.meta_data.FieldMetaData("taskIdentity", org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TaskIdentifier.class)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
@@ -148,7 +148,7 @@ public class TaskStatusChangeEvent implements org.apache.thrift.TBase<TaskStatus
   }
 
   public TaskStatusChangeEvent(
-    org.apache.airavata.model.workspace.experiment.TaskState state,
+    org.apache.airavata.model.status.TaskState state,
     TaskIdentifier taskIdentity)
   {
     this();
@@ -180,17 +180,17 @@ public class TaskStatusChangeEvent implements org.apache.thrift.TBase<TaskStatus
 
   /**
    * 
-   * @see org.apache.airavata.model.workspace.experiment.TaskState
+   * @see org.apache.airavata.model.status.TaskState
    */
-  public org.apache.airavata.model.workspace.experiment.TaskState getState() {
+  public org.apache.airavata.model.status.TaskState getState() {
     return this.state;
   }
 
   /**
    * 
-   * @see org.apache.airavata.model.workspace.experiment.TaskState
+   * @see org.apache.airavata.model.status.TaskState
    */
-  public void setState(org.apache.airavata.model.workspace.experiment.TaskState state) {
+  public void setState(org.apache.airavata.model.status.TaskState state) {
     this.state = state;
   }
 
@@ -238,7 +238,7 @@ public class TaskStatusChangeEvent implements org.apache.thrift.TBase<TaskStatus
       if (value == null) {
         unsetState();
       } else {
-        setState((org.apache.airavata.model.workspace.experiment.TaskState)value);
+        setState((org.apache.airavata.model.status.TaskState)value);
       }
       break;
 
@@ -450,7 +450,7 @@ public class TaskStatusChangeEvent implements org.apache.thrift.TBase<TaskStatus
         switch (schemeField.id) {
           case 1: // STATE
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.state = org.apache.airavata.model.workspace.experiment.TaskState.findByValue(iprot.readI32());
+              struct.state = org.apache.airavata.model.status.TaskState.findByValue(iprot.readI32());
               struct.setStateIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -512,7 +512,7 @@ public class TaskStatusChangeEvent implements org.apache.thrift.TBase<TaskStatus
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TaskStatusChangeEvent struct) throws org.apache.thrift.TException {
       TTupleProtocol iprot = (TTupleProtocol) prot;
-      struct.state = org.apache.airavata.model.workspace.experiment.TaskState.findByValue(iprot.readI32());
+      struct.state = org.apache.airavata.model.status.TaskState.findByValue(iprot.readI32());
       struct.setStateIsSet(true);
       struct.taskIdentity = new TaskIdentifier();
       struct.taskIdentity.read(iprot);

http://git-wip-us.apache.org/repos/asf/airavata/blob/51fa27b8/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java
index 2fa4dfd..764bb28 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-12")
 public class TaskStatusChangeRequestEvent implements org.apache.thrift.TBase<TaskStatusChangeRequestEvent, TaskStatusChangeRequestEvent._Fields>, java.io.Serializable, Cloneable, Comparable<TaskStatusChangeRequestEvent> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskStatusChangeRequestEvent");
 
@@ -64,14 +64,14 @@ public class TaskStatusChangeRequestEvent implements org.apache.thrift.TBase<Tas
     schemes.put(TupleScheme.class, new TaskStatusChangeRequestEventTupleSchemeFactory());
   }
 
-  private org.apache.airavata.model.workspace.experiment.TaskState state; // required
+  private org.apache.airavata.model.status.TaskState state; // required
   private TaskIdentifier taskIdentity; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     /**
      * 
-     * @see org.apache.airavata.model.workspace.experiment.TaskState
+     * @see org.apache.airavata.model.status.TaskState
      */
     STATE((short)1, "state"),
     TASK_IDENTITY((short)2, "taskIdentity");
@@ -137,7 +137,7 @@ public class TaskStatusChangeRequestEvent implements org.apache.thrift.TBase<Tas
   static {
     Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.STATE, new org.apache.thrift.meta_data.FieldMetaData("state", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.workspace.experiment.TaskState.class)));
+        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.status.TaskState.class)));
     tmpMap.put(_Fields.TASK_IDENTITY, new org.apache.thrift.meta_data.FieldMetaData("taskIdentity", org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TaskIdentifier.class)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
@@ -148,7 +148,7 @@ public class TaskStatusChangeRequestEvent implements org.apache.thrift.TBase<Tas
   }
 
   public TaskStatusChangeRequestEvent(
-    org.apache.airavata.model.workspace.experiment.TaskState state,
+    org.apache.airavata.model.status.TaskState state,
     TaskIdentifier taskIdentity)
   {
     this();
@@ -180,17 +180,17 @@ public class TaskStatusChangeRequestEvent implements org.apache.thrift.TBase<Tas
 
   /**
    * 
-   * @see org.apache.airavata.model.workspace.experiment.TaskState
+   * @see org.apache.airavata.model.status.TaskState
    */
-  public org.apache.airavata.model.workspace.experiment.TaskState getState() {
+  public org.apache.airavata.model.status.TaskState getState() {
     return this.state;
   }
 
   /**
    * 
-   * @see org.apache.airavata.model.workspace.experiment.TaskState
+   * @see org.apache.airavata.model.status.TaskState
    */
-  public void setState(org.apache.airavata.model.workspace.experiment.TaskState state) {
+  public void setState(org.apache.airavata.model.status.TaskState state) {
     this.state = state;
   }
 
@@ -238,7 +238,7 @@ public class TaskStatusChangeRequestEvent implements org.apache.thrift.TBase<Tas
       if (value == null) {
         unsetState();
       } else {
-        setState((org.apache.airavata.model.workspace.experiment.TaskState)value);
+        setState((org.apache.airavata.model.status.TaskState)value);
       }
       break;
 
@@ -450,7 +450,7 @@ public class TaskStatusChangeRequestEvent implements org.apache.thrift.TBase<Tas
         switch (schemeField.id) {
           case 1: // STATE
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.state = org.apache.airavata.model.workspace.experiment.TaskState.findByValue(iprot.readI32());
+              struct.state = org.apache.airavata.model.status.TaskState.findByValue(iprot.readI32());
               struct.setStateIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -512,7 +512,7 @@ public class TaskStatusChangeRequestEvent implements org.apache.thrift.TBase<Tas
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TaskStatusChangeRequestEvent struct) throws org.apache.thrift.TException {
       TTupleProtocol iprot = (TTupleProtocol) prot;
-      struct.state = org.apache.airavata.model.workspace.experiment.TaskState.findByValue(iprot.readI32());
+      struct.state = org.apache.airavata.model.status.TaskState.findByValue(iprot.readI32());
       struct.setStateIsSet(true);
       struct.taskIdentity = new TaskIdentifier();
       struct.taskIdentity.read(iprot);

http://git-wip-us.apache.org/repos/asf/airavata/blob/51fa27b8/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskSubmitEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskSubmitEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskSubmitEvent.java
index 56e42bd..daee823 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskSubmitEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskSubmitEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-12")
 public class TaskSubmitEvent implements org.apache.thrift.TBase<TaskSubmitEvent, TaskSubmitEvent._Fields>, java.io.Serializable, Cloneable, Comparable<TaskSubmitEvent> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskSubmitEvent");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/51fa27b8/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskTerminateEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskTerminateEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskTerminateEvent.java
index 8a26d08..d400c16 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskTerminateEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskTerminateEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-11")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-12")
 public class TaskTerminateEvent implements org.apache.thrift.TBase<TaskTerminateEvent, TaskTerminateEvent._Fields>, java.io.Serializable, Cloneable, Comparable<TaskTerminateEvent> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskTerminateEvent");
 


Mime
View raw message