http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataClientException.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataClientException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataClientException.java index bbac0bf..168c4b5 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataClientException.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataClientException.java @@ -66,7 +66,7 @@ import org.slf4j.LoggerFactory; * parameter: If the error applied to a particular input parameter, this will * indicate which parameter. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") public class AiravataClientException extends TException implements org.apache.thrift.TBase<AiravataClientException, AiravataClientException._Fields>, java.io.Serializable, Cloneable, Comparable<AiravataClientException> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AiravataClientException");
http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataSystemException.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataSystemException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataSystemException.java index 73515a3..4f07532 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataSystemException.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataSystemException.java @@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory; * message: This may contain additional information about the error * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") public class AiravataSystemException extends TException implements org.apache.thrift.TBase<AiravataSystemException, AiravataSystemException._Fields>, java.io.Serializable, Cloneable, Comparable<AiravataSystemException> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AiravataSystemException"); http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthenticationException.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthenticationException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthenticationException.java index 7f29669..2358896 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthenticationException.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthenticationException.java @@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory; * * message: contains the cause of the authorization failure. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") public class AuthenticationException extends TException implements org.apache.thrift.TBase<AuthenticationException, AuthenticationException._Fields>, java.io.Serializable, Cloneable, Comparable<AuthenticationException> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AuthenticationException"); http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthorizationException.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthorizationException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthorizationException.java index e8b3d90..5611e20 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthorizationException.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthorizationException.java @@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory; * * message: contains the authorization failure message */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") public class AuthorizationException extends TException implements org.apache.thrift.TBase<AuthorizationException, AuthorizationException._Fields>, java.io.Serializable, Cloneable, Comparable<AuthorizationException> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AuthorizationException"); http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ExperimentNotFoundException.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ExperimentNotFoundException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ExperimentNotFoundException.java index ca8e533..386c39a 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ExperimentNotFoundException.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ExperimentNotFoundException.java @@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory; * * key: The value passed from the client in the identifier, which was not found. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") public class ExperimentNotFoundException extends TException implements org.apache.thrift.TBase<ExperimentNotFoundException, ExperimentNotFoundException._Fields>, java.io.Serializable, Cloneable, Comparable<ExperimentNotFoundException> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentNotFoundException"); http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/InvalidRequestException.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/InvalidRequestException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/InvalidRequestException.java index 3e93f3a..c24445f 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/InvalidRequestException.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/InvalidRequestException.java @@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory; * * message: contains the associated error message. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") public class InvalidRequestException extends TException implements org.apache.thrift.TBase<InvalidRequestException, InvalidRequestException._Fields>, java.io.Serializable, Cloneable, Comparable<InvalidRequestException> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InvalidRequestException"); http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/LaunchValidationException.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/LaunchValidationException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/LaunchValidationException.java index 47d2939..98b1190 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/LaunchValidationException.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/LaunchValidationException.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-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") public class LaunchValidationException extends TException implements org.apache.thrift.TBase<LaunchValidationException, LaunchValidationException._Fields>, java.io.Serializable, Cloneable, Comparable<LaunchValidationException> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LaunchValidationException"); http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ProjectNotFoundException.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ProjectNotFoundException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ProjectNotFoundException.java index efa9b9a..b6b6bc3 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ProjectNotFoundException.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ProjectNotFoundException.java @@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory; * 2: optional string key * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") public class ProjectNotFoundException extends TException implements org.apache.thrift.TBase<ProjectNotFoundException, ProjectNotFoundException._Fields>, java.io.Serializable, Cloneable, Comparable<ProjectNotFoundException> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProjectNotFoundException"); http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/TimedOutException.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/TimedOutException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/TimedOutException.java index 3e2d96d..28d5fd5 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/TimedOutException.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/TimedOutException.java @@ -54,7 +54,7 @@ import org.slf4j.LoggerFactory; /** * This exception is thrown when RPC timeout gets exceeded. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") public class TimedOutException extends TException implements org.apache.thrift.TBase<TimedOutException, TimedOutException._Fields>, java.io.Serializable, Cloneable, Comparable<TimedOutException> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TimedOutException"); http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/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 aa02d9d..fe136cc 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.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") 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/6242acac/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 cf25bef..a263bcc 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.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") 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/6242acac/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 4462014..e892785 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.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") 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/6242acac/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 e3cb3c7..152b37f 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-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") 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/6242acac/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 00a536f..ca60d32 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.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") 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/6242acac/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 6ba0f44..a97573c 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-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") 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/6242acac/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 caccbef..19d1abd 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") 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/6242acac/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 d892b3f..75793af 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-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") 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/6242acac/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 37fc235..4c3c346 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-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") 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/6242acac/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 147feb7..644d4cb 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-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") 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/6242acac/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 4d88fdf..12641fb 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-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") 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/6242acac/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 52b7624..bb04148 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-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") 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/6242acac/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 c7996d1..6c908e7 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") 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/6242acac/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 f715d5e..7d447a3 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") 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/6242acac/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 3ce4ac1..1165313 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") 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/6242acac/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 cd39424..c2b141b 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-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") 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/6242acac/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 363b4d0..06b39c6 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") 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/6242acac/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 d23c47a..fb2c3cd 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-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") 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/6242acac/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 0fed548..cd29160 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-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") 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/6242acac/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 f4bf043..5a374fb 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-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") 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/6242acac/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 6bd05f8..277ceb5 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-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") 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/6242acac/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 a3266c6..dce8cd0 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-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") 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/6242acac/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 8fc2773..f6a4e9f 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-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") 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/6242acac/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 cda1c70..b9bf082 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-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") 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/6242acac/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 26c9a21..59e4320 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-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") 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/6242acac/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 f6c9db8..900dbc6 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-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") 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/6242acac/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 fef36f8..c42ead2 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-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") 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/6242acac/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 ad606cb..53c6dc1 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-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") 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/6242acac/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 7386125..6b7ce44 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.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") 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/6242acac/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 8e5b241..b57bbeb 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.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") 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/6242acac/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 b1be35a..2f3792d 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.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") 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/6242acac/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 3502006..909f691 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.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") 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/6242acac/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 578ae7b..eb4f794 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java @@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory; * subTaskModel: * A generic byte object for the Task developer to store internal serialized data into registry catalogs. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") 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/6242acac/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 3e58644..075e827 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-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") 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/6242acac/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 7c12d6f..f38042c 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-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") 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/6242acac/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 4b726a4..4d6564d 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-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") 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/6242acac/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 793ad5f..3d8ab01 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-12-2") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-3") 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/6242acac/modules/data-manager/src/main/java/org/apache/airavata/data/manager/DataManager.java ---------------------------------------------------------------------- diff --git a/modules/data-manager/src/main/java/org/apache/airavata/data/manager/DataManager.java b/modules/data-manager/src/main/java/org/apache/airavata/data/manager/DataManager.java index 7b046d5..dde3ef1 100644 --- a/modules/data-manager/src/main/java/org/apache/airavata/data/manager/DataManager.java +++ b/modules/data-manager/src/main/java/org/apache/airavata/data/manager/DataManager.java @@ -20,24 +20,28 @@ */ package org.apache.airavata.data.manager; +import org.apache.airavata.model.data.resource.DataReplicaLocationModel; import org.apache.airavata.model.data.resource.DataResourceModel; +import org.apache.airavata.registry.cpi.DataCatalogException; + +import java.util.List; public interface DataManager { /** - * To create a replica entry for an already existing file(s). This is how the system comes to know about already + * To create a new dataResourceModel. This is how the system comes to know about already * existing resources - * @param resource + * @param dataResourceModel * @return */ - String publishDataResource(DataResourceModel resource) throws DataManagerException; + String publishResource(DataResourceModel dataResourceModel) throws DataManagerException; /** * To remove a resource entry from the replica catalog * @param resourceId * @return */ - boolean removeDataResource(String resourceId) throws DataManagerException; + boolean removeResource(String resourceId) throws DataManagerException; /** @@ -46,22 +50,72 @@ public interface DataManager { * @return * @throws DataManagerException */ - boolean updateDataResource(DataResourceModel dataResourceModel) throws DataManagerException; + boolean updateResource(DataResourceModel dataResourceModel) throws DataManagerException; /** * To retrieve a resource object providing the resourceId * @param resourceId * @return */ - DataResourceModel getDataResource(String resourceId) throws DataManagerException; + DataResourceModel getResource(String resourceId) throws DataManagerException; /** * To copy an already existing resource to a specified location. After successful copying the new location will be - * added to the available replica locations of the resource + * added to the available replica locations of the resource. The replica to copy will be selected automatically based + * on performance and availability metrics. + * @param resourceId + * @param destLocation + * @return + */ + boolean copyResource(String resourceId, String destLocation) throws DataManagerException; + + /** + * To copy an already existing resource from the specified replica location to a specified location. After successful + * copying the new location will be added to the available replica locations of the resource * @param resourceId + * @param replicaLocationModel * @param destLocation * @return + * @throws DataManagerException + */ + boolean copyResource(String resourceId, DataReplicaLocationModel replicaLocationModel, String destLocation) + throws DataManagerException; + + /** + * To create a new data replica location. This is how the system comes to know about already + * existing resources + * @param dataReplicaLocationModel + * @return */ - boolean copyDataResource(String resourceId, String destLocation) throws DataManagerException; + String publishReplicaLocation(DataReplicaLocationModel dataReplicaLocationModel) throws DataManagerException; + /** + * To remove a replica entry from the replica catalog + * @param replicaId + * @return + */ + boolean removeReplicaLocation(String replicaId) throws DataManagerException; + + /** + * To update an existing data replica model + * @param dataReplicaLocationModel + * @return + * @throws DataManagerException + */ + boolean updateReplicaLocation(DataReplicaLocationModel dataReplicaLocationModel) throws DataManagerException; + + /** + * To retrieve a replica object providing the replicaId + * @param replicaId + * @return + */ + DataReplicaLocationModel getReplicaLocation(String replicaId) throws DataManagerException; + + /** + * To retrieve all the replica entries for a given resource id + * @param resourceId + * @return + * @throws DataCatalogException + */ + List<DataReplicaLocationModel> getAllReplicaLocations(String resourceId) throws DataManagerException; } http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/modules/data-manager/src/main/java/org/apache/airavata/data/manager/DataManagerConstants.java ---------------------------------------------------------------------- diff --git a/modules/data-manager/src/main/java/org/apache/airavata/data/manager/DataManagerConstants.java b/modules/data-manager/src/main/java/org/apache/airavata/data/manager/DataManagerConstants.java new file mode 100644 index 0000000..567ee2c --- /dev/null +++ b/modules/data-manager/src/main/java/org/apache/airavata/data/manager/DataManagerConstants.java @@ -0,0 +1,30 @@ +/* + * + * 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. + * +*/ +package org.apache.airavata.data.manager; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class DataManagerConstants { + private final static Logger logger = LoggerFactory.getLogger(DataManagerConstants.class); + + public static final String SCP_URI_SCHEME = "scp"; +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/modules/data-manager/src/main/java/org/apache/airavata/data/manager/DataManagerImpl.java ---------------------------------------------------------------------- diff --git a/modules/data-manager/src/main/java/org/apache/airavata/data/manager/DataManagerImpl.java b/modules/data-manager/src/main/java/org/apache/airavata/data/manager/DataManagerImpl.java index a8b1ae6..696c6cd 100644 --- a/modules/data-manager/src/main/java/org/apache/airavata/data/manager/DataManagerImpl.java +++ b/modules/data-manager/src/main/java/org/apache/airavata/data/manager/DataManagerImpl.java @@ -20,6 +20,7 @@ */ package org.apache.airavata.data.manager; +import org.apache.airavata.model.data.resource.DataReplicaLocationModel; import org.apache.airavata.model.data.resource.DataResourceModel; import org.apache.airavata.registry.core.experiment.catalog.impl.RegistryFactory; import org.apache.airavata.registry.cpi.DataCatalog; @@ -27,6 +28,10 @@ import org.apache.airavata.registry.cpi.DataCatalogException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.List; + public class DataManagerImpl implements DataManager{ private final static Logger logger = LoggerFactory.getLogger(DataManagerImpl.class); @@ -41,10 +46,16 @@ public class DataManagerImpl implements DataManager{ } } + /** + * To create a replica entry for an already existing file(s). This is how the system comes to know about already + * existing resources + * @param dataResourceModel + * @return + */ @Override - public String publishDataResource(DataResourceModel resourceModel) throws DataManagerException{ + public String publishResource(DataResourceModel dataResourceModel) throws DataManagerException{ try { - String resourceId = dataCatalog.publishResource(resourceModel); + String resourceId = dataCatalog.publishResource(dataResourceModel); return resourceId; } catch (DataCatalogException e) { logger.error(e.getMessage(), e); @@ -52,8 +63,13 @@ public class DataManagerImpl implements DataManager{ } } + /** + * To remove a resource entry from the replica catalog + * @param resourceId + * @return + */ @Override - public boolean removeDataResource(String resourceId) throws DataManagerException { + public boolean removeResource(String resourceId) throws DataManagerException { try { boolean result = dataCatalog.removeResource(resourceId); return result; @@ -63,8 +79,14 @@ public class DataManagerImpl implements DataManager{ } } + /** + * To update an existing data resource model + * @param dataResourceModel + * @return + * @throws DataManagerException + */ @Override - public boolean updateDataResource(DataResourceModel dataResourceModel) throws DataManagerException { + public boolean updateResource(DataResourceModel dataResourceModel) throws DataManagerException { try { boolean result = dataCatalog.updateResource(dataResourceModel); return result; @@ -74,8 +96,13 @@ public class DataManagerImpl implements DataManager{ } } + /** + * To retrieve a resource object providing the resourceId + * @param resourceId + * @return + */ @Override - public DataResourceModel getDataResource(String resourceId) throws DataManagerException { + public DataResourceModel getResource(String resourceId) throws DataManagerException { try { DataResourceModel dataResource = dataCatalog.getResource(resourceId); return dataResource; @@ -85,8 +112,138 @@ public class DataManagerImpl implements DataManager{ } } + /** + * To copy an already existing resource to a specified location. After successful copying the new location will be + * added to the available replica locations of the resource. The replica to copy will be selected automatically based + * on performance and availability metrics. + * @param resourceId + * @param destLocation + * @return + */ @Override - public boolean copyDataResource(String resourceId, String destLocation) throws DataManagerException{ + public boolean copyResource(String resourceId, String destLocation) throws DataManagerException{ return false; } + + /** + * To copy an already existing resource from the specified replica location to a specified location. After successful + * copying the new location will be added to the available replica locations of the resource + * + * @param resourceId + * @param replicaLocationModel + * @param destLocation + * @return + * @throws DataManagerException + */ + @Override + public boolean copyResource(String resourceId, DataReplicaLocationModel replicaLocationModel, String destLocation) + throws DataManagerException { + try { + //FIXME Bellow implementation is a skeleton code only to support the current airavata usecase of one to one copy + DataResourceModel resourceModel = getResource(resourceId); + if(resourceModel == null) + throw new DataManagerException("Non existent resource id:"+resourceId); + URI sourceUri = new URI(replicaLocationModel.getDataLocations().get(0)); + URI destinationUri = new URI(destLocation); + if(sourceUri.getScheme().equals(destinationUri.getScheme()) && sourceUri.getScheme() + .equals(DataManagerConstants.SCP_URI_SCHEME)){ + + }else{ + throw new DataManagerException("Unsupported Data Transfer protocol. Currently Data Manager only supports" + + " one to one SCP transfers"); + } + } catch (URISyntaxException e) { + logger.error(e.getMessage(), e); + throw new DataManagerException(e); + } + return true; + } + + /** + * To create a new data replica location. This is how the system comes to know about already + * existing resources + * + * @param dataReplicaLocationModel + * @return + */ + @Override + public String publishReplicaLocation(DataReplicaLocationModel dataReplicaLocationModel) throws DataManagerException { + try { + String replicaId = dataCatalog.publishReplicaLocation(dataReplicaLocationModel); + return replicaId; + } catch (DataCatalogException e) { + logger.error(e.getMessage(), e); + throw new DataManagerException(e); + } + } + + /** + * To remove a replica entry from the replica catalog + * + * @param replicaId + * @return + */ + @Override + public boolean removeReplicaLocation(String replicaId) throws DataManagerException { + try { + boolean result = dataCatalog.removeReplicaLocation(replicaId); + return result; + } catch (DataCatalogException e) { + logger.error(e.getMessage(), e); + throw new DataManagerException(e); + } + } + + /** + * To update an existing data replica model + * + * @param dataReplicaLocationModel + * @return + * @throws DataManagerException + */ + @Override + public boolean updateReplicaLocation(DataReplicaLocationModel dataReplicaLocationModel) throws DataManagerException { + try { + boolean result = dataCatalog.updateReplicaLocation(dataReplicaLocationModel); + return result; + } catch (DataCatalogException e) { + logger.error(e.getMessage(), e); + throw new DataManagerException(e); + } + } + + /** + * To retrieve a replica object providing the replicaId + * + * @param replicaId + * @return + */ + @Override + public DataReplicaLocationModel getReplicaLocation(String replicaId) throws DataManagerException { + try { + DataReplicaLocationModel dataReplicaLocationModel = dataCatalog.getReplicaLocation(replicaId); + return dataReplicaLocationModel; + } catch (DataCatalogException e) { + logger.error(e.getMessage(), e); + throw new DataManagerException(e); + } + } + + /** + * To retrieve all the replica entries for a given resource id + * + * @param resourceId + * @return + * @throws DataCatalogException + */ + @Override + public List<DataReplicaLocationModel> getAllReplicaLocations(String resourceId) throws DataManagerException { + try { + List<DataReplicaLocationModel> dataReplicaLocationModelList = dataCatalog.getAllReplicaLocations(resourceId); + return dataReplicaLocationModelList; + } catch (DataCatalogException e) { + logger.error(e.getMessage(), e); + throw new DataManagerException(e); + } + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/6242acac/modules/data-manager/src/test/java/org/apache/airavata/data/manager/DataManagerImplTest.java ---------------------------------------------------------------------- diff --git a/modules/data-manager/src/test/java/org/apache/airavata/data/manager/DataManagerImplTest.java b/modules/data-manager/src/test/java/org/apache/airavata/data/manager/DataManagerImplTest.java index af8b54b..d8ecafd 100644 --- a/modules/data-manager/src/test/java/org/apache/airavata/data/manager/DataManagerImplTest.java +++ b/modules/data-manager/src/test/java/org/apache/airavata/data/manager/DataManagerImplTest.java @@ -41,7 +41,7 @@ public class DataManagerImplTest { private static DataCatInit dataCatInit; private static DataManager dataManager; private static DataResourceModel dataResourceModel; - + private static DataReplicaLocationModel dataReplicaLocationModel; @BeforeClass public static void setUp() { try { @@ -53,14 +53,11 @@ public class DataManagerImplTest { dataManager = DataManagerFactory.getDataManager(); dataResourceModel = new DataResourceModel(); dataResourceModel.setResourceName("test-file.txt"); - List<DataReplicaLocationModel> replicaLocationModelList = new ArrayList<>(); - DataReplicaLocationModel dataReplicaLocationModel = new DataReplicaLocationModel(); + dataReplicaLocationModel = new DataReplicaLocationModel(); dataReplicaLocationModel.setReplicaName("1-st-replica"); ArrayList<String> dataLocations = new ArrayList<>(); dataLocations.add("scp://g75.iu.xsede.org:/var/www/portal/experimentData/test-file.txt"); dataReplicaLocationModel.setDataLocations(dataLocations); - replicaLocationModelList.add(dataReplicaLocationModel); - dataResourceModel.setReplicaLocations(replicaLocationModelList); } catch (DataManagerException e) { logger.error(e.getMessage(), e); } @@ -75,7 +72,7 @@ public class DataManagerImplTest { @Test public void testPublishDataResource(){ try { - String resourceId = dataManager.publishDataResource(dataResourceModel); + String resourceId = dataManager.publishResource(dataResourceModel); org.junit.Assert.assertNotNull(resourceId); } catch (DataManagerException e) { e.printStackTrace(); @@ -86,13 +83,13 @@ public class DataManagerImplTest { @Test public void testRemoveDataResource(){ try { - boolean result = dataManager.removeDataResource("234234234"); + boolean result = dataManager.removeResource("234234234"); Assert.assertFalse(result); - String resourceId = dataManager.publishDataResource(dataResourceModel); + String resourceId = dataManager.publishResource(dataResourceModel); Assert.assertNotNull(resourceId); - result = dataManager.removeDataResource(resourceId); + result = dataManager.removeResource(resourceId); Assert.assertTrue(result); - result = dataManager.removeDataResource(resourceId); + result = dataManager.removeResource(resourceId); Assert.assertFalse(result); } catch (DataManagerException e) { e.printStackTrace(); @@ -103,11 +100,10 @@ public class DataManagerImplTest { @Test public void testGetDataResource(){ try { - String resourceId = dataManager.publishDataResource(dataResourceModel); + String resourceId = dataManager.publishResource(dataResourceModel); Assert.assertNotNull(resourceId); - DataResourceModel persistedCopy = dataManager.getDataResource(resourceId); + DataResourceModel persistedCopy = dataManager.getResource(resourceId); Assert.assertNotNull(persistedCopy); - Assert.assertTrue(persistedCopy.getReplicaLocations().size()==1); } catch (DataManagerException e) { e.printStackTrace(); Assert.fail(); @@ -118,21 +114,87 @@ public class DataManagerImplTest { public void testUpdateDataResource(){ try { dataResourceModel.setResourceId(UUID.randomUUID().toString()); - boolean result = dataManager.updateDataResource(dataResourceModel); + boolean result = dataManager.updateResource(dataResourceModel); Assert.assertFalse(result); - dataManager.publishDataResource(dataResourceModel); - DataReplicaLocationModel dataReplicaLocationModel = new DataReplicaLocationModel(); - dataReplicaLocationModel.setReplicaName("2-nd-replica"); - ArrayList<String> dataLocations = new ArrayList<>(); - dataLocations.add("scp://g175.iu.xsede.org:/var/www/portal/experimentData/test-file.txt"); - dataResourceModel.getReplicaLocations().add(dataReplicaLocationModel); - dataManager.updateDataResource(dataResourceModel); - dataResourceModel = dataManager.getDataResource(dataResourceModel.getResourceId()); - Assert.assertTrue(dataResourceModel.getReplicaLocations().size()==2); - dataResourceModel.getReplicaLocations().remove(1); - dataManager.updateDataResource(dataResourceModel); - dataResourceModel = dataManager.getDataResource(dataResourceModel.getResourceId()); - Assert.assertTrue(dataResourceModel.getReplicaLocations().size()==1); + dataManager.publishResource(dataResourceModel); + dataResourceModel.setResourceName("updated-name"); + dataManager.updateResource(dataResourceModel); + dataResourceModel = dataManager.getResource(dataResourceModel.getResourceId()); + Assert.assertTrue(dataResourceModel.getResourceName().equals("updated-name")); + } catch (DataManagerException e) { + e.printStackTrace(); + Assert.fail(); + } + } + + @Test + public void testPublishReplicaLocation(){ + try { + String resourceId = dataManager.publishResource(dataResourceModel); + dataReplicaLocationModel.setResourceId(resourceId); + String replicaId = dataManager.publishReplicaLocation(dataReplicaLocationModel); + org.junit.Assert.assertNotNull(replicaId); + } catch (DataManagerException e) { + e.printStackTrace(); + Assert.fail(); + } + } + + @Test + public void testRemoveReplicaLocation(){ + try { + String resourceId = dataManager.publishResource(dataResourceModel); + dataReplicaLocationModel.setResourceId(resourceId); + String replicaId = dataManager.publishReplicaLocation(dataReplicaLocationModel); + boolean result = dataManager.removeReplicaLocation(replicaId); + Assert.assertTrue(result); + result = dataManager.removeReplicaLocation(dataReplicaLocationModel.getReplicaId()); + Assert.assertFalse(result); + } catch (DataManagerException e) { + e.printStackTrace(); + Assert.fail(); + } + } + + @Test + public void testGetReplicaLocation(){ + try { + String resourceId = dataManager.publishResource(dataResourceModel); + dataReplicaLocationModel.setResourceId(resourceId); + String replicaId = dataManager.publishReplicaLocation(dataReplicaLocationModel); + DataReplicaLocationModel persistedCopy = dataManager.getReplicaLocation(replicaId); + Assert.assertNotNull(persistedCopy); + } catch (DataManagerException e) { + e.printStackTrace(); + Assert.fail(); + } + } + + @Test + public void testUpdateReplicaLocation(){ + try { + String resourceId = dataManager.publishResource(dataResourceModel); + dataReplicaLocationModel.setResourceId(resourceId); + String replicaId = dataManager.publishReplicaLocation(dataReplicaLocationModel); + DataReplicaLocationModel persistedCopy = dataManager.getReplicaLocation(replicaId); + persistedCopy.setReplicaDescription("updated-description"); + dataManager.updateReplicaLocation(persistedCopy); + persistedCopy = dataManager.getReplicaLocation(replicaId); + Assert.assertTrue(persistedCopy.getReplicaDescription().equals("updated-description")); + } catch (DataManagerException e) { + e.printStackTrace(); + Assert.fail(); + } + } + + @Test + public void testGetAllReplicaLocations(){ + try { + String resourceId = dataManager.publishResource(dataResourceModel); + dataReplicaLocationModel.setResourceId(resourceId); + String replicaId = dataManager.publishReplicaLocation(dataReplicaLocationModel); + List<DataReplicaLocationModel> replicaLocationModelList = dataManager.getAllReplicaLocations(resourceId); + Assert.assertTrue(replicaLocationModelList.get(0).getReplicaId().equals(replicaId)); } catch (DataManagerException e) { e.printStackTrace(); Assert.fail();
