http://git-wip-us.apache.org/repos/asf/airavata/blob/a8ca4fcb/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h index d073bd9..4f3ac5e 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h @@ -2968,11 +2968,11 @@ class AiravataIf { virtual bool shareResourceWithUsers(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::group::ResourceType::type resourceType, const std::map<std::string, ::apache::airavata::model::group::ResourcePermissionType::type> & userPermissionList) = 0; virtual bool revokeSharingOfResourceFromUsers(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::group::ResourceType::type resourceType, const std::map<std::string, ::apache::airavata::model::group::ResourcePermissionType::type> & userPermissionList) = 0; virtual void getAllAccessibleUsers(std::vector<std::string> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::group::ResourceType::type resourceType, const ::apache::airavata::model::group::ResourcePermissionType::type permissionType) = 0; - virtual bool createGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::group::GroupModel& groupModel) = 0; + virtual void createGroup(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::group::GroupModel& groupModel) = 0; virtual bool updateGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::group::GroupModel& groupModel) = 0; - virtual bool deleteGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId, const std::string& ownerId, const std::string& gatewayId) = 0; + virtual bool deleteGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId, const std::string& ownerId) = 0; virtual void getGroup( ::apache::airavata::model::group::GroupModel& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId) = 0; - virtual void getAllGroupsUserBelongs(std::vector< ::apache::airavata::model::group::GroupModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId) = 0; + virtual void getAllGroupsUserBelongs(std::vector< ::apache::airavata::model::group::GroupModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName) = 0; }; class AiravataIfFactory { @@ -3551,22 +3551,21 @@ class AiravataNull : virtual public AiravataIf { void getAllAccessibleUsers(std::vector<std::string> & /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* resourceId */, const ::apache::airavata::model::group::ResourceType::type /* resourceType */, const ::apache::airavata::model::group::ResourcePermissionType::type /* permissionType */) { return; } - bool createGroup(const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const ::apache::airavata::model::group::GroupModel& /* groupModel */) { - bool _return = false; - return _return; + void createGroup(std::string& /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const ::apache::airavata::model::group::GroupModel& /* groupModel */) { + return; } bool updateGroup(const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const ::apache::airavata::model::group::GroupModel& /* groupModel */) { bool _return = false; return _return; } - bool deleteGroup(const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* groupId */, const std::string& /* ownerId */, const std::string& /* gatewayId */) { + bool deleteGroup(const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* groupId */, const std::string& /* ownerId */) { bool _return = false; return _return; } void getGroup( ::apache::airavata::model::group::GroupModel& /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* groupId */) { return; } - void getAllGroupsUserBelongs(std::vector< ::apache::airavata::model::group::GroupModel> & /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* userName */, const std::string& /* gatewayId */) { + void getAllGroupsUserBelongs(std::vector< ::apache::airavata::model::group::GroupModel> & /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* userName */) { return; } }; @@ -26806,11 +26805,11 @@ class Airavata_createGroup_result { Airavata_createGroup_result(const Airavata_createGroup_result&); Airavata_createGroup_result& operator=(const Airavata_createGroup_result&); - Airavata_createGroup_result() : success(0) { + Airavata_createGroup_result() : success() { } virtual ~Airavata_createGroup_result() throw(); - bool success; + std::string success; ::apache::airavata::api::error::InvalidRequestException ire; ::apache::airavata::api::error::AiravataClientException ace; ::apache::airavata::api::error::AiravataSystemException ase; @@ -26818,7 +26817,7 @@ class Airavata_createGroup_result { _Airavata_createGroup_result__isset __isset; - void __set_success(const bool val); + void __set_success(const std::string& val); void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val); @@ -26867,7 +26866,7 @@ class Airavata_createGroup_presult { virtual ~Airavata_createGroup_presult() throw(); - bool* success; + std::string* success; ::apache::airavata::api::error::InvalidRequestException ire; ::apache::airavata::api::error::AiravataClientException ace; ::apache::airavata::api::error::AiravataSystemException ase; @@ -27021,14 +27020,13 @@ class Airavata_deleteGroup_args { Airavata_deleteGroup_args(const Airavata_deleteGroup_args&); Airavata_deleteGroup_args& operator=(const Airavata_deleteGroup_args&); - Airavata_deleteGroup_args() : groupId(), ownerId(), gatewayId() { + Airavata_deleteGroup_args() : groupId(), ownerId() { } virtual ~Airavata_deleteGroup_args() throw(); ::apache::airavata::model::security::AuthzToken authzToken; std::string groupId; std::string ownerId; - std::string gatewayId; void __set_authzToken(const ::apache::airavata::model::security::AuthzToken& val); @@ -27036,8 +27034,6 @@ class Airavata_deleteGroup_args { void __set_ownerId(const std::string& val); - void __set_gatewayId(const std::string& val); - bool operator == (const Airavata_deleteGroup_args & rhs) const { if (!(authzToken == rhs.authzToken)) @@ -27046,8 +27042,6 @@ class Airavata_deleteGroup_args { return false; if (!(ownerId == rhs.ownerId)) return false; - if (!(gatewayId == rhs.gatewayId)) - return false; return true; } bool operator != (const Airavata_deleteGroup_args &rhs) const { @@ -27070,7 +27064,6 @@ class Airavata_deleteGroup_pargs { const ::apache::airavata::model::security::AuthzToken* authzToken; const std::string* groupId; const std::string* ownerId; - const std::string* gatewayId; uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; @@ -27305,28 +27298,23 @@ class Airavata_getAllGroupsUserBelongs_args { Airavata_getAllGroupsUserBelongs_args(const Airavata_getAllGroupsUserBelongs_args&); Airavata_getAllGroupsUserBelongs_args& operator=(const Airavata_getAllGroupsUserBelongs_args&); - Airavata_getAllGroupsUserBelongs_args() : userName(), gatewayId() { + Airavata_getAllGroupsUserBelongs_args() : userName() { } virtual ~Airavata_getAllGroupsUserBelongs_args() throw(); ::apache::airavata::model::security::AuthzToken authzToken; std::string userName; - std::string gatewayId; void __set_authzToken(const ::apache::airavata::model::security::AuthzToken& val); void __set_userName(const std::string& val); - void __set_gatewayId(const std::string& val); - bool operator == (const Airavata_getAllGroupsUserBelongs_args & rhs) const { if (!(authzToken == rhs.authzToken)) return false; if (!(userName == rhs.userName)) return false; - if (!(gatewayId == rhs.gatewayId)) - return false; return true; } bool operator != (const Airavata_getAllGroupsUserBelongs_args &rhs) const { @@ -27348,7 +27336,6 @@ class Airavata_getAllGroupsUserBelongs_pargs { virtual ~Airavata_getAllGroupsUserBelongs_pargs() throw(); const ::apache::airavata::model::security::AuthzToken* authzToken; const std::string* userName; - const std::string* gatewayId; uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; @@ -27958,20 +27945,20 @@ class AiravataClient : virtual public AiravataIf { void getAllAccessibleUsers(std::vector<std::string> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::group::ResourceType::type resourceType, const ::apache::airavata::model::group::ResourcePermissionType::type permissionType); void send_getAllAccessibleUsers(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::group::ResourceType::type resourceType, const ::apache::airavata::model::group::ResourcePermissionType::type permissionType); void recv_getAllAccessibleUsers(std::vector<std::string> & _return); - bool createGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::group::GroupModel& groupModel); + void createGroup(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::group::GroupModel& groupModel); void send_createGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::group::GroupModel& groupModel); - bool recv_createGroup(); + void recv_createGroup(std::string& _return); bool updateGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::group::GroupModel& groupModel); void send_updateGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::group::GroupModel& groupModel); bool recv_updateGroup(); - bool deleteGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId, const std::string& ownerId, const std::string& gatewayId); - void send_deleteGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId, const std::string& ownerId, const std::string& gatewayId); + bool deleteGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId, const std::string& ownerId); + void send_deleteGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId, const std::string& ownerId); bool recv_deleteGroup(); void getGroup( ::apache::airavata::model::group::GroupModel& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId); void send_getGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId); void recv_getGroup( ::apache::airavata::model::group::GroupModel& _return); - void getAllGroupsUserBelongs(std::vector< ::apache::airavata::model::group::GroupModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId); - void send_getAllGroupsUserBelongs(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId); + void getAllGroupsUserBelongs(std::vector< ::apache::airavata::model::group::GroupModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName); + void send_getAllGroupsUserBelongs(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName); void recv_getAllGroupsUserBelongs(std::vector< ::apache::airavata::model::group::GroupModel> & _return); protected: boost::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot_; @@ -29932,13 +29919,14 @@ class AiravataMultiface : virtual public AiravataIf { return; } - bool createGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::group::GroupModel& groupModel) { + void createGroup(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::group::GroupModel& groupModel) { size_t sz = ifaces_.size(); size_t i = 0; for (; i < (sz - 1); ++i) { - ifaces_[i]->createGroup(authzToken, groupModel); + ifaces_[i]->createGroup(_return, authzToken, groupModel); } - return ifaces_[i]->createGroup(authzToken, groupModel); + ifaces_[i]->createGroup(_return, authzToken, groupModel); + return; } bool updateGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::group::GroupModel& groupModel) { @@ -29950,13 +29938,13 @@ class AiravataMultiface : virtual public AiravataIf { return ifaces_[i]->updateGroup(authzToken, groupModel); } - bool deleteGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId, const std::string& ownerId, const std::string& gatewayId) { + bool deleteGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId, const std::string& ownerId) { size_t sz = ifaces_.size(); size_t i = 0; for (; i < (sz - 1); ++i) { - ifaces_[i]->deleteGroup(authzToken, groupId, ownerId, gatewayId); + ifaces_[i]->deleteGroup(authzToken, groupId, ownerId); } - return ifaces_[i]->deleteGroup(authzToken, groupId, ownerId, gatewayId); + return ifaces_[i]->deleteGroup(authzToken, groupId, ownerId); } void getGroup( ::apache::airavata::model::group::GroupModel& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId) { @@ -29969,13 +29957,13 @@ class AiravataMultiface : virtual public AiravataIf { return; } - void getAllGroupsUserBelongs(std::vector< ::apache::airavata::model::group::GroupModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId) { + void getAllGroupsUserBelongs(std::vector< ::apache::airavata::model::group::GroupModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName) { size_t sz = ifaces_.size(); size_t i = 0; for (; i < (sz - 1); ++i) { - ifaces_[i]->getAllGroupsUserBelongs(_return, authzToken, userName, gatewayId); + ifaces_[i]->getAllGroupsUserBelongs(_return, authzToken, userName); } - ifaces_[i]->getAllGroupsUserBelongs(_return, authzToken, userName, gatewayId); + ifaces_[i]->getAllGroupsUserBelongs(_return, authzToken, userName); return; } @@ -30501,20 +30489,20 @@ class AiravataConcurrentClient : virtual public AiravataIf { void getAllAccessibleUsers(std::vector<std::string> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::group::ResourceType::type resourceType, const ::apache::airavata::model::group::ResourcePermissionType::type permissionType); int32_t send_getAllAccessibleUsers(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::group::ResourceType::type resourceType, const ::apache::airavata::model::group::ResourcePermissionType::type permissionType); void recv_getAllAccessibleUsers(std::vector<std::string> & _return, const int32_t seqid); - bool createGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::group::GroupModel& groupModel); + void createGroup(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::group::GroupModel& groupModel); int32_t send_createGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::group::GroupModel& groupModel); - bool recv_createGroup(const int32_t seqid); + void recv_createGroup(std::string& _return, const int32_t seqid); bool updateGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::group::GroupModel& groupModel); int32_t send_updateGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::group::GroupModel& groupModel); bool recv_updateGroup(const int32_t seqid); - bool deleteGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId, const std::string& ownerId, const std::string& gatewayId); - int32_t send_deleteGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId, const std::string& ownerId, const std::string& gatewayId); + bool deleteGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId, const std::string& ownerId); + int32_t send_deleteGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId, const std::string& ownerId); bool recv_deleteGroup(const int32_t seqid); void getGroup( ::apache::airavata::model::group::GroupModel& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId); int32_t send_getGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId); void recv_getGroup( ::apache::airavata::model::group::GroupModel& _return, const int32_t seqid); - void getAllGroupsUserBelongs(std::vector< ::apache::airavata::model::group::GroupModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId); - int32_t send_getAllGroupsUserBelongs(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId); + void getAllGroupsUserBelongs(std::vector< ::apache::airavata::model::group::GroupModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName); + int32_t send_getAllGroupsUserBelongs(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName); void recv_getAllGroupsUserBelongs(std::vector< ::apache::airavata::model::group::GroupModel> & _return, const int32_t seqid); protected: boost::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot_;
http://git-wip-us.apache.org/repos/asf/airavata/blob/a8ca4fcb/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp index 6fbb294..3cbc25f 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp @@ -3486,7 +3486,7 @@ class AiravataHandler : virtual public AiravataIf { printf("getAllAccessibleUsers\n"); } - bool createGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::group::GroupModel& groupModel) { + void createGroup(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::group::GroupModel& groupModel) { // Your implementation goes here printf("createGroup\n"); } @@ -3496,7 +3496,7 @@ class AiravataHandler : virtual public AiravataIf { printf("updateGroup\n"); } - bool deleteGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId, const std::string& ownerId, const std::string& gatewayId) { + bool deleteGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId, const std::string& ownerId) { // Your implementation goes here printf("deleteGroup\n"); } @@ -3506,7 +3506,7 @@ class AiravataHandler : virtual public AiravataIf { printf("getGroup\n"); } - void getAllGroupsUserBelongs(std::vector< ::apache::airavata::model::group::GroupModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId) { + void getAllGroupsUserBelongs(std::vector< ::apache::airavata::model::group::GroupModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName) { // Your implementation goes here printf("getAllGroupsUserBelongs\n"); } http://git-wip-us.apache.org/repos/asf/airavata/blob/a8ca4fcb/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php index ae27035..18bfcf5 100644 --- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php +++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php @@ -4045,7 +4045,7 @@ interface AiravataIf { /** * @param \Airavata\Model\Security\AuthzToken $authzToken * @param \Airavata\Model\Group\GroupModel $groupModel - * @return bool + * @return string * @throws \Airavata\API\Error\InvalidRequestException * @throws \Airavata\API\Error\AiravataClientException * @throws \Airavata\API\Error\AiravataSystemException @@ -4066,14 +4066,13 @@ interface AiravataIf { * @param \Airavata\Model\Security\AuthzToken $authzToken * @param string $groupId * @param string $ownerId - * @param string $gatewayId * @return bool * @throws \Airavata\API\Error\InvalidRequestException * @throws \Airavata\API\Error\AiravataClientException * @throws \Airavata\API\Error\AiravataSystemException * @throws \Airavata\API\Error\AuthorizationException */ - public function deleteGroup(\Airavata\Model\Security\AuthzToken $authzToken, $groupId, $ownerId, $gatewayId); + public function deleteGroup(\Airavata\Model\Security\AuthzToken $authzToken, $groupId, $ownerId); /** * @param \Airavata\Model\Security\AuthzToken $authzToken * @param string $groupId @@ -4087,14 +4086,13 @@ interface AiravataIf { /** * @param \Airavata\Model\Security\AuthzToken $authzToken * @param string $userName - * @param string $gatewayId * @return \Airavata\Model\Group\GroupModel[] * @throws \Airavata\API\Error\InvalidRequestException * @throws \Airavata\API\Error\AiravataClientException * @throws \Airavata\API\Error\AiravataSystemException * @throws \Airavata\API\Error\AuthorizationException */ - public function getAllGroupsUserBelongs(\Airavata\Model\Security\AuthzToken $authzToken, $userName, $gatewayId); + public function getAllGroupsUserBelongs(\Airavata\Model\Security\AuthzToken $authzToken, $userName); } class AiravataClient implements \Airavata\API\AiravataIf { @@ -14860,19 +14858,18 @@ class AiravataClient implements \Airavata\API\AiravataIf { throw new \Exception("updateGroup failed: unknown result"); } - public function deleteGroup(\Airavata\Model\Security\AuthzToken $authzToken, $groupId, $ownerId, $gatewayId) + public function deleteGroup(\Airavata\Model\Security\AuthzToken $authzToken, $groupId, $ownerId) { - $this->send_deleteGroup($authzToken, $groupId, $ownerId, $gatewayId); + $this->send_deleteGroup($authzToken, $groupId, $ownerId); return $this->recv_deleteGroup(); } - public function send_deleteGroup(\Airavata\Model\Security\AuthzToken $authzToken, $groupId, $ownerId, $gatewayId) + public function send_deleteGroup(\Airavata\Model\Security\AuthzToken $authzToken, $groupId, $ownerId) { $args = new \Airavata\API\Airavata_deleteGroup_args(); $args->authzToken = $authzToken; $args->groupId = $groupId; $args->ownerId = $ownerId; - $args->gatewayId = $gatewayId; $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary'); if ($bin_accel) { @@ -14990,18 +14987,17 @@ class AiravataClient implements \Airavata\API\AiravataIf { throw new \Exception("getGroup failed: unknown result"); } - public function getAllGroupsUserBelongs(\Airavata\Model\Security\AuthzToken $authzToken, $userName, $gatewayId) + public function getAllGroupsUserBelongs(\Airavata\Model\Security\AuthzToken $authzToken, $userName) { - $this->send_getAllGroupsUserBelongs($authzToken, $userName, $gatewayId); + $this->send_getAllGroupsUserBelongs($authzToken, $userName); return $this->recv_getAllGroupsUserBelongs(); } - public function send_getAllGroupsUserBelongs(\Airavata\Model\Security\AuthzToken $authzToken, $userName, $gatewayId) + public function send_getAllGroupsUserBelongs(\Airavata\Model\Security\AuthzToken $authzToken, $userName) { $args = new \Airavata\API\Airavata_getAllGroupsUserBelongs_args(); $args->authzToken = $authzToken; $args->userName = $userName; - $args->gatewayId = $gatewayId; $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary'); if ($bin_accel) { @@ -65533,7 +65529,7 @@ class Airavata_createGroup_result { static $_TSPEC; /** - * @var bool + * @var string */ public $success = null; /** @@ -65558,7 +65554,7 @@ class Airavata_createGroup_result { self::$_TSPEC = array( 0 => array( 'var' => 'success', - 'type' => TType::BOOL, + 'type' => TType::STRING, ), 1 => array( 'var' => 'ire', @@ -65621,8 +65617,8 @@ class Airavata_createGroup_result { switch ($fid) { case 0: - if ($ftype == TType::BOOL) { - $xfer += $input->readBool($this->success); + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->success); } else { $xfer += $input->skip($ftype); } @@ -65673,8 +65669,8 @@ class Airavata_createGroup_result { $xfer = 0; $xfer += $output->writeStructBegin('Airavata_createGroup_result'); if ($this->success !== null) { - $xfer += $output->writeFieldBegin('success', TType::BOOL, 0); - $xfer += $output->writeBool($this->success); + $xfer += $output->writeFieldBegin('success', TType::STRING, 0); + $xfer += $output->writeString($this->success); $xfer += $output->writeFieldEnd(); } if ($this->ire !== null) { @@ -66002,10 +65998,6 @@ class Airavata_deleteGroup_args { * @var string */ public $ownerId = null; - /** - * @var string - */ - public $gatewayId = null; public function __construct($vals=null) { if (!isset(self::$_TSPEC)) { @@ -66023,10 +66015,6 @@ class Airavata_deleteGroup_args { 'var' => 'ownerId', 'type' => TType::STRING, ), - 4 => array( - 'var' => 'gatewayId', - 'type' => TType::STRING, - ), ); } if (is_array($vals)) { @@ -66039,9 +66027,6 @@ class Airavata_deleteGroup_args { if (isset($vals['ownerId'])) { $this->ownerId = $vals['ownerId']; } - if (isset($vals['gatewayId'])) { - $this->gatewayId = $vals['gatewayId']; - } } } @@ -66086,13 +66071,6 @@ class Airavata_deleteGroup_args { $xfer += $input->skip($ftype); } break; - case 4: - if ($ftype == TType::STRING) { - $xfer += $input->readString($this->gatewayId); - } else { - $xfer += $input->skip($ftype); - } - break; default: $xfer += $input->skip($ftype); break; @@ -66124,11 +66102,6 @@ class Airavata_deleteGroup_args { $xfer += $output->writeString($this->ownerId); $xfer += $output->writeFieldEnd(); } - if ($this->gatewayId !== null) { - $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 4); - $xfer += $output->writeString($this->gatewayId); - $xfer += $output->writeFieldEnd(); - } $xfer += $output->writeFieldStop(); $xfer += $output->writeStructEnd(); return $xfer; @@ -66605,10 +66578,6 @@ class Airavata_getAllGroupsUserBelongs_args { * @var string */ public $userName = null; - /** - * @var string - */ - public $gatewayId = null; public function __construct($vals=null) { if (!isset(self::$_TSPEC)) { @@ -66622,10 +66591,6 @@ class Airavata_getAllGroupsUserBelongs_args { 'var' => 'userName', 'type' => TType::STRING, ), - 3 => array( - 'var' => 'gatewayId', - 'type' => TType::STRING, - ), ); } if (is_array($vals)) { @@ -66635,9 +66600,6 @@ class Airavata_getAllGroupsUserBelongs_args { if (isset($vals['userName'])) { $this->userName = $vals['userName']; } - if (isset($vals['gatewayId'])) { - $this->gatewayId = $vals['gatewayId']; - } } } @@ -66675,13 +66637,6 @@ class Airavata_getAllGroupsUserBelongs_args { $xfer += $input->skip($ftype); } break; - case 3: - if ($ftype == TType::STRING) { - $xfer += $input->readString($this->gatewayId); - } else { - $xfer += $input->skip($ftype); - } - break; default: $xfer += $input->skip($ftype); break; @@ -66708,11 +66663,6 @@ class Airavata_getAllGroupsUserBelongs_args { $xfer += $output->writeString($this->userName); $xfer += $output->writeFieldEnd(); } - if ($this->gatewayId !== null) { - $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 3); - $xfer += $output->writeString($this->gatewayId); - $xfer += $output->writeFieldEnd(); - } $xfer += $output->writeFieldStop(); $xfer += $output->writeStructEnd(); return $xfer; http://git-wip-us.apache.org/repos/asf/airavata/blob/a8ca4fcb/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php index 03a2690..86e6c5d 100644 --- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php +++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php @@ -51,7 +51,7 @@ final class ResourceJobManagerType { 3 => 'LSF', 4 => 'UGE', 5 => 'CLOUD', - 6 => 'AIRAVATA_CUSTOM', + 6 => 'AIRAVATA_CUSTOM', ); } http://git-wip-us.apache.org/repos/asf/airavata/blob/a8ca4fcb/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Application/Io/Types.php ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Application/Io/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Application/Io/Types.php index fd97025..b8bdf76 100644 --- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Application/Io/Types.php +++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Application/Io/Types.php @@ -173,9 +173,9 @@ class InputDataObjectType { 'var' => 'storageResourceId', 'type' => TType::STRING, ), - 13 => array( - 'var' => 'isReadOnly', - 'type' => TType::BOOL, + 13 => array( + 'var' => 'isReadOnly', + 'type' => TType::BOOL, ), ); } http://git-wip-us.apache.org/repos/asf/airavata/blob/a8ca4fcb/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote index 9fbba49..6e93167 100755 --- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote +++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote @@ -188,11 +188,11 @@ if len(sys.argv) <= 1 or sys.argv[1] == '--help': print(' bool shareResourceWithUsers(AuthzToken authzToken, string resourceId, ResourceType resourceType, userPermissionList)') print(' bool revokeSharingOfResourceFromUsers(AuthzToken authzToken, string resourceId, ResourceType resourceType, userPermissionList)') print(' getAllAccessibleUsers(AuthzToken authzToken, string resourceId, ResourceType resourceType, ResourcePermissionType permissionType)') - print(' bool createGroup(AuthzToken authzToken, GroupModel groupModel)') + print(' string createGroup(AuthzToken authzToken, GroupModel groupModel)') print(' bool updateGroup(AuthzToken authzToken, GroupModel groupModel)') - print(' bool deleteGroup(AuthzToken authzToken, string groupId, string ownerId, string gatewayId)') + print(' bool deleteGroup(AuthzToken authzToken, string groupId, string ownerId)') print(' GroupModel getGroup(AuthzToken authzToken, string groupId)') - print(' getAllGroupsUserBelongs(AuthzToken authzToken, string userName, string gatewayId)') + print(' getAllGroupsUserBelongs(AuthzToken authzToken, string userName)') print('') sys.exit(0) @@ -1246,10 +1246,10 @@ elif cmd == 'updateGroup': pp.pprint(client.updateGroup(eval(args[0]),eval(args[1]),)) elif cmd == 'deleteGroup': - if len(args) != 4: - print('deleteGroup requires 4 args') + if len(args) != 3: + print('deleteGroup requires 3 args') sys.exit(1) - pp.pprint(client.deleteGroup(eval(args[0]),args[1],args[2],args[3],)) + pp.pprint(client.deleteGroup(eval(args[0]),args[1],args[2],)) elif cmd == 'getGroup': if len(args) != 2: @@ -1258,10 +1258,10 @@ elif cmd == 'getGroup': pp.pprint(client.getGroup(eval(args[0]),args[1],)) elif cmd == 'getAllGroupsUserBelongs': - if len(args) != 3: - print('getAllGroupsUserBelongs requires 3 args') + if len(args) != 2: + print('getAllGroupsUserBelongs requires 2 args') sys.exit(1) - pp.pprint(client.getAllGroupsUserBelongs(eval(args[0]),args[1],args[2],)) + pp.pprint(client.getAllGroupsUserBelongs(eval(args[0]),args[1],)) else: print('Unrecognized method %s' % cmd) http://git-wip-us.apache.org/repos/asf/airavata/blob/a8ca4fcb/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py index c083274..ee69980 100644 --- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py +++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py @@ -3429,13 +3429,12 @@ class Iface: """ pass - def deleteGroup(self, authzToken, groupId, ownerId, gatewayId): + def deleteGroup(self, authzToken, groupId, ownerId): """ Parameters: - authzToken - groupId - ownerId - - gatewayId """ pass @@ -3447,12 +3446,11 @@ class Iface: """ pass - def getAllGroupsUserBelongs(self, authzToken, userName, gatewayId): + def getAllGroupsUserBelongs(self, authzToken, userName): """ Parameters: - authzToken - userName - - gatewayId """ pass @@ -12483,24 +12481,22 @@ class Client(Iface): raise result.ae raise TApplicationException(TApplicationException.MISSING_RESULT, "updateGroup failed: unknown result") - def deleteGroup(self, authzToken, groupId, ownerId, gatewayId): + def deleteGroup(self, authzToken, groupId, ownerId): """ Parameters: - authzToken - groupId - ownerId - - gatewayId """ - self.send_deleteGroup(authzToken, groupId, ownerId, gatewayId) + self.send_deleteGroup(authzToken, groupId, ownerId) return self.recv_deleteGroup() - def send_deleteGroup(self, authzToken, groupId, ownerId, gatewayId): + def send_deleteGroup(self, authzToken, groupId, ownerId): self._oprot.writeMessageBegin('deleteGroup', TMessageType.CALL, self._seqid) args = deleteGroup_args() args.authzToken = authzToken args.groupId = groupId args.ownerId = ownerId - args.gatewayId = gatewayId args.write(self._oprot) self._oprot.writeMessageEnd() self._oprot.trans.flush() @@ -12569,22 +12565,20 @@ class Client(Iface): raise result.ae raise TApplicationException(TApplicationException.MISSING_RESULT, "getGroup failed: unknown result") - def getAllGroupsUserBelongs(self, authzToken, userName, gatewayId): + def getAllGroupsUserBelongs(self, authzToken, userName): """ Parameters: - authzToken - userName - - gatewayId """ - self.send_getAllGroupsUserBelongs(authzToken, userName, gatewayId) + self.send_getAllGroupsUserBelongs(authzToken, userName) return self.recv_getAllGroupsUserBelongs() - def send_getAllGroupsUserBelongs(self, authzToken, userName, gatewayId): + def send_getAllGroupsUserBelongs(self, authzToken, userName): self._oprot.writeMessageBegin('getAllGroupsUserBelongs', TMessageType.CALL, self._seqid) args = getAllGroupsUserBelongs_args() args.authzToken = authzToken args.userName = userName - args.gatewayId = gatewayId args.write(self._oprot) self._oprot.writeMessageEnd() self._oprot.trans.flush() @@ -17969,7 +17963,7 @@ class Processor(Iface, TProcessor): iprot.readMessageEnd() result = deleteGroup_result() try: - result.success = self._handler.deleteGroup(args.authzToken, args.groupId, args.ownerId, args.gatewayId) + result.success = self._handler.deleteGroup(args.authzToken, args.groupId, args.ownerId) msg_type = TMessageType.REPLY except (TTransport.TTransportException, KeyboardInterrupt, SystemExit): raise @@ -18031,7 +18025,7 @@ class Processor(Iface, TProcessor): iprot.readMessageEnd() result = getAllGroupsUserBelongs_result() try: - result.success = self._handler.getAllGroupsUserBelongs(args.authzToken, args.userName, args.gatewayId) + result.success = self._handler.getAllGroupsUserBelongs(args.authzToken, args.userName) msg_type = TMessageType.REPLY except (TTransport.TTransportException, KeyboardInterrupt, SystemExit): raise @@ -53909,7 +53903,7 @@ class createGroup_result: """ thrift_spec = ( - (0, TType.BOOL, 'success', None, None, ), # 0 + (0, TType.STRING, 'success', None, None, ), # 0 (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1 (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2 (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3 @@ -53933,8 +53927,8 @@ class createGroup_result: if ftype == TType.STOP: break if fid == 0: - if ftype == TType.BOOL: - self.success = iprot.readBool() + if ftype == TType.STRING: + self.success = iprot.readString() else: iprot.skip(ftype) elif fid == 1: @@ -53972,8 +53966,8 @@ class createGroup_result: return oprot.writeStructBegin('createGroup_result') if self.success is not None: - oprot.writeFieldBegin('success', TType.BOOL, 0) - oprot.writeBool(self.success) + oprot.writeFieldBegin('success', TType.STRING, 0) + oprot.writeString(self.success) oprot.writeFieldEnd() if self.ire is not None: oprot.writeFieldBegin('ire', TType.STRUCT, 1) @@ -54228,7 +54222,6 @@ class deleteGroup_args: - authzToken - groupId - ownerId - - gatewayId """ thrift_spec = ( @@ -54236,14 +54229,12 @@ class deleteGroup_args: (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1 (2, TType.STRING, 'groupId', None, None, ), # 2 (3, TType.STRING, 'ownerId', None, None, ), # 3 - (4, TType.STRING, 'gatewayId', None, None, ), # 4 ) - def __init__(self, authzToken=None, groupId=None, ownerId=None, gatewayId=None,): + def __init__(self, authzToken=None, groupId=None, ownerId=None,): self.authzToken = authzToken self.groupId = groupId self.ownerId = ownerId - self.gatewayId = gatewayId 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: @@ -54270,11 +54261,6 @@ class deleteGroup_args: self.ownerId = iprot.readString() else: iprot.skip(ftype) - elif fid == 4: - if ftype == TType.STRING: - self.gatewayId = iprot.readString() - else: - iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -54297,10 +54283,6 @@ class deleteGroup_args: oprot.writeFieldBegin('ownerId', TType.STRING, 3) oprot.writeString(self.ownerId) oprot.writeFieldEnd() - if self.gatewayId is not None: - oprot.writeFieldBegin('gatewayId', TType.STRING, 4) - oprot.writeString(self.gatewayId) - oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -54311,8 +54293,6 @@ class deleteGroup_args: raise TProtocol.TProtocolException(message='Required field groupId is unset!') if self.ownerId is None: raise TProtocol.TProtocolException(message='Required field ownerId is unset!') - if self.gatewayId is None: - raise TProtocol.TProtocolException(message='Required field gatewayId is unset!') return @@ -54321,7 +54301,6 @@ class deleteGroup_args: value = (value * 31) ^ hash(self.authzToken) value = (value * 31) ^ hash(self.groupId) value = (value * 31) ^ hash(self.ownerId) - value = (value * 31) ^ hash(self.gatewayId) return value def __repr__(self): @@ -54664,20 +54643,17 @@ class getAllGroupsUserBelongs_args: Attributes: - authzToken - userName - - gatewayId """ thrift_spec = ( None, # 0 (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1 (2, TType.STRING, 'userName', None, None, ), # 2 - (3, TType.STRING, 'gatewayId', None, None, ), # 3 ) - def __init__(self, authzToken=None, userName=None, gatewayId=None,): + def __init__(self, authzToken=None, userName=None,): self.authzToken = authzToken self.userName = userName - self.gatewayId = gatewayId 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: @@ -54699,11 +54675,6 @@ class getAllGroupsUserBelongs_args: self.userName = iprot.readString() else: iprot.skip(ftype) - elif fid == 3: - if ftype == TType.STRING: - self.gatewayId = iprot.readString() - else: - iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -54722,10 +54693,6 @@ class getAllGroupsUserBelongs_args: oprot.writeFieldBegin('userName', TType.STRING, 2) oprot.writeString(self.userName) oprot.writeFieldEnd() - if self.gatewayId is not None: - oprot.writeFieldBegin('gatewayId', TType.STRING, 3) - oprot.writeString(self.gatewayId) - oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -54734,8 +54701,6 @@ class getAllGroupsUserBelongs_args: raise TProtocol.TProtocolException(message='Required field authzToken is unset!') if self.userName is None: raise TProtocol.TProtocolException(message='Required field userName is unset!') - if self.gatewayId is None: - raise TProtocol.TProtocolException(message='Required field gatewayId is unset!') return @@ -54743,7 +54708,6 @@ class getAllGroupsUserBelongs_args: value = 17 value = (value * 31) ^ hash(self.authzToken) value = (value * 31) ^ hash(self.userName) - value = (value * 31) ^ hash(self.gatewayId) return value def __repr__(self): http://git-wip-us.apache.org/repos/asf/airavata/blob/a8ca4fcb/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentState.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentState.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentState.java index 624567b..1e68782 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentState.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentState.java @@ -1,22 +1,20 @@ /** + * 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 * - * 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 * - * 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. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + /** * Autogenerated by Thrift Compiler (0.9.3) * http://git-wip-us.apache.org/repos/asf/airavata/blob/a8ca4fcb/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 837bff7..4da27d6 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 @@ -1,22 +1,20 @@ /** + * 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 * - * 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 * - * 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. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + /** * Autogenerated by Thrift Compiler (0.9.3) * http://git-wip-us.apache.org/repos/asf/airavata/blob/a8ca4fcb/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 8c173ed..949692b 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 @@ -1,22 +1,20 @@ /** + * 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 * - * 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 * - * 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. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + /** * Autogenerated by Thrift Compiler (0.9.3) * http://git-wip-us.apache.org/repos/asf/airavata/blob/a8ca4fcb/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 a244f95..ea24faa 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 @@ -1,22 +1,20 @@ /** + * 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 * - * 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 * - * 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. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + /** * Autogenerated by Thrift Compiler (0.9.3) * http://git-wip-us.apache.org/repos/asf/airavata/blob/a8ca4fcb/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 edc316d..54b3391 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 @@ -1,22 +1,20 @@ /** + * 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 * - * 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 * - * 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. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + /** * Autogenerated by Thrift Compiler (0.9.3) * http://git-wip-us.apache.org/repos/asf/airavata/blob/a8ca4fcb/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 8255e3e..ba6569c 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 @@ -1,22 +1,20 @@ /** + * 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 * - * 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 * - * 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. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + /** * Autogenerated by Thrift Compiler (0.9.3) * http://git-wip-us.apache.org/repos/asf/airavata/blob/a8ca4fcb/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowState.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowState.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowState.java index 5a290bb..5faac14 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowState.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowState.java @@ -1,22 +1,20 @@ /** + * 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 * - * 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 * - * 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. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + /** * Autogenerated by Thrift Compiler (0.9.3) * http://git-wip-us.apache.org/repos/asf/airavata/blob/a8ca4fcb/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 adbbb65..deadf51 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 @@ -1,22 +1,20 @@ /** + * 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 * - * 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 * - * 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. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + /** * Autogenerated by Thrift Compiler (0.9.3) * http://git-wip-us.apache.org/repos/asf/airavata/blob/a8ca4fcb/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 6925295..36f1d9d 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 @@ -1,22 +1,20 @@ /** + * 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 * - * 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 * - * 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. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + /** * Autogenerated by Thrift Compiler (0.9.3) * http://git-wip-us.apache.org/repos/asf/airavata/blob/a8ca4fcb/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 da9ee8d..f574e9a 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 @@ -1,22 +1,20 @@ /** + * 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 * - * 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 * - * 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. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + /** * Autogenerated by Thrift Compiler (0.9.3) * http://git-wip-us.apache.org/repos/asf/airavata/blob/a8ca4fcb/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 c2db4c8..45df73d 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 @@ -1,22 +1,20 @@ /** + * 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 * - * 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 * - * 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. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + /** * Autogenerated by Thrift Compiler (0.9.3) * http://git-wip-us.apache.org/repos/asf/airavata/blob/a8ca4fcb/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 c7b6ed7..392cc9e 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 @@ -1,22 +1,20 @@ /** + * 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 * - * 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 * - * 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. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + /** * Autogenerated by Thrift Compiler (0.9.3) * http://git-wip-us.apache.org/repos/asf/airavata/blob/a8ca4fcb/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 84d6f6d..e832256 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 @@ -1,22 +1,20 @@ /** + * 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 * - * 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 * - * 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. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + /** * Autogenerated by Thrift Compiler (0.9.3) * http://git-wip-us.apache.org/repos/asf/airavata/blob/a8ca4fcb/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 4f481b0..67dfc20 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 @@ -1,22 +1,20 @@ /** + * 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 * - * 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 * - * 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. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + /** * Autogenerated by Thrift Compiler (0.9.3) * http://git-wip-us.apache.org/repos/asf/airavata/blob/a8ca4fcb/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 bbed869..7d540de 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 @@ -1,22 +1,20 @@ /** + * 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 * - * 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 * - * 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. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + /** * Autogenerated by Thrift Compiler (0.9.3) * http://git-wip-us.apache.org/repos/asf/airavata/blob/a8ca4fcb/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 e306e90..c1dd4f9 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 @@ -1,22 +1,20 @@ /** + * 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 * - * 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 * - * 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. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + /** * Autogenerated by Thrift Compiler (0.9.3) * http://git-wip-us.apache.org/repos/asf/airavata/blob/a8ca4fcb/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/DMType.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/DMType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/DMType.java index d48b946..a434764 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/DMType.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/DMType.java @@ -1,22 +1,20 @@ /** + * 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 * - * 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 * - * 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. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + /** * Autogenerated by Thrift Compiler (0.9.3) *
