Repository: airavata Updated Branches: refs/heads/master 28b845715 -> 940f11757
http://git-wip-us.apache.org/repos/asf/airavata/blob/940f1175/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 7cc6ebd..d20ce9e 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-4") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-5") 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,8 +64,8 @@ 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 STD_OUT_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 STD_ERR_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>(); @@ -83,8 +83,8 @@ 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 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. */ @@ -98,8 +98,8 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie COMPUTE_RESOURCE_CONSUMED((short)7, "computeResourceConsumed"), JOB_NAME((short)8, "jobName"), WORKING_DIR((short)9, "workingDir"), - STDOUT((short)10, "stdout"), - STDERR((short)11, "stderr"), + STD_OUT((short)10, "stdOut"), + STD_ERR((short)11, "stdErr"), EXIT_CODE((short)12, "exitCode"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -133,10 +133,10 @@ 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 10: // STD_OUT + return STD_OUT; + case 11: // STD_ERR + return STD_ERR; case 12: // EXIT_CODE return EXIT_CODE; default: @@ -182,7 +182,7 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie 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,_Fields.STDOUT,_Fields.STDERR,_Fields.EXIT_CODE}; + private static final _Fields optionals[] = {_Fields.CREATION_TIME,_Fields.JOB_STATUS,_Fields.COMPUTE_RESOURCE_CONSUMED,_Fields.JOB_NAME,_Fields.WORKING_DIR,_Fields.STD_OUT,_Fields.STD_ERR,_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); @@ -204,9 +204,9 @@ 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, + tmpMap.put(_Fields.STD_OUT, 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, + tmpMap.put(_Fields.STD_ERR, 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))); @@ -260,11 +260,11 @@ 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.isSetStdOut()) { + this.stdOut = other.stdOut; } - if (other.isSetStderr()) { - this.stderr = other.stderr; + if (other.isSetStdErr()) { + this.stdErr = other.stdErr; } this.exitCode = other.exitCode; } @@ -285,8 +285,8 @@ 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; + this.stdOut = null; + this.stdErr = null; setExitCodeIsSet(false); this.exitCode = 0; } @@ -497,49 +497,49 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie } } - public String getStdout() { - return this.stdout; + public String getStdOut() { + return this.stdOut; } - public void setStdout(String stdout) { - this.stdout = stdout; + public void setStdOut(String stdOut) { + this.stdOut = stdOut; } - public void unsetStdout() { - this.stdout = null; + 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; + /** 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) { + public void setStdOutIsSet(boolean value) { if (!value) { - this.stdout = null; + this.stdOut = null; } } - public String getStderr() { - return this.stderr; + public String getStdErr() { + return this.stdErr; } - public void setStderr(String stderr) { - this.stderr = stderr; + public void setStdErr(String stdErr) { + this.stdErr = stdErr; } - public void unsetStderr() { - this.stderr = null; + 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; + /** 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) { + public void setStdErrIsSet(boolean value) { if (!value) { - this.stderr = null; + this.stdErr = null; } } @@ -639,19 +639,19 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie } break; - case STDOUT: + case STD_OUT: if (value == null) { - unsetStdout(); + unsetStdOut(); } else { - setStdout((String)value); + setStdOut((String)value); } break; - case STDERR: + case STD_ERR: if (value == null) { - unsetStderr(); + unsetStdErr(); } else { - setStderr((String)value); + setStdErr((String)value); } break; @@ -695,11 +695,11 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie case WORKING_DIR: return getWorkingDir(); - case STDOUT: - return getStdout(); + case STD_OUT: + return getStdOut(); - case STDERR: - return getStderr(); + case STD_ERR: + return getStdErr(); case EXIT_CODE: return Integer.valueOf(getExitCode()); @@ -733,10 +733,10 @@ 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 STD_OUT: + return isSetStdOut(); + case STD_ERR: + return isSetStdErr(); case EXIT_CODE: return isSetExitCode(); } @@ -837,21 +837,21 @@ 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)) + 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)) + 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)) + 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)) + if (!this.stdErr.equals(that.stdErr)) return false; } @@ -916,15 +916,15 @@ 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_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_stdErr = true && (isSetStdErr()); + list.add(present_stdErr); + if (present_stdErr) + list.add(stdErr); boolean present_exitCode = true && (isSetExitCode()); list.add(present_exitCode); @@ -1032,22 +1032,22 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie return lastComparison; } } - lastComparison = Boolean.valueOf(isSetStdout()).compareTo(other.isSetStdout()); + 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 (isSetStdOut()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stdOut, other.stdOut); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetStderr()).compareTo(other.isSetStderr()); + 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 (isSetStdErr()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stdErr, other.stdErr); if (lastComparison != 0) { return lastComparison; } @@ -1159,23 +1159,23 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie } first = false; } - if (isSetStdout()) { + if (isSetStdOut()) { if (!first) sb.append(", "); - sb.append("stdout:"); - if (this.stdout == null) { + sb.append("stdOut:"); + if (this.stdOut == null) { sb.append("null"); } else { - sb.append(this.stdout); + sb.append(this.stdOut); } first = false; } - if (isSetStderr()) { + if (isSetStdErr()) { if (!first) sb.append(", "); - sb.append("stderr:"); - if (this.stderr == null) { + sb.append("stdErr:"); + if (this.stdErr == null) { sb.append("null"); } else { - sb.append(this.stderr); + sb.append(this.stdErr); } first = false; } @@ -1322,18 +1322,18 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 10: // STDOUT + case 10: // STD_OUT if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.stdout = iprot.readString(); - struct.setStdoutIsSet(true); + struct.stdOut = iprot.readString(); + struct.setStdOutIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 11: // STDERR + case 11: // STD_ERR if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.stderr = iprot.readString(); - struct.setStderrIsSet(true); + struct.stdErr = iprot.readString(); + struct.setStdErrIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -1412,17 +1412,17 @@ 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); + if (struct.stdOut != null) { + if (struct.isSetStdOut()) { + oprot.writeFieldBegin(STD_OUT_FIELD_DESC); + oprot.writeString(struct.stdOut); oprot.writeFieldEnd(); } } - if (struct.stderr != null) { - if (struct.isSetStderr()) { - oprot.writeFieldBegin(STDERR_FIELD_DESC); - oprot.writeString(struct.stderr); + if (struct.stdErr != null) { + if (struct.isSetStdErr()) { + oprot.writeFieldBegin(STD_ERR_FIELD_DESC); + oprot.writeString(struct.stdErr); oprot.writeFieldEnd(); } } @@ -1468,10 +1468,10 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie if (struct.isSetWorkingDir()) { optionals.set(4); } - if (struct.isSetStdout()) { + if (struct.isSetStdOut()) { optionals.set(5); } - if (struct.isSetStderr()) { + if (struct.isSetStdErr()) { optionals.set(6); } if (struct.isSetExitCode()) { @@ -1493,11 +1493,11 @@ 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.isSetStdOut()) { + oprot.writeString(struct.stdOut); } - if (struct.isSetStderr()) { - oprot.writeString(struct.stderr); + if (struct.isSetStdErr()) { + oprot.writeString(struct.stdErr); } if (struct.isSetExitCode()) { oprot.writeI32(struct.exitCode); @@ -1538,12 +1538,12 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie struct.setWorkingDirIsSet(true); } if (incoming.get(5)) { - struct.stdout = iprot.readString(); - struct.setStdoutIsSet(true); + struct.stdOut = iprot.readString(); + struct.setStdOutIsSet(true); } if (incoming.get(6)) { - struct.stderr = iprot.readString(); - struct.setStderrIsSet(true); + struct.stdErr = iprot.readString(); + struct.setStdErrIsSet(true); } if (incoming.get(7)) { struct.exitCode = iprot.readI32(); http://git-wip-us.apache.org/repos/asf/airavata/blob/940f1175/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 ebff219..0d6bb40 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-4") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-5") 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/940f1175/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 b961278..3f00657 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-4") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-5") 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/940f1175/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 2dea045..9982351 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-4") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-5") 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/940f1175/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 a498dcf..3a7a534 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-4") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-5") 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/940f1175/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 92bbb2e..b4c7429 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-4") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-5") 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/940f1175/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 c26bd75..b30d04c 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-4") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-5") 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/940f1175/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 3f6006e..ae4c40c 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-4") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-5") 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/940f1175/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 f95bc60..e748fa3 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-4") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-5") 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/940f1175/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 1ac4a85..a9bef43 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-4") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-5") 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/940f1175/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 70fa453..58e75a3 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-4") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-5") 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/940f1175/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 dc3f341..69272c8 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-4") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-5") 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/940f1175/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 a58e16c..495a81d 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-4") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-5") 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/940f1175/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 f6d5645..3a6ca68 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-4") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-5") 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/940f1175/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 5d37b6b..c3c4c4e 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-4") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-5") 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/940f1175/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 c685d14..d1313bf 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-4") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-5") 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/940f1175/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 fd3901f..a70ad8d 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-4") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-5") 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/940f1175/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 1df1ae5..bae7288 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-4") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-5") 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/940f1175/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 ec3043e..0cb68fe 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-4") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-5") 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/940f1175/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 b7aa0b2..03f70a4 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-4") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-5") 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/940f1175/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 0d67cf5..59e6a8b 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-4") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-5") 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/940f1175/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 976aa90..ea86a18 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-4") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-5") 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/940f1175/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 e62b446..e111f29 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-4") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-5") 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/940f1175/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 9e66b76..65acc8a 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-4") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-5") 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/940f1175/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 f0685c0..97740d2 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-4") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-5") 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/940f1175/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 ffc1a66..70adc6f 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-4") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-5") 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/940f1175/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 10cef37..f0de8a6 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-4") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-5") 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/940f1175/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 9ce5bd4..ccac173 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-4") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-9-5") 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/940f1175/distribution/src/main/assembly/bin-assembly.xml ---------------------------------------------------------------------- diff --git a/distribution/src/main/assembly/bin-assembly.xml b/distribution/src/main/assembly/bin-assembly.xml index 2116783..62e431b 100644 --- a/distribution/src/main/assembly/bin-assembly.xml +++ b/distribution/src/main/assembly/bin-assembly.xml @@ -134,6 +134,7 @@ <dependencySets> <dependencySet> + <useProjectArtifact>false</useProjectArtifact> <outputDirectory>lib</outputDirectory> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> <includes> http://git-wip-us.apache.org/repos/asf/airavata/blob/940f1175/modules/gfac/gfac-core/pom.xml ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/pom.xml b/modules/gfac/gfac-core/pom.xml index 4d17e5c..6a103b9 100644 --- a/modules/gfac/gfac-core/pom.xml +++ b/modules/gfac/gfac-core/pom.xml @@ -114,12 +114,6 @@ <artifactId>airavata-data-models</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.xmlbeans</groupId> - <artifactId>xmlbeans</artifactId> - <version>${xmlbeans.version}</version> - <scope>compile</scope> - </dependency> <!-- this is the dependency for amqp implementation --> <!-- zookeeper dependencies --> <dependency> http://git-wip-us.apache.org/repos/asf/airavata/blob/940f1175/modules/gfac/gfac-impl/pom.xml ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/pom.xml b/modules/gfac/gfac-impl/pom.xml index 0215c7b..fd0f0b2 100644 --- a/modules/gfac/gfac-impl/pom.xml +++ b/modules/gfac/gfac-impl/pom.xml @@ -62,11 +62,6 @@ <version>262</version> </dependency> <dependency> - <groupId>net.schmizz</groupId> - <artifactId>sshj</artifactId> - <version>0.6.1</version> - </dependency> - <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> <version>2.4.4</version> http://git-wip-us.apache.org/repos/asf/airavata/blob/940f1175/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SSHForkJobSubmissionTask.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SSHForkJobSubmissionTask.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SSHForkJobSubmissionTask.java index 471dbfd..d5e2423 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SSHForkJobSubmissionTask.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SSHForkJobSubmissionTask.java @@ -76,8 +76,8 @@ public class SSHForkJobSubmissionTask implements JobSubmissionTask { JobSubmissionOutput jobSubmissionOutput = remoteCluster.submitBatchJob(jobFile.getPath(), processContext.getWorkingDir()); jobModel.setExitCode(jobSubmissionOutput.getExitCode()); - jobModel.setStderr(jobSubmissionOutput.getStdErr()); - jobModel.setStdout(jobSubmissionOutput.getStdOut()); + jobModel.setStdErr(jobSubmissionOutput.getStdErr()); + jobModel.setStdOut(jobSubmissionOutput.getStdOut()); String jobId = jobSubmissionOutput.getJobId(); if (jobId != null && !jobId.isEmpty()) { jobModel.setJobId(jobId); http://git-wip-us.apache.org/repos/asf/airavata/blob/940f1175/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SSHJobSubmissionTask.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SSHJobSubmissionTask.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SSHJobSubmissionTask.java index 6acc312..3fa786f 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SSHJobSubmissionTask.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SSHJobSubmissionTask.java @@ -77,8 +77,8 @@ public class SSHJobSubmissionTask implements JobSubmissionTask { JobSubmissionOutput jobSubmissionOutput = remoteCluster.submitBatchJob(jobFile.getPath(), processContext.getWorkingDir()); jobModel.setExitCode(jobSubmissionOutput.getExitCode()); - jobModel.setStderr(jobSubmissionOutput.getStdErr()); - jobModel.setStdout(jobSubmissionOutput.getStdOut()); + jobModel.setStdErr(jobSubmissionOutput.getStdErr()); + jobModel.setStdOut(jobSubmissionOutput.getStdOut()); String jobId = jobSubmissionOutput.getJobId(); if (jobId != null && !jobId.isEmpty()) { jobModel.setJobId(jobId); http://git-wip-us.apache.org/repos/asf/airavata/blob/940f1175/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 3eefd7d..aa9a544 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 @@ -489,8 +489,8 @@ public class ExperimentRegistry { jobResource.setJobName(job.getJobName()); jobResource.setWorkingDir(job.getWorkingDir()); jobResource.setExitCode(job.getExitCode()); - jobResource.setStdOut(job.getStdout()); - jobResource.setStderr(job.getStderr()); + jobResource.setStdOut(job.getStdOut()); + jobResource.setStdErr(job.getStdErr()); jobResource.save(); } catch (Exception e) { logger.error(processId, "Error while adding task...", e); @@ -854,8 +854,8 @@ public class ExperimentRegistry { jobResource.setComputeResourceConsumed(job.getComputeResourceConsumed()); jobResource.setJobName(job.getJobName()); jobResource.setWorkingDir(job.getWorkingDir()); - jobResource.setStdOut(job.getStdout()); - jobResource.setStderr(job.getStderr()); + jobResource.setStdOut(job.getStdOut()); + jobResource.setStdErr(job.getStdErr()); jobResource.setExitCode(job.getExitCode()); jobResource.save(); } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/airavata/blob/940f1175/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 d4c1a99..f0e1359 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 @@ -49,7 +49,7 @@ public class JobResource extends AbstractExpCatResource { private String jobName; private String workingDir; private String stdOut; - private String stderr; + private String stdErr; private int exitCode; public String getJobId() { @@ -124,12 +124,12 @@ public class JobResource extends AbstractExpCatResource { this.stdOut = stdOut; } - public String getStderr() { - return stderr; + public String getStdErr() { + return stdErr; } - public void setStderr(String stderr) { - this.stderr = stderr; + public void setStdErr(String stderr) { + this.stdErr = stderr; } public int getExitCode() { @@ -291,8 +291,8 @@ public class JobResource extends AbstractExpCatResource { if (stdOut != null) { job.setStdout(stdOut.toCharArray()); } - if (stderr != null) { - job.setStderr(stderr.toCharArray()); + if (stdErr != null) { + job.setStderr(stdErr.toCharArray()); } job.setCreationTime(creationTime); job.setComputeResourceConsumed(computeResourceConsumed); http://git-wip-us.apache.org/repos/asf/airavata/blob/940f1175/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 c42f6db..97e3976 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 @@ -655,7 +655,7 @@ public class Utils { jobResource.setJobDescription(new String(o.getJobDescription())); } if (o.getStderr() != null){ - jobResource.setStderr(new String(o.getStderr())); + jobResource.setStdErr(new String(o.getStderr())); } if (o.getStdout() != null){ jobResource.setStdOut(new String(o.getStdout())); http://git-wip-us.apache.org/repos/asf/airavata/blob/940f1175/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 fbe5159..5b6e4b6 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 @@ -404,8 +404,8 @@ public class ThriftDataModelConversion { model.setWorkingDir(jobResource.getWorkingDir()); model.setJobStatus(getJobStatus(jobResource.getJobStatus())); model.setExitCode(jobResource.getExitCode()); - model.setStdout(jobResource.getStdOut()); - model.setStderr(jobResource.getStderr()); + model.setStdOut(jobResource.getStdOut()); + model.setStdErr(jobResource.getStdErr()); return model; } http://git-wip-us.apache.org/repos/asf/airavata/blob/940f1175/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 bd38c59..f908c5e 100644 --- a/thrift-interface-descriptions/airavata-api/job_model.thrift +++ b/thrift-interface-descriptions/airavata-api/job_model.thrift @@ -21,7 +21,7 @@ include "status_models.thrift" namespace java org.apache.airavata.model.job - namespace php Airavata.Model.job + namespace php Airavata.Model.Job namespace cpp apache.airavata.model.job namespace py apache.airavata.model.job @@ -35,8 +35,8 @@ struct JobModel { 7: optional string computeResourceConsumed, 8: optional string jobName, 9: optional string workingDir, - 10: optional string stdout, - 11: optional string stderr, + 10: optional string stdOut, + 11: optional string stdErr, 12: optional i32 exitCode }
