setting replica URIs for experiment outputs
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/8e4212ea Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/8e4212ea Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/8e4212ea Branch: refs/heads/develop Commit: 8e4212ea0e9aa574329cc128b36b49743b6dcc73 Parents: 2453195 Author: scnakandala <[email protected]> Authored: Fri Mar 25 13:06:13 2016 -0400 Committer: scnakandala <[email protected]> Committed: Fri Mar 25 13:06:13 2016 -0400 ---------------------------------------------------------------------- .../server/handler/AiravataServerHandler.java | 11 +- .../java/org/apache/airavata/api/Airavata.java | 2 +- .../airavata/replica_catalog_models_types.cpp | 60 ++--- .../lib/airavata/replica_catalog_models_types.h | 17 +- .../lib/Airavata/Model/Data/Replica/Types.php | 83 +++---- .../airavata/model/data/replica/ttypes.py | 82 +++---- .../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 | 220 +++++-------------- .../model/data/replica/DataProductType.java | 9 +- .../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/Project.java | 2 +- .../apache/airavata/model/workspace/User.java | 2 +- .../apache/airavata/gfac/core/GFacUtils.java | 19 +- .../catalog/impl/ReplicaCatalogImpl.java | 59 +---- .../core/replica/catalog/model/DataProduct.java | 10 - .../utils/ThriftDataModelConversion.java | 2 - .../src/main/resources/replicacatalog-derby.sql | 1 - .../src/main/resources/replicacatalog-mysql.sql | 1 - .../replica/catalog/ReplicaCatalogTest.java | 1 - .../registry/cpi/ReplicaCatalogException.java | 2 +- .../replica_catalog_models.thrift | 20 +- 98 files changed, 268 insertions(+), 493 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/8e4212ea/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java index b881222..a176573 100644 --- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java +++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java @@ -1992,6 +1992,7 @@ public class AiravataServerHandler implements Airavata.Iface { logger.info("Airavata cloned experiment with experiment id : " + existingExperimentID); return (String) experimentCatalog.add(ExpCatParentDataType.EXPERIMENT, existingExperiment, gatewayId); } catch (Exception e) { + logger.error(existingExperimentID, "Error while cloning the experiment with existing configuration...", e); AiravataSystemException exception = new AiravataSystemException(); exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR); @@ -4308,7 +4309,7 @@ public class AiravataServerHandler implements Airavata.Iface { dataCatalog = RegistryFactory.getReplicaCatalog(); String productUrl = dataCatalog.registerDataProduct(dataProductModel); return productUrl; - } catch (Exception e) { + } catch (RegistryException e) { String msg = "Error in registering the data resource"+dataProductModel.getProductName()+"."; logger.error(msg, e); AiravataSystemException exception = new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR); @@ -4325,7 +4326,7 @@ public class AiravataServerHandler implements Airavata.Iface { dataCatalog = RegistryFactory.getReplicaCatalog(); DataProductModel dataProductModel = dataCatalog.getDataProduct(productUri); return dataProductModel; - } catch (Exception e) { + } catch (RegistryException e) { String msg = "Error in retreiving the data product "+productUri+"."; logger.error(msg, e); AiravataSystemException exception = new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR); @@ -4342,7 +4343,7 @@ public class AiravataServerHandler implements Airavata.Iface { dataCatalog = RegistryFactory.getReplicaCatalog(); String replicaId = dataCatalog.registerReplicaLocation(replicaLocationModel); return replicaId; - } catch (Exception e) { + } catch (RegistryException e) { String msg = "Error in retreiving the replica "+replicaLocationModel.getReplicaName()+"."; logger.error(msg, e); AiravataSystemException exception = new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR); @@ -4358,7 +4359,7 @@ public class AiravataServerHandler implements Airavata.Iface { dataCatalog = RegistryFactory.getReplicaCatalog(); DataProductModel dataProductModel = dataCatalog.getParentDataProduct(productUri); return dataProductModel; - } catch (Exception e) { + } catch (RegistryException e) { String msg = "Error in retreiving the parent data product for "+ productUri+"."; logger.error(msg, e); AiravataSystemException exception = new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR); @@ -4374,7 +4375,7 @@ public class AiravataServerHandler implements Airavata.Iface { dataCatalog = RegistryFactory.getReplicaCatalog(); List<DataProductModel> dataProductModels = dataCatalog.getChildDataProducts(productUri); return dataProductModels; - } catch (Exception e) { + } catch (RegistryException e) { String msg = "Error in retreiving the child products for "+productUri+"."; logger.error(msg, e); AiravataSystemException exception = new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR); http://git-wip-us.apache.org/repos/asf/airavata/blob/8e4212ea/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 19dc169..7781f0d 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-03-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-25") public class Airavata { public interface Iface { http://git-wip-us.apache.org/repos/asf/airavata/blob/8e4212ea/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/replica_catalog_models_types.cpp ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/replica_catalog_models_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/replica_catalog_models_types.cpp index 1334b5f..937030b 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/replica_catalog_models_types.cpp +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/replica_catalog_models_types.cpp @@ -55,16 +55,14 @@ const char* _kReplicaPersistentTypeNames[] = { const std::map<int, const char*> _ReplicaPersistentType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(2, _kReplicaPersistentTypeValues, _kReplicaPersistentTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL)); int _kDataProductTypeValues[] = { - DataProductType::DIR, DataProductType::FILE, DataProductType::COLLECTION }; const char* _kDataProductTypeNames[] = { - "DIR", "FILE", "COLLECTION" }; -const std::map<int, const char*> _DataProductType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(3, _kDataProductTypeValues, _kDataProductTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL)); +const std::map<int, const char*> _DataProductType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(2, _kDataProductTypeValues, _kDataProductTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL)); DataProductModel::~DataProductModel() throw() { @@ -86,11 +84,6 @@ void DataProductModel::__set_parentProductUri(const std::string& val) { __isset.parentProductUri = true; } -void DataProductModel::__set_logicalPath(const std::string& val) { - this->logicalPath = val; -__isset.logicalPath = true; -} - void DataProductModel::__set_productName(const std::string& val) { this->productName = val; __isset.productName = true; @@ -183,21 +176,13 @@ uint32_t DataProductModel::read(::apache::thrift::protocol::TProtocol* iprot) { break; case 4: if (ftype == ::apache::thrift::protocol::T_STRING) { - xfer += iprot->readString(this->logicalPath); - this->__isset.logicalPath = true; - } else { - xfer += iprot->skip(ftype); - } - break; - case 5: - if (ftype == ::apache::thrift::protocol::T_STRING) { xfer += iprot->readString(this->productName); this->__isset.productName = true; } else { xfer += iprot->skip(ftype); } break; - case 6: + case 5: if (ftype == ::apache::thrift::protocol::T_STRING) { xfer += iprot->readString(this->productDescription); this->__isset.productDescription = true; @@ -205,7 +190,7 @@ uint32_t DataProductModel::read(::apache::thrift::protocol::TProtocol* iprot) { xfer += iprot->skip(ftype); } break; - case 7: + case 6: if (ftype == ::apache::thrift::protocol::T_STRING) { xfer += iprot->readString(this->ownerName); this->__isset.ownerName = true; @@ -213,7 +198,7 @@ uint32_t DataProductModel::read(::apache::thrift::protocol::TProtocol* iprot) { xfer += iprot->skip(ftype); } break; - case 8: + case 7: if (ftype == ::apache::thrift::protocol::T_I32) { int32_t ecast0; xfer += iprot->readI32(ecast0); @@ -223,7 +208,7 @@ uint32_t DataProductModel::read(::apache::thrift::protocol::TProtocol* iprot) { xfer += iprot->skip(ftype); } break; - case 9: + case 8: if (ftype == ::apache::thrift::protocol::T_I32) { xfer += iprot->readI32(this->productSize); this->__isset.productSize = true; @@ -231,7 +216,7 @@ uint32_t DataProductModel::read(::apache::thrift::protocol::TProtocol* iprot) { xfer += iprot->skip(ftype); } break; - case 10: + case 9: if (ftype == ::apache::thrift::protocol::T_I64) { xfer += iprot->readI64(this->creationTime); this->__isset.creationTime = true; @@ -239,7 +224,7 @@ uint32_t DataProductModel::read(::apache::thrift::protocol::TProtocol* iprot) { xfer += iprot->skip(ftype); } break; - case 11: + case 10: if (ftype == ::apache::thrift::protocol::T_I64) { xfer += iprot->readI64(this->lastModifiedTime); this->__isset.lastModifiedTime = true; @@ -247,7 +232,7 @@ uint32_t DataProductModel::read(::apache::thrift::protocol::TProtocol* iprot) { xfer += iprot->skip(ftype); } break; - case 12: + case 11: if (ftype == ::apache::thrift::protocol::T_MAP) { { this->productMetadata.clear(); @@ -270,7 +255,7 @@ uint32_t DataProductModel::read(::apache::thrift::protocol::TProtocol* iprot) { xfer += iprot->skip(ftype); } break; - case 13: + case 12: if (ftype == ::apache::thrift::protocol::T_LIST) { { this->replicaLocations.clear(); @@ -322,48 +307,43 @@ uint32_t DataProductModel::write(::apache::thrift::protocol::TProtocol* oprot) c xfer += oprot->writeString(this->parentProductUri); xfer += oprot->writeFieldEnd(); } - if (this->__isset.logicalPath) { - xfer += oprot->writeFieldBegin("logicalPath", ::apache::thrift::protocol::T_STRING, 4); - xfer += oprot->writeString(this->logicalPath); - xfer += oprot->writeFieldEnd(); - } if (this->__isset.productName) { - xfer += oprot->writeFieldBegin("productName", ::apache::thrift::protocol::T_STRING, 5); + xfer += oprot->writeFieldBegin("productName", ::apache::thrift::protocol::T_STRING, 4); xfer += oprot->writeString(this->productName); xfer += oprot->writeFieldEnd(); } if (this->__isset.productDescription) { - xfer += oprot->writeFieldBegin("productDescription", ::apache::thrift::protocol::T_STRING, 6); + xfer += oprot->writeFieldBegin("productDescription", ::apache::thrift::protocol::T_STRING, 5); xfer += oprot->writeString(this->productDescription); xfer += oprot->writeFieldEnd(); } if (this->__isset.ownerName) { - xfer += oprot->writeFieldBegin("ownerName", ::apache::thrift::protocol::T_STRING, 7); + xfer += oprot->writeFieldBegin("ownerName", ::apache::thrift::protocol::T_STRING, 6); xfer += oprot->writeString(this->ownerName); xfer += oprot->writeFieldEnd(); } if (this->__isset.dataProductType) { - xfer += oprot->writeFieldBegin("dataProductType", ::apache::thrift::protocol::T_I32, 8); + xfer += oprot->writeFieldBegin("dataProductType", ::apache::thrift::protocol::T_I32, 7); xfer += oprot->writeI32((int32_t)this->dataProductType); xfer += oprot->writeFieldEnd(); } if (this->__isset.productSize) { - xfer += oprot->writeFieldBegin("productSize", ::apache::thrift::protocol::T_I32, 9); + xfer += oprot->writeFieldBegin("productSize", ::apache::thrift::protocol::T_I32, 8); xfer += oprot->writeI32(this->productSize); xfer += oprot->writeFieldEnd(); } if (this->__isset.creationTime) { - xfer += oprot->writeFieldBegin("creationTime", ::apache::thrift::protocol::T_I64, 10); + xfer += oprot->writeFieldBegin("creationTime", ::apache::thrift::protocol::T_I64, 9); xfer += oprot->writeI64(this->creationTime); xfer += oprot->writeFieldEnd(); } if (this->__isset.lastModifiedTime) { - xfer += oprot->writeFieldBegin("lastModifiedTime", ::apache::thrift::protocol::T_I64, 11); + xfer += oprot->writeFieldBegin("lastModifiedTime", ::apache::thrift::protocol::T_I64, 10); xfer += oprot->writeI64(this->lastModifiedTime); xfer += oprot->writeFieldEnd(); } if (this->__isset.productMetadata) { - xfer += oprot->writeFieldBegin("productMetadata", ::apache::thrift::protocol::T_MAP, 12); + xfer += oprot->writeFieldBegin("productMetadata", ::apache::thrift::protocol::T_MAP, 11); { xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->productMetadata.size())); std::map<std::string, std::string> ::const_iterator _iter13; @@ -377,7 +357,7 @@ uint32_t DataProductModel::write(::apache::thrift::protocol::TProtocol* oprot) c xfer += oprot->writeFieldEnd(); } if (this->__isset.replicaLocations) { - xfer += oprot->writeFieldBegin("replicaLocations", ::apache::thrift::protocol::T_LIST, 13); + xfer += oprot->writeFieldBegin("replicaLocations", ::apache::thrift::protocol::T_LIST, 12); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->replicaLocations.size())); std::vector<DataReplicaLocationModel> ::const_iterator _iter14; @@ -399,7 +379,6 @@ void swap(DataProductModel &a, DataProductModel &b) { swap(a.productUri, b.productUri); swap(a.gatewayId, b.gatewayId); swap(a.parentProductUri, b.parentProductUri); - swap(a.logicalPath, b.logicalPath); swap(a.productName, b.productName); swap(a.productDescription, b.productDescription); swap(a.ownerName, b.ownerName); @@ -416,7 +395,6 @@ DataProductModel::DataProductModel(const DataProductModel& other15) { productUri = other15.productUri; gatewayId = other15.gatewayId; parentProductUri = other15.parentProductUri; - logicalPath = other15.logicalPath; productName = other15.productName; productDescription = other15.productDescription; ownerName = other15.ownerName; @@ -432,7 +410,6 @@ DataProductModel& DataProductModel::operator=(const DataProductModel& other16) { productUri = other16.productUri; gatewayId = other16.gatewayId; parentProductUri = other16.parentProductUri; - logicalPath = other16.logicalPath; productName = other16.productName; productDescription = other16.productDescription; ownerName = other16.ownerName; @@ -451,7 +428,6 @@ void DataProductModel::printTo(std::ostream& out) const { out << "productUri="; (__isset.productUri ? (out << to_string(productUri)) : (out << "<null>")); out << ", " << "gatewayId="; (__isset.gatewayId ? (out << to_string(gatewayId)) : (out << "<null>")); out << ", " << "parentProductUri="; (__isset.parentProductUri ? (out << to_string(parentProductUri)) : (out << "<null>")); - out << ", " << "logicalPath="; (__isset.logicalPath ? (out << to_string(logicalPath)) : (out << "<null>")); out << ", " << "productName="; (__isset.productName ? (out << to_string(productName)) : (out << "<null>")); out << ", " << "productDescription="; (__isset.productDescription ? (out << to_string(productDescription)) : (out << "<null>")); out << ", " << "ownerName="; (__isset.ownerName ? (out << to_string(ownerName)) : (out << "<null>")); http://git-wip-us.apache.org/repos/asf/airavata/blob/8e4212ea/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/replica_catalog_models_types.h ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/replica_catalog_models_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/replica_catalog_models_types.h index f188f39..c30079f 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/replica_catalog_models_types.h +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/replica_catalog_models_types.h @@ -58,9 +58,8 @@ extern const std::map<int, const char*> _ReplicaPersistentType_VALUES_TO_NAMES; struct DataProductType { enum type { - DIR = 0, - FILE = 1, - COLLECTION = 2 + FILE = 0, + COLLECTION = 1 }; }; @@ -71,11 +70,10 @@ class DataProductModel; class DataReplicaLocationModel; typedef struct _DataProductModel__isset { - _DataProductModel__isset() : productUri(false), gatewayId(false), parentProductUri(false), logicalPath(false), productName(false), productDescription(false), ownerName(false), dataProductType(false), productSize(false), creationTime(false), lastModifiedTime(false), productMetadata(false), replicaLocations(false) {} + _DataProductModel__isset() : productUri(false), gatewayId(false), parentProductUri(false), productName(false), productDescription(false), ownerName(false), dataProductType(false), productSize(false), creationTime(false), lastModifiedTime(false), productMetadata(false), replicaLocations(false) {} bool productUri :1; bool gatewayId :1; bool parentProductUri :1; - bool logicalPath :1; bool productName :1; bool productDescription :1; bool ownerName :1; @@ -92,14 +90,13 @@ class DataProductModel { DataProductModel(const DataProductModel&); DataProductModel& operator=(const DataProductModel&); - DataProductModel() : productUri(), gatewayId(), parentProductUri(), logicalPath(), productName(), productDescription(), ownerName(), dataProductType((DataProductType::type)0), productSize(0), creationTime(0), lastModifiedTime(0) { + DataProductModel() : productUri(), gatewayId(), parentProductUri(), productName(), productDescription(), ownerName(), dataProductType((DataProductType::type)0), productSize(0), creationTime(0), lastModifiedTime(0) { } virtual ~DataProductModel() throw(); std::string productUri; std::string gatewayId; std::string parentProductUri; - std::string logicalPath; std::string productName; std::string productDescription; std::string ownerName; @@ -118,8 +115,6 @@ class DataProductModel { void __set_parentProductUri(const std::string& val); - void __set_logicalPath(const std::string& val); - void __set_productName(const std::string& val); void __set_productDescription(const std::string& val); @@ -152,10 +147,6 @@ class DataProductModel { return false; else if (__isset.parentProductUri && !(parentProductUri == rhs.parentProductUri)) return false; - if (__isset.logicalPath != rhs.__isset.logicalPath) - return false; - else if (__isset.logicalPath && !(logicalPath == rhs.logicalPath)) - return false; if (__isset.productName != rhs.__isset.productName) return false; else if (__isset.productName && !(productName == rhs.productName)) http://git-wip-us.apache.org/repos/asf/airavata/blob/8e4212ea/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Data/Replica/Types.php ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Data/Replica/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Data/Replica/Types.php index 03978b0..7fba287 100644 --- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Data/Replica/Types.php +++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Data/Replica/Types.php @@ -40,13 +40,11 @@ final class ReplicaPersistentType { } final class DataProductType { - const DIR = 0; - const FILE = 1; - const COLLECTION = 2; + const FILE = 0; + const COLLECTION = 1; static public $__names = array( - 0 => 'DIR', - 1 => 'FILE', - 2 => 'COLLECTION', + 0 => 'FILE', + 1 => 'COLLECTION', ); } @@ -68,10 +66,6 @@ class DataProductModel { /** * @var string */ - public $logicalPath = null; - /** - * @var string - */ public $productName = null; /** * @var string @@ -122,38 +116,34 @@ class DataProductModel { 'type' => TType::STRING, ), 4 => array( - 'var' => 'logicalPath', - 'type' => TType::STRING, - ), - 5 => array( 'var' => 'productName', 'type' => TType::STRING, ), - 6 => array( + 5 => array( 'var' => 'productDescription', 'type' => TType::STRING, ), - 7 => array( + 6 => array( 'var' => 'ownerName', 'type' => TType::STRING, ), - 8 => array( + 7 => array( 'var' => 'dataProductType', 'type' => TType::I32, ), - 9 => array( + 8 => array( 'var' => 'productSize', 'type' => TType::I32, ), - 10 => array( + 9 => array( 'var' => 'creationTime', 'type' => TType::I64, ), - 11 => array( + 10 => array( 'var' => 'lastModifiedTime', 'type' => TType::I64, ), - 12 => array( + 11 => array( 'var' => 'productMetadata', 'type' => TType::MAP, 'ktype' => TType::STRING, @@ -165,7 +155,7 @@ class DataProductModel { 'type' => TType::STRING, ), ), - 13 => array( + 12 => array( 'var' => 'replicaLocations', 'type' => TType::LST, 'etype' => TType::STRUCT, @@ -186,9 +176,6 @@ class DataProductModel { if (isset($vals['parentProductUri'])) { $this->parentProductUri = $vals['parentProductUri']; } - if (isset($vals['logicalPath'])) { - $this->logicalPath = $vals['logicalPath']; - } if (isset($vals['productName'])) { $this->productName = $vals['productName']; } @@ -261,61 +248,54 @@ class DataProductModel { break; case 4: if ($ftype == TType::STRING) { - $xfer += $input->readString($this->logicalPath); - } else { - $xfer += $input->skip($ftype); - } - break; - case 5: - if ($ftype == TType::STRING) { $xfer += $input->readString($this->productName); } else { $xfer += $input->skip($ftype); } break; - case 6: + case 5: if ($ftype == TType::STRING) { $xfer += $input->readString($this->productDescription); } else { $xfer += $input->skip($ftype); } break; - case 7: + case 6: if ($ftype == TType::STRING) { $xfer += $input->readString($this->ownerName); } else { $xfer += $input->skip($ftype); } break; - case 8: + case 7: if ($ftype == TType::I32) { $xfer += $input->readI32($this->dataProductType); } else { $xfer += $input->skip($ftype); } break; - case 9: + case 8: if ($ftype == TType::I32) { $xfer += $input->readI32($this->productSize); } else { $xfer += $input->skip($ftype); } break; - case 10: + case 9: if ($ftype == TType::I64) { $xfer += $input->readI64($this->creationTime); } else { $xfer += $input->skip($ftype); } break; - case 11: + case 10: if ($ftype == TType::I64) { $xfer += $input->readI64($this->lastModifiedTime); } else { $xfer += $input->skip($ftype); } break; - case 12: + case 11: if ($ftype == TType::MAP) { $this->productMetadata = array(); $_size0 = 0; @@ -335,7 +315,7 @@ class DataProductModel { $xfer += $input->skip($ftype); } break; - case 13: + case 12: if ($ftype == TType::LST) { $this->replicaLocations = array(); $_size7 = 0; @@ -381,43 +361,38 @@ class DataProductModel { $xfer += $output->writeString($this->parentProductUri); $xfer += $output->writeFieldEnd(); } - if ($this->logicalPath !== null) { - $xfer += $output->writeFieldBegin('logicalPath', TType::STRING, 4); - $xfer += $output->writeString($this->logicalPath); - $xfer += $output->writeFieldEnd(); - } if ($this->productName !== null) { - $xfer += $output->writeFieldBegin('productName', TType::STRING, 5); + $xfer += $output->writeFieldBegin('productName', TType::STRING, 4); $xfer += $output->writeString($this->productName); $xfer += $output->writeFieldEnd(); } if ($this->productDescription !== null) { - $xfer += $output->writeFieldBegin('productDescription', TType::STRING, 6); + $xfer += $output->writeFieldBegin('productDescription', TType::STRING, 5); $xfer += $output->writeString($this->productDescription); $xfer += $output->writeFieldEnd(); } if ($this->ownerName !== null) { - $xfer += $output->writeFieldBegin('ownerName', TType::STRING, 7); + $xfer += $output->writeFieldBegin('ownerName', TType::STRING, 6); $xfer += $output->writeString($this->ownerName); $xfer += $output->writeFieldEnd(); } if ($this->dataProductType !== null) { - $xfer += $output->writeFieldBegin('dataProductType', TType::I32, 8); + $xfer += $output->writeFieldBegin('dataProductType', TType::I32, 7); $xfer += $output->writeI32($this->dataProductType); $xfer += $output->writeFieldEnd(); } if ($this->productSize !== null) { - $xfer += $output->writeFieldBegin('productSize', TType::I32, 9); + $xfer += $output->writeFieldBegin('productSize', TType::I32, 8); $xfer += $output->writeI32($this->productSize); $xfer += $output->writeFieldEnd(); } if ($this->creationTime !== null) { - $xfer += $output->writeFieldBegin('creationTime', TType::I64, 10); + $xfer += $output->writeFieldBegin('creationTime', TType::I64, 9); $xfer += $output->writeI64($this->creationTime); $xfer += $output->writeFieldEnd(); } if ($this->lastModifiedTime !== null) { - $xfer += $output->writeFieldBegin('lastModifiedTime', TType::I64, 11); + $xfer += $output->writeFieldBegin('lastModifiedTime', TType::I64, 10); $xfer += $output->writeI64($this->lastModifiedTime); $xfer += $output->writeFieldEnd(); } @@ -425,7 +400,7 @@ class DataProductModel { if (!is_array($this->productMetadata)) { throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); } - $xfer += $output->writeFieldBegin('productMetadata', TType::MAP, 12); + $xfer += $output->writeFieldBegin('productMetadata', TType::MAP, 11); { $output->writeMapBegin(TType::STRING, TType::STRING, count($this->productMetadata)); { @@ -443,7 +418,7 @@ class DataProductModel { if (!is_array($this->replicaLocations)) { throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); } - $xfer += $output->writeFieldBegin('replicaLocations', TType::LST, 13); + $xfer += $output->writeFieldBegin('replicaLocations', TType::LST, 12); { $output->writeListBegin(TType::STRUCT, count($this->replicaLocations)); { http://git-wip-us.apache.org/repos/asf/airavata/blob/8e4212ea/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/data/replica/ttypes.py ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/data/replica/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/data/replica/ttypes.py index 38f07f5..e40994d 100644 --- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/data/replica/ttypes.py +++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/data/replica/ttypes.py @@ -51,20 +51,17 @@ class ReplicaPersistentType: } class DataProductType: - DIR = 0 - FILE = 1 - COLLECTION = 2 + FILE = 0 + COLLECTION = 1 _VALUES_TO_NAMES = { - 0: "DIR", - 1: "FILE", - 2: "COLLECTION", + 0: "FILE", + 1: "COLLECTION", } _NAMES_TO_VALUES = { - "DIR": 0, - "FILE": 1, - "COLLECTION": 2, + "FILE": 0, + "COLLECTION": 1, } @@ -74,7 +71,6 @@ class DataProductModel: - productUri - gatewayId - parentProductUri - - logicalPath - productName - productDescription - ownerName @@ -91,23 +87,21 @@ class DataProductModel: (1, TType.STRING, 'productUri', None, None, ), # 1 (2, TType.STRING, 'gatewayId', None, None, ), # 2 (3, TType.STRING, 'parentProductUri', None, None, ), # 3 - (4, TType.STRING, 'logicalPath', None, None, ), # 4 - (5, TType.STRING, 'productName', None, None, ), # 5 - (6, TType.STRING, 'productDescription', None, None, ), # 6 - (7, TType.STRING, 'ownerName', None, None, ), # 7 - (8, TType.I32, 'dataProductType', None, None, ), # 8 - (9, TType.I32, 'productSize', None, None, ), # 9 - (10, TType.I64, 'creationTime', None, None, ), # 10 - (11, TType.I64, 'lastModifiedTime', None, None, ), # 11 - (12, TType.MAP, 'productMetadata', (TType.STRING,None,TType.STRING,None), None, ), # 12 - (13, TType.LIST, 'replicaLocations', (TType.STRUCT,(DataReplicaLocationModel, DataReplicaLocationModel.thrift_spec)), None, ), # 13 + (4, TType.STRING, 'productName', None, None, ), # 4 + (5, TType.STRING, 'productDescription', None, None, ), # 5 + (6, TType.STRING, 'ownerName', None, None, ), # 6 + (7, TType.I32, 'dataProductType', None, None, ), # 7 + (8, TType.I32, 'productSize', None, None, ), # 8 + (9, TType.I64, 'creationTime', None, None, ), # 9 + (10, TType.I64, 'lastModifiedTime', None, None, ), # 10 + (11, TType.MAP, 'productMetadata', (TType.STRING,None,TType.STRING,None), None, ), # 11 + (12, TType.LIST, 'replicaLocations', (TType.STRUCT,(DataReplicaLocationModel, DataReplicaLocationModel.thrift_spec)), None, ), # 12 ) - def __init__(self, productUri=None, gatewayId=None, parentProductUri=None, logicalPath=None, productName=None, productDescription=None, ownerName=None, dataProductType=None, productSize=None, creationTime=None, lastModifiedTime=None, productMetadata=None, replicaLocations=None,): + def __init__(self, productUri=None, gatewayId=None, parentProductUri=None, productName=None, productDescription=None, ownerName=None, dataProductType=None, productSize=None, creationTime=None, lastModifiedTime=None, productMetadata=None, replicaLocations=None,): self.productUri = productUri self.gatewayId = gatewayId self.parentProductUri = parentProductUri - self.logicalPath = logicalPath self.productName = productName self.productDescription = productDescription self.ownerName = ownerName @@ -144,45 +138,40 @@ class DataProductModel: iprot.skip(ftype) elif fid == 4: if ftype == TType.STRING: - self.logicalPath = iprot.readString() - else: - iprot.skip(ftype) - elif fid == 5: - if ftype == TType.STRING: self.productName = iprot.readString() else: iprot.skip(ftype) - elif fid == 6: + elif fid == 5: if ftype == TType.STRING: self.productDescription = iprot.readString() else: iprot.skip(ftype) - elif fid == 7: + elif fid == 6: if ftype == TType.STRING: self.ownerName = iprot.readString() else: iprot.skip(ftype) - elif fid == 8: + elif fid == 7: if ftype == TType.I32: self.dataProductType = iprot.readI32() else: iprot.skip(ftype) - elif fid == 9: + elif fid == 8: if ftype == TType.I32: self.productSize = iprot.readI32() else: iprot.skip(ftype) - elif fid == 10: + elif fid == 9: if ftype == TType.I64: self.creationTime = iprot.readI64() else: iprot.skip(ftype) - elif fid == 11: + elif fid == 10: if ftype == TType.I64: self.lastModifiedTime = iprot.readI64() else: iprot.skip(ftype) - elif fid == 12: + elif fid == 11: if ftype == TType.MAP: self.productMetadata = {} (_ktype1, _vtype2, _size0 ) = iprot.readMapBegin() @@ -193,7 +182,7 @@ class DataProductModel: iprot.readMapEnd() else: iprot.skip(ftype) - elif fid == 13: + elif fid == 12: if ftype == TType.LIST: self.replicaLocations = [] (_etype10, _size7) = iprot.readListBegin() @@ -226,40 +215,36 @@ class DataProductModel: oprot.writeFieldBegin('parentProductUri', TType.STRING, 3) oprot.writeString(self.parentProductUri) oprot.writeFieldEnd() - if self.logicalPath is not None: - oprot.writeFieldBegin('logicalPath', TType.STRING, 4) - oprot.writeString(self.logicalPath) - oprot.writeFieldEnd() if self.productName is not None: - oprot.writeFieldBegin('productName', TType.STRING, 5) + oprot.writeFieldBegin('productName', TType.STRING, 4) oprot.writeString(self.productName) oprot.writeFieldEnd() if self.productDescription is not None: - oprot.writeFieldBegin('productDescription', TType.STRING, 6) + oprot.writeFieldBegin('productDescription', TType.STRING, 5) oprot.writeString(self.productDescription) oprot.writeFieldEnd() if self.ownerName is not None: - oprot.writeFieldBegin('ownerName', TType.STRING, 7) + oprot.writeFieldBegin('ownerName', TType.STRING, 6) oprot.writeString(self.ownerName) oprot.writeFieldEnd() if self.dataProductType is not None: - oprot.writeFieldBegin('dataProductType', TType.I32, 8) + oprot.writeFieldBegin('dataProductType', TType.I32, 7) oprot.writeI32(self.dataProductType) oprot.writeFieldEnd() if self.productSize is not None: - oprot.writeFieldBegin('productSize', TType.I32, 9) + oprot.writeFieldBegin('productSize', TType.I32, 8) oprot.writeI32(self.productSize) oprot.writeFieldEnd() if self.creationTime is not None: - oprot.writeFieldBegin('creationTime', TType.I64, 10) + oprot.writeFieldBegin('creationTime', TType.I64, 9) oprot.writeI64(self.creationTime) oprot.writeFieldEnd() if self.lastModifiedTime is not None: - oprot.writeFieldBegin('lastModifiedTime', TType.I64, 11) + oprot.writeFieldBegin('lastModifiedTime', TType.I64, 10) oprot.writeI64(self.lastModifiedTime) oprot.writeFieldEnd() if self.productMetadata is not None: - oprot.writeFieldBegin('productMetadata', TType.MAP, 12) + oprot.writeFieldBegin('productMetadata', TType.MAP, 11) oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.productMetadata)) for kiter13,viter14 in self.productMetadata.items(): oprot.writeString(kiter13) @@ -267,7 +252,7 @@ class DataProductModel: oprot.writeMapEnd() oprot.writeFieldEnd() if self.replicaLocations is not None: - oprot.writeFieldBegin('replicaLocations', TType.LIST, 13) + oprot.writeFieldBegin('replicaLocations', TType.LIST, 12) oprot.writeListBegin(TType.STRUCT, len(self.replicaLocations)) for iter15 in self.replicaLocations: iter15.write(oprot) @@ -285,7 +270,6 @@ class DataProductModel: value = (value * 31) ^ hash(self.productUri) value = (value * 31) ^ hash(self.gatewayId) value = (value * 31) ^ hash(self.parentProductUri) - value = (value * 31) ^ hash(self.logicalPath) value = (value * 31) ^ hash(self.productName) value = (value * 31) ^ hash(self.productDescription) value = (value * 31) ^ hash(self.ownerName) http://git-wip-us.apache.org/repos/asf/airavata/blob/8e4212ea/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 5d4e331..7a85d05 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-03-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-25") 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/8e4212ea/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 ed759d4..33221f8 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-03-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-25") 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/8e4212ea/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 29beaba..36910d8 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-03-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-25") 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/8e4212ea/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 ce4d7e4..557f861 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-03-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-25") 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/8e4212ea/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 38bb50e..1868c5c 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-03-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-25") 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/8e4212ea/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 8fa23cf..cd2efe0 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-03-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-25") 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/8e4212ea/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 eb74aaf..a2fbcef 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-03-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-25") 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/8e4212ea/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 eb2bbef..e757c83 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-03-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-25") 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/8e4212ea/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 6303047..a48fc03 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-03-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-25") 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/8e4212ea/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 5cd0076..f0fc336 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-03-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-25") 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/8e4212ea/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 0c0eb10..47a037c 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-03-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-25") 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/8e4212ea/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 f96036a..b41e918 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-03-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-25") 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/8e4212ea/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 9d3cd9f..bea570d 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-03-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-25") 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/8e4212ea/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 6e66e41..0c41f35 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-03-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-25") 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/8e4212ea/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 0ad7ea1..3000092 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-03-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-25") 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/8e4212ea/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 f93b4b2..564997f 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-03-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-25") 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/8e4212ea/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 e0e3e68..4f1cfc5 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-03-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-25") 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/8e4212ea/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 15bc83f..a14d5cc 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-03-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-25") 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/8e4212ea/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 c34d55a..2a417f9 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-03-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-25") 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/8e4212ea/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 5fc5d26..e262222 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-03-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-25") 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/8e4212ea/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 bf51b4c..d16cd3e 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-03-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-25") 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/8e4212ea/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 0625220..fa3b782 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-03-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-25") 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/8e4212ea/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 2ae6125..e6a800a 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-03-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-25") 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/8e4212ea/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 7306ece..35ac8b8 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-03-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-25") 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/8e4212ea/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 3cf7d8a..dde272f 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-03-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-25") 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/8e4212ea/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 7cd3ed7..3e2308e 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-03-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-25") 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/8e4212ea/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 68da980..a674147 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-03-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-25") 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/8e4212ea/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 cabc7cf..38be5b1 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-03-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-25") 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/8e4212ea/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 75abc53..c18a045 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-03-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-25") 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/8e4212ea/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 a2cd48f..4e45246 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-03-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-25") 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/8e4212ea/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 d83cf69..9d0a53b 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-03-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-25") 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/8e4212ea/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 caa1cd3..fafa7e1 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-03-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-25") 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/8e4212ea/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 dc4f1c9..d8af655 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-03-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-03-25") 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");
