Repository: airavata Updated Branches: refs/heads/master b5bdad1a6 -> fad21741d
http://git-wip-us.apache.org/repos/asf/airavata/blob/27e93a0f/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidationResults.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidationResults.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidationResults.java index 8cfc5f5..25d993d 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidationResults.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidationResults.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.3)", date = "2016-03-25") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-30") public class ValidationResults implements org.apache.thrift.TBase<ValidationResults, ValidationResults._Fields>, java.io.Serializable, Cloneable, Comparable<ValidationResults> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ValidationResults"); http://git-wip-us.apache.org/repos/asf/airavata/blob/27e93a0f/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidatorResult.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidatorResult.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidatorResult.java index ac1cac6..7968c96 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidatorResult.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidatorResult.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.3)", date = "2016-03-25") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-30") public class ValidatorResult implements org.apache.thrift.TBase<ValidatorResult, ValidatorResult._Fields>, java.io.Serializable, Cloneable, Comparable<ValidatorResult> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ValidatorResult"); http://git-wip-us.apache.org/repos/asf/airavata/blob/27e93a0f/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 0051eda..dc7d950 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 @@ -67,7 +67,7 @@ import org.slf4j.LoggerFactory; * experimentDescription: * The verbose description of the experiment. This is an optional parameter. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-25") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-30") 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"); http://git-wip-us.apache.org/repos/asf/airavata/blob/27e93a0f/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 37c8b22..25b1b60 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.3)", date = "2016-03-25") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-30") 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/27e93a0f/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 9ff7932..5feb2bf 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 @@ -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.3)", date = "2016-03-25") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-30") 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"); http://git-wip-us.apache.org/repos/asf/airavata/blob/27e93a0f/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 7e39f8e..d9aacee 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.3)", date = "2016-03-25") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-30") 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/27e93a0f/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 2875197..6f6b343 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.3)", date = "2016-03-25") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-30") 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"); http://git-wip-us.apache.org/repos/asf/airavata/blob/27e93a0f/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 45345e5..44c1a1e 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.3)", date = "2016-03-25") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-30") 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/27e93a0f/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 76be2f0..5cbdbf1 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.3)", date = "2016-03-25") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-30") 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/27e93a0f/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 6be0f0f..56c4643 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.3)", date = "2016-03-25") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-30") 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/27e93a0f/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 e849bf8..d04cb20 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.3)", date = "2016-03-25") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-30") 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/27e93a0f/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 06154d9..e852c7e 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.3)", date = "2016-03-25") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-30") 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/27e93a0f/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 6022700..73f424b 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.3)", date = "2016-03-25") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-30") 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/27e93a0f/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 7551cce..4d66e75 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.3)", date = "2016-03-25") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-30") 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/27e93a0f/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 a404025..f6f9bc2 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.3)", date = "2016-03-25") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-30") 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/27e93a0f/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 a822b9e..3d78f51 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.3)", date = "2016-03-25") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-30") 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/27e93a0f/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 34813a8..55c6ecb 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.3)", date = "2016-03-25") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-30") 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/27e93a0f/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 38c7a54..5144e46 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.3)", date = "2016-03-25") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-30") 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/27e93a0f/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 5667c82..ce6cec8 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.3)", date = "2016-03-25") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-30") 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/27e93a0f/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 e2a649e..2c04194 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.3)", date = "2016-03-25") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-30") 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/27e93a0f/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 c7c6250..733c148 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.3)", date = "2016-03-25") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-30") 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/27e93a0f/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 170a30a..d7c95ba 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.3)", date = "2016-03-25") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-30") 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/27e93a0f/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 a77a524..debaa55 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.3)", date = "2016-03-25") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-30") 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"); @@ -69,6 +69,9 @@ public class ComputationalResourceSchedulingModel implements org.apache.thrift.T private static final org.apache.thrift.protocol.TField TOTAL_PHYSICAL_MEMORY_FIELD_DESC = new org.apache.thrift.protocol.TField("totalPhysicalMemory", org.apache.thrift.protocol.TType.I32, (short)7); private static final org.apache.thrift.protocol.TField CHESSIS_NUMBER_FIELD_DESC = new org.apache.thrift.protocol.TField("chessisNumber", org.apache.thrift.protocol.TType.STRING, (short)8); private static final org.apache.thrift.protocol.TField STATIC_WORKING_DIR_FIELD_DESC = new org.apache.thrift.protocol.TField("staticWorkingDir", org.apache.thrift.protocol.TType.STRING, (short)9); + private static final org.apache.thrift.protocol.TField OVERRIDE_LOGIN_USER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("overrideLoginUserName", org.apache.thrift.protocol.TType.STRING, (short)10); + private static final org.apache.thrift.protocol.TField OVERRIDE_SCRATCH_LOCATION_FIELD_DESC = new org.apache.thrift.protocol.TField("overrideScratchLocation", org.apache.thrift.protocol.TType.STRING, (short)11); + private static final org.apache.thrift.protocol.TField OVERRIDE_ALLOCATION_PROJECT_NUMBER_FIELD_DESC = new org.apache.thrift.protocol.TField("overrideAllocationProjectNumber", org.apache.thrift.protocol.TType.STRING, (short)12); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -85,6 +88,9 @@ public class ComputationalResourceSchedulingModel implements org.apache.thrift.T private int totalPhysicalMemory; // optional private String chessisNumber; // optional private String staticWorkingDir; // optional + private String overrideLoginUserName; // optional + private String overrideScratchLocation; // optional + private String overrideAllocationProjectNumber; // 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 { @@ -96,7 +102,10 @@ public class ComputationalResourceSchedulingModel implements org.apache.thrift.T WALL_TIME_LIMIT((short)6, "wallTimeLimit"), TOTAL_PHYSICAL_MEMORY((short)7, "totalPhysicalMemory"), CHESSIS_NUMBER((short)8, "chessisNumber"), - STATIC_WORKING_DIR((short)9, "staticWorkingDir"); + STATIC_WORKING_DIR((short)9, "staticWorkingDir"), + OVERRIDE_LOGIN_USER_NAME((short)10, "overrideLoginUserName"), + OVERRIDE_SCRATCH_LOCATION((short)11, "overrideScratchLocation"), + OVERRIDE_ALLOCATION_PROJECT_NUMBER((short)12, "overrideAllocationProjectNumber"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -129,6 +138,12 @@ public class ComputationalResourceSchedulingModel implements org.apache.thrift.T return CHESSIS_NUMBER; case 9: // STATIC_WORKING_DIR return STATIC_WORKING_DIR; + case 10: // OVERRIDE_LOGIN_USER_NAME + return OVERRIDE_LOGIN_USER_NAME; + case 11: // OVERRIDE_SCRATCH_LOCATION + return OVERRIDE_SCRATCH_LOCATION; + case 12: // OVERRIDE_ALLOCATION_PROJECT_NUMBER + return OVERRIDE_ALLOCATION_PROJECT_NUMBER; default: return null; } @@ -175,7 +190,7 @@ public class ComputationalResourceSchedulingModel implements org.apache.thrift.T private static final int __WALLTIMELIMIT_ISSET_ID = 3; private static final int __TOTALPHYSICALMEMORY_ISSET_ID = 4; private byte __isset_bitfield = 0; - private static final _Fields optionals[] = {_Fields.RESOURCE_HOST_ID,_Fields.TOTAL_CPUCOUNT,_Fields.NODE_COUNT,_Fields.NUMBER_OF_THREADS,_Fields.QUEUE_NAME,_Fields.WALL_TIME_LIMIT,_Fields.TOTAL_PHYSICAL_MEMORY,_Fields.CHESSIS_NUMBER,_Fields.STATIC_WORKING_DIR}; + private static final _Fields optionals[] = {_Fields.RESOURCE_HOST_ID,_Fields.TOTAL_CPUCOUNT,_Fields.NODE_COUNT,_Fields.NUMBER_OF_THREADS,_Fields.QUEUE_NAME,_Fields.WALL_TIME_LIMIT,_Fields.TOTAL_PHYSICAL_MEMORY,_Fields.CHESSIS_NUMBER,_Fields.STATIC_WORKING_DIR,_Fields.OVERRIDE_LOGIN_USER_NAME,_Fields.OVERRIDE_SCRATCH_LOCATION,_Fields.OVERRIDE_ALLOCATION_PROJECT_NUMBER}; 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); @@ -197,6 +212,12 @@ public class ComputationalResourceSchedulingModel implements org.apache.thrift.T new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.STATIC_WORKING_DIR, new org.apache.thrift.meta_data.FieldMetaData("staticWorkingDir", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.OVERRIDE_LOGIN_USER_NAME, new org.apache.thrift.meta_data.FieldMetaData("overrideLoginUserName", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.OVERRIDE_SCRATCH_LOCATION, new org.apache.thrift.meta_data.FieldMetaData("overrideScratchLocation", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.OVERRIDE_ALLOCATION_PROJECT_NUMBER, new org.apache.thrift.meta_data.FieldMetaData("overrideAllocationProjectNumber", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ComputationalResourceSchedulingModel.class, metaDataMap); } @@ -226,6 +247,15 @@ public class ComputationalResourceSchedulingModel implements org.apache.thrift.T if (other.isSetStaticWorkingDir()) { this.staticWorkingDir = other.staticWorkingDir; } + if (other.isSetOverrideLoginUserName()) { + this.overrideLoginUserName = other.overrideLoginUserName; + } + if (other.isSetOverrideScratchLocation()) { + this.overrideScratchLocation = other.overrideScratchLocation; + } + if (other.isSetOverrideAllocationProjectNumber()) { + this.overrideAllocationProjectNumber = other.overrideAllocationProjectNumber; + } } public ComputationalResourceSchedulingModel deepCopy() { @@ -248,6 +278,9 @@ public class ComputationalResourceSchedulingModel implements org.apache.thrift.T this.totalPhysicalMemory = 0; this.chessisNumber = null; this.staticWorkingDir = null; + this.overrideLoginUserName = null; + this.overrideScratchLocation = null; + this.overrideAllocationProjectNumber = null; } public String getResourceHostId() { @@ -452,6 +485,75 @@ public class ComputationalResourceSchedulingModel implements org.apache.thrift.T } } + public String getOverrideLoginUserName() { + return this.overrideLoginUserName; + } + + public void setOverrideLoginUserName(String overrideLoginUserName) { + this.overrideLoginUserName = overrideLoginUserName; + } + + public void unsetOverrideLoginUserName() { + this.overrideLoginUserName = null; + } + + /** Returns true if field overrideLoginUserName is set (has been assigned a value) and false otherwise */ + public boolean isSetOverrideLoginUserName() { + return this.overrideLoginUserName != null; + } + + public void setOverrideLoginUserNameIsSet(boolean value) { + if (!value) { + this.overrideLoginUserName = null; + } + } + + public String getOverrideScratchLocation() { + return this.overrideScratchLocation; + } + + public void setOverrideScratchLocation(String overrideScratchLocation) { + this.overrideScratchLocation = overrideScratchLocation; + } + + public void unsetOverrideScratchLocation() { + this.overrideScratchLocation = null; + } + + /** Returns true if field overrideScratchLocation is set (has been assigned a value) and false otherwise */ + public boolean isSetOverrideScratchLocation() { + return this.overrideScratchLocation != null; + } + + public void setOverrideScratchLocationIsSet(boolean value) { + if (!value) { + this.overrideScratchLocation = null; + } + } + + public String getOverrideAllocationProjectNumber() { + return this.overrideAllocationProjectNumber; + } + + public void setOverrideAllocationProjectNumber(String overrideAllocationProjectNumber) { + this.overrideAllocationProjectNumber = overrideAllocationProjectNumber; + } + + public void unsetOverrideAllocationProjectNumber() { + this.overrideAllocationProjectNumber = null; + } + + /** Returns true if field overrideAllocationProjectNumber is set (has been assigned a value) and false otherwise */ + public boolean isSetOverrideAllocationProjectNumber() { + return this.overrideAllocationProjectNumber != null; + } + + public void setOverrideAllocationProjectNumberIsSet(boolean value) { + if (!value) { + this.overrideAllocationProjectNumber = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case RESOURCE_HOST_ID: @@ -526,6 +628,30 @@ public class ComputationalResourceSchedulingModel implements org.apache.thrift.T } break; + case OVERRIDE_LOGIN_USER_NAME: + if (value == null) { + unsetOverrideLoginUserName(); + } else { + setOverrideLoginUserName((String)value); + } + break; + + case OVERRIDE_SCRATCH_LOCATION: + if (value == null) { + unsetOverrideScratchLocation(); + } else { + setOverrideScratchLocation((String)value); + } + break; + + case OVERRIDE_ALLOCATION_PROJECT_NUMBER: + if (value == null) { + unsetOverrideAllocationProjectNumber(); + } else { + setOverrideAllocationProjectNumber((String)value); + } + break; + } } @@ -558,6 +684,15 @@ public class ComputationalResourceSchedulingModel implements org.apache.thrift.T case STATIC_WORKING_DIR: return getStaticWorkingDir(); + case OVERRIDE_LOGIN_USER_NAME: + return getOverrideLoginUserName(); + + case OVERRIDE_SCRATCH_LOCATION: + return getOverrideScratchLocation(); + + case OVERRIDE_ALLOCATION_PROJECT_NUMBER: + return getOverrideAllocationProjectNumber(); + } throw new IllegalStateException(); } @@ -587,6 +722,12 @@ public class ComputationalResourceSchedulingModel implements org.apache.thrift.T return isSetChessisNumber(); case STATIC_WORKING_DIR: return isSetStaticWorkingDir(); + case OVERRIDE_LOGIN_USER_NAME: + return isSetOverrideLoginUserName(); + case OVERRIDE_SCRATCH_LOCATION: + return isSetOverrideScratchLocation(); + case OVERRIDE_ALLOCATION_PROJECT_NUMBER: + return isSetOverrideAllocationProjectNumber(); } throw new IllegalStateException(); } @@ -685,6 +826,33 @@ public class ComputationalResourceSchedulingModel implements org.apache.thrift.T return false; } + boolean this_present_overrideLoginUserName = true && this.isSetOverrideLoginUserName(); + boolean that_present_overrideLoginUserName = true && that.isSetOverrideLoginUserName(); + if (this_present_overrideLoginUserName || that_present_overrideLoginUserName) { + if (!(this_present_overrideLoginUserName && that_present_overrideLoginUserName)) + return false; + if (!this.overrideLoginUserName.equals(that.overrideLoginUserName)) + return false; + } + + boolean this_present_overrideScratchLocation = true && this.isSetOverrideScratchLocation(); + boolean that_present_overrideScratchLocation = true && that.isSetOverrideScratchLocation(); + if (this_present_overrideScratchLocation || that_present_overrideScratchLocation) { + if (!(this_present_overrideScratchLocation && that_present_overrideScratchLocation)) + return false; + if (!this.overrideScratchLocation.equals(that.overrideScratchLocation)) + return false; + } + + boolean this_present_overrideAllocationProjectNumber = true && this.isSetOverrideAllocationProjectNumber(); + boolean that_present_overrideAllocationProjectNumber = true && that.isSetOverrideAllocationProjectNumber(); + if (this_present_overrideAllocationProjectNumber || that_present_overrideAllocationProjectNumber) { + if (!(this_present_overrideAllocationProjectNumber && that_present_overrideAllocationProjectNumber)) + return false; + if (!this.overrideAllocationProjectNumber.equals(that.overrideAllocationProjectNumber)) + return false; + } + return true; } @@ -737,6 +905,21 @@ public class ComputationalResourceSchedulingModel implements org.apache.thrift.T if (present_staticWorkingDir) list.add(staticWorkingDir); + boolean present_overrideLoginUserName = true && (isSetOverrideLoginUserName()); + list.add(present_overrideLoginUserName); + if (present_overrideLoginUserName) + list.add(overrideLoginUserName); + + boolean present_overrideScratchLocation = true && (isSetOverrideScratchLocation()); + list.add(present_overrideScratchLocation); + if (present_overrideScratchLocation) + list.add(overrideScratchLocation); + + boolean present_overrideAllocationProjectNumber = true && (isSetOverrideAllocationProjectNumber()); + list.add(present_overrideAllocationProjectNumber); + if (present_overrideAllocationProjectNumber) + list.add(overrideAllocationProjectNumber); + return list.hashCode(); } @@ -838,6 +1021,36 @@ public class ComputationalResourceSchedulingModel implements org.apache.thrift.T return lastComparison; } } + lastComparison = Boolean.valueOf(isSetOverrideLoginUserName()).compareTo(other.isSetOverrideLoginUserName()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetOverrideLoginUserName()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.overrideLoginUserName, other.overrideLoginUserName); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetOverrideScratchLocation()).compareTo(other.isSetOverrideScratchLocation()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetOverrideScratchLocation()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.overrideScratchLocation, other.overrideScratchLocation); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetOverrideAllocationProjectNumber()).compareTo(other.isSetOverrideAllocationProjectNumber()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetOverrideAllocationProjectNumber()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.overrideAllocationProjectNumber, other.overrideAllocationProjectNumber); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -927,6 +1140,36 @@ public class ComputationalResourceSchedulingModel implements org.apache.thrift.T } first = false; } + if (isSetOverrideLoginUserName()) { + if (!first) sb.append(", "); + sb.append("overrideLoginUserName:"); + if (this.overrideLoginUserName == null) { + sb.append("null"); + } else { + sb.append(this.overrideLoginUserName); + } + first = false; + } + if (isSetOverrideScratchLocation()) { + if (!first) sb.append(", "); + sb.append("overrideScratchLocation:"); + if (this.overrideScratchLocation == null) { + sb.append("null"); + } else { + sb.append(this.overrideScratchLocation); + } + first = false; + } + if (isSetOverrideAllocationProjectNumber()) { + if (!first) sb.append(", "); + sb.append("overrideAllocationProjectNumber:"); + if (this.overrideAllocationProjectNumber == null) { + sb.append("null"); + } else { + sb.append(this.overrideAllocationProjectNumber); + } + first = false; + } sb.append(")"); return sb.toString(); } @@ -1044,6 +1287,30 @@ public class ComputationalResourceSchedulingModel implements org.apache.thrift.T org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 10: // OVERRIDE_LOGIN_USER_NAME + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.overrideLoginUserName = iprot.readString(); + struct.setOverrideLoginUserNameIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 11: // OVERRIDE_SCRATCH_LOCATION + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.overrideScratchLocation = iprot.readString(); + struct.setOverrideScratchLocationIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 12: // OVERRIDE_ALLOCATION_PROJECT_NUMBER + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.overrideAllocationProjectNumber = iprot.readString(); + struct.setOverrideAllocationProjectNumberIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -1110,6 +1377,27 @@ public class ComputationalResourceSchedulingModel implements org.apache.thrift.T oprot.writeFieldEnd(); } } + if (struct.overrideLoginUserName != null) { + if (struct.isSetOverrideLoginUserName()) { + oprot.writeFieldBegin(OVERRIDE_LOGIN_USER_NAME_FIELD_DESC); + oprot.writeString(struct.overrideLoginUserName); + oprot.writeFieldEnd(); + } + } + if (struct.overrideScratchLocation != null) { + if (struct.isSetOverrideScratchLocation()) { + oprot.writeFieldBegin(OVERRIDE_SCRATCH_LOCATION_FIELD_DESC); + oprot.writeString(struct.overrideScratchLocation); + oprot.writeFieldEnd(); + } + } + if (struct.overrideAllocationProjectNumber != null) { + if (struct.isSetOverrideAllocationProjectNumber()) { + oprot.writeFieldBegin(OVERRIDE_ALLOCATION_PROJECT_NUMBER_FIELD_DESC); + oprot.writeString(struct.overrideAllocationProjectNumber); + oprot.writeFieldEnd(); + } + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -1155,7 +1443,16 @@ public class ComputationalResourceSchedulingModel implements org.apache.thrift.T if (struct.isSetStaticWorkingDir()) { optionals.set(8); } - oprot.writeBitSet(optionals, 9); + if (struct.isSetOverrideLoginUserName()) { + optionals.set(9); + } + if (struct.isSetOverrideScratchLocation()) { + optionals.set(10); + } + if (struct.isSetOverrideAllocationProjectNumber()) { + optionals.set(11); + } + oprot.writeBitSet(optionals, 12); if (struct.isSetResourceHostId()) { oprot.writeString(struct.resourceHostId); } @@ -1183,12 +1480,21 @@ public class ComputationalResourceSchedulingModel implements org.apache.thrift.T if (struct.isSetStaticWorkingDir()) { oprot.writeString(struct.staticWorkingDir); } + if (struct.isSetOverrideLoginUserName()) { + oprot.writeString(struct.overrideLoginUserName); + } + if (struct.isSetOverrideScratchLocation()) { + oprot.writeString(struct.overrideScratchLocation); + } + if (struct.isSetOverrideAllocationProjectNumber()) { + oprot.writeString(struct.overrideAllocationProjectNumber); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, ComputationalResourceSchedulingModel struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(9); + BitSet incoming = iprot.readBitSet(12); if (incoming.get(0)) { struct.resourceHostId = iprot.readString(); struct.setResourceHostIdIsSet(true); @@ -1225,6 +1531,18 @@ public class ComputationalResourceSchedulingModel implements org.apache.thrift.T struct.staticWorkingDir = iprot.readString(); struct.setStaticWorkingDirIsSet(true); } + if (incoming.get(9)) { + struct.overrideLoginUserName = iprot.readString(); + struct.setOverrideLoginUserNameIsSet(true); + } + if (incoming.get(10)) { + struct.overrideScratchLocation = iprot.readString(); + struct.setOverrideScratchLocationIsSet(true); + } + if (incoming.get(11)) { + struct.overrideAllocationProjectNumber = iprot.readString(); + struct.setOverrideAllocationProjectNumberIsSet(true); + } } } http://git-wip-us.apache.org/repos/asf/airavata/blob/27e93a0f/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 88b81db..b3d6b9c 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.3)", date = "2016-03-25") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-30") 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/27e93a0f/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 cd5d3ad..89e9668 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.3)", date = "2016-03-25") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-30") 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/27e93a0f/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 2455dfc..44e7306 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.3)", date = "2016-03-25") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-30") 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/27e93a0f/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 5742a36..0dd999f 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.3)", date = "2016-03-25") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-30") 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/27e93a0f/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 0209772..03bdf15 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.3)", date = "2016-03-25") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-30") 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/27e93a0f/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 27debda..617d209 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 @@ -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.3)", date = "2016-03-25") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-30") 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/27e93a0f/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java index 882c8c2..af2b209 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java @@ -55,7 +55,7 @@ import org.slf4j.LoggerFactory; * EnvironmentSetupTaskModel: A structure holding the environment creation task details * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-25") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-30") public class EnvironmentSetupTaskModel implements org.apache.thrift.TBase<EnvironmentSetupTaskModel, EnvironmentSetupTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<EnvironmentSetupTaskModel> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("EnvironmentSetupTaskModel"); http://git-wip-us.apache.org/repos/asf/airavata/blob/27e93a0f/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java index b77e182..cbf8a02 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.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.3)", date = "2016-03-25") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-30") public class JobSubmissionTaskModel implements org.apache.thrift.TBase<JobSubmissionTaskModel, JobSubmissionTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<JobSubmissionTaskModel> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobSubmissionTaskModel"); http://git-wip-us.apache.org/repos/asf/airavata/blob/27e93a0f/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java index 54f6ea9..af46f7e 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.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.3)", date = "2016-03-25") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-30") public class MonitorTaskModel implements org.apache.thrift.TBase<MonitorTaskModel, MonitorTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<MonitorTaskModel> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("MonitorTaskModel"); http://git-wip-us.apache.org/repos/asf/airavata/blob/27e93a0f/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 7a3c76c..1859145 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.3)", date = "2016-03-25") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-30") 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/27e93a0f/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 ca39c40..4058956 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.3)", date = "2016-03-25") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-30") 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/27e93a0f/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 27d3cff..1f1c6c5 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.3)", date = "2016-03-25") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-30") 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/27e93a0f/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 4c6a844..836dbf6 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.3)", date = "2016-03-25") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-30") 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/27e93a0f/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 641abc3..9c2d6a7 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.3)", date = "2016-03-25") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-30") 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/27e93a0f/thrift-interface-descriptions/data-models/experiment-catalog-models/scheduling_model.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/data-models/experiment-catalog-models/scheduling_model.thrift b/thrift-interface-descriptions/data-models/experiment-catalog-models/scheduling_model.thrift index 61d33a8..9418808 100644 --- a/thrift-interface-descriptions/data-models/experiment-catalog-models/scheduling_model.thrift +++ b/thrift-interface-descriptions/data-models/experiment-catalog-models/scheduling_model.thrift @@ -37,5 +37,8 @@ struct ComputationalResourceSchedulingModel { 6: optional i32 wallTimeLimit, 7: optional i32 totalPhysicalMemory, 8: optional string chessisNumber, - 9: optional string staticWorkingDir + 9: optional string staticWorkingDir, + 10: optional string overrideLoginUserName, + 11: optional string overrideScratchLocation, + 12: optional string overrideAllocationProjectNumber } \ No newline at end of file
