updating notification model
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ab0541ae Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ab0541ae Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ab0541ae Branch: refs/heads/develop Commit: ab0541aeb0d9d09a4d70954f5d1299a6fa028bcc Parents: 81e4a39 Author: scnakandala <[email protected]> Authored: Fri Apr 29 15:32:49 2016 -0400 Committer: scnakandala <[email protected]> Committed: Fri Apr 29 15:32:50 2016 -0400 ---------------------------------------------------------------------- .../handler/AiravataServerHandlerTest.java | 2 +- .../java/org/apache/airavata/api/Airavata.java | 2 +- .../lib/airavata/workspace_model_types.cpp | 124 +++-- .../lib/airavata/workspace_model_types.h | 46 +- .../lib/Airavata/Model/Workspace/Types.php | 91 +++- .../apache/airavata/model/workspace/ttypes.py | 85 +++- .../apache/airavata/model/ComponentStatus.java | 2 +- .../org/apache/airavata/model/EdgeModel.java | 2 +- .../org/apache/airavata/model/NodeModel.java | 2 +- .../org/apache/airavata/model/PortModel.java | 2 +- .../apache/airavata/model/WorkflowModel.java | 2 +- .../apache/airavata/model/WorkflowStatus.java | 2 +- .../ApplicationDeploymentDescription.java | 2 +- .../appdeployment/ApplicationModule.java | 2 +- .../appcatalog/appdeployment/CommandObject.java | 2 +- .../appcatalog/appdeployment/SetEnvPaths.java | 2 +- .../ApplicationInterfaceDescription.java | 2 +- .../appcatalog/computeresource/BatchQueue.java | 2 +- .../computeresource/CloudJobSubmission.java | 2 +- .../ComputeResourceDescription.java | 2 +- .../computeresource/GlobusJobSubmission.java | 2 +- .../computeresource/JobSubmissionInterface.java | 2 +- .../computeresource/LOCALSubmission.java | 2 +- .../computeresource/ResourceJobManager.java | 2 +- .../computeresource/SSHJobSubmission.java | 2 +- .../computeresource/UnicoreJobSubmission.java | 2 +- .../ComputeResourcePreference.java | 2 +- .../gatewayprofile/GatewayResourceProfile.java | 2 +- .../gatewayprofile/StoragePreference.java | 2 +- .../StorageResourceDescription.java | 2 +- .../application/io/InputDataObjectType.java | 2 +- .../application/io/OutputDataObjectType.java | 2 +- .../airavata/model/commons/ErrorModel.java | 2 +- .../model/commons/ValidationResults.java | 2 +- .../airavata/model/commons/ValidatorResult.java | 2 +- .../data/movement/DataMovementInterface.java | 2 +- .../data/movement/GridFTPDataMovement.java | 2 +- .../model/data/movement/LOCALDataMovement.java | 2 +- .../model/data/movement/SCPDataMovement.java | 2 +- .../data/movement/UnicoreDataMovement.java | 2 +- .../model/data/replica/DataProductModel.java | 2 +- .../data/replica/DataReplicaLocationModel.java | 2 +- .../model/error/AiravataClientException.java | 2 +- .../model/error/AiravataSystemException.java | 2 +- .../model/error/AuthenticationException.java | 2 +- .../model/error/AuthorizationException.java | 2 +- .../error/ExperimentNotFoundException.java | 2 +- .../model/error/InvalidRequestException.java | 2 +- .../model/error/LaunchValidationException.java | 2 +- .../model/error/ProjectNotFoundException.java | 2 +- .../airavata/model/error/TimedOutException.java | 2 +- .../airavata/model/error/ValidationResults.java | 2 +- .../airavata/model/error/ValidatorResult.java | 2 +- .../model/experiment/ExperimentModel.java | 2 +- .../model/experiment/ExperimentStatistics.java | 2 +- .../experiment/ExperimentSummaryModel.java | 2 +- .../experiment/UserConfigurationDataModel.java | 2 +- .../org/apache/airavata/model/job/JobModel.java | 2 +- .../event/ExperimentStatusChangeEvent.java | 2 +- .../model/messaging/event/JobIdentifier.java | 2 +- .../messaging/event/JobStatusChangeEvent.java | 2 +- .../event/JobStatusChangeRequestEvent.java | 2 +- .../airavata/model/messaging/event/Message.java | 2 +- .../messaging/event/ProcessIdentifier.java | 2 +- .../event/ProcessStatusChangeEvent.java | 2 +- .../event/ProcessStatusChangeRequestEvent.java | 2 +- .../messaging/event/ProcessSubmitEvent.java | 2 +- .../messaging/event/ProcessTerminateEvent.java | 2 +- .../model/messaging/event/TaskIdentifier.java | 2 +- .../messaging/event/TaskOutputChangeEvent.java | 2 +- .../messaging/event/TaskStatusChangeEvent.java | 2 +- .../event/TaskStatusChangeRequestEvent.java | 2 +- .../airavata/model/process/ProcessModel.java | 2 +- .../ComputationalResourceSchedulingModel.java | 2 +- .../airavata/model/security/AuthzToken.java | 2 +- .../airavata/model/status/ExperimentStatus.java | 2 +- .../apache/airavata/model/status/JobStatus.java | 2 +- .../airavata/model/status/ProcessStatus.java | 2 +- .../airavata/model/status/TaskStatus.java | 2 +- .../model/task/DataStagingTaskModel.java | 2 +- .../model/task/EnvironmentSetupTaskModel.java | 2 +- .../model/task/JobSubmissionTaskModel.java | 2 +- .../airavata/model/task/MonitorTaskModel.java | 2 +- .../apache/airavata/model/task/TaskModel.java | 2 +- .../airavata/model/workspace/Gateway.java | 2 +- .../apache/airavata/model/workspace/Group.java | 2 +- .../airavata/model/workspace/Notification.java | 451 ++++++++++++++----- .../model/workspace/NotificationPriority.java | 65 +++ .../airavata/model/workspace/Project.java | 2 +- .../apache/airavata/model/workspace/User.java | 2 +- .../catalog/impl/NotificationRegistry.java | 11 +- .../experiment/catalog/model/Notification.java | 20 + .../catalog/resources/NotificationResource.java | 18 + .../experiment/catalog/resources/Utils.java | 2 + .../utils/ThriftDataModelConversion.java | 8 +- .../src/main/resources/expcatalog-derby.sql | 2 + .../src/main/resources/expcatalog-mysql.sql | 2 + .../workspace_model.thrift | 14 +- 98 files changed, 817 insertions(+), 290 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/ab0541ae/airavata-api/airavata-api-server/src/test/java/org/apache/airavata/api/server/handler/AiravataServerHandlerTest.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-api-server/src/test/java/org/apache/airavata/api/server/handler/AiravataServerHandlerTest.java b/airavata-api/airavata-api-server/src/test/java/org/apache/airavata/api/server/handler/AiravataServerHandlerTest.java index 081d15c..3311f02 100644 --- a/airavata-api/airavata-api-server/src/test/java/org/apache/airavata/api/server/handler/AiravataServerHandlerTest.java +++ b/airavata-api/airavata-api-server/src/test/java/org/apache/airavata/api/server/handler/AiravataServerHandlerTest.java @@ -319,7 +319,7 @@ public class AiravataServerHandlerTest { Notification notification = new Notification(); notification.setTitle("3424234"); notification.setGatewayId("test"); - notification.setNotifcationMessage("sdkjfbjks kjbsdf kjsdbfkjsdbf"); + notification.setNotificationMessage("sdkjfbjks kjbsdf kjsdbfkjsdbf"); String notificationId = airavataServerHandler.createNotification(authzToken, notification); Assert.assertNotNull(notificationId); List<Notification> notifications = airavataServerHandler.getAllNotifications(authzToken, "test"); http://git-wip-us.apache.org/repos/asf/airavata/blob/ab0541ae/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java index a726a21..ec4885f 100644 --- a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java +++ b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.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-04-22") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-29") public class Airavata { public interface Iface { http://git-wip-us.apache.org/repos/asf/airavata/blob/ab0541ae/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.cpp ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.cpp index e45f171..2229493 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.cpp +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.cpp @@ -30,6 +30,18 @@ namespace apache { namespace airavata { namespace model { namespace workspace { +int _kNotificationPriorityValues[] = { + NotificationPriority::LOW, + NotificationPriority::NORMAL, + NotificationPriority::HIGH +}; +const char* _kNotificationPriorityNames[] = { + "LOW", + "NORMAL", + "HIGH" +}; +const std::map<int, const char*> _NotificationPriority_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(3, _kNotificationPriorityValues, _kNotificationPriorityNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL)); + Group::~Group() throw() { } @@ -708,13 +720,18 @@ void Notification::__set_title(const std::string& val) { this->title = val; } -void Notification::__set_notifcationMessage(const std::string& val) { - this->notifcationMessage = val; +void Notification::__set_notificationMessage(const std::string& val) { + this->notificationMessage = val; +} + +void Notification::__set_creationTime(const int64_t val) { + this->creationTime = val; +__isset.creationTime = true; } -void Notification::__set_publishedtime(const int64_t val) { - this->publishedtime = val; -__isset.publishedtime = true; +void Notification::__set_publishedTime(const int64_t val) { + this->publishedTime = val; +__isset.publishedTime = true; } void Notification::__set_expirationTime(const int64_t val) { @@ -722,6 +739,11 @@ void Notification::__set_expirationTime(const int64_t val) { __isset.expirationTime = true; } +void Notification::__set_priority(const NotificationPriority::type val) { + this->priority = val; +__isset.priority = true; +} + uint32_t Notification::read(::apache::thrift::protocol::TProtocol* iprot) { apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); @@ -736,7 +758,7 @@ uint32_t Notification::read(::apache::thrift::protocol::TProtocol* iprot) { bool isset_gatewayId = false; bool isset_title = false; - bool isset_notifcationMessage = false; + bool isset_notificationMessage = false; while (true) { @@ -772,28 +794,46 @@ uint32_t Notification::read(::apache::thrift::protocol::TProtocol* iprot) { break; case 4: if (ftype == ::apache::thrift::protocol::T_STRING) { - xfer += iprot->readString(this->notifcationMessage); - isset_notifcationMessage = true; + xfer += iprot->readString(this->notificationMessage); + isset_notificationMessage = true; } else { xfer += iprot->skip(ftype); } break; case 5: if (ftype == ::apache::thrift::protocol::T_I64) { - xfer += iprot->readI64(this->publishedtime); - this->__isset.publishedtime = true; + xfer += iprot->readI64(this->creationTime); + this->__isset.creationTime = true; } else { xfer += iprot->skip(ftype); } break; case 6: if (ftype == ::apache::thrift::protocol::T_I64) { + xfer += iprot->readI64(this->publishedTime); + this->__isset.publishedTime = true; + } else { + xfer += iprot->skip(ftype); + } + break; + case 7: + if (ftype == ::apache::thrift::protocol::T_I64) { xfer += iprot->readI64(this->expirationTime); this->__isset.expirationTime = true; } else { xfer += iprot->skip(ftype); } break; + case 8: + if (ftype == ::apache::thrift::protocol::T_I32) { + int32_t ecast26; + xfer += iprot->readI32(ecast26); + this->priority = (NotificationPriority::type)ecast26; + this->__isset.priority = true; + } else { + xfer += iprot->skip(ftype); + } + break; default: xfer += iprot->skip(ftype); break; @@ -807,7 +847,7 @@ uint32_t Notification::read(::apache::thrift::protocol::TProtocol* iprot) { throw TProtocolException(TProtocolException::INVALID_DATA); if (!isset_title) throw TProtocolException(TProtocolException::INVALID_DATA); - if (!isset_notifcationMessage) + if (!isset_notificationMessage) throw TProtocolException(TProtocolException::INVALID_DATA); return xfer; } @@ -830,20 +870,30 @@ uint32_t Notification::write(::apache::thrift::protocol::TProtocol* oprot) const xfer += oprot->writeString(this->title); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("notifcationMessage", ::apache::thrift::protocol::T_STRING, 4); - xfer += oprot->writeString(this->notifcationMessage); + xfer += oprot->writeFieldBegin("notificationMessage", ::apache::thrift::protocol::T_STRING, 4); + xfer += oprot->writeString(this->notificationMessage); xfer += oprot->writeFieldEnd(); - if (this->__isset.publishedtime) { - xfer += oprot->writeFieldBegin("publishedtime", ::apache::thrift::protocol::T_I64, 5); - xfer += oprot->writeI64(this->publishedtime); + if (this->__isset.creationTime) { + xfer += oprot->writeFieldBegin("creationTime", ::apache::thrift::protocol::T_I64, 5); + xfer += oprot->writeI64(this->creationTime); + xfer += oprot->writeFieldEnd(); + } + if (this->__isset.publishedTime) { + xfer += oprot->writeFieldBegin("publishedTime", ::apache::thrift::protocol::T_I64, 6); + xfer += oprot->writeI64(this->publishedTime); xfer += oprot->writeFieldEnd(); } if (this->__isset.expirationTime) { - xfer += oprot->writeFieldBegin("expirationTime", ::apache::thrift::protocol::T_I64, 6); + xfer += oprot->writeFieldBegin("expirationTime", ::apache::thrift::protocol::T_I64, 7); xfer += oprot->writeI64(this->expirationTime); xfer += oprot->writeFieldEnd(); } + if (this->__isset.priority) { + xfer += oprot->writeFieldBegin("priority", ::apache::thrift::protocol::T_I32, 8); + xfer += oprot->writeI32((int32_t)this->priority); + xfer += oprot->writeFieldEnd(); + } xfer += oprot->writeFieldStop(); xfer += oprot->writeStructEnd(); return xfer; @@ -854,29 +904,35 @@ void swap(Notification &a, Notification &b) { swap(a.notificationId, b.notificationId); swap(a.gatewayId, b.gatewayId); swap(a.title, b.title); - swap(a.notifcationMessage, b.notifcationMessage); - swap(a.publishedtime, b.publishedtime); + swap(a.notificationMessage, b.notificationMessage); + swap(a.creationTime, b.creationTime); + swap(a.publishedTime, b.publishedTime); swap(a.expirationTime, b.expirationTime); + swap(a.priority, b.priority); swap(a.__isset, b.__isset); } -Notification::Notification(const Notification& other26) { - notificationId = other26.notificationId; - gatewayId = other26.gatewayId; - title = other26.title; - notifcationMessage = other26.notifcationMessage; - publishedtime = other26.publishedtime; - expirationTime = other26.expirationTime; - __isset = other26.__isset; -} -Notification& Notification::operator=(const Notification& other27) { +Notification::Notification(const Notification& other27) { notificationId = other27.notificationId; gatewayId = other27.gatewayId; title = other27.title; - notifcationMessage = other27.notifcationMessage; - publishedtime = other27.publishedtime; + notificationMessage = other27.notificationMessage; + creationTime = other27.creationTime; + publishedTime = other27.publishedTime; expirationTime = other27.expirationTime; + priority = other27.priority; __isset = other27.__isset; +} +Notification& Notification::operator=(const Notification& other28) { + notificationId = other28.notificationId; + gatewayId = other28.gatewayId; + title = other28.title; + notificationMessage = other28.notificationMessage; + creationTime = other28.creationTime; + publishedTime = other28.publishedTime; + expirationTime = other28.expirationTime; + priority = other28.priority; + __isset = other28.__isset; return *this; } void Notification::printTo(std::ostream& out) const { @@ -885,9 +941,11 @@ void Notification::printTo(std::ostream& out) const { out << "notificationId="; (__isset.notificationId ? (out << to_string(notificationId)) : (out << "<null>")); out << ", " << "gatewayId=" << to_string(gatewayId); out << ", " << "title=" << to_string(title); - out << ", " << "notifcationMessage=" << to_string(notifcationMessage); - out << ", " << "publishedtime="; (__isset.publishedtime ? (out << to_string(publishedtime)) : (out << "<null>")); + out << ", " << "notificationMessage=" << to_string(notificationMessage); + out << ", " << "creationTime="; (__isset.creationTime ? (out << to_string(creationTime)) : (out << "<null>")); + out << ", " << "publishedTime="; (__isset.publishedTime ? (out << to_string(publishedTime)) : (out << "<null>")); out << ", " << "expirationTime="; (__isset.expirationTime ? (out << to_string(expirationTime)) : (out << "<null>")); + out << ", " << "priority="; (__isset.priority ? (out << to_string(priority)) : (out << "<null>")); out << ")"; } http://git-wip-us.apache.org/repos/asf/airavata/blob/ab0541ae/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.h ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.h index 121b181..7502186 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.h +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.h @@ -37,6 +37,16 @@ namespace apache { namespace airavata { namespace model { namespace workspace { +struct NotificationPriority { + enum type { + LOW = 0, + NORMAL = 1, + HIGH = 2 + }; +}; + +extern const std::map<int, const char*> _NotificationPriority_VALUES_TO_NAMES; + class Group; class Project; @@ -310,10 +320,12 @@ inline std::ostream& operator<<(std::ostream& out, const Gateway& obj) } typedef struct _Notification__isset { - _Notification__isset() : notificationId(false), publishedtime(false), expirationTime(false) {} + _Notification__isset() : notificationId(false), creationTime(false), publishedTime(false), expirationTime(false), priority(false) {} bool notificationId :1; - bool publishedtime :1; + bool creationTime :1; + bool publishedTime :1; bool expirationTime :1; + bool priority :1; } _Notification__isset; class Notification { @@ -321,16 +333,18 @@ class Notification { Notification(const Notification&); Notification& operator=(const Notification&); - Notification() : notificationId(), gatewayId(), title(), notifcationMessage(), publishedtime(0), expirationTime(0) { + Notification() : notificationId(), gatewayId(), title(), notificationMessage(), creationTime(0), publishedTime(0), expirationTime(0), priority((NotificationPriority::type)0) { } virtual ~Notification() throw(); std::string notificationId; std::string gatewayId; std::string title; - std::string notifcationMessage; - int64_t publishedtime; + std::string notificationMessage; + int64_t creationTime; + int64_t publishedTime; int64_t expirationTime; + NotificationPriority::type priority; _Notification__isset __isset; @@ -340,12 +354,16 @@ class Notification { void __set_title(const std::string& val); - void __set_notifcationMessage(const std::string& val); + void __set_notificationMessage(const std::string& val); + + void __set_creationTime(const int64_t val); - void __set_publishedtime(const int64_t val); + void __set_publishedTime(const int64_t val); void __set_expirationTime(const int64_t val); + void __set_priority(const NotificationPriority::type val); + bool operator == (const Notification & rhs) const { if (__isset.notificationId != rhs.__isset.notificationId) @@ -356,16 +374,24 @@ class Notification { return false; if (!(title == rhs.title)) return false; - if (!(notifcationMessage == rhs.notifcationMessage)) + if (!(notificationMessage == rhs.notificationMessage)) + return false; + if (__isset.creationTime != rhs.__isset.creationTime) return false; - if (__isset.publishedtime != rhs.__isset.publishedtime) + else if (__isset.creationTime && !(creationTime == rhs.creationTime)) return false; - else if (__isset.publishedtime && !(publishedtime == rhs.publishedtime)) + if (__isset.publishedTime != rhs.__isset.publishedTime) + return false; + else if (__isset.publishedTime && !(publishedTime == rhs.publishedTime)) return false; if (__isset.expirationTime != rhs.__isset.expirationTime) return false; else if (__isset.expirationTime && !(expirationTime == rhs.expirationTime)) return false; + if (__isset.priority != rhs.__isset.priority) + return false; + else if (__isset.priority && !(priority == rhs.priority)) + return false; return true; } bool operator != (const Notification &rhs) const { http://git-wip-us.apache.org/repos/asf/airavata/blob/ab0541ae/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Types.php ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Types.php index cb7b721..61355c2 100644 --- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Types.php +++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Types.php @@ -17,6 +17,17 @@ use Thrift\Protocol\TBinaryProtocolAccelerated; use Thrift\Exception\TApplicationException; +final class NotificationPriority { + const LOW = 0; + const NORMAL = 1; + const HIGH = 2; + static public $__names = array( + 0 => 'LOW', + 1 => 'NORMAL', + 2 => 'HIGH', + ); +} + class Group { static $_TSPEC; @@ -668,15 +679,23 @@ class Notification { /** * @var string */ - public $notifcationMessage = null; + public $notificationMessage = null; /** * @var int */ - public $publishedtime = null; + public $creationTime = null; + /** + * @var int + */ + public $publishedTime = null; /** * @var int */ public $expirationTime = null; + /** + * @var int + */ + public $priority = null; public function __construct($vals=null) { if (!isset(self::$_TSPEC)) { @@ -694,17 +713,25 @@ class Notification { 'type' => TType::STRING, ), 4 => array( - 'var' => 'notifcationMessage', + 'var' => 'notificationMessage', 'type' => TType::STRING, ), 5 => array( - 'var' => 'publishedtime', + 'var' => 'creationTime', 'type' => TType::I64, ), 6 => array( + 'var' => 'publishedTime', + 'type' => TType::I64, + ), + 7 => array( 'var' => 'expirationTime', 'type' => TType::I64, ), + 8 => array( + 'var' => 'priority', + 'type' => TType::I32, + ), ); } if (is_array($vals)) { @@ -717,15 +744,21 @@ class Notification { if (isset($vals['title'])) { $this->title = $vals['title']; } - if (isset($vals['notifcationMessage'])) { - $this->notifcationMessage = $vals['notifcationMessage']; + if (isset($vals['notificationMessage'])) { + $this->notificationMessage = $vals['notificationMessage']; } - if (isset($vals['publishedtime'])) { - $this->publishedtime = $vals['publishedtime']; + if (isset($vals['creationTime'])) { + $this->creationTime = $vals['creationTime']; + } + if (isset($vals['publishedTime'])) { + $this->publishedTime = $vals['publishedTime']; } if (isset($vals['expirationTime'])) { $this->expirationTime = $vals['expirationTime']; } + if (isset($vals['priority'])) { + $this->priority = $vals['priority']; + } } } @@ -771,25 +804,39 @@ class Notification { break; case 4: if ($ftype == TType::STRING) { - $xfer += $input->readString($this->notifcationMessage); + $xfer += $input->readString($this->notificationMessage); } else { $xfer += $input->skip($ftype); } break; case 5: if ($ftype == TType::I64) { - $xfer += $input->readI64($this->publishedtime); + $xfer += $input->readI64($this->creationTime); } else { $xfer += $input->skip($ftype); } break; case 6: if ($ftype == TType::I64) { + $xfer += $input->readI64($this->publishedTime); + } else { + $xfer += $input->skip($ftype); + } + break; + case 7: + if ($ftype == TType::I64) { $xfer += $input->readI64($this->expirationTime); } else { $xfer += $input->skip($ftype); } break; + case 8: + if ($ftype == TType::I32) { + $xfer += $input->readI32($this->priority); + } else { + $xfer += $input->skip($ftype); + } + break; default: $xfer += $input->skip($ftype); break; @@ -818,21 +865,31 @@ class Notification { $xfer += $output->writeString($this->title); $xfer += $output->writeFieldEnd(); } - if ($this->notifcationMessage !== null) { - $xfer += $output->writeFieldBegin('notifcationMessage', TType::STRING, 4); - $xfer += $output->writeString($this->notifcationMessage); + if ($this->notificationMessage !== null) { + $xfer += $output->writeFieldBegin('notificationMessage', TType::STRING, 4); + $xfer += $output->writeString($this->notificationMessage); $xfer += $output->writeFieldEnd(); } - if ($this->publishedtime !== null) { - $xfer += $output->writeFieldBegin('publishedtime', TType::I64, 5); - $xfer += $output->writeI64($this->publishedtime); + if ($this->creationTime !== null) { + $xfer += $output->writeFieldBegin('creationTime', TType::I64, 5); + $xfer += $output->writeI64($this->creationTime); + $xfer += $output->writeFieldEnd(); + } + if ($this->publishedTime !== null) { + $xfer += $output->writeFieldBegin('publishedTime', TType::I64, 6); + $xfer += $output->writeI64($this->publishedTime); $xfer += $output->writeFieldEnd(); } if ($this->expirationTime !== null) { - $xfer += $output->writeFieldBegin('expirationTime', TType::I64, 6); + $xfer += $output->writeFieldBegin('expirationTime', TType::I64, 7); $xfer += $output->writeI64($this->expirationTime); $xfer += $output->writeFieldEnd(); } + if ($this->priority !== null) { + $xfer += $output->writeFieldBegin('priority', TType::I32, 8); + $xfer += $output->writeI32($this->priority); + $xfer += $output->writeFieldEnd(); + } $xfer += $output->writeFieldStop(); $xfer += $output->writeStructEnd(); return $xfer; http://git-wip-us.apache.org/repos/asf/airavata/blob/ab0541ae/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workspace/ttypes.py ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workspace/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workspace/ttypes.py index ce23bea..74678df 100644 --- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workspace/ttypes.py +++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workspace/ttypes.py @@ -18,6 +18,23 @@ except: fastbinary = None +class NotificationPriority: + LOW = 0 + NORMAL = 1 + HIGH = 2 + + _VALUES_TO_NAMES = { + 0: "LOW", + 1: "NORMAL", + 2: "HIGH", + } + + _NAMES_TO_VALUES = { + "LOW": 0, + "NORMAL": 1, + "HIGH": 2, + } + class Group: """ @@ -465,9 +482,11 @@ class Notification: - notificationId - gatewayId - title - - notifcationMessage - - publishedtime + - notificationMessage + - creationTime + - publishedTime - expirationTime + - priority """ thrift_spec = ( @@ -475,18 +494,22 @@ class Notification: (1, TType.STRING, 'notificationId', None, None, ), # 1 (2, TType.STRING, 'gatewayId', None, None, ), # 2 (3, TType.STRING, 'title', None, None, ), # 3 - (4, TType.STRING, 'notifcationMessage', None, None, ), # 4 - (5, TType.I64, 'publishedtime', None, None, ), # 5 - (6, TType.I64, 'expirationTime', None, None, ), # 6 + (4, TType.STRING, 'notificationMessage', None, None, ), # 4 + (5, TType.I64, 'creationTime', None, None, ), # 5 + (6, TType.I64, 'publishedTime', None, None, ), # 6 + (7, TType.I64, 'expirationTime', None, None, ), # 7 + (8, TType.I32, 'priority', None, None, ), # 8 ) - def __init__(self, notificationId=None, gatewayId=None, title=None, notifcationMessage=None, publishedtime=None, expirationTime=None,): + def __init__(self, notificationId=None, gatewayId=None, title=None, notificationMessage=None, creationTime=None, publishedTime=None, expirationTime=None, priority=None,): self.notificationId = notificationId self.gatewayId = gatewayId self.title = title - self.notifcationMessage = notifcationMessage - self.publishedtime = publishedtime + self.notificationMessage = notificationMessage + self.creationTime = creationTime + self.publishedTime = publishedTime self.expirationTime = expirationTime + self.priority = priority def read(self, iprot): if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None: @@ -514,19 +537,29 @@ class Notification: iprot.skip(ftype) elif fid == 4: if ftype == TType.STRING: - self.notifcationMessage = iprot.readString() + self.notificationMessage = iprot.readString() else: iprot.skip(ftype) elif fid == 5: if ftype == TType.I64: - self.publishedtime = iprot.readI64() + self.creationTime = iprot.readI64() else: iprot.skip(ftype) elif fid == 6: if ftype == TType.I64: + self.publishedTime = iprot.readI64() + else: + iprot.skip(ftype) + elif fid == 7: + if ftype == TType.I64: self.expirationTime = iprot.readI64() else: iprot.skip(ftype) + elif fid == 8: + if ftype == TType.I32: + self.priority = iprot.readI32() + else: + iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -549,18 +582,26 @@ class Notification: oprot.writeFieldBegin('title', TType.STRING, 3) oprot.writeString(self.title) oprot.writeFieldEnd() - if self.notifcationMessage is not None: - oprot.writeFieldBegin('notifcationMessage', TType.STRING, 4) - oprot.writeString(self.notifcationMessage) + if self.notificationMessage is not None: + oprot.writeFieldBegin('notificationMessage', TType.STRING, 4) + oprot.writeString(self.notificationMessage) oprot.writeFieldEnd() - if self.publishedtime is not None: - oprot.writeFieldBegin('publishedtime', TType.I64, 5) - oprot.writeI64(self.publishedtime) + if self.creationTime is not None: + oprot.writeFieldBegin('creationTime', TType.I64, 5) + oprot.writeI64(self.creationTime) + oprot.writeFieldEnd() + if self.publishedTime is not None: + oprot.writeFieldBegin('publishedTime', TType.I64, 6) + oprot.writeI64(self.publishedTime) oprot.writeFieldEnd() if self.expirationTime is not None: - oprot.writeFieldBegin('expirationTime', TType.I64, 6) + oprot.writeFieldBegin('expirationTime', TType.I64, 7) oprot.writeI64(self.expirationTime) oprot.writeFieldEnd() + if self.priority is not None: + oprot.writeFieldBegin('priority', TType.I32, 8) + oprot.writeI32(self.priority) + oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -569,8 +610,8 @@ class Notification: raise TProtocol.TProtocolException(message='Required field gatewayId is unset!') if self.title is None: raise TProtocol.TProtocolException(message='Required field title is unset!') - if self.notifcationMessage is None: - raise TProtocol.TProtocolException(message='Required field notifcationMessage is unset!') + if self.notificationMessage is None: + raise TProtocol.TProtocolException(message='Required field notificationMessage is unset!') return @@ -579,9 +620,11 @@ class Notification: value = (value * 31) ^ hash(self.notificationId) value = (value * 31) ^ hash(self.gatewayId) value = (value * 31) ^ hash(self.title) - value = (value * 31) ^ hash(self.notifcationMessage) - value = (value * 31) ^ hash(self.publishedtime) + value = (value * 31) ^ hash(self.notificationMessage) + value = (value * 31) ^ hash(self.creationTime) + value = (value * 31) ^ hash(self.publishedTime) value = (value * 31) ^ hash(self.expirationTime) + value = (value * 31) ^ hash(self.priority) return value def __repr__(self): http://git-wip-us.apache.org/repos/asf/airavata/blob/ab0541ae/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java index 00dbe75..a07377b 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.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-04-22") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-29") public class ComponentStatus implements org.apache.thrift.TBase<ComponentStatus, ComponentStatus._Fields>, java.io.Serializable, Cloneable, Comparable<ComponentStatus> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComponentStatus"); http://git-wip-us.apache.org/repos/asf/airavata/blob/ab0541ae/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java index 52922fa..72dcb54 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.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-04-22") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-29") public class EdgeModel implements org.apache.thrift.TBase<EdgeModel, EdgeModel._Fields>, java.io.Serializable, Cloneable, Comparable<EdgeModel> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("EdgeModel"); http://git-wip-us.apache.org/repos/asf/airavata/blob/ab0541ae/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java index 0a4aa4f..0f3bcec 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.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-04-22") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-29") public class NodeModel implements org.apache.thrift.TBase<NodeModel, NodeModel._Fields>, java.io.Serializable, Cloneable, Comparable<NodeModel> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NodeModel"); http://git-wip-us.apache.org/repos/asf/airavata/blob/ab0541ae/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java index e218de7..6057db8 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.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-04-22") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-29") public class PortModel implements org.apache.thrift.TBase<PortModel, PortModel._Fields>, java.io.Serializable, Cloneable, Comparable<PortModel> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PortModel"); http://git-wip-us.apache.org/repos/asf/airavata/blob/ab0541ae/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java index 80acc5c..f9374ca 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.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-04-22") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-29") public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, WorkflowModel._Fields>, java.io.Serializable, Cloneable, Comparable<WorkflowModel> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WorkflowModel"); http://git-wip-us.apache.org/repos/asf/airavata/blob/ab0541ae/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java index 149f366..6101f8f 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.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-04-22") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-29") public class WorkflowStatus implements org.apache.thrift.TBase<WorkflowStatus, WorkflowStatus._Fields>, java.io.Serializable, Cloneable, Comparable<WorkflowStatus> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WorkflowStatus"); http://git-wip-us.apache.org/repos/asf/airavata/blob/ab0541ae/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java index 931dd34..cfe9fd3 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java @@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory; * assigns to the environment variable "NAME" the value * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-22") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-29") public class ApplicationDeploymentDescription implements org.apache.thrift.TBase<ApplicationDeploymentDescription, ApplicationDeploymentDescription._Fields>, java.io.Serializable, Cloneable, Comparable<ApplicationDeploymentDescription> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ApplicationDeploymentDescription"); http://git-wip-us.apache.org/repos/asf/airavata/blob/ab0541ae/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java index 8c202d6..ed2b9d3 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java @@ -66,7 +66,7 @@ import org.slf4j.LoggerFactory; * Descriprion of the Module * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-22") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-29") public class ApplicationModule implements org.apache.thrift.TBase<ApplicationModule, ApplicationModule._Fields>, java.io.Serializable, Cloneable, Comparable<ApplicationModule> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ApplicationModule"); http://git-wip-us.apache.org/repos/asf/airavata/blob/ab0541ae/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java index e9332f4..0549d32 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java @@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory; * commandOrder: * Order of the command in the multiple command situation */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-22") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-29") public class CommandObject implements org.apache.thrift.TBase<CommandObject, CommandObject._Fields>, java.io.Serializable, Cloneable, Comparable<CommandObject> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CommandObject"); http://git-wip-us.apache.org/repos/asf/airavata/blob/ab0541ae/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java index e024dd9..20299a6 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java @@ -63,7 +63,7 @@ import org.slf4j.LoggerFactory; * envPathOrder: * The order of the setting of the env variables when there are multiple env variables */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-22") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-29") public class SetEnvPaths implements org.apache.thrift.TBase<SetEnvPaths, SetEnvPaths._Fields>, java.io.Serializable, Cloneable, Comparable<SetEnvPaths> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SetEnvPaths"); http://git-wip-us.apache.org/repos/asf/airavata/blob/ab0541ae/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java index 1b11bea..6bc2d62 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java @@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory; * Outputs generated from the application * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-22") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-29") public class ApplicationInterfaceDescription implements org.apache.thrift.TBase<ApplicationInterfaceDescription, ApplicationInterfaceDescription._Fields>, java.io.Serializable, Cloneable, Comparable<ApplicationInterfaceDescription> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ApplicationInterfaceDescription"); http://git-wip-us.apache.org/repos/asf/airavata/blob/ab0541ae/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java index 6437e84..e57dfb4 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java @@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory; * maxRunTime: * Maximum allowed run time in hours. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-22") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-29") public class BatchQueue implements org.apache.thrift.TBase<BatchQueue, BatchQueue._Fields>, java.io.Serializable, Cloneable, Comparable<BatchQueue> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("BatchQueue"); http://git-wip-us.apache.org/repos/asf/airavata/blob/ab0541ae/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java index 455c1c7..e4b0bfc 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java @@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory; * * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-22") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-29") public class CloudJobSubmission implements org.apache.thrift.TBase<CloudJobSubmission, CloudJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<CloudJobSubmission> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CloudJobSubmission"); http://git-wip-us.apache.org/repos/asf/airavata/blob/ab0541ae/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java index 7d14bab..499217c 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java @@ -80,7 +80,7 @@ import org.slf4j.LoggerFactory; * Map of file systems type and the path. * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-22") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-29") public class ComputeResourceDescription implements org.apache.thrift.TBase<ComputeResourceDescription, ComputeResourceDescription._Fields>, java.io.Serializable, Cloneable, Comparable<ComputeResourceDescription> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComputeResourceDescription"); http://git-wip-us.apache.org/repos/asf/airavata/blob/ab0541ae/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java index 8fe9630..e4f1c9a 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.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-04-22") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-29") public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSubmission, GlobusJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<GlobusJobSubmission> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GlobusJobSubmission"); http://git-wip-us.apache.org/repos/asf/airavata/blob/ab0541ae/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java index 3d23d5b..2c80b14 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java @@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory; * Lower the numerical number, higher the priority * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-22") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-29") public class JobSubmissionInterface implements org.apache.thrift.TBase<JobSubmissionInterface, JobSubmissionInterface._Fields>, java.io.Serializable, Cloneable, Comparable<JobSubmissionInterface> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobSubmissionInterface"); http://git-wip-us.apache.org/repos/asf/airavata/blob/ab0541ae/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java index f3934b5..2047f31 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java @@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory; * sshPort: * If a non-default port needs to used, specify it. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-22") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-29") public class LOCALSubmission implements org.apache.thrift.TBase<LOCALSubmission, LOCALSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<LOCALSubmission> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LOCALSubmission"); http://git-wip-us.apache.org/repos/asf/airavata/blob/ab0541ae/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java index b84a869..749b49f 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java @@ -68,7 +68,7 @@ import org.slf4j.LoggerFactory; * An enumeration of commonly used manager commands. * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-22") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-29") public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobManager, ResourceJobManager._Fields>, java.io.Serializable, Cloneable, Comparable<ResourceJobManager> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ResourceJobManager"); http://git-wip-us.apache.org/repos/asf/airavata/blob/ab0541ae/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java index 1461064..f43c976 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java @@ -67,7 +67,7 @@ import org.slf4j.LoggerFactory; * the same. Example: *@*.example.com or *@example.com * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-22") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-29") public class SSHJobSubmission implements org.apache.thrift.TBase<SSHJobSubmission, SSHJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<SSHJobSubmission> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SSHJobSubmission"); http://git-wip-us.apache.org/repos/asf/airavata/blob/ab0541ae/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java index adf2a42..53954be 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java @@ -59,7 +59,7 @@ import org.slf4j.LoggerFactory; * authenticationMode * The authenticationMode defines the way certificate is fetched. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-22") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-29") public class UnicoreJobSubmission implements org.apache.thrift.TBase<UnicoreJobSubmission, UnicoreJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<UnicoreJobSubmission> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UnicoreJobSubmission"); http://git-wip-us.apache.org/repos/asf/airavata/blob/ab0541ae/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java index 5cbd8fd..5566912 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java @@ -85,7 +85,7 @@ import org.slf4j.LoggerFactory; * default credential store. * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-22") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-29") public class ComputeResourcePreference implements org.apache.thrift.TBase<ComputeResourcePreference, ComputeResourcePreference._Fields>, java.io.Serializable, Cloneable, Comparable<ComputeResourcePreference> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComputeResourcePreference"); http://git-wip-us.apache.org/repos/asf/airavata/blob/ab0541ae/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java index 7204527..06f9835 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java @@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory; * List of resource preferences for each of the registered compute resources. * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-22") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-29") public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayResourceProfile, GatewayResourceProfile._Fields>, java.io.Serializable, Cloneable, Comparable<GatewayResourceProfile> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GatewayResourceProfile"); http://git-wip-us.apache.org/repos/asf/airavata/blob/ab0541ae/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java index d8332e6..5f46684 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.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-04-22") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-29") public class StoragePreference implements org.apache.thrift.TBase<StoragePreference, StoragePreference._Fields>, java.io.Serializable, Cloneable, Comparable<StoragePreference> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StoragePreference"); http://git-wip-us.apache.org/repos/asf/airavata/blob/ab0541ae/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java index 3afa4e6..ad07e7c 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java @@ -68,7 +68,7 @@ import org.slf4j.LoggerFactory; * * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-22") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-29") public class StorageResourceDescription implements org.apache.thrift.TBase<StorageResourceDescription, StorageResourceDescription._Fields>, java.io.Serializable, Cloneable, Comparable<StorageResourceDescription> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StorageResourceDescription"); http://git-wip-us.apache.org/repos/asf/airavata/blob/ab0541ae/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java index f115ca9..1a64b4c 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java @@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory; * Any metadat. This is typically ignore by Airavata and is used by gateways for application configuration. * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-22") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-29") public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObjectType, InputDataObjectType._Fields>, java.io.Serializable, Cloneable, Comparable<InputDataObjectType> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InputDataObjectType"); http://git-wip-us.apache.org/repos/asf/airavata/blob/ab0541ae/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java index 2440676..fbe21ea 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java @@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory; * Any metadat. This is typically ignore by Airavata and is used by gateways for application configuration. * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-22") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-29") public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataObjectType, OutputDataObjectType._Fields>, java.io.Serializable, Cloneable, Comparable<OutputDataObjectType> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("OutputDataObjectType"); http://git-wip-us.apache.org/repos/asf/airavata/blob/ab0541ae/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java index 0d78880..263313d 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.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-04-22") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-29") public class ErrorModel implements org.apache.thrift.TBase<ErrorModel, ErrorModel._Fields>, java.io.Serializable, Cloneable, Comparable<ErrorModel> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ErrorModel"); http://git-wip-us.apache.org/repos/asf/airavata/blob/ab0541ae/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidationResults.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidationResults.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidationResults.java index 7f18838..38d3a27 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidationResults.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/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-04-22") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-29") 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/ab0541ae/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidatorResult.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidatorResult.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidatorResult.java index 1c9adeb..caf5243 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidatorResult.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidatorResult.java @@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory; * during the experiment launch operation * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-22") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-29") 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/ab0541ae/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java index 7d5df52..882a3a3 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java @@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory; * Lower the numerical number, higher the priority * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-22") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-29") public class DataMovementInterface implements org.apache.thrift.TBase<DataMovementInterface, DataMovementInterface._Fields>, java.io.Serializable, Cloneable, Comparable<DataMovementInterface> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataMovementInterface"); http://git-wip-us.apache.org/repos/asf/airavata/blob/ab0541ae/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java index 44c0443..280dc4a 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java @@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory; * sshPort: * If a non-default port needs to used, specify it. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-22") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-29") public class GridFTPDataMovement implements org.apache.thrift.TBase<GridFTPDataMovement, GridFTPDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<GridFTPDataMovement> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GridFTPDataMovement"); http://git-wip-us.apache.org/repos/asf/airavata/blob/ab0541ae/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java index 14c085e..0f54651 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java @@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory; * sshPort: * If a non-defualt port needs to used, specify it. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-22") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-29") public class LOCALDataMovement implements org.apache.thrift.TBase<LOCALDataMovement, LOCALDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<LOCALDataMovement> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LOCALDataMovement"); http://git-wip-us.apache.org/repos/asf/airavata/blob/ab0541ae/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java index 3ccef4a..39b6329 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java @@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory; * sshPort: * If a non-default port needs to used, specify it. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-22") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-29") public class SCPDataMovement implements org.apache.thrift.TBase<SCPDataMovement, SCPDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<SCPDataMovement> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SCPDataMovement"); http://git-wip-us.apache.org/repos/asf/airavata/blob/ab0541ae/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java index b5c71bb..e5a1f42 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java @@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory; * unicoreEndPointURL: * unicoreGateway End Point. The provider will query this service to fetch required service end points. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-22") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-29") public class UnicoreDataMovement implements org.apache.thrift.TBase<UnicoreDataMovement, UnicoreDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<UnicoreDataMovement> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UnicoreDataMovement"); http://git-wip-us.apache.org/repos/asf/airavata/blob/ab0541ae/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductModel.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductModel.java index 7f27013..a5fa78a 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductModel.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-04-22") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-29") public class DataProductModel implements org.apache.thrift.TBase<DataProductModel, DataProductModel._Fields>, java.io.Serializable, Cloneable, Comparable<DataProductModel> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataProductModel"); http://git-wip-us.apache.org/repos/asf/airavata/blob/ab0541ae/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataReplicaLocationModel.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataReplicaLocationModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataReplicaLocationModel.java index 8fec272..f48c226 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataReplicaLocationModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataReplicaLocationModel.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-04-22") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-29") public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataReplicaLocationModel, DataReplicaLocationModel._Fields>, java.io.Serializable, Cloneable, Comparable<DataReplicaLocationModel> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataReplicaLocationModel"); http://git-wip-us.apache.org/repos/asf/airavata/blob/ab0541ae/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 3b1ab1f..4a61372 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.3)", date = "2016-04-22") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-29") 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/ab0541ae/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 c5763fe..b5616e8 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.3)", date = "2016-04-22") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-29") 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/ab0541ae/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 89e8d83..cf723dc 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.3)", date = "2016-04-22") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-29") 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");
