Repository: airavata Updated Branches: refs/heads/master 640e1e3e5 -> c46e21dce
http://git-wip-us.apache.org/repos/asf/airavata/blob/c46e21dc/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 index 4286049..7cc6ebd 100644 --- 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 @@ -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-9-3") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-4") 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"); @@ -64,6 +64,9 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie 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 org.apache.thrift.protocol.TField STDOUT_FIELD_DESC = new org.apache.thrift.protocol.TField("stdout", org.apache.thrift.protocol.TType.STRING, (short)10); + private static final org.apache.thrift.protocol.TField STDERR_FIELD_DESC = new org.apache.thrift.protocol.TField("stderr", org.apache.thrift.protocol.TType.STRING, (short)11); + private static final org.apache.thrift.protocol.TField EXIT_CODE_FIELD_DESC = new org.apache.thrift.protocol.TField("exitCode", org.apache.thrift.protocol.TType.I32, (short)12); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -80,6 +83,9 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie private String computeResourceConsumed; // optional private String jobName; // optional private String workingDir; // optional + private String stdout; // optional + private String stderr; // optional + private int exitCode; // 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 { @@ -91,7 +97,10 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie JOB_STATUS((short)6, "jobStatus"), COMPUTE_RESOURCE_CONSUMED((short)7, "computeResourceConsumed"), JOB_NAME((short)8, "jobName"), - WORKING_DIR((short)9, "workingDir"); + WORKING_DIR((short)9, "workingDir"), + STDOUT((short)10, "stdout"), + STDERR((short)11, "stderr"), + EXIT_CODE((short)12, "exitCode"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -124,6 +133,12 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie return JOB_NAME; case 9: // WORKING_DIR return WORKING_DIR; + case 10: // STDOUT + return STDOUT; + case 11: // STDERR + return STDERR; + case 12: // EXIT_CODE + return EXIT_CODE; default: return null; } @@ -165,8 +180,9 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie // isset id assignments private static final int __CREATIONTIME_ISSET_ID = 0; + private static final int __EXITCODE_ISSET_ID = 1; 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}; + private static final _Fields optionals[] = {_Fields.CREATION_TIME,_Fields.JOB_STATUS,_Fields.COMPUTE_RESOURCE_CONSUMED,_Fields.JOB_NAME,_Fields.WORKING_DIR,_Fields.STDOUT,_Fields.STDERR,_Fields.EXIT_CODE}; 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); @@ -188,6 +204,12 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie 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))); + tmpMap.put(_Fields.STDOUT, new org.apache.thrift.meta_data.FieldMetaData("stdout", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.STDERR, new org.apache.thrift.meta_data.FieldMetaData("stderr", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.EXIT_CODE, new org.apache.thrift.meta_data.FieldMetaData("exitCode", 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(JobModel.class, metaDataMap); } @@ -238,6 +260,13 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie if (other.isSetWorkingDir()) { this.workingDir = other.workingDir; } + if (other.isSetStdout()) { + this.stdout = other.stdout; + } + if (other.isSetStderr()) { + this.stderr = other.stderr; + } + this.exitCode = other.exitCode; } public JobModel deepCopy() { @@ -256,6 +285,10 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie this.computeResourceConsumed = null; this.jobName = null; this.workingDir = null; + this.stdout = null; + this.stderr = null; + setExitCodeIsSet(false); + this.exitCode = 0; } public String getJobId() { @@ -464,6 +497,74 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie } } + public String getStdout() { + return this.stdout; + } + + public void setStdout(String stdout) { + this.stdout = stdout; + } + + public void unsetStdout() { + this.stdout = null; + } + + /** Returns true if field stdout is set (has been assigned a value) and false otherwise */ + public boolean isSetStdout() { + return this.stdout != null; + } + + public void setStdoutIsSet(boolean value) { + if (!value) { + this.stdout = null; + } + } + + public String getStderr() { + return this.stderr; + } + + public void setStderr(String stderr) { + this.stderr = stderr; + } + + public void unsetStderr() { + this.stderr = null; + } + + /** Returns true if field stderr is set (has been assigned a value) and false otherwise */ + public boolean isSetStderr() { + return this.stderr != null; + } + + public void setStderrIsSet(boolean value) { + if (!value) { + this.stderr = null; + } + } + + public int getExitCode() { + return this.exitCode; + } + + public void setExitCode(int exitCode) { + this.exitCode = exitCode; + setExitCodeIsSet(true); + } + + public void unsetExitCode() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __EXITCODE_ISSET_ID); + } + + /** Returns true if field exitCode is set (has been assigned a value) and false otherwise */ + public boolean isSetExitCode() { + return EncodingUtils.testBit(__isset_bitfield, __EXITCODE_ISSET_ID); + } + + public void setExitCodeIsSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __EXITCODE_ISSET_ID, value); + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case JOB_ID: @@ -538,6 +639,30 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie } break; + case STDOUT: + if (value == null) { + unsetStdout(); + } else { + setStdout((String)value); + } + break; + + case STDERR: + if (value == null) { + unsetStderr(); + } else { + setStderr((String)value); + } + break; + + case EXIT_CODE: + if (value == null) { + unsetExitCode(); + } else { + setExitCode((Integer)value); + } + break; + } } @@ -570,6 +695,15 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie case WORKING_DIR: return getWorkingDir(); + case STDOUT: + return getStdout(); + + case STDERR: + return getStderr(); + + case EXIT_CODE: + return Integer.valueOf(getExitCode()); + } throw new IllegalStateException(); } @@ -599,6 +733,12 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie return isSetJobName(); case WORKING_DIR: return isSetWorkingDir(); + case STDOUT: + return isSetStdout(); + case STDERR: + return isSetStderr(); + case EXIT_CODE: + return isSetExitCode(); } throw new IllegalStateException(); } @@ -697,6 +837,33 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie return false; } + boolean this_present_stdout = true && this.isSetStdout(); + boolean that_present_stdout = true && that.isSetStdout(); + if (this_present_stdout || that_present_stdout) { + if (!(this_present_stdout && that_present_stdout)) + return false; + if (!this.stdout.equals(that.stdout)) + return false; + } + + boolean this_present_stderr = true && this.isSetStderr(); + boolean that_present_stderr = true && that.isSetStderr(); + if (this_present_stderr || that_present_stderr) { + if (!(this_present_stderr && that_present_stderr)) + return false; + if (!this.stderr.equals(that.stderr)) + return false; + } + + boolean this_present_exitCode = true && this.isSetExitCode(); + boolean that_present_exitCode = true && that.isSetExitCode(); + if (this_present_exitCode || that_present_exitCode) { + if (!(this_present_exitCode && that_present_exitCode)) + return false; + if (this.exitCode != that.exitCode) + return false; + } + return true; } @@ -749,6 +916,21 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie if (present_workingDir) list.add(workingDir); + boolean present_stdout = true && (isSetStdout()); + list.add(present_stdout); + if (present_stdout) + list.add(stdout); + + boolean present_stderr = true && (isSetStderr()); + list.add(present_stderr); + if (present_stderr) + list.add(stderr); + + boolean present_exitCode = true && (isSetExitCode()); + list.add(present_exitCode); + if (present_exitCode) + list.add(exitCode); + return list.hashCode(); } @@ -850,6 +1032,36 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie return lastComparison; } } + lastComparison = Boolean.valueOf(isSetStdout()).compareTo(other.isSetStdout()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetStdout()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stdout, other.stdout); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetStderr()).compareTo(other.isSetStderr()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetStderr()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stderr, other.stderr); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetExitCode()).compareTo(other.isSetExitCode()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetExitCode()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.exitCode, other.exitCode); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -947,6 +1159,32 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie } first = false; } + if (isSetStdout()) { + if (!first) sb.append(", "); + sb.append("stdout:"); + if (this.stdout == null) { + sb.append("null"); + } else { + sb.append(this.stdout); + } + first = false; + } + if (isSetStderr()) { + if (!first) sb.append(", "); + sb.append("stderr:"); + if (this.stderr == null) { + sb.append("null"); + } else { + sb.append(this.stderr); + } + first = false; + } + if (isSetExitCode()) { + if (!first) sb.append(", "); + sb.append("exitCode:"); + sb.append(this.exitCode); + first = false; + } sb.append(")"); return sb.toString(); } @@ -1084,6 +1322,30 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 10: // STDOUT + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.stdout = iprot.readString(); + struct.setStdoutIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 11: // STDERR + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.stderr = iprot.readString(); + struct.setStderrIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 12: // EXIT_CODE + if (schemeField.type == org.apache.thrift.protocol.TType.I32) { + struct.exitCode = iprot.readI32(); + struct.setExitCodeIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -1150,6 +1412,25 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie oprot.writeFieldEnd(); } } + if (struct.stdout != null) { + if (struct.isSetStdout()) { + oprot.writeFieldBegin(STDOUT_FIELD_DESC); + oprot.writeString(struct.stdout); + oprot.writeFieldEnd(); + } + } + if (struct.stderr != null) { + if (struct.isSetStderr()) { + oprot.writeFieldBegin(STDERR_FIELD_DESC); + oprot.writeString(struct.stderr); + oprot.writeFieldEnd(); + } + } + if (struct.isSetExitCode()) { + oprot.writeFieldBegin(EXIT_CODE_FIELD_DESC); + oprot.writeI32(struct.exitCode); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -1187,7 +1468,16 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie if (struct.isSetWorkingDir()) { optionals.set(4); } - oprot.writeBitSet(optionals, 5); + if (struct.isSetStdout()) { + optionals.set(5); + } + if (struct.isSetStderr()) { + optionals.set(6); + } + if (struct.isSetExitCode()) { + optionals.set(7); + } + oprot.writeBitSet(optionals, 8); if (struct.isSetCreationTime()) { oprot.writeI64(struct.creationTime); } @@ -1203,6 +1493,15 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie if (struct.isSetWorkingDir()) { oprot.writeString(struct.workingDir); } + if (struct.isSetStdout()) { + oprot.writeString(struct.stdout); + } + if (struct.isSetStderr()) { + oprot.writeString(struct.stderr); + } + if (struct.isSetExitCode()) { + oprot.writeI32(struct.exitCode); + } } @Override @@ -1216,7 +1515,7 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie struct.setProcessIdIsSet(true); struct.jobDescription = iprot.readString(); struct.setJobDescriptionIsSet(true); - BitSet incoming = iprot.readBitSet(5); + BitSet incoming = iprot.readBitSet(8); if (incoming.get(0)) { struct.creationTime = iprot.readI64(); struct.setCreationTimeIsSet(true); @@ -1238,6 +1537,18 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie struct.workingDir = iprot.readString(); struct.setWorkingDirIsSet(true); } + if (incoming.get(5)) { + struct.stdout = iprot.readString(); + struct.setStdoutIsSet(true); + } + if (incoming.get(6)) { + struct.stderr = iprot.readString(); + struct.setStderrIsSet(true); + } + if (incoming.get(7)) { + struct.exitCode = iprot.readI32(); + struct.setExitCodeIsSet(true); + } } } http://git-wip-us.apache.org/repos/asf/airavata/blob/c46e21dc/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 44e7643..ebff219 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-9-3") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-4") 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"); http://git-wip-us.apache.org/repos/asf/airavata/blob/c46e21dc/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 45c3d04..b961278 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-9-3") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-4") 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/c46e21dc/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 3c2e5cb..2dea045 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-9-3") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-4") 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"); http://git-wip-us.apache.org/repos/asf/airavata/blob/c46e21dc/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 018d29e..a498dcf 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-9-3") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-4") 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"); http://git-wip-us.apache.org/repos/asf/airavata/blob/c46e21dc/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 5f00e73..92bbb2e 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-9-3") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-4") 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/c46e21dc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.java index d372cf4..c26bd75 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.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-9-3") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-4") public class ProcessIdentifier implements org.apache.thrift.TBase<ProcessIdentifier, ProcessIdentifier._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessIdentifier> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessIdentifier"); http://git-wip-us.apache.org/repos/asf/airavata/blob/c46e21dc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java index 737b930..3f6006e 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.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-9-3") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-4") public class ProcessStatusChangeEvent implements org.apache.thrift.TBase<ProcessStatusChangeEvent, ProcessStatusChangeEvent._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessStatusChangeEvent> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessStatusChangeEvent"); http://git-wip-us.apache.org/repos/asf/airavata/blob/c46e21dc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java index d71514a..f95bc60 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.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-9-3") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-4") public class ProcessStatusChangeRequestEvent implements org.apache.thrift.TBase<ProcessStatusChangeRequestEvent, ProcessStatusChangeRequestEvent._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessStatusChangeRequestEvent> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessStatusChangeRequestEvent"); http://git-wip-us.apache.org/repos/asf/airavata/blob/c46e21dc/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 16f54d6..1ac4a85 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-9-3") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-4") 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/c46e21dc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.java index 64f700b..70fa453 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.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-9-3") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-4") public class ProcessTerminateEvent implements org.apache.thrift.TBase<ProcessTerminateEvent, ProcessTerminateEvent._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessTerminateEvent> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessTerminateEvent"); http://git-wip-us.apache.org/repos/asf/airavata/blob/c46e21dc/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 0483742..dc3f341 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-9-3") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-4") 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/c46e21dc/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 e70ff5c..a58e16c 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-9-3") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-4") 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"); http://git-wip-us.apache.org/repos/asf/airavata/blob/c46e21dc/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 62e66db..f6d5645 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-9-3") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-4") 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"); http://git-wip-us.apache.org/repos/asf/airavata/blob/c46e21dc/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 7bd2d91..5d37b6b 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-9-3") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-4") 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"); http://git-wip-us.apache.org/repos/asf/airavata/blob/c46e21dc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java index 792af34..c685d14 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java @@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory; * * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-3") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-4") public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, ProcessModel._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessModel> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessModel"); http://git-wip-us.apache.org/repos/asf/airavata/blob/c46e21dc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java index 518ce1a..fd3901f 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java @@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory; * * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-3") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-4") public class ComputationalResourceSchedulingModel implements org.apache.thrift.TBase<ComputationalResourceSchedulingModel, ComputationalResourceSchedulingModel._Fields>, java.io.Serializable, Cloneable, Comparable<ComputationalResourceSchedulingModel> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComputationalResourceSchedulingModel"); http://git-wip-us.apache.org/repos/asf/airavata/blob/c46e21dc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java index 30540e3..1df1ae5 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.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-9-3") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-4") public class AuthzToken implements org.apache.thrift.TBase<AuthzToken, AuthzToken._Fields>, java.io.Serializable, Cloneable, Comparable<AuthzToken> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AuthzToken"); http://git-wip-us.apache.org/repos/asf/airavata/blob/c46e21dc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java index 35e00b7..ec3043e 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java @@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory; * User friendly reason on how the state is inferred. * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-3") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-4") public class ExperimentStatus implements org.apache.thrift.TBase<ExperimentStatus, ExperimentStatus._Fields>, java.io.Serializable, Cloneable, Comparable<ExperimentStatus> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentStatus"); http://git-wip-us.apache.org/repos/asf/airavata/blob/c46e21dc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java index 7e98fd2..b7aa0b2 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.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-9-3") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-4") public class JobStatus implements org.apache.thrift.TBase<JobStatus, JobStatus._Fields>, java.io.Serializable, Cloneable, Comparable<JobStatus> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobStatus"); http://git-wip-us.apache.org/repos/asf/airavata/blob/c46e21dc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java index 151dbe4..0d67cf5 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.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-9-3") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-4") public class ProcessStatus implements org.apache.thrift.TBase<ProcessStatus, ProcessStatus._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessStatus> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessStatus"); http://git-wip-us.apache.org/repos/asf/airavata/blob/c46e21dc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java index fa95d0e..976aa90 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.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-9-3") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-4") public class TaskStatus implements org.apache.thrift.TBase<TaskStatus, TaskStatus._Fields>, java.io.Serializable, Cloneable, Comparable<TaskStatus> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskStatus"); http://git-wip-us.apache.org/repos/asf/airavata/blob/c46e21dc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java index 353266e..e62b446 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java @@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory; * A friendly description of the task, usally used to communicate information to users. * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-3") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-4") public class DataStagingTaskModel implements org.apache.thrift.TBase<DataStagingTaskModel, DataStagingTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<DataStagingTaskModel> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataStagingTaskModel"); http://git-wip-us.apache.org/repos/asf/airavata/blob/c46e21dc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java index c8a86de..9e66b76 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java @@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory; * subTaskModel: * A generic byte object for the Task developer to store internal serialized data into registry catalogs. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-3") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-4") public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<TaskModel> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskModel"); http://git-wip-us.apache.org/repos/asf/airavata/blob/c46e21dc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java index 417ce0b..f0685c0 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.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-9-3") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-4") public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields>, java.io.Serializable, Cloneable, Comparable<Gateway> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Gateway"); http://git-wip-us.apache.org/repos/asf/airavata/blob/c46e21dc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java index 07381a4..ffc1a66 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.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-9-3") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-4") public class Group implements org.apache.thrift.TBase<Group, Group._Fields>, java.io.Serializable, Cloneable, Comparable<Group> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Group"); http://git-wip-us.apache.org/repos/asf/airavata/blob/c46e21dc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java index f98bf7c..10cef37 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.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-9-3") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-4") public class Project implements org.apache.thrift.TBase<Project, Project._Fields>, java.io.Serializable, Cloneable, Comparable<Project> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Project"); http://git-wip-us.apache.org/repos/asf/airavata/blob/c46e21dc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java index 756e091..9ce5bd4 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.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-9-3") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-4") public class User implements org.apache.thrift.TBase<User, User._Fields>, java.io.Serializable, Cloneable, Comparable<User> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("User"); http://git-wip-us.apache.org/repos/asf/airavata/blob/c46e21dc/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java index d0e9636..3eefd7d 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java @@ -488,6 +488,9 @@ public class ExperimentRegistry { jobResource.setComputeResourceConsumed(job.getComputeResourceConsumed()); jobResource.setJobName(job.getJobName()); jobResource.setWorkingDir(job.getWorkingDir()); + jobResource.setExitCode(job.getExitCode()); + jobResource.setStdOut(job.getStdout()); + jobResource.setStderr(job.getStderr()); jobResource.save(); } catch (Exception e) { logger.error(processId, "Error while adding task...", e); @@ -851,6 +854,9 @@ public class ExperimentRegistry { jobResource.setComputeResourceConsumed(job.getComputeResourceConsumed()); jobResource.setJobName(job.getJobName()); jobResource.setWorkingDir(job.getWorkingDir()); + jobResource.setStdOut(job.getStdout()); + jobResource.setStderr(job.getStderr()); + jobResource.setExitCode(job.getExitCode()); jobResource.save(); } catch (Exception e) { logger.error(jobId, "Error while adding job...", e); http://git-wip-us.apache.org/repos/asf/airavata/blob/c46e21dc/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Job.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Job.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Job.java index ae97ed2..d8aac2d 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Job.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Job.java @@ -35,6 +35,9 @@ public class Job { private String taskId; private String processId; private char[] jobDescription; + private char[] stdout; + private char[] stderr; + private int exitCode; private Timestamp creationTime; private String computeResourceConsumed; private String jobName; @@ -82,6 +85,36 @@ public class Job { this.jobDescription = jobDescription; } + @Lob + @Column(name = "STDOUT") + public char[] getStdout() { + return stdout; + } + + public void setStdout(char[] stdout) { + this.stdout = stdout; + } + + @Lob + @Column(name = "STDERR") + public char[] getStderr() { + return stderr; + } + + public void setStderr(char[] stderr) { + this.stderr = stderr; + } + + @Basic + @Column(name = "EXIT_CODE") + public int getExitCode() { + return exitCode; + } + + public void setExitCode(int exitCode) { + this.exitCode = exitCode; + } + @Basic @Column(name = "CREATION_TIME") public Timestamp getCreationTime() { http://git-wip-us.apache.org/repos/asf/airavata/blob/c46e21dc/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/JobResource.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/JobResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/JobResource.java index 10a8ced..a8e6d11 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/JobResource.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/JobResource.java @@ -48,6 +48,9 @@ public class JobResource extends AbstractExpCatResource { private String computeResourceConsumed; private String jobName; private String workingDir; + private String stdOut; + private String stderr; + private int exitCode; public String getJobId() { return jobId; @@ -113,6 +116,30 @@ public class JobResource extends AbstractExpCatResource { this.workingDir = workingDir; } + public String getStdOut() { + return stdOut; + } + + public void setStdOut(String stdOut) { + this.stdOut = stdOut; + } + + public String getStderr() { + return stderr; + } + + public void setStderr(String stderr) { + this.stderr = stderr; + } + + public int getExitCode() { + return exitCode; + } + + public void setExitCode(int exitCode) { + this.exitCode = exitCode; + } + public ExperimentCatResource create(ResourceType type) throws RegistryException { switch (type){ case JOB_STATUS: @@ -263,10 +290,17 @@ public class JobResource extends AbstractExpCatResource { if (jobDescription != null) { job.setJobDescription(jobDescription.toCharArray()); } + if (stdOut != null) { + job.setStdout(stdOut.toCharArray()); + } + if (stderr != null) { + job.setStderr(stderr.toCharArray()); + } job.setCreationTime(creationTime); job.setComputeResourceConsumed(computeResourceConsumed); job.setJobName(jobName); job.setWorkingDir(workingDir); + job.setExitCode(exitCode); em.persist(job); em.getTransaction().commit(); em.close(); http://git-wip-us.apache.org/repos/asf/airavata/blob/c46e21dc/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java index d805116..c42f6db 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java @@ -654,9 +654,16 @@ public class Utils { if (o.getJobDescription() != null){ jobResource.setJobDescription(new String(o.getJobDescription())); } + if (o.getStderr() != null){ + jobResource.setStderr(new String(o.getStderr())); + } + if (o.getStdout() != null){ + jobResource.setStdOut(new String(o.getStdout())); + } jobResource.setComputeResourceConsumed(o.getComputeResourceConsumed()); jobResource.setJobName(o.getJobName()); jobResource.setWorkingDir(o.getWorkingDir()); + jobResource.setExitCode(o.getExitCode()); } return jobResource; } http://git-wip-us.apache.org/repos/asf/airavata/blob/c46e21dc/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java index 0c954f7..fbe5159 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java @@ -403,7 +403,9 @@ public class ThriftDataModelConversion { model.setJobName(jobResource.getJobName()); model.setWorkingDir(jobResource.getWorkingDir()); model.setJobStatus(getJobStatus(jobResource.getJobStatus())); - + model.setExitCode(jobResource.getExitCode()); + model.setStdout(jobResource.getStdOut()); + model.setStderr(jobResource.getStderr()); return model; } http://git-wip-us.apache.org/repos/asf/airavata/blob/c46e21dc/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql b/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql index 6ffe240..c395099 100644 --- a/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql +++ b/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql @@ -306,6 +306,9 @@ CREATE TABLE JOB ( COMPUTE_RESOURCE_CONSUMED varchar(255), JOB_NAME varchar(255), WORKING_DIR varchar(255), + STDOUT CLOB, + STDERR CLOB, + EXIT_CODE INTEGER(11), PRIMARY KEY (JOB_ID, PROCESS_ID), FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE CASCADE ); http://git-wip-us.apache.org/repos/asf/airavata/blob/c46e21dc/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql b/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql index b09f315..12b61ec 100644 --- a/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql +++ b/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql @@ -215,7 +215,7 @@ CREATE TABLE PROCESS_OUTPUT ( PROCESS_ID varchar(255), OUTPUT_NAME varchar(255), - OUTPUT_VALUE text, + OUTPUT_VALUE LONGTEXT, DATA_TYPE varchar(255), APPLICATION_ARGUMENT varchar(255), IS_REQUIRED tinyint(1), @@ -308,6 +308,9 @@ CREATE TABLE JOB ( COMPUTE_RESOURCE_CONSUMED varchar(255), JOB_NAME varchar(255), WORKING_DIR varchar(255), + STDOUT LONGTEXT, + STDERR LONGTEXT, + EXIT_CODE INTEGER(11), PRIMARY KEY (JOB_ID, PROCESS_ID), FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE CASCADE ); http://git-wip-us.apache.org/repos/asf/airavata/blob/c46e21dc/thrift-interface-descriptions/airavata-api/job_model.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/airavata-api/job_model.thrift b/thrift-interface-descriptions/airavata-api/job_model.thrift index f1943a2..bd38c59 100644 --- a/thrift-interface-descriptions/airavata-api/job_model.thrift +++ b/thrift-interface-descriptions/airavata-api/job_model.thrift @@ -34,6 +34,9 @@ struct JobModel { 6: optional status_models.JobStatus jobStatus, 7: optional string computeResourceConsumed, 8: optional string jobName, - 9: optional string workingDir + 9: optional string workingDir, + 10: optional string stdout, + 11: optional string stderr, + 12: optional i32 exitCode }
