You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2015/06/23 23:41:25 UTC
[03/14] airavata git commit: Adding taskId to JobModel
http://git-wip-us.apache.org/repos/asf/airavata/blob/ed63a40a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
index 332482b..935de1f 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
@@ -1,4 +1,21 @@
/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
* Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
@@ -6,17 +23,32 @@
*/
package org.apache.airavata.model.experiment;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
-import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
import javax.annotation.Generated;
-import java.util.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/**
@@ -35,7 +67,7 @@ import java.util.*;
* experimentDescription:
* The verbose description of the experiment. This is an optional parameter.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-22")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel, ExperimentModel._Fields>, java.io.Serializable, Cloneable, Comparable<ExperimentModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentModel");
@@ -63,27 +95,23 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
schemes.put(TupleScheme.class, new ExperimentModelTupleSchemeFactory());
}
- public String experimentId; // required
- public String projectId; // required
- public String gatewayId; // required
- /**
- *
- * @see org.apache.airavata.model.experiment.ExperimentType
- */
- public ExperimentType experimentType; // required
- public String userName; // required
- public String experimentName; // required
- public long creationTime; // optional
- public String description; // optional
- public String executionId; // optional
- public String gatewayExecutionId; // optional
- public boolean enableEmailNotification; // optional
- public List<String> emailAddresses; // optional
- public UserConfigurationDataModel userConfigurationData; // optional
- public List<org.apache.airavata.model.application.io.InputDataObjectType> experimentInputs; // optional
- public List<org.apache.airavata.model.application.io.OutputDataObjectType> experimentOutputs; // optional
- public org.apache.airavata.model.status.ExperimentStatus experimentStatus; // optional
- public List<org.apache.airavata.model.commons.ErrorModel> errors; // optional
+ private String experimentId; // required
+ private String projectId; // required
+ private String gatewayId; // required
+ private ExperimentType experimentType; // required
+ private String userName; // required
+ private String experimentName; // required
+ private long creationTime; // optional
+ private String description; // optional
+ private String executionId; // optional
+ private String gatewayExecutionId; // optional
+ private boolean enableEmailNotification; // optional
+ private List<String> emailAddresses; // optional
+ private UserConfigurationDataModel userConfigurationData; // optional
+ private List<org.apache.airavata.model.application.io.InputDataObjectType> experimentInputs; // optional
+ private List<org.apache.airavata.model.application.io.OutputDataObjectType> experimentOutputs; // optional
+ private org.apache.airavata.model.status.ExperimentStatus experimentStatus; // optional
+ private List<org.apache.airavata.model.commons.ErrorModel> errors; // 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 {
@@ -92,7 +120,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
GATEWAY_ID((short)3, "gatewayId"),
/**
*
- * @see org.apache.airavata.model.experiment.ExperimentType
+ * @see ExperimentType
*/
EXPERIMENT_TYPE((short)4, "experimentType"),
USER_NAME((short)5, "userName"),
@@ -246,11 +274,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
}
public ExperimentModel() {
- this.experimentId = "DO_NOT_SET_AT_CLIENTS";
-
- this.projectId = "DEFAULT_PROJECT";
-
- this.experimentType = ExperimentType.SINGLE_APPLICATION;
+ this.experimentType = org.apache.airavata.model.experiment.ExperimentType.SINGLE_APPLICATION;
}
@@ -344,12 +368,10 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
@Override
public void clear() {
- this.experimentId = "DO_NOT_SET_AT_CLIENTS";
-
- this.projectId = "DEFAULT_PROJECT";
-
+ this.experimentId = null;
+ this.projectId = null;
this.gatewayId = null;
- this.experimentType = ExperimentType.SINGLE_APPLICATION;
+ this.experimentType = org.apache.airavata.model.experiment.ExperimentType.SINGLE_APPLICATION;
this.userName = null;
this.experimentName = null;
@@ -372,9 +394,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.experimentId;
}
- public ExperimentModel setExperimentId(String experimentId) {
+ public void setExperimentId(String experimentId) {
this.experimentId = experimentId;
- return this;
}
public void unsetExperimentId() {
@@ -396,9 +417,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.projectId;
}
- public ExperimentModel setProjectId(String projectId) {
+ public void setProjectId(String projectId) {
this.projectId = projectId;
- return this;
}
public void unsetProjectId() {
@@ -420,9 +440,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.gatewayId;
}
- public ExperimentModel setGatewayId(String gatewayId) {
+ public void setGatewayId(String gatewayId) {
this.gatewayId = gatewayId;
- return this;
}
public void unsetGatewayId() {
@@ -442,7 +461,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
/**
*
- * @see org.apache.airavata.model.experiment.ExperimentType
+ * @see ExperimentType
*/
public ExperimentType getExperimentType() {
return this.experimentType;
@@ -450,11 +469,10 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
/**
*
- * @see org.apache.airavata.model.experiment.ExperimentType
+ * @see ExperimentType
*/
- public ExperimentModel setExperimentType(ExperimentType experimentType) {
+ public void setExperimentType(ExperimentType experimentType) {
this.experimentType = experimentType;
- return this;
}
public void unsetExperimentType() {
@@ -476,9 +494,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.userName;
}
- public ExperimentModel setUserName(String userName) {
+ public void setUserName(String userName) {
this.userName = userName;
- return this;
}
public void unsetUserName() {
@@ -500,9 +517,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.experimentName;
}
- public ExperimentModel setExperimentName(String experimentName) {
+ public void setExperimentName(String experimentName) {
this.experimentName = experimentName;
- return this;
}
public void unsetExperimentName() {
@@ -524,10 +540,9 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.creationTime;
}
- public ExperimentModel setCreationTime(long creationTime) {
+ public void setCreationTime(long creationTime) {
this.creationTime = creationTime;
setCreationTimeIsSet(true);
- return this;
}
public void unsetCreationTime() {
@@ -547,9 +562,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.description;
}
- public ExperimentModel setDescription(String description) {
+ public void setDescription(String description) {
this.description = description;
- return this;
}
public void unsetDescription() {
@@ -571,9 +585,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.executionId;
}
- public ExperimentModel setExecutionId(String executionId) {
+ public void setExecutionId(String executionId) {
this.executionId = executionId;
- return this;
}
public void unsetExecutionId() {
@@ -595,9 +608,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.gatewayExecutionId;
}
- public ExperimentModel setGatewayExecutionId(String gatewayExecutionId) {
+ public void setGatewayExecutionId(String gatewayExecutionId) {
this.gatewayExecutionId = gatewayExecutionId;
- return this;
}
public void unsetGatewayExecutionId() {
@@ -619,10 +631,9 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.enableEmailNotification;
}
- public ExperimentModel setEnableEmailNotification(boolean enableEmailNotification) {
+ public void setEnableEmailNotification(boolean enableEmailNotification) {
this.enableEmailNotification = enableEmailNotification;
setEnableEmailNotificationIsSet(true);
- return this;
}
public void unsetEnableEmailNotification() {
@@ -657,9 +668,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.emailAddresses;
}
- public ExperimentModel setEmailAddresses(List<String> emailAddresses) {
+ public void setEmailAddresses(List<String> emailAddresses) {
this.emailAddresses = emailAddresses;
- return this;
}
public void unsetEmailAddresses() {
@@ -681,9 +691,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.userConfigurationData;
}
- public ExperimentModel setUserConfigurationData(UserConfigurationDataModel userConfigurationData) {
+ public void setUserConfigurationData(UserConfigurationDataModel userConfigurationData) {
this.userConfigurationData = userConfigurationData;
- return this;
}
public void unsetUserConfigurationData() {
@@ -720,9 +729,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.experimentInputs;
}
- public ExperimentModel setExperimentInputs(List<org.apache.airavata.model.application.io.InputDataObjectType> experimentInputs) {
+ public void setExperimentInputs(List<org.apache.airavata.model.application.io.InputDataObjectType> experimentInputs) {
this.experimentInputs = experimentInputs;
- return this;
}
public void unsetExperimentInputs() {
@@ -759,9 +767,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.experimentOutputs;
}
- public ExperimentModel setExperimentOutputs(List<org.apache.airavata.model.application.io.OutputDataObjectType> experimentOutputs) {
+ public void setExperimentOutputs(List<org.apache.airavata.model.application.io.OutputDataObjectType> experimentOutputs) {
this.experimentOutputs = experimentOutputs;
- return this;
}
public void unsetExperimentOutputs() {
@@ -783,9 +790,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.experimentStatus;
}
- public ExperimentModel setExperimentStatus(org.apache.airavata.model.status.ExperimentStatus experimentStatus) {
+ public void setExperimentStatus(org.apache.airavata.model.status.ExperimentStatus experimentStatus) {
this.experimentStatus = experimentStatus;
- return this;
}
public void unsetExperimentStatus() {
@@ -822,9 +828,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.errors;
}
- public ExperimentModel setErrors(List<org.apache.airavata.model.commons.ErrorModel> errors) {
+ public void setErrors(List<org.apache.airavata.model.commons.ErrorModel> errors) {
this.errors = errors;
- return this;
}
public void unsetErrors() {
@@ -1531,11 +1536,11 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return _Fields.findByThriftId(fieldId);
}
- public void read(org.apache.thrift.protocol.TProtocol iprot) throws TException {
+ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
- public void write(org.apache.thrift.protocol.TProtocol oprot) throws TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@@ -1697,26 +1702,32 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return sb.toString();
}
- public void validate() throws TException {
+ public void validate() throws org.apache.thrift.TException {
// check for required fields
- if (experimentId == null) {
- throw new TProtocolException("Required field 'experimentId' was not present! Struct: " + toString());
+ if (!isSetExperimentId()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'experimentId' is unset! Struct:" + toString());
}
- if (projectId == null) {
- throw new TProtocolException("Required field 'projectId' was not present! Struct: " + toString());
+
+ if (!isSetProjectId()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'projectId' is unset! Struct:" + toString());
}
- if (gatewayId == null) {
- throw new TProtocolException("Required field 'gatewayId' was not present! Struct: " + toString());
+
+ if (!isSetGatewayId()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'gatewayId' is unset! Struct:" + toString());
}
- if (experimentType == null) {
- throw new TProtocolException("Required field 'experimentType' was not present! Struct: " + toString());
+
+ if (!isSetExperimentType()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'experimentType' is unset! Struct:" + toString());
}
- if (userName == null) {
- throw new TProtocolException("Required field 'userName' was not present! Struct: " + toString());
+
+ if (!isSetUserName()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'userName' is unset! Struct:" + toString());
}
- if (experimentName == null) {
- throw new TProtocolException("Required field 'experimentName' was not present! Struct: " + toString());
+
+ if (!isSetExperimentName()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'experimentName' is unset! Struct:" + toString());
}
+
// check for sub-struct validity
if (userConfigurationData != null) {
userConfigurationData.validate();
@@ -1729,7 +1740,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
try {
write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
- } catch (TException te) {
+ } catch (org.apache.thrift.TException te) {
throw new java.io.IOException(te);
}
}
@@ -1739,7 +1750,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
// it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
__isset_bitfield = 0;
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
- } catch (TException te) {
+ } catch (org.apache.thrift.TException te) {
throw new java.io.IOException(te);
}
}
@@ -1752,7 +1763,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
private static class ExperimentModelStandardScheme extends StandardScheme<ExperimentModel> {
- public void read(org.apache.thrift.protocol.TProtocol iprot, ExperimentModel struct) throws TException {
+ public void read(org.apache.thrift.protocol.TProtocol iprot, ExperimentModel struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
iprot.readStructBegin();
while (true)
@@ -1788,7 +1799,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
break;
case 4: // EXPERIMENT_TYPE
if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
- struct.experimentType = ExperimentType.findByValue(iprot.readI32());
+ struct.experimentType = org.apache.airavata.model.experiment.ExperimentType.findByValue(iprot.readI32());
struct.setExperimentTypeIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -1949,12 +1960,10 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
iprot.readFieldEnd();
}
iprot.readStructEnd();
-
- // check for required fields of primitive type, which can't be checked in the validate method
struct.validate();
}
- public void write(org.apache.thrift.protocol.TProtocol oprot, ExperimentModel struct) throws TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot, ExperimentModel struct) throws org.apache.thrift.TException {
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
@@ -2104,7 +2113,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
private static class ExperimentModelTupleScheme extends TupleScheme<ExperimentModel> {
@Override
- public void write(org.apache.thrift.protocol.TProtocol prot, ExperimentModel struct) throws TException {
+ public void write(org.apache.thrift.protocol.TProtocol prot, ExperimentModel struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
oprot.writeString(struct.experimentId);
oprot.writeString(struct.projectId);
@@ -2207,7 +2216,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
}
@Override
- public void read(org.apache.thrift.protocol.TProtocol prot, ExperimentModel struct) throws TException {
+ public void read(org.apache.thrift.protocol.TProtocol prot, ExperimentModel struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
struct.experimentId = iprot.readString();
struct.setExperimentIdIsSet(true);
@@ -2215,7 +2224,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
struct.setProjectIdIsSet(true);
struct.gatewayId = iprot.readString();
struct.setGatewayIdIsSet(true);
- struct.experimentType = ExperimentType.findByValue(iprot.readI32());
+ struct.experimentType = org.apache.airavata.model.experiment.ExperimentType.findByValue(iprot.readI32());
struct.setExperimentTypeIsSet(true);
struct.userName = iprot.readString();
struct.setUserNameIsSet(true);
http://git-wip-us.apache.org/repos/asf/airavata/blob/ed63a40a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentStatistics.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentStatistics.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentStatistics.java
index cd64683..ed91100 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentStatistics.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentStatistics.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentStatistics, ExperimentStatistics._Fields>, java.io.Serializable, Cloneable, Comparable<ExperimentStatistics> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentStatistics");
http://git-wip-us.apache.org/repos/asf/airavata/blob/ed63a40a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentSummaryModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentSummaryModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentSummaryModel.java
index 64918ff..3c43807 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentSummaryModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentSummaryModel.java
@@ -1,4 +1,21 @@
/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
* Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
@@ -6,20 +23,35 @@
*/
package org.apache.airavata.model.experiment;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
-import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
import javax.annotation.Generated;
-import java.util.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-22")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
public class ExperimentSummaryModel implements org.apache.thrift.TBase<ExperimentSummaryModel, ExperimentSummaryModel._Fields>, java.io.Serializable, Cloneable, Comparable<ExperimentSummaryModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentSummaryModel");
@@ -40,16 +72,16 @@ public class ExperimentSummaryModel implements org.apache.thrift.TBase<Experimen
schemes.put(TupleScheme.class, new ExperimentSummaryModelTupleSchemeFactory());
}
- public String experimentId; // required
- public String projectId; // required
- public String gatewayId; // required
- public long creationTime; // optional
- public String userName; // required
- public String name; // required
- public String description; // optional
- public String executionId; // optional
- public String experimentStatus; // optional
- public long statusUpdateTime; // optional
+ private String experimentId; // required
+ private String projectId; // required
+ private String gatewayId; // required
+ private long creationTime; // optional
+ private String userName; // required
+ private String name; // required
+ private String description; // optional
+ private String executionId; // optional
+ private String experimentStatus; // optional
+ private long statusUpdateTime; // 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 {
@@ -243,9 +275,8 @@ public class ExperimentSummaryModel implements org.apache.thrift.TBase<Experimen
return this.experimentId;
}
- public ExperimentSummaryModel setExperimentId(String experimentId) {
+ public void setExperimentId(String experimentId) {
this.experimentId = experimentId;
- return this;
}
public void unsetExperimentId() {
@@ -267,9 +298,8 @@ public class ExperimentSummaryModel implements org.apache.thrift.TBase<Experimen
return this.projectId;
}
- public ExperimentSummaryModel setProjectId(String projectId) {
+ public void setProjectId(String projectId) {
this.projectId = projectId;
- return this;
}
public void unsetProjectId() {
@@ -291,9 +321,8 @@ public class ExperimentSummaryModel implements org.apache.thrift.TBase<Experimen
return this.gatewayId;
}
- public ExperimentSummaryModel setGatewayId(String gatewayId) {
+ public void setGatewayId(String gatewayId) {
this.gatewayId = gatewayId;
- return this;
}
public void unsetGatewayId() {
@@ -315,10 +344,9 @@ public class ExperimentSummaryModel implements org.apache.thrift.TBase<Experimen
return this.creationTime;
}
- public ExperimentSummaryModel setCreationTime(long creationTime) {
+ public void setCreationTime(long creationTime) {
this.creationTime = creationTime;
setCreationTimeIsSet(true);
- return this;
}
public void unsetCreationTime() {
@@ -338,9 +366,8 @@ public class ExperimentSummaryModel implements org.apache.thrift.TBase<Experimen
return this.userName;
}
- public ExperimentSummaryModel setUserName(String userName) {
+ public void setUserName(String userName) {
this.userName = userName;
- return this;
}
public void unsetUserName() {
@@ -362,9 +389,8 @@ public class ExperimentSummaryModel implements org.apache.thrift.TBase<Experimen
return this.name;
}
- public ExperimentSummaryModel setName(String name) {
+ public void setName(String name) {
this.name = name;
- return this;
}
public void unsetName() {
@@ -386,9 +412,8 @@ public class ExperimentSummaryModel implements org.apache.thrift.TBase<Experimen
return this.description;
}
- public ExperimentSummaryModel setDescription(String description) {
+ public void setDescription(String description) {
this.description = description;
- return this;
}
public void unsetDescription() {
@@ -410,9 +435,8 @@ public class ExperimentSummaryModel implements org.apache.thrift.TBase<Experimen
return this.executionId;
}
- public ExperimentSummaryModel setExecutionId(String executionId) {
+ public void setExecutionId(String executionId) {
this.executionId = executionId;
- return this;
}
public void unsetExecutionId() {
@@ -434,9 +458,8 @@ public class ExperimentSummaryModel implements org.apache.thrift.TBase<Experimen
return this.experimentStatus;
}
- public ExperimentSummaryModel setExperimentStatus(String experimentStatus) {
+ public void setExperimentStatus(String experimentStatus) {
this.experimentStatus = experimentStatus;
- return this;
}
public void unsetExperimentStatus() {
@@ -458,10 +481,9 @@ public class ExperimentSummaryModel implements org.apache.thrift.TBase<Experimen
return this.statusUpdateTime;
}
- public ExperimentSummaryModel setStatusUpdateTime(long statusUpdateTime) {
+ public void setStatusUpdateTime(long statusUpdateTime) {
this.statusUpdateTime = statusUpdateTime;
setStatusUpdateTimeIsSet(true);
- return this;
}
public void unsetStatusUpdateTime() {
@@ -907,11 +929,11 @@ public class ExperimentSummaryModel implements org.apache.thrift.TBase<Experimen
return _Fields.findByThriftId(fieldId);
}
- public void read(org.apache.thrift.protocol.TProtocol iprot) throws TException {
+ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
- public void write(org.apache.thrift.protocol.TProtocol oprot) throws TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@@ -1005,30 +1027,35 @@ public class ExperimentSummaryModel implements org.apache.thrift.TBase<Experimen
return sb.toString();
}
- public void validate() throws TException {
+ public void validate() throws org.apache.thrift.TException {
// check for required fields
- if (experimentId == null) {
- throw new TProtocolException("Required field 'experimentId' was not present! Struct: " + toString());
+ if (!isSetExperimentId()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'experimentId' is unset! Struct:" + toString());
}
- if (projectId == null) {
- throw new TProtocolException("Required field 'projectId' was not present! Struct: " + toString());
+
+ if (!isSetProjectId()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'projectId' is unset! Struct:" + toString());
}
- if (gatewayId == null) {
- throw new TProtocolException("Required field 'gatewayId' was not present! Struct: " + toString());
+
+ if (!isSetGatewayId()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'gatewayId' is unset! Struct:" + toString());
}
- if (userName == null) {
- throw new TProtocolException("Required field 'userName' was not present! Struct: " + toString());
+
+ if (!isSetUserName()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'userName' is unset! Struct:" + toString());
}
- if (name == null) {
- throw new TProtocolException("Required field 'name' was not present! Struct: " + toString());
+
+ if (!isSetName()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'name' is unset! Struct:" + toString());
}
+
// check for sub-struct validity
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
try {
write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
- } catch (TException te) {
+ } catch (org.apache.thrift.TException te) {
throw new java.io.IOException(te);
}
}
@@ -1038,7 +1065,7 @@ public class ExperimentSummaryModel implements org.apache.thrift.TBase<Experimen
// it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
__isset_bitfield = 0;
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
- } catch (TException te) {
+ } catch (org.apache.thrift.TException te) {
throw new java.io.IOException(te);
}
}
@@ -1051,7 +1078,7 @@ public class ExperimentSummaryModel implements org.apache.thrift.TBase<Experimen
private static class ExperimentSummaryModelStandardScheme extends StandardScheme<ExperimentSummaryModel> {
- public void read(org.apache.thrift.protocol.TProtocol iprot, ExperimentSummaryModel struct) throws TException {
+ public void read(org.apache.thrift.protocol.TProtocol iprot, ExperimentSummaryModel struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
iprot.readStructBegin();
while (true)
@@ -1147,12 +1174,10 @@ public class ExperimentSummaryModel implements org.apache.thrift.TBase<Experimen
iprot.readFieldEnd();
}
iprot.readStructEnd();
-
- // check for required fields of primitive type, which can't be checked in the validate method
struct.validate();
}
- public void write(org.apache.thrift.protocol.TProtocol oprot, ExperimentSummaryModel struct) throws TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot, ExperimentSummaryModel struct) throws org.apache.thrift.TException {
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
@@ -1227,7 +1252,7 @@ public class ExperimentSummaryModel implements org.apache.thrift.TBase<Experimen
private static class ExperimentSummaryModelTupleScheme extends TupleScheme<ExperimentSummaryModel> {
@Override
- public void write(org.apache.thrift.protocol.TProtocol prot, ExperimentSummaryModel struct) throws TException {
+ public void write(org.apache.thrift.protocol.TProtocol prot, ExperimentSummaryModel struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
oprot.writeString(struct.experimentId);
oprot.writeString(struct.projectId);
@@ -1269,7 +1294,7 @@ public class ExperimentSummaryModel implements org.apache.thrift.TBase<Experimen
}
@Override
- public void read(org.apache.thrift.protocol.TProtocol prot, ExperimentSummaryModel struct) throws TException {
+ public void read(org.apache.thrift.protocol.TProtocol prot, ExperimentSummaryModel struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
struct.experimentId = iprot.readString();
struct.setExperimentIdIsSet(true);
http://git-wip-us.apache.org/repos/asf/airavata/blob/ed63a40a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/UserConfigurationDataModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/UserConfigurationDataModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/UserConfigurationDataModel.java
index 2315ee3..08e798c 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/UserConfigurationDataModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/UserConfigurationDataModel.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
public class UserConfigurationDataModel implements org.apache.thrift.TBase<UserConfigurationDataModel, UserConfigurationDataModel._Fields>, java.io.Serializable, Cloneable, Comparable<UserConfigurationDataModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UserConfigurationDataModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/ed63a40a/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 21c5e74..4607d89 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,17 +51,18 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fields>, java.io.Serializable, Cloneable, Comparable<JobModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobModel");
private static final org.apache.thrift.protocol.TField JOB_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("jobId", org.apache.thrift.protocol.TType.STRING, (short)1);
- private static final org.apache.thrift.protocol.TField JOB_DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("jobDescription", org.apache.thrift.protocol.TType.STRING, (short)2);
- private static final org.apache.thrift.protocol.TField CREATION_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("creationTime", org.apache.thrift.protocol.TType.I64, (short)3);
- private static final org.apache.thrift.protocol.TField JOB_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("jobStatus", org.apache.thrift.protocol.TType.STRUCT, (short)4);
- private static final org.apache.thrift.protocol.TField COMPUTE_RESOURCE_CONSUMED_FIELD_DESC = new org.apache.thrift.protocol.TField("computeResourceConsumed", org.apache.thrift.protocol.TType.STRING, (short)7);
- private static final org.apache.thrift.protocol.TField JOB_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("jobName", org.apache.thrift.protocol.TType.STRING, (short)8);
- private static final org.apache.thrift.protocol.TField WORKING_DIR_FIELD_DESC = new org.apache.thrift.protocol.TField("workingDir", org.apache.thrift.protocol.TType.STRING, (short)9);
+ private static final org.apache.thrift.protocol.TField TASK_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("taskId", org.apache.thrift.protocol.TType.STRING, (short)2);
+ private static final org.apache.thrift.protocol.TField JOB_DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("jobDescription", org.apache.thrift.protocol.TType.STRING, (short)3);
+ private static final org.apache.thrift.protocol.TField CREATION_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("creationTime", org.apache.thrift.protocol.TType.I64, (short)4);
+ private static final org.apache.thrift.protocol.TField JOB_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("jobStatus", org.apache.thrift.protocol.TType.STRUCT, (short)5);
+ 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)6);
+ 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)7);
+ 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)8);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -70,6 +71,7 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
}
private String jobId; // required
+ private String taskId; // required
private String jobDescription; // required
private long creationTime; // optional
private org.apache.airavata.model.status.JobStatus jobStatus; // optional
@@ -80,12 +82,13 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
JOB_ID((short)1, "jobId"),
- JOB_DESCRIPTION((short)2, "jobDescription"),
- CREATION_TIME((short)3, "creationTime"),
- JOB_STATUS((short)4, "jobStatus"),
- COMPUTE_RESOURCE_CONSUMED((short)7, "computeResourceConsumed"),
- JOB_NAME((short)8, "jobName"),
- WORKING_DIR((short)9, "workingDir");
+ TASK_ID((short)2, "taskId"),
+ JOB_DESCRIPTION((short)3, "jobDescription"),
+ CREATION_TIME((short)4, "creationTime"),
+ JOB_STATUS((short)5, "jobStatus"),
+ COMPUTE_RESOURCE_CONSUMED((short)6, "computeResourceConsumed"),
+ JOB_NAME((short)7, "jobName"),
+ WORKING_DIR((short)8, "workingDir");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -102,17 +105,19 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
switch(fieldId) {
case 1: // JOB_ID
return JOB_ID;
- case 2: // JOB_DESCRIPTION
+ case 2: // TASK_ID
+ return TASK_ID;
+ case 3: // JOB_DESCRIPTION
return JOB_DESCRIPTION;
- case 3: // CREATION_TIME
+ case 4: // CREATION_TIME
return CREATION_TIME;
- case 4: // JOB_STATUS
+ case 5: // JOB_STATUS
return JOB_STATUS;
- case 7: // COMPUTE_RESOURCE_CONSUMED
+ case 6: // COMPUTE_RESOURCE_CONSUMED
return COMPUTE_RESOURCE_CONSUMED;
- case 8: // JOB_NAME
+ case 7: // JOB_NAME
return JOB_NAME;
- case 9: // WORKING_DIR
+ case 8: // WORKING_DIR
return WORKING_DIR;
default:
return null;
@@ -162,6 +167,8 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
tmpMap.put(_Fields.JOB_ID, new org.apache.thrift.meta_data.FieldMetaData("jobId", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.TASK_ID, new org.apache.thrift.meta_data.FieldMetaData("taskId", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.JOB_DESCRIPTION, new org.apache.thrift.meta_data.FieldMetaData("jobDescription", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.CREATION_TIME, new org.apache.thrift.meta_data.FieldMetaData("creationTime", org.apache.thrift.TFieldRequirementType.OPTIONAL,
@@ -183,10 +190,12 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
public JobModel(
String jobId,
+ String taskId,
String jobDescription)
{
this();
this.jobId = jobId;
+ this.taskId = taskId;
this.jobDescription = jobDescription;
}
@@ -198,6 +207,9 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
if (other.isSetJobId()) {
this.jobId = other.jobId;
}
+ if (other.isSetTaskId()) {
+ this.taskId = other.taskId;
+ }
if (other.isSetJobDescription()) {
this.jobDescription = other.jobDescription;
}
@@ -223,6 +235,7 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
@Override
public void clear() {
this.jobId = null;
+ this.taskId = null;
this.jobDescription = null;
setCreationTimeIsSet(false);
this.creationTime = 0;
@@ -255,6 +268,29 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
}
}
+ public String getTaskId() {
+ return this.taskId;
+ }
+
+ public void setTaskId(String taskId) {
+ this.taskId = taskId;
+ }
+
+ public void unsetTaskId() {
+ this.taskId = null;
+ }
+
+ /** Returns true if field taskId is set (has been assigned a value) and false otherwise */
+ public boolean isSetTaskId() {
+ return this.taskId != null;
+ }
+
+ public void setTaskIdIsSet(boolean value) {
+ if (!value) {
+ this.taskId = null;
+ }
+ }
+
public String getJobDescription() {
return this.jobDescription;
}
@@ -402,6 +438,14 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
}
break;
+ case TASK_ID:
+ if (value == null) {
+ unsetTaskId();
+ } else {
+ setTaskId((String)value);
+ }
+ break;
+
case JOB_DESCRIPTION:
if (value == null) {
unsetJobDescription();
@@ -458,6 +502,9 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
case JOB_ID:
return getJobId();
+ case TASK_ID:
+ return getTaskId();
+
case JOB_DESCRIPTION:
return getJobDescription();
@@ -489,6 +536,8 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
switch (field) {
case JOB_ID:
return isSetJobId();
+ case TASK_ID:
+ return isSetTaskId();
case JOB_DESCRIPTION:
return isSetJobDescription();
case CREATION_TIME:
@@ -527,6 +576,15 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
return false;
}
+ boolean this_present_taskId = true && this.isSetTaskId();
+ boolean that_present_taskId = true && that.isSetTaskId();
+ if (this_present_taskId || that_present_taskId) {
+ if (!(this_present_taskId && that_present_taskId))
+ return false;
+ if (!this.taskId.equals(that.taskId))
+ return false;
+ }
+
boolean this_present_jobDescription = true && this.isSetJobDescription();
boolean that_present_jobDescription = true && that.isSetJobDescription();
if (this_present_jobDescription || that_present_jobDescription) {
@@ -593,6 +651,11 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
if (present_jobId)
list.add(jobId);
+ boolean present_taskId = true && (isSetTaskId());
+ list.add(present_taskId);
+ if (present_taskId)
+ list.add(taskId);
+
boolean present_jobDescription = true && (isSetJobDescription());
list.add(present_jobDescription);
if (present_jobDescription)
@@ -644,6 +707,16 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetTaskId()).compareTo(other.isSetTaskId());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetTaskId()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.taskId, other.taskId);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
lastComparison = Boolean.valueOf(isSetJobDescription()).compareTo(other.isSetJobDescription());
if (lastComparison != 0) {
return lastComparison;
@@ -732,6 +805,14 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
}
first = false;
if (!first) sb.append(", ");
+ sb.append("taskId:");
+ if (this.taskId == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.taskId);
+ }
+ first = false;
+ if (!first) sb.append(", ");
sb.append("jobDescription:");
if (this.jobDescription == null) {
sb.append("null");
@@ -795,6 +876,10 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
throw new org.apache.thrift.protocol.TProtocolException("Required field 'jobId' is unset! Struct:" + toString());
}
+ if (!isSetTaskId()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'taskId' is unset! Struct:" + toString());
+ }
+
if (!isSetJobDescription()) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'jobDescription' is unset! Struct:" + toString());
}
@@ -849,7 +934,15 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 2: // JOB_DESCRIPTION
+ case 2: // TASK_ID
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.taskId = iprot.readString();
+ struct.setTaskIdIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 3: // JOB_DESCRIPTION
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.jobDescription = iprot.readString();
struct.setJobDescriptionIsSet(true);
@@ -857,7 +950,7 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 3: // CREATION_TIME
+ case 4: // CREATION_TIME
if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
struct.creationTime = iprot.readI64();
struct.setCreationTimeIsSet(true);
@@ -865,7 +958,7 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 4: // JOB_STATUS
+ case 5: // JOB_STATUS
if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
struct.jobStatus = new org.apache.airavata.model.status.JobStatus();
struct.jobStatus.read(iprot);
@@ -874,7 +967,7 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 7: // COMPUTE_RESOURCE_CONSUMED
+ case 6: // COMPUTE_RESOURCE_CONSUMED
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.computeResourceConsumed = iprot.readString();
struct.setComputeResourceConsumedIsSet(true);
@@ -882,7 +975,7 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 8: // JOB_NAME
+ case 7: // JOB_NAME
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.jobName = iprot.readString();
struct.setJobNameIsSet(true);
@@ -890,7 +983,7 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 9: // WORKING_DIR
+ case 8: // WORKING_DIR
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.workingDir = iprot.readString();
struct.setWorkingDirIsSet(true);
@@ -916,6 +1009,11 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
oprot.writeString(struct.jobId);
oprot.writeFieldEnd();
}
+ if (struct.taskId != null) {
+ oprot.writeFieldBegin(TASK_ID_FIELD_DESC);
+ oprot.writeString(struct.taskId);
+ oprot.writeFieldEnd();
+ }
if (struct.jobDescription != null) {
oprot.writeFieldBegin(JOB_DESCRIPTION_FIELD_DESC);
oprot.writeString(struct.jobDescription);
@@ -972,6 +1070,7 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
public void write(org.apache.thrift.protocol.TProtocol prot, JobModel struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
oprot.writeString(struct.jobId);
+ oprot.writeString(struct.taskId);
oprot.writeString(struct.jobDescription);
BitSet optionals = new BitSet();
if (struct.isSetCreationTime()) {
@@ -1012,6 +1111,8 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
TTupleProtocol iprot = (TTupleProtocol) prot;
struct.jobId = iprot.readString();
struct.setJobIdIsSet(true);
+ struct.taskId = iprot.readString();
+ struct.setTaskIdIsSet(true);
struct.jobDescription = iprot.readString();
struct.setJobDescriptionIsSet(true);
BitSet incoming = iprot.readBitSet(5);
http://git-wip-us.apache.org/repos/asf/airavata/blob/ed63a40a/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 be23363..a2375d8 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 5ced6f7..599c2cc 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 c807853..1bd7beb 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 817a79a..03b851f 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 4f3eb57..2a7bfc6 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 e6bc73f..ee1db51 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 4d1429e..95f9834 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 53e2833..1e67e54 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 ddd7a39..59673aa 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 3f039e8..4f2ed69 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskSubmitEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskSubmitEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskSubmitEvent.java
index 8c9cada..6118429 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskSubmitEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskSubmitEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
public class TaskSubmitEvent implements org.apache.thrift.TBase<TaskSubmitEvent, TaskSubmitEvent._Fields>, java.io.Serializable, Cloneable, Comparable<TaskSubmitEvent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskSubmitEvent");
http://git-wip-us.apache.org/repos/asf/airavata/blob/ed63a40a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskTerminateEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskTerminateEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskTerminateEvent.java
index 6e766c8..7d31cc9 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskTerminateEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskTerminateEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
public class TaskTerminateEvent implements org.apache.thrift.TBase<TaskTerminateEvent, TaskTerminateEvent._Fields>, java.io.Serializable, Cloneable, Comparable<TaskTerminateEvent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskTerminateEvent");
http://git-wip-us.apache.org/repos/asf/airavata/blob/ed63a40a/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 407a0f2..582d3b9 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 244fd31..fbb318e 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 3ddc7c0..35524bb 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 780e879..712bc61 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 6896ec2..a333e52 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 4b55123..aee590d 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 fe01c79..8c933c2 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 ea951a9..8004e76 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 ca555b7..563da06 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;
* taskInternalStore:
* 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 ad3a254..fd6c631 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 d431e0e..39a08be 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 a7cfd40..fa52def 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 108ece3..4fdd074 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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");