airavata git commit: fixing some of the test failures
Repository: airavata Updated Branches: refs/heads/master 80d202785 -> 5d0bee58d fixing some of the test failures Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/5d0bee58 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/5d0bee58 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/5d0bee58 Branch: refs/heads/master Commit: 5d0bee58d24cf77dbd9238eef235bf6e250fdfc4 Parents: 80d2027 Author: scnakandalaAuthored: Wed Dec 16 14:27:06 2015 -0500 Committer: scnakandala Committed: Wed Dec 16 14:27:06 2015 -0500 -- .../airavata/api/server/handler/AiravataServerHandler.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/airavata/blob/5d0bee58/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 d9121d8..1ad1536 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 @@ -32,6 +32,9 @@ import org.apache.airavata.credential.store.client.CredentialStoreClientFactory; import org.apache.airavata.credential.store.cpi.CredentialStoreService; import org.apache.airavata.credential.store.datamodel.SSHCredential; import org.apache.airavata.credential.store.exception.CredentialStoreException; +import org.apache.airavata.data.catalog.core.DataManagerFactory; +import org.apache.airavata.data.catalog.cpi.DataManager; +import org.apache.airavata.data.catalog.cpi.DataManagerException; import org.apache.airavata.messaging.core.MessageContext; import org.apache.airavata.messaging.core.Publisher; import org.apache.airavata.messaging.core.PublisherFactory; @@ -73,9 +76,6 @@ import org.apache.airavata.registry.core.experiment.catalog.impl.RegistryFactory import org.apache.airavata.registry.cpi.*; import org.apache.airavata.registry.cpi.utils.Constants; -import org.apache.airavata.replica.catalog.core.DataManagerFactory; -import org.apache.airavata.replica.catalog.cpi.DataManager; -import org.apache.airavata.replica.catalog.cpi.DataManagerException; import org.apache.thrift.TException; import org.slf4j.Logger; import org.slf4j.LoggerFactory;
[3/5] airavata git commit: changes to the replicaLocation data model
http://git-wip-us.apache.org/repos/asf/airavata/blob/36da4ee4/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Data/Resource/Types.php -- diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Data/Resource/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Data/Resource/Types.php index 32140e2..cd5542a 100644 --- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Data/Resource/Types.php +++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Data/Resource/Types.php @@ -519,35 +519,23 @@ class DataReplicaLocationModel { /** * @var int */ - public $replicaLocationCategory = null; - /** - * @var int - */ - public $replicaPersistentType = null; - /** - * @var string - */ - public $storageResourceId = null; - /** - * @var string - */ - public $storageResourceHostName = null; + public $validUntilTime = null; /** * @var int */ - public $dataMovementProtocol = null; + public $replicaLocationCategory = null; /** * @var int */ - public $hostPort = null; + public $replicaPersistentType = null; /** * @var string */ - public $filePath = null; + public $storageResourceId = null; /** * @var string */ - public $replicaUrl = null; + public $fileAbsolutePath = null; /** * @var array */ @@ -581,38 +569,26 @@ class DataReplicaLocationModel { 'type' => TType::I64, ), 7 => array( - 'var' => 'replicaLocationCategory', - 'type' => TType::I32, + 'var' => 'validUntilTime', + 'type' => TType::I64, ), 8 => array( - 'var' => 'replicaPersistentType', + 'var' => 'replicaLocationCategory', 'type' => TType::I32, ), 9 => array( - 'var' => 'storageResourceId', - 'type' => TType::STRING, + 'var' => 'replicaPersistentType', + 'type' => TType::I32, ), 10 => array( - 'var' => 'storageResourceHostName', + 'var' => 'storageResourceId', 'type' => TType::STRING, ), 11 => array( - 'var' => 'dataMovementProtocol', - 'type' => TType::I32, - ), -12 => array( - 'var' => 'hostPort', - 'type' => TType::I64, - ), -13 => array( - 'var' => 'filePath', - 'type' => TType::STRING, - ), -14 => array( - 'var' => 'replicaUrl', + 'var' => 'fileAbsolutePath', 'type' => TType::STRING, ), -15 => array( +12 => array( 'var' => 'replicaMetadata', 'type' => TType::MAP, 'ktype' => TType::STRING, @@ -645,6 +621,9 @@ class DataReplicaLocationModel { if (isset($vals['lastModifiedTime'])) { $this->lastModifiedTime = $vals['lastModifiedTime']; } + if (isset($vals['validUntilTime'])) { +$this->validUntilTime = $vals['validUntilTime']; + } if (isset($vals['replicaLocationCategory'])) { $this->replicaLocationCategory = $vals['replicaLocationCategory']; } @@ -654,20 +633,8 @@ class DataReplicaLocationModel { if (isset($vals['storageResourceId'])) { $this->storageResourceId = $vals['storageResourceId']; } - if (isset($vals['storageResourceHostName'])) { -$this->storageResourceHostName = $vals['storageResourceHostName']; - } - if (isset($vals['dataMovementProtocol'])) { -$this->dataMovementProtocol = $vals['dataMovementProtocol']; - } - if (isset($vals['hostPort'])) { -$this->hostPort = $vals['hostPort']; - } - if (isset($vals['filePath'])) { -$this->filePath = $vals['filePath']; - } - if (isset($vals['replicaUrl'])) { -$this->replicaUrl = $vals['replicaUrl']; + if (isset($vals['fileAbsolutePath'])) { +$this->fileAbsolutePath = $vals['fileAbsolutePath']; } if (isset($vals['replicaMetadata'])) { $this->replicaMetadata = $vals['replicaMetadata']; @@ -737,62 +704,41 @@ class DataReplicaLocationModel { } break; case 7: - if ($ftype == TType::I32) { -$xfer += $input->readI32($this->replicaLocationCategory); + if ($ftype == TType::I64) { +$xfer += $input->readI64($this->validUntilTime); } else { $xfer += $input->skip($ftype); } break; case 8: if ($ftype == TType::I32) { -$xfer += $input->readI32($this->replicaPersistentType); +$xfer += $input->readI32($this->replicaLocationCategory); } else { $xfer
[1/5] airavata git commit: changes to the replicaLocation data model
Repository: airavata Updated Branches: refs/heads/master 5d0bee58d -> 36da4ee4d http://git-wip-us.apache.org/repos/asf/airavata/blob/36da4ee4/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/UserConfigurationDataModel.java -- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/UserConfigurationDataModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/UserConfigurationDataModel.java index 11a9fd1..761ccc9 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/UserConfigurationDataModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/UserConfigurationDataModel.java @@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory; * * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") public class UserConfigurationDataModel implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UserConfigurationDataModel"); http://git-wip-us.apache.org/repos/asf/airavata/blob/36da4ee4/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.java -- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.java index 88dbca0..48defaa 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") public class JobModel implements org.apache.thrift.TBase , java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobModel"); http://git-wip-us.apache.org/repos/asf/airavata/blob/36da4ee4/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.java -- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.java index eddcdb9..eadaa35 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") public class ExperimentStatusChangeEvent implements org.apache.thrift.TBase , java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentStatusChangeEvent"); http://git-wip-us.apache.org/repos/asf/airavata/blob/36da4ee4/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.java -- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.java index e1d8c0d..235f8e7 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes",
[4/5] airavata git commit: changes to the replicaLocation data model
http://git-wip-us.apache.org/repos/asf/airavata/blob/36da4ee4/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 aabc232..4be84d3 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 @@ -78,6 +78,8 @@ class AiravataHandler : virtual public AiravataIf { * @return gateway *Modified gateway obejct. * + * @exception AiravataClientException + * * * * @param authzToken @@ -138,6 +140,23 @@ class AiravataHandler : virtual public AiravataIf { printf("getAllGateways\n"); } + /** + * Check for the Existance of a Gateway within Airavata + * + * @param gatewayId + * Provide the gatewayId of the gateway you want to check the existancy + * + * @return boolean + * Boolean idetifier for the existance or non-existane of the gatewayId + * + * @return gatewayId + * return the gatewayId of the existing gateway. + * + * + * + * @param authzToken + * @param gatewayId + */ bool isGatewayExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId) { // Your implementation goes here printf("isGatewayExist\n"); @@ -232,6 +251,21 @@ class AiravataHandler : virtual public AiravataIf { printf("getAllGatewaySSHPubKeys\n"); } + /** + * Delete a Gateway + * + * @param gatewayId + *The gateway Id of the Gateway to be deleted. + * + * @return boolean + *Boolean identifier for the success or failure of the deletion operation. + * + * + * + * @param authzToken + * @param airavataCredStoreToken + * @param gatewayId + */ bool deleteSSHPubKey(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataCredStoreToken, const std::string& gatewayId) { // Your implementation goes here printf("deleteSSHPubKey\n"); @@ -248,6 +282,7 @@ class AiravataHandler : virtual public AiravataIf { *The Project Object described in the workspace_model * * + * * @param authzToken * @param gatewayId * @param project @@ -258,7 +293,14 @@ class AiravataHandler : virtual public AiravataIf { } /** - * Update a Project + * Update an Existing Project + * + * @param projectId + *The projectId of the project needed an update. + * + * @return void + *Currently this does not return any value. + * * * * @param authzToken @@ -272,6 +314,14 @@ class AiravataHandler : virtual public AiravataIf { /** * Get a Project by ID + *This method is to obtain a project by providing a projectId + * + * @param projectId + *projectId of the project you require + * + * @return project + *project data model will be returned + * * * * @param authzToken @@ -282,24 +332,43 @@ class AiravataHandler : virtual public AiravataIf { printf("getProject\n"); } + /** + * Delete a Project + *This method is used to delete an existing Project + * + * @param projectId + *projectId of the project you want to delete + * + * @return boolean + *Boolean identifier for the success or failure of the deletion operation. + * + * + * + * @param authzToken + * @param projectId + */ bool deleteProject(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& projectId) { // Your implementation goes here printf("deleteProject\n"); } /** - * * Get all Project by user with pagination. Results will be ordered based - * * on creation time DESC - * * - * * @param gatewayId - * *The identifier for the requested gateway. - * * @param userName - * *The identifier of the user - * * @param limit - * *The amount results to be fetched - * * @param offset - * *The starting point of the results to be fetched - * * + * Get all Project by user with pagination. Results will be ordered based + * on creation time DESC + * + * @param gatewayId + *The identifier for the requested gateway. + * + * @param userName + *The identifier of the user + * + * @param limit + *The amount results to be fetched + * + * @param offset + *The starting point of the results to be fetched + * + * * * @param authzToken * @param gatewayId @@ -327,6 +396,7 @@ class AiravataHandler : virtual
[2/5] airavata git commit: changes to the replicaLocation data model
http://git-wip-us.apache.org/repos/asf/airavata/blob/36da4ee4/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 534577e..75e2569 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 = "2015-12-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") public class SSHJobSubmission implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { 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/36da4ee4/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 239ac66..cfb8eaa 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 = "2015-12-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") public class UnicoreJobSubmission implements org.apache.thrift.TBase , java.io.Serializable, Cloneable, Comparable { 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/36da4ee4/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 0b9ff29..49d9b2f 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 = "2015-12-15") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") public class ComputeResourcePreference implements org.apache.thrift.TBase , java.io.Serializable, Cloneable, Comparable { 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/36da4ee4/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 3fec636..e9b7265 100644 ---
[5/5] airavata git commit: changes to the replicaLocation data model
changes to the replicaLocation data model Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/36da4ee4 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/36da4ee4 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/36da4ee4 Branch: refs/heads/master Commit: 36da4ee4dac92bba6104d9bc9d89e22e1e837d96 Parents: 5d0bee5 Author: scnakandalaAuthored: Wed Dec 16 15:14:17 2015 -0500 Committer: scnakandala Committed: Wed Dec 16 15:14:17 2015 -0500 -- .../java/org/apache/airavata/api/Airavata.java | 501 --- .../src/main/resources/lib/airavata/Airavata.h | 512 --- .../lib/airavata/Airavata_server.skeleton.cpp | 499 --- .../airavata/replica_catalog_models_types.cpp | 206 ++--- .../lib/airavata/replica_catalog_models_types.h | 54 +- .../resources/lib/Airavata/API/Airavata.php | 440 ++--- .../lib/Airavata/Model/Data/Resource/Types.php | 145 +-- .../lib/apache/airavata/api/Airavata.py | 884 ++- .../airavata/model/data/resource/ttypes.py | 103 +-- .../org/apache/airavata/model/Workflow.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 +- .../data/resource/DataReplicaLocationModel.java | 686 -- .../model/data/resource/DataResourceModel.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 +-
[5/5] airavata git commit: adding data mover code to data manager
adding data mover code to data manager Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/6572a821 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/6572a821 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/6572a821 Branch: refs/heads/master Commit: 6572a821436871df07d5747949c16c14fce69444 Parents: 36da4ee Author: scnakandalaAuthored: Wed Dec 16 18:21:39 2015 -0500 Committer: scnakandala Committed: Wed Dec 16 18:21:39 2015 -0500 -- .../server/handler/AiravataServerHandler.java |62 +- .../java/org/apache/airavata/api/Airavata.java | 37488 + .../main/resources/lib/airavata/Airavata.cpp| 569 + .../src/main/resources/lib/airavata/Airavata.h | 170 + .../lib/airavata/Airavata_server.skeleton.cpp | 5 + .../resources/lib/Airavata/API/Airavata.php | 402 + .../lib/apache/airavata/api/Airavata-remote | 7 + .../lib/apache/airavata/api/Airavata.py | 320 + .../data/catalog/core/DataManagerFactory.java |34 - .../data/catalog/core/DataManagerImpl.java | 207 - .../data/manager/core/DataManagerFactory.java |34 + .../data/manager/core/DataManagerImpl.java | 393 + .../data/manager/core/ssh/CommandOutput.java|34 + .../data/manager/core/ssh/SSHApiException.java |33 + .../data/manager/core/ssh/SSHUtils.java | 505 + .../manager/core/ssh/StandardOutReader.java |86 + .../manager/core/DataManagerFactoryTest.java|45 + .../data/manager/core/DataManagerImplTest.java | 208 + .../data/manager/core/utils/AppCatInit.java | 320 + .../data/manager/core/utils/DataCatInit.java| 315 + .../catalog/core/DataManagerFactoryTest.java|41 - .../data/catalog/core/DataManagerImplTest.java | 205 - .../data/catalog/core/utils/AppCatInit.java | 320 - .../data/catalog/core/utils/DataCatInit.java| 315 - .../airavata/data/catalog/cpi/DataManager.java |98 - .../data/catalog/cpi/DataManagerConstants.java |28 - .../data/catalog/cpi/DataManagerException.java |35 - .../airavata/data/manager/cpi/DataManager.java | 109 + .../data/manager/cpi/DataManagerConstants.java |28 + .../data/manager/cpi/DataManagerException.java |35 + modules/data-manager/pom.xml| 4 + .../airavata-apis/airavata_api.thrift |10 + 32 files changed, 23212 insertions(+), 19253 deletions(-) -- http://git-wip-us.apache.org/repos/asf/airavata/blob/6572a821/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 1ad1536..0917f5e 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 @@ -32,9 +32,9 @@ import org.apache.airavata.credential.store.client.CredentialStoreClientFactory; import org.apache.airavata.credential.store.cpi.CredentialStoreService; import org.apache.airavata.credential.store.datamodel.SSHCredential; import org.apache.airavata.credential.store.exception.CredentialStoreException; -import org.apache.airavata.data.catalog.core.DataManagerFactory; -import org.apache.airavata.data.catalog.cpi.DataManager; -import org.apache.airavata.data.catalog.cpi.DataManagerException; +import org.apache.airavata.data.manager.core.DataManagerFactory; +import org.apache.airavata.data.manager.cpi.DataManager; +import org.apache.airavata.data.manager.cpi.DataManagerException; import org.apache.airavata.messaging.core.MessageContext; import org.apache.airavata.messaging.core.Publisher; import org.apache.airavata.messaging.core.PublisherFactory; @@ -4069,17 +4069,6 @@ public class AiravataServerHandler implements Airavata.Iface { * * */ -/** - * Create new data resource. Resourse ID is returned - * @param authzToken - * @param dataResourceModel - * @return - * @throws InvalidRequestException - * @throws AiravataClientException - * @throws AiravataSystemException - * @throws AuthorizationException - * @throws TException - */ @Override @SecurityCheck public String registerDataResource(AuthzToken authzToken, DataResourceModel dataResourceModel) throws InvalidRequestException, AiravataClientException, AiravataSystemException,
[2/5] airavata git commit: adding data mover code to data manager
http://git-wip-us.apache.org/repos/asf/airavata/blob/6572a821/modules/data-manager/data-manager-core/src/main/java/org/apache/airavata/data/manager/core/DataManagerImpl.java -- diff --git a/modules/data-manager/data-manager-core/src/main/java/org/apache/airavata/data/manager/core/DataManagerImpl.java b/modules/data-manager/data-manager-core/src/main/java/org/apache/airavata/data/manager/core/DataManagerImpl.java new file mode 100644 index 000..4b79af1 --- /dev/null +++ b/modules/data-manager/data-manager-core/src/main/java/org/apache/airavata/data/manager/core/DataManagerImpl.java @@ -0,0 +1,393 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * +*/ +package org.apache.airavata.data.manager.core; + +import com.jcraft.jsch.JSch; +import com.jcraft.jsch.JSchException; +import com.jcraft.jsch.Session; +import org.apache.airavata.common.exception.ApplicationSettingsException; +import org.apache.airavata.common.utils.ServerSettings; +import org.apache.airavata.credential.store.client.CredentialStoreClientFactory; +import org.apache.airavata.credential.store.cpi.CredentialStoreService; +import org.apache.airavata.credential.store.datamodel.SSHCredential; +import org.apache.airavata.credential.store.exception.CredentialStoreException; +import org.apache.airavata.data.manager.core.ssh.SSHUtils; +import org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile; +import org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference; +import org.apache.airavata.model.appcatalog.storageresource.StorageResourceDescription; +import org.apache.airavata.model.data.movement.DataMovementInterface; +import org.apache.airavata.model.data.movement.DataMovementProtocol; +import org.apache.airavata.model.data.movement.SCPDataMovement; +import org.apache.airavata.model.data.resource.DataReplicaLocationModel; +import org.apache.airavata.model.data.resource.DataResourceModel; +import org.apache.airavata.model.data.resource.DataResourceType; +import org.apache.airavata.registry.core.experiment.catalog.impl.RegistryFactory; +import org.apache.airavata.registry.cpi.AppCatalog; +import org.apache.airavata.registry.cpi.AppCatalogException; +import org.apache.airavata.registry.cpi.DataCatalog; +import org.apache.airavata.registry.cpi.DataCatalogException; + +import org.apache.airavata.data.manager.cpi.DataManager; +import org.apache.airavata.data.manager.cpi.DataManagerException; +import org.apache.thrift.TException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.File; +import java.io.IOException; +import java.util.List; +import java.util.Optional; + +public class DataManagerImpl implements DataManager { +private final static Logger logger = LoggerFactory.getLogger(DataManagerImpl.class); + +private final AppCatalog appCatalog; +private final DataCatalog dataCatalog; + +public DataManagerImpl() throws DataManagerException { +try { +this.appCatalog = RegistryFactory.getAppCatalog(); +this.dataCatalog = RegistryFactory.getDataCatalog(); +} catch (Exception e) { +logger.error(e.getMessage(), e); +throw new DataManagerException(e); +} +} + +public DataManagerImpl(AppCatalog appCatalog, DataCatalog dataCatalog){ +this.appCatalog = appCatalog; +this.dataCatalog = dataCatalog; +} + +/** + * To create a replica entry for an already existing file(s). This is how the system comes to know about already + * existing resources + * @param dataResourceModel + * @return + */ +@Override +public String registerResource(DataResourceModel dataResourceModel) throws DataManagerException { +try { +String resourceId = dataCatalog.publishResource(dataResourceModel); +return resourceId; +} catch (DataCatalogException e) { +logger.error(e.getMessage(), e); +throw new DataManagerException(e); +} +} + +/** + * To remove a resource entry from the replica catalog + * @param resourceId + * @return + */ +@Override +public
[1/5] airavata git commit: adding data mover code to data manager
Repository: airavata Updated Branches: refs/heads/master 36da4ee4d -> 6572a8214 http://git-wip-us.apache.org/repos/asf/airavata/blob/6572a821/modules/data-manager/data-manager-core/src/test/java/org/apache/airavata/data/catalog/core/DataManagerImplTest.java -- diff --git a/modules/data-manager/data-manager-core/src/test/java/org/apache/airavata/data/catalog/core/DataManagerImplTest.java b/modules/data-manager/data-manager-core/src/test/java/org/apache/airavata/data/catalog/core/DataManagerImplTest.java deleted file mode 100644 index f644520..000 --- a/modules/data-manager/data-manager-core/src/test/java/org/apache/airavata/data/catalog/core/DataManagerImplTest.java +++ /dev/null @@ -1,205 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * -*/ -package org.apache.airavata.data.catalog.core; - -import org.apache.airavata.data.catalog.cpi.DataManagerException; -import org.apache.airavata.data.catalog.core.utils.AppCatInit; -import org.apache.airavata.data.catalog.core.utils.DataCatInit; -import org.apache.airavata.model.data.resource.DataReplicaLocationModel; -import org.apache.airavata.model.data.resource.DataResourceModel; -import org.apache.airavata.registry.core.experiment.catalog.impl.RegistryFactory; -import org.apache.airavata.registry.cpi.DataCatalog; -import org.apache.airavata.data.catalog.cpi.DataManager; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.List; -import java.util.UUID; - -public class DataManagerImplTest { -private final static Logger logger = LoggerFactory.getLogger(DataManagerImplTest.class); -private static AppCatInit appCatInit; -private static DataCatInit dataCatInit; -private static DataManager dataManager; -private static DataResourceModel dataResourceModel; -private static DataReplicaLocationModel dataReplicaLocationModel; - -@BeforeClass -public static void setUp() { -try { -System.out.println("** SET UP "); -appCatInit = new AppCatInit("appcatalog-derby.sql"); -appCatInit.initializeDB(); -dataCatInit = new DataCatInit("datacatalog-derby.sql"); -dataCatInit.initializeDB(); -DataCatalog dataCatalog = RegistryFactory.getDataCatalog(); -DataManagerImplTest.dataManager = new DataManagerImpl(dataCatalog); -dataResourceModel = new DataResourceModel(); -dataResourceModel.setResourceName("test-file.txt"); -dataReplicaLocationModel = new DataReplicaLocationModel(); -dataReplicaLocationModel.setReplicaName("1-st-replica"); -} catch (Exception e) { -logger.error(e.getMessage(), e); -} -} - -@AfterClass -public static void tearDown() throws Exception { -System.out.println("** TEAR DOWN "); -dataCatInit.stopDerbyServer(); -} - -@Test -public void testPublishDataResource(){ -try { -String resourceId = dataManager.registerResource(dataResourceModel); -org.junit.Assert.assertNotNull(resourceId); -} catch (DataManagerException e) { -e.printStackTrace(); -Assert.fail(); -} -} - -@Test -public void testRemoveDataResource(){ -try { -boolean result = dataManager.removeResource("234234234"); -Assert.assertFalse(result); -String resourceId = dataManager.registerResource(dataResourceModel); -Assert.assertNotNull(resourceId); -result = dataManager.removeResource(resourceId); -Assert.assertTrue(result); -result = dataManager.removeResource(resourceId); -Assert.assertFalse(result); -} catch (DataManagerException e) { -e.printStackTrace(); -Assert.fail(); -} -} - -@Test -public void testGetDataResource(){ -try { -String resourceId = dataManager.registerResource(dataResourceModel);
[4/5] airavata git commit: adding data mover code to data manager
http://git-wip-us.apache.org/repos/asf/airavata/blob/6572a821/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 b84b3ac..9d117e5 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 @@ -2324,6 +2324,8 @@ public class Airavata { public org.apache.airavata.model.data.resource.DataResourceModel getDataResource(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException; +public String copyDataResource(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, String destStorageResourceId, String destinationParentPath) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException; + } public interface AsyncIface { @@ -2600,6 +2602,8 @@ public class Airavata { public void getDataResource(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; +public void copyDataResource(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, String destStorageResourceId, String destinationParentPath, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + } public static class Client extends org.apache.thrift.TServiceClient implements Iface { @@ -7610,6 +7614,44 @@ public class Airavata { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getDataResource failed: unknown result"); } +public String copyDataResource(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, String destStorageResourceId, String destinationParentPath) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException +{ + send_copyDataResource(authzToken, resourceId, destStorageResourceId, destinationParentPath); + return recv_copyDataResource(); +} + +public void send_copyDataResource(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, String destStorageResourceId, String destinationParentPath) throws org.apache.thrift.TException +{ + copyDataResource_args args = new copyDataResource_args(); + args.setAuthzToken(authzToken); + args.setResourceId(resourceId); + args.setDestStorageResourceId(destStorageResourceId); + args.setDestinationParentPath(destinationParentPath); + sendBase("copyDataResource", args); +} + +public String recv_copyDataResource() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException +{ + copyDataResource_result result = new copyDataResource_result(); + receiveBase(result, "copyDataResource"); + if (result.isSetSuccess()) { +return result.success; + } + if (result.ire != null) { +throw result.ire; + } + if (result.ace != null) { +throw result.ace; + } + if (result.ase != null) { +throw result.ase; + } + if (result.ae != null) { +throw result.ae; + } + throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "copyDataResource failed: unknown result"); +} + } public static class AsyncClient extends org.apache.thrift.async.TAsyncClient implements AsyncIface { public static class Factory implements org.apache.thrift.async.TAsyncClientFactory { @@ -12718,6 +12760,47 @@ public class Airavata { } } +public void copyDataResource(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, String destStorageResourceId, String destinationParentPath,
[3/5] airavata git commit: adding data mover code to data manager
http://git-wip-us.apache.org/repos/asf/airavata/blob/6572a821/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp -- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp index 3b8976d..5fa7f87 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp @@ -42468,6 +42468,333 @@ uint32_t Airavata_getDataResource_presult::read(::apache::thrift::protocol::TPro return xfer; } + +Airavata_copyDataResource_args::~Airavata_copyDataResource_args() throw() { +} + + +uint32_t Airavata_copyDataResource_args::read(::apache::thrift::protocol::TProtocol* iprot) { + + apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); + uint32_t xfer = 0; + std::string fname; + ::apache::thrift::protocol::TType ftype; + int16_t fid; + + xfer += iprot->readStructBegin(fname); + + using ::apache::thrift::protocol::TProtocolException; + + bool isset_authzToken = false; + bool isset_resourceId = false; + bool isset_destStorageResourceId = false; + bool isset_destinationParentPath = false; + + while (true) + { +xfer += iprot->readFieldBegin(fname, ftype, fid); +if (ftype == ::apache::thrift::protocol::T_STOP) { + break; +} +switch (fid) +{ + case 1: +if (ftype == ::apache::thrift::protocol::T_STRUCT) { + xfer += this->authzToken.read(iprot); + isset_authzToken = true; +} else { + xfer += iprot->skip(ftype); +} +break; + case 2: +if (ftype == ::apache::thrift::protocol::T_STRING) { + xfer += iprot->readString(this->resourceId); + isset_resourceId = true; +} else { + xfer += iprot->skip(ftype); +} +break; + case 3: +if (ftype == ::apache::thrift::protocol::T_STRING) { + xfer += iprot->readString(this->destStorageResourceId); + isset_destStorageResourceId = true; +} else { + xfer += iprot->skip(ftype); +} +break; + case 4: +if (ftype == ::apache::thrift::protocol::T_STRING) { + xfer += iprot->readString(this->destinationParentPath); + isset_destinationParentPath = true; +} else { + xfer += iprot->skip(ftype); +} +break; + default: +xfer += iprot->skip(ftype); +break; +} +xfer += iprot->readFieldEnd(); + } + + xfer += iprot->readStructEnd(); + + if (!isset_authzToken) +throw TProtocolException(TProtocolException::INVALID_DATA); + if (!isset_resourceId) +throw TProtocolException(TProtocolException::INVALID_DATA); + if (!isset_destStorageResourceId) +throw TProtocolException(TProtocolException::INVALID_DATA); + if (!isset_destinationParentPath) +throw TProtocolException(TProtocolException::INVALID_DATA); + return xfer; +} + +uint32_t Airavata_copyDataResource_args::write(::apache::thrift::protocol::TProtocol* oprot) const { + uint32_t xfer = 0; + apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); + xfer += oprot->writeStructBegin("Airavata_copyDataResource_args"); + + xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1); + xfer += this->authzToken.write(oprot); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("resourceId", ::apache::thrift::protocol::T_STRING, 2); + xfer += oprot->writeString(this->resourceId); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("destStorageResourceId", ::apache::thrift::protocol::T_STRING, 3); + xfer += oprot->writeString(this->destStorageResourceId); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("destinationParentPath", ::apache::thrift::protocol::T_STRING, 4); + xfer += oprot->writeString(this->destinationParentPath); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldStop(); + xfer += oprot->writeStructEnd(); + return xfer; +} + + +Airavata_copyDataResource_pargs::~Airavata_copyDataResource_pargs() throw() { +} + + +uint32_t Airavata_copyDataResource_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const { + uint32_t xfer = 0; + apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); + xfer += oprot->writeStructBegin("Airavata_copyDataResource_pargs"); + + xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1); + xfer += (*(this->authzToken)).write(oprot); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("resourceId", ::apache::thrift::protocol::T_STRING, 2); + xfer +=
airavata git commit: fixing some date issues
Repository: airavata Updated Branches: refs/heads/master 6572a8214 -> 1837eea8c fixing some date issues Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/1837eea8 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/1837eea8 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/1837eea8 Branch: refs/heads/master Commit: 1837eea8cd2a0c2114b45ee463f0d56540a3f88d Parents: 6572a82 Author: scnakandalaAuthored: Wed Dec 16 22:30:40 2015 -0500 Committer: scnakandala Committed: Wed Dec 16 22:30:40 2015 -0500 -- .../client/samples/DataManagerSample.java | 68 .../data/manager/core/DataManagerImpl.java | 4 +- .../core/data/catalog/impl/DataCatalogImpl.java | 18 +- .../utils/ThriftDataModelConversion.java| 16 +++-- .../airavata/data/catalog/DataCatalogTest.java | 32 - .../airavata/registry/cpi/DataCatalog.java | 4 +- 6 files changed, 114 insertions(+), 28 deletions(-) -- http://git-wip-us.apache.org/repos/asf/airavata/blob/1837eea8/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/DataManagerSample.java -- diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/DataManagerSample.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/DataManagerSample.java new file mode 100644 index 000..44e20cf --- /dev/null +++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/DataManagerSample.java @@ -0,0 +1,68 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * +*/ +package org.apache.airavata.client.samples; + +import org.apache.airavata.api.Airavata; +import org.apache.airavata.api.client.AiravataClientFactory; +import org.apache.airavata.model.data.resource.DataReplicaLocationModel; +import org.apache.airavata.model.data.resource.DataResourceModel; +import org.apache.airavata.model.data.resource.DataResourceType; +import org.apache.airavata.model.security.AuthzToken; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class DataManagerSample { +private final static Logger logger = LoggerFactory.getLogger(DataManagerSample.class); + +public static final String THRIFT_SERVER_HOST = "gw77.iu.xsede.org"; +public static final int THRIFT_SERVER_PORT = 8930; +private static final String USER_NAME = "master"; +private static final String DEFAULT_GATEWAY = "default"; +private static final String STORAGE_RESOURCE_ID = ""; +private static final AuthzToken authzToken = new AuthzToken("empty-token"); +private static Airavata.Client client; + +public static void main(String[] args) { +try { +client = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST, THRIFT_SERVER_PORT); +System.out.println(client.getAPIVersion(authzToken)); + +DataResourceModel dataResourceModel = new DataResourceModel(); +dataResourceModel.setGatewayId(DEFAULT_GATEWAY); +dataResourceModel.setOwnerName(USER_NAME); +dataResourceModel.setResourceName("test-1"); +dataResourceModel.setDataResourceType(DataResourceType.FILE); + +DataReplicaLocationModel replicaLocationModel = new DataReplicaLocationModel(); +replicaLocationModel.setStorageResourceId(STORAGE_RESOURCE_ID); +replicaLocationModel.setFileAbsolutePath("/var/www/portal/"); + +dataResourceModel.addToReplicaLocations(replicaLocationModel); + +String resourceId = client.registerDataResource(authzToken, dataResourceModel); +System.out.println(resourceId); + +} catch (Exception e) { +logger.error("Error while connecting with server", e.getMessage()); +
[1/2] airavata-php-gateway git commit: updating the thrift 0.9.3 generated code
Repository: airavata-php-gateway Updated Branches: refs/heads/master b545744c8 -> e5e190efd http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e5e190ef/app/libraries/Airavata/Model/Data/Resource/Types.php -- diff --git a/app/libraries/Airavata/Model/Data/Resource/Types.php b/app/libraries/Airavata/Model/Data/Resource/Types.php index 84e6c9c..cd5542a 100644 --- a/app/libraries/Airavata/Model/Data/Resource/Types.php +++ b/app/libraries/Airavata/Model/Data/Resource/Types.php @@ -2,7 +2,7 @@ namespace Airavata\Model\Data\Resource; /** - * Autogenerated by Thrift Compiler (0.9.2) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -39,6 +39,15 @@ final class ReplicaPersistentType { ); } +final class DataResourceType { + const COLLECTION = 0; + const FILE = 1; + static public $__names = array( +0 => 'COLLECTION', +1 => 'FILE', + ); +} + class DataResourceModel { static $_TSPEC; @@ -53,6 +62,10 @@ class DataResourceModel { /** * @var string */ + public $parentResourceId = null; + /** + * @var string + */ public $resourceName = null; /** * @var string @@ -65,6 +78,10 @@ class DataResourceModel { /** * @var int */ + public $dataResourceType = null; + /** + * @var int + */ public $resourceSize = null; /** * @var int @@ -81,7 +98,11 @@ class DataResourceModel { /** * @var \Airavata\Model\Data\Resource\DataReplicaLocationModel[] */ - public $dataReplicaLocations = null; + public $replicaLocations = null; + /** + * @var \Airavata\Model\Data\Resource\DataResourceModel[] + */ + public $childResources = null; public function __construct($vals=null) { if (!isset(self::$_TSPEC)) { @@ -95,30 +116,38 @@ class DataResourceModel { 'type' => TType::STRING, ), 3 => array( - 'var' => 'resourceName', + 'var' => 'parentResourceId', 'type' => TType::STRING, ), 4 => array( - 'var' => 'resourceDescription', + 'var' => 'resourceName', 'type' => TType::STRING, ), 5 => array( - 'var' => 'ownerName', + 'var' => 'resourceDescription', 'type' => TType::STRING, ), 6 => array( + 'var' => 'ownerName', + 'type' => TType::STRING, + ), +7 => array( + 'var' => 'dataResourceType', + 'type' => TType::I32, + ), +8 => array( 'var' => 'resourceSize', 'type' => TType::I32, ), -7 => array( +9 => array( 'var' => 'creationTime', 'type' => TType::I64, ), -8 => array( +10 => array( 'var' => 'lastModifiedTime', 'type' => TType::I64, ), -9 => array( +11 => array( 'var' => 'resourceMetadata', 'type' => TType::MAP, 'ktype' => TType::STRING, @@ -130,8 +159,8 @@ class DataResourceModel { 'type' => TType::STRING, ), ), -10 => array( - 'var' => 'dataReplicaLocations', +12 => array( + 'var' => 'replicaLocations', 'type' => TType::LST, 'etype' => TType::STRUCT, 'elem' => array( @@ -139,6 +168,15 @@ class DataResourceModel { 'class' => '\Airavata\Model\Data\Resource\DataReplicaLocationModel', ), ), +13 => array( + 'var' => 'childResources', + 'type' => TType::LST, + 'etype' => TType::STRUCT, + 'elem' => array( +'type' => TType::STRUCT, +'class' => '\Airavata\Model\Data\Resource\DataResourceModel', +), + ), ); } if (is_array($vals)) { @@ -148,6 +186,9 @@ class DataResourceModel { if (isset($vals['gatewayId'])) { $this->gatewayId = $vals['gatewayId']; } + if (isset($vals['parentResourceId'])) { +$this->parentResourceId = $vals['parentResourceId']; + } if (isset($vals['resourceName'])) { $this->resourceName = $vals['resourceName']; } @@ -157,6 +198,9 @@ class DataResourceModel { if (isset($vals['ownerName'])) { $this->ownerName = $vals['ownerName']; } + if (isset($vals['dataResourceType'])) { +$this->dataResourceType = $vals['dataResourceType']; + } if (isset($vals['resourceSize'])) { $this->resourceSize = $vals['resourceSize']; } @@ -169,8 +213,11 @@ class DataResourceModel { if (isset($vals['resourceMetadata'])) { $this->resourceMetadata = $vals['resourceMetadata']; } - if (isset($vals['dataReplicaLocations'])) { -$this->dataReplicaLocations =
[2/2] airavata-php-gateway git commit: updating the thrift 0.9.3 generated code
updating the thrift 0.9.3 generated code Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/e5e190ef Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/e5e190ef Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/e5e190ef Branch: refs/heads/master Commit: e5e190efdf66f5cc11665f2f4665fedc48abb507 Parents: b545744 Author: scnakandalaAuthored: Wed Dec 16 23:01:28 2015 -0500 Committer: scnakandala Committed: Wed Dec 16 23:01:28 2015 -0500 -- app/libraries/Airavata/API/Airavata.php | 1104 ++ app/libraries/Airavata/API/Error/Types.php |2 +- app/libraries/Airavata/API/Types.php|4 +- .../Model/AppCatalog/AppDeployment/Types.php|2 +- .../Model/AppCatalog/AppInterface/Types.php |2 +- .../Model/AppCatalog/ComputeResource/Types.php | 11 +- .../Model/AppCatalog/GatewayProfile/Types.php |2 +- .../Model/AppCatalog/StorageResource/Types.php |2 +- .../Airavata/Model/Application/Io/Types.php |2 +- app/libraries/Airavata/Model/Commons/Types.php |2 +- .../Airavata/Model/Data/Movement/Types.php |2 +- .../Airavata/Model/Data/Resource/Types.php | 312 +++-- .../Airavata/Model/Experiment/Types.php |2 +- app/libraries/Airavata/Model/Job/Types.php |2 +- .../Airavata/Model/Messaging/Event/Types.php|2 +- app/libraries/Airavata/Model/Process/Types.php |2 +- .../Airavata/Model/Scheduling/Types.php |2 +- app/libraries/Airavata/Model/Security/Types.php |2 +- app/libraries/Airavata/Model/Status/Types.php |2 +- app/libraries/Airavata/Model/Task/Types.php |2 +- app/libraries/Airavata/Model/Types.php |2 +- .../Airavata/Model/Workspace/Types.php |2 +- .../Thrift/Exception/TProtocolException.php |2 - .../Protocol/TBinaryProtocolAccelerated.php | 17 +- .../Thrift/Protocol/TCompactProtocol.php| 12 +- app/libraries/Thrift/Protocol/TJSONProtocol.php |4 +- .../Thrift/Serializer/TBinarySerializer.php |8 +- app/libraries/Thrift/Thrift.php | 789 + .../Thrift/Transport/TBufferedTransport.php |7 +- app/libraries/Thrift/Transport/TSocket.php |6 +- app/libraries/Thrift/autoload.php | 51 + 31 files changed, 2011 insertions(+), 352 deletions(-) -- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e5e190ef/app/libraries/Airavata/API/Airavata.php -- diff --git a/app/libraries/Airavata/API/Airavata.php b/app/libraries/Airavata/API/Airavata.php index 7171104..4cc073b 100644 --- a/app/libraries/Airavata/API/Airavata.php +++ b/app/libraries/Airavata/API/Airavata.php @@ -1,7 +1,7 @@ + * tasks -> jobs information. * * @param airavataExperimentId *The identifier for the requested experiment. This is returned during the create experiment step. @@ -612,7 +824,7 @@ interface AiravataIf { * * @throws org.apache.airavata.model.error.AiravataClientException *The following list of exceptions are thrown which Airavata Client can take corrective actions to resolve: - * + * * UNKNOWN_GATEWAY_ID - If a Gateway is not registered with Airavata as a one time administrative * step, then Airavata Registry will not have a provenance area setup. The client has to follow * gateway registration steps and retry this request. @@ -651,16 +863,21 @@ interface AiravataIf { * @throws \Airavata\API\Error\AiravataSystemException * @throws \Airavata\API\Error\AuthorizationException */ - public function getExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId); + public function getDetailedExperimentTree(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId); /** - * Fetch the completed nested tree structue of previously created experiment metadata which includes processes -> - * tasks -> jobs information. + * Configure a previously created experiment with required inputs, scheduling and other quality of service + * parameters. This method only updates the experiment object within the registry. The experiment has to be launched + * to make it actionable by the server. * * @param airavataExperimentId *The identifier for the requested experiment. This is returned during the create experiment step. * - * @return experimentMetada - * This method will return the previously stored experiment metadata. + * @param experimentConfigurationData + *The configuration
[4/4] airavata git commit: changing the order of groupId
changing the order of groupId Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/74201879 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/74201879 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/74201879 Branch: refs/heads/master Commit: 74201879bd02ebf40c0f6874da42bc3df8a79817 Parents: ee8a15e Author: scnakandalaAuthored: Thu Dec 17 00:11:36 2015 -0500 Committer: scnakandala Committed: Thu Dec 17 00:11:36 2015 -0500 -- airavata-api/airavata-api-server/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/airavata/blob/74201879/airavata-api/airavata-api-server/pom.xml -- diff --git a/airavata-api/airavata-api-server/pom.xml b/airavata-api/airavata-api-server/pom.xml index 367dff6..9e3c27b 100644 --- a/airavata-api/airavata-api-server/pom.xml +++ b/airavata-api/airavata-api-server/pom.xml @@ -14,8 +14,8 @@ 4.0.0 -airavata-api org.apache.airavata +airavata-api 0.16-SNAPSHOT ../pom.xml
[3/4] airavata git commit: fixing test failure
fixing test failure Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ee8a15e4 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ee8a15e4 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ee8a15e4 Branch: refs/heads/master Commit: ee8a15e4d7fad3c73fb23f70fc1c8ecf49f37c89 Parents: 3d5bf9e Author: scnakandalaAuthored: Wed Dec 16 23:34:17 2015 -0500 Committer: scnakandala Committed: Wed Dec 16 23:34:17 2015 -0500 -- airavata-api/airavata-data-models/pom.xml| 2 +- .../catalog/utils/ThriftDataModelConversion.java | 15 ++- samples/java-client/experiment/pom.xml | 6 +++--- 3 files changed, 14 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/airavata/blob/ee8a15e4/airavata-api/airavata-data-models/pom.xml -- diff --git a/airavata-api/airavata-data-models/pom.xml b/airavata-api/airavata-data-models/pom.xml index 220ab7a..cf18efc 100644 --- a/airavata-api/airavata-data-models/pom.xml +++ b/airavata-api/airavata-data-models/pom.xml @@ -13,8 +13,8 @@ 4.0.0 -airavata-api org.apache.airavata +airavata-api 0.16-SNAPSHOT ../pom.xml http://git-wip-us.apache.org/repos/asf/airavata/blob/ee8a15e4/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/data/catalog/utils/ThriftDataModelConversion.java -- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/data/catalog/utils/ThriftDataModelConversion.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/data/catalog/utils/ThriftDataModelConversion.java index 3ea4dad..7f358fe 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/data/catalog/utils/ThriftDataModelConversion.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/data/catalog/utils/ThriftDataModelConversion.java @@ -53,8 +53,10 @@ public class ThriftDataModelConversion { dataResourceModel.setResourceDescription(dataResource.getResourceDescription()); dataResourceModel.setOwnerName(dataResource.getOwnerName()); dataResourceModel.setResourceSize(dataResource.getResourceSize()); - dataResourceModel.setCreationTime(dataResource.getCreationTime().getTime()); - dataResourceModel.setLastModifiedTime(dataResource.getLastModifiedTime().getTime()); +if(dataResource.getCreationTime() != null) + dataResourceModel.setCreationTime(dataResource.getCreationTime().getTime()); +if(dataResource.getLastModifiedTime() != null) + dataResourceModel.setLastModifiedTime(dataResource.getLastModifiedTime().getTime()); dataResourceModel.setResourceMetadata(getResourceMetaData(dataResource.getDataResourceMetaData())); if(dataResource.getDataReplicaLocations() != null){ ArrayList dataReplicaLocationModels = new ArrayList<>(); @@ -133,10 +135,13 @@ public class ThriftDataModelConversion { replicaLocationModel.setReplicaName(replicaLocation.getReplicaName()); replicaLocationModel.setReplicaDescription(replicaLocation.getReplicaDescription()); replicaLocationModel.setStorageResourceId(replicaLocation.getStorageResourceId()); - replicaLocationModel.setValidUntilTime(replicaLocation.getValidUntilTime().getTime()); +if(replicaLocation.getValidUntilTime() != null) + replicaLocationModel.setValidUntilTime(replicaLocation.getValidUntilTime().getTime()); replicaLocationModel.setFileAbsolutePath(replicaLocation.getFileAbsolutePath()); - replicaLocationModel.setCreationTime(replicaLocation.getCreationTime().getTime()); - replicaLocationModel.setLastModifiedTime(replicaLocation.getLastModifiedTime().getTime()); +if(replicaLocation.getCreationTime() != null) + replicaLocationModel.setCreationTime(replicaLocation.getCreationTime().getTime()); +if(replicaLocation.getLastModifiedTime() != null) + replicaLocationModel.setLastModifiedTime(replicaLocation.getLastModifiedTime().getTime()); if(replicaLocation.getReplicaLocationCategory() != null) replicaLocationModel.setReplicaLocationCategory(ReplicaLocationCategory.valueOf(replicaLocation .getReplicaLocationCategory().toString()));
[2/4] airavata git commit: changes to the validUntil time
changes to the validUntil time Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/3d5bf9ee Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/3d5bf9ee Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/3d5bf9ee Branch: refs/heads/master Commit: 3d5bf9eeacdc2dacf0b9425e555eade954c18314 Parents: fd62b23 Author: scnakandalaAuthored: Wed Dec 16 22:45:30 2015 -0500 Committer: scnakandala Committed: Wed Dec 16 22:45:30 2015 -0500 -- .../org/apache/airavata/client/samples/DataManagerSample.java | 7 --- .../registry/core/data/catalog/impl/DataCatalogImpl.java | 6 -- 2 files changed, 4 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/airavata/blob/3d5bf9ee/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/DataManagerSample.java -- diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/DataManagerSample.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/DataManagerSample.java index 44e20cf..c417f31 100644 --- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/DataManagerSample.java +++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/DataManagerSample.java @@ -22,9 +22,7 @@ package org.apache.airavata.client.samples; import org.apache.airavata.api.Airavata; import org.apache.airavata.api.client.AiravataClientFactory; -import org.apache.airavata.model.data.resource.DataReplicaLocationModel; -import org.apache.airavata.model.data.resource.DataResourceModel; -import org.apache.airavata.model.data.resource.DataResourceType; +import org.apache.airavata.model.data.resource.*; import org.apache.airavata.model.security.AuthzToken; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,6 +51,9 @@ public class DataManagerSample { DataReplicaLocationModel replicaLocationModel = new DataReplicaLocationModel(); replicaLocationModel.setStorageResourceId(STORAGE_RESOURCE_ID); +replicaLocationModel.setReplicaName("test-1-replica-1"); + replicaLocationModel.setReplicaLocationCategory(ReplicaLocationCategory.GATEWAY_DATA_STORE); + replicaLocationModel.setReplicaPersistentType(ReplicaPersistentType.PERSISTENT); replicaLocationModel.setFileAbsolutePath("/var/www/portal/"); dataResourceModel.addToReplicaLocations(replicaLocationModel); http://git-wip-us.apache.org/repos/asf/airavata/blob/3d5bf9ee/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/data/catalog/impl/DataCatalogImpl.java -- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/data/catalog/impl/DataCatalogImpl.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/data/catalog/impl/DataCatalogImpl.java index 91e3ce5..f596980 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/data/catalog/impl/DataCatalogImpl.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/data/catalog/impl/DataCatalogImpl.java @@ -41,8 +41,6 @@ public class DataCatalogImpl implements DataCatalog { private final static Logger logger = LoggerFactory.getLogger(DataCatalogImpl.class); -private final static long DEFAULT_REPLICA_VALID_TIME = 1000 * 60 * 60 * 24 * 365 * 10; - @Override public String registerResource(DataResourceModel resourceModel) throws DataCatalogException { String resourceId = UUID.randomUUID().toString(); @@ -56,8 +54,6 @@ public class DataCatalogImpl implements DataCatalog { r.setReplicaId(UUID.randomUUID().toString()); r.setCreationTime(currentTime); r.setLastModifiedTime(currentTime); -if(r.getValidUntilTime() <= 0) -r.setValidUntilTime(currentTime + DEFAULT_REPLICA_VALID_TIME); }); } resourceModel.setCreationTime(System.currentTimeMillis()); @@ -165,8 +161,6 @@ public class DataCatalogImpl implements DataCatalog { long currentTime = System.currentTimeMillis(); dataReplicaLocationModel.setCreationTime(currentTime); dataReplicaLocationModel.setLastModifiedTime(currentTime); -if(dataReplicaLocationModel.getValidUntilTime() <= 0) -
[1/4] airavata git commit: changing the mysql script
Repository: airavata Updated Branches: refs/heads/master 1837eea8c -> 74201879b changing the mysql script Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/fd62b238 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/fd62b238 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/fd62b238 Branch: refs/heads/master Commit: fd62b238e14bb769c887121731f4f39b0777527e Parents: 1837eea Author: scnakandalaAuthored: Wed Dec 16 22:42:54 2015 -0500 Committer: scnakandala Committed: Wed Dec 16 22:42:54 2015 -0500 -- .../registry/core/data/catalog/impl/DataCatalogImpl.java | 2 +- .../src/main/resources/datacatalog-mysql.sql | 10 +- 2 files changed, 6 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/airavata/blob/fd62b238/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/data/catalog/impl/DataCatalogImpl.java -- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/data/catalog/impl/DataCatalogImpl.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/data/catalog/impl/DataCatalogImpl.java index 0957709..91e3ce5 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/data/catalog/impl/DataCatalogImpl.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/data/catalog/impl/DataCatalogImpl.java @@ -41,7 +41,7 @@ public class DataCatalogImpl implements DataCatalog { private final static Logger logger = LoggerFactory.getLogger(DataCatalogImpl.class); -private final static long DEFAULT_REPLICA_VALID_TIME = 1000 * 60 * 60 * 24 * 365 + 10; +private final static long DEFAULT_REPLICA_VALID_TIME = 1000 * 60 * 60 * 24 * 365 * 10; @Override public String registerResource(DataResourceModel resourceModel) throws DataCatalogException { http://git-wip-us.apache.org/repos/asf/airavata/blob/fd62b238/modules/registry/registry-core/src/main/resources/datacatalog-mysql.sql -- diff --git a/modules/registry/registry-core/src/main/resources/datacatalog-mysql.sql b/modules/registry/registry-core/src/main/resources/datacatalog-mysql.sql index 7bff542..cb10b5b 100644 --- a/modules/registry/registry-core/src/main/resources/datacatalog-mysql.sql +++ b/modules/registry/registry-core/src/main/resources/datacatalog-mysql.sql @@ -28,8 +28,8 @@ CREATE TABLE DATA_RESOURCE OWNER_NAME VARCHAR (255), PARENT_RESOURCE_ID VARCHAR (255), RESOURCE_SIZE INT, -CREATION_TIME TIMESTAMP, -LAST_MODIFIED_TIME TIMESTAMP, +CREATION_TIME TIMESTAMP DEFAULT NULL, +LAST_MODIFIED_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP , PRIMARY KEY (RESOURCE_ID) ); @@ -41,9 +41,9 @@ CREATE TABLE DATA_REPLICA_LOCATION REPLICA_DESCRIPTION VARCHAR (1024), STORAGE_RESOURCE_ID VARCHAR (255), FILE_ABSOLUTE_PATH VARCHAR (4096), -CREATION_TIME TIMESTAMP, -LAST_MODIFIED_TIME TIMESTAMP, -VALID_UNTIL_TIME TIMESTAMP, +CREATION_TIME TIMESTAMP DEFAULT NULL, +LAST_MODIFIED_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP , +VALID_UNTIL_TIME TIMESTAMP DEFAULT NULL, PRIMARY KEY (REPLICA_ID), FOREIGN KEY (RESOURCE_ID) REFERENCES DATA_RESOURCE(RESOURCE_ID) ON DELETE CASCADE );
[09/13] airavata git commit: reverting the generated classes to 0.9.2 as the tests did not pass - AIRAVATA-1883
http://git-wip-us.apache.org/repos/asf/airavata/blob/52f18ba6/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_interface_model_types.h -- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_interface_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_interface_model_types.h index adafa82..cdf8fa3 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_interface_model_types.h +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_interface_model_types.h @@ -16,7 +16,7 @@ */ /** - * Autogenerated by Thrift Compiler (0.9.3) + * Autogenerated by Thrift Compiler (0.9.2) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -51,6 +51,9 @@ typedef struct _ApplicationInterfaceDescription__isset { class ApplicationInterfaceDescription { public: + static const char* ascii_fingerprint; // = "D41488A7C34E28C6E04EA596F09A1F6C"; + static const uint8_t binary_fingerprint[16]; // = {0xD4,0x14,0x88,0xA7,0xC3,0x4E,0x28,0xC6,0xE0,0x4E,0xA5,0x96,0xF0,0x9A,0x1F,0x6C}; + ApplicationInterfaceDescription(const ApplicationInterfaceDescription&); ApplicationInterfaceDescription& operator=(const ApplicationInterfaceDescription&); ApplicationInterfaceDescription() : applicationInterfaceId("DO_NOT_SET_AT_CLIENTS"), applicationName(), applicationDescription() { @@ -111,17 +114,11 @@ class ApplicationInterfaceDescription { uint32_t read(::apache::thrift::protocol::TProtocol* iprot); uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; - virtual void printTo(std::ostream& out) const; + friend std::ostream& operator<<(std::ostream& out, const ApplicationInterfaceDescription& obj); }; void swap(ApplicationInterfaceDescription , ApplicationInterfaceDescription ); -inline std::ostream& operator<<(std::ostream& out, const ApplicationInterfaceDescription& obj) -{ - obj.printTo(out); - return out; -} - } // namespace #endif http://git-wip-us.apache.org/repos/asf/airavata/blob/52f18ba6/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_io_models_constants.cpp -- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_io_models_constants.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_io_models_constants.cpp index bdf3e7c..16c91d6 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_io_models_constants.cpp +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_io_models_constants.cpp @@ -16,7 +16,7 @@ */ /** - * Autogenerated by Thrift Compiler (0.9.3) + * Autogenerated by Thrift Compiler (0.9.2) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated http://git-wip-us.apache.org/repos/asf/airavata/blob/52f18ba6/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_io_models_constants.h -- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_io_models_constants.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_io_models_constants.h index 7181ead..67902c9 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_io_models_constants.h +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_io_models_constants.h @@ -16,7 +16,7 @@ */ /** - * Autogenerated by Thrift Compiler (0.9.3) + * Autogenerated by Thrift Compiler (0.9.2) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated http://git-wip-us.apache.org/repos/asf/airavata/blob/52f18ba6/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_io_models_types.cpp -- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_io_models_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_io_models_types.cpp index 0604770..75476f8 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_io_models_types.cpp +++
[13/13] airavata git commit: reverting the generated classes to 0.9.2 as the tests did not pass - AIRAVATA-1883
reverting the generated classes to 0.9.2 as the tests did not pass - AIRAVATA-1883 Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/52f18ba6 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/52f18ba6 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/52f18ba6 Branch: refs/heads/master Commit: 52f18ba682f3255fa67c13e75e7c53375425779e Parents: 7420187 Author: smarruAuthored: Thu Dec 17 00:48:25 2015 -0500 Committer: smarru Committed: Thu Dec 17 00:48:25 2015 -0500 -- .../java/org/apache/airavata/api/Airavata.java | 162 +- .../airavata/api/airavata_apiConstants.java | 2 +- .../main/resources/lib/airavata/Airavata.cpp| 15139 + .../src/main/resources/lib/airavata/Airavata.h | 2651 ++- .../lib/airavata/airavata_api_constants.cpp | 2 +- .../lib/airavata/airavata_api_constants.h | 2 +- .../lib/airavata/airavata_api_types.cpp | 2 +- .../resources/lib/airavata/airavata_api_types.h | 2 +- .../lib/airavata/airavata_commons_constants.cpp | 2 +- .../lib/airavata/airavata_commons_constants.h | 2 +- .../lib/airavata/airavata_commons_types.cpp |58 +- .../lib/airavata/airavata_commons_types.h |35 +- .../airavata/airavata_data_models_constants.cpp | 2 +- .../airavata/airavata_data_models_constants.h | 2 +- .../lib/airavata/airavata_data_models_types.cpp | 2 +- .../lib/airavata/airavata_data_models_types.h | 2 +- .../lib/airavata/airavata_errors_constants.cpp | 2 +- .../lib/airavata/airavata_errors_constants.h| 2 +- .../lib/airavata/airavata_errors_types.cpp | 264 +- .../lib/airavata/airavata_errors_types.h| 141 +- .../application_deployment_model_constants.cpp | 2 +- .../application_deployment_model_constants.h| 2 +- .../application_deployment_model_types.cpp |92 +- .../application_deployment_model_types.h|46 +- .../application_interface_model_constants.cpp | 2 +- .../application_interface_model_constants.h | 2 +- .../application_interface_model_types.cpp |26 +- .../application_interface_model_types.h |13 +- .../application_io_models_constants.cpp | 2 +- .../airavata/application_io_models_constants.h | 2 +- .../airavata/application_io_models_types.cpp|68 +- .../lib/airavata/application_io_models_types.h |24 +- .../compute_resource_model_constants.cpp| 2 +- .../airavata/compute_resource_model_constants.h | 2 +- .../airavata/compute_resource_model_types.cpp | 206 +- .../lib/airavata/compute_resource_model_types.h | 101 +- .../airavata/data_movement_models_constants.cpp | 2 +- .../airavata/data_movement_models_constants.h | 2 +- .../lib/airavata/data_movement_models_types.cpp |90 +- .../lib/airavata/data_movement_models_types.h |57 +- .../lib/airavata/experiment_model_constants.cpp | 2 +- .../lib/airavata/experiment_model_constants.h | 2 +- .../lib/airavata/experiment_model_types.cpp | 148 +- .../lib/airavata/experiment_model_types.h |46 +- ...gateway_resource_profile_model_constants.cpp | 2 +- .../gateway_resource_profile_model_constants.h | 2 +- .../gateway_resource_profile_model_types.cpp|72 +- .../gateway_resource_profile_model_types.h |35 +- .../lib/airavata/job_model_constants.cpp| 2 +- .../lib/airavata/job_model_constants.h | 2 +- .../resources/lib/airavata/job_model_types.cpp |38 +- .../resources/lib/airavata/job_model_types.h|13 +- .../lib/airavata/messaging_events_constants.cpp | 2 +- .../lib/airavata/messaging_events_constants.h | 2 +- .../lib/airavata/messaging_events_types.cpp | 252 +- .../lib/airavata/messaging_events_types.h | 156 +- .../lib/airavata/process_model_constants.cpp| 2 +- .../lib/airavata/process_model_constants.h | 2 +- .../lib/airavata/process_model_types.cpp|56 +- .../lib/airavata/process_model_types.h |13 +- .../replica_catalog_models_constants.cpp| 2 +- .../airavata/replica_catalog_models_constants.h | 2 +- .../airavata/replica_catalog_models_types.cpp |76 +- .../lib/airavata/replica_catalog_models_types.h |24 +- .../lib/airavata/scheduling_model_constants.cpp | 2 +- .../lib/airavata/scheduling_model_constants.h | 2 +- .../lib/airavata/scheduling_model_types.cpp |32 +- .../lib/airavata/scheduling_model_types.h |13 +- .../lib/airavata/security_model_constants.cpp | 2 +- .../lib/airavata/security_model_constants.h | 2 +- .../lib/airavata/security_model_types.cpp |18 +- .../lib/airavata/security_model_types.h
[04/13] airavata git commit: reverting the generated classes to 0.9.2 as the tests did not pass - AIRAVATA-1883
http://git-wip-us.apache.org/repos/asf/airavata/blob/52f18ba6/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/constants.py -- diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/constants.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/constants.py index fc60574..ae922f1 100644 --- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/constants.py +++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/constants.py @@ -1,5 +1,5 @@ # -# Autogenerated by Thrift Compiler (0.9.3) +# Autogenerated by Thrift Compiler (0.9.2) # # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING # http://git-wip-us.apache.org/repos/asf/airavata/blob/52f18ba6/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/error/constants.py -- diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/error/constants.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/error/constants.py index 4a6492b..99717a9 100644 --- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/error/constants.py +++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/error/constants.py @@ -1,5 +1,5 @@ # -# Autogenerated by Thrift Compiler (0.9.3) +# Autogenerated by Thrift Compiler (0.9.2) # # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING # http://git-wip-us.apache.org/repos/asf/airavata/blob/52f18ba6/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/error/ttypes.py -- diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/error/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/error/ttypes.py index 522cc18..130eef5 100644 --- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/error/ttypes.py +++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/error/ttypes.py @@ -1,5 +1,5 @@ # -# Autogenerated by Thrift Compiler (0.9.3) +# Autogenerated by Thrift Compiler (0.9.2) # # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING # @@ -101,7 +101,7 @@ class ExperimentNotFoundException(TException): break if fid == 1: if ftype == TType.STRING: - self.message = iprot.readString() + self.message = iprot.readString(); else: iprot.skip(ftype) else: @@ -175,7 +175,7 @@ class ProjectNotFoundException(TException): break if fid == 1: if ftype == TType.STRING: - self.message = iprot.readString() + self.message = iprot.readString(); else: iprot.skip(ftype) else: @@ -250,7 +250,7 @@ class InvalidRequestException(TException): break if fid == 1: if ftype == TType.STRING: - self.message = iprot.readString() + self.message = iprot.readString(); else: iprot.skip(ftype) else: @@ -376,7 +376,7 @@ class AuthenticationException(TException): break if fid == 1: if ftype == TType.STRING: - self.message = iprot.readString() + self.message = iprot.readString(); else: iprot.skip(ftype) else: @@ -450,7 +450,7 @@ class AuthorizationException(TException): break if fid == 1: if ftype == TType.STRING: - self.message = iprot.readString() + self.message = iprot.readString(); else: iprot.skip(ftype) else: @@ -537,12 +537,12 @@ class AiravataClientException(TException): break if fid == 1: if ftype == TType.I32: - self.airavataErrorType = iprot.readI32() + self.airavataErrorType = iprot.readI32(); else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.parameter = iprot.readString() + self.parameter = iprot.readString(); else: iprot.skip(ftype) else: @@ -620,12 +620,12 @@ class ValidatorResult: break if fid == 1: if ftype == TType.BOOL: - self.result = iprot.readBool() + self.result = iprot.readBool(); else: iprot.skip(ftype) elif fid == 2:
[08/13] airavata git commit: reverting the generated classes to 0.9.2 as the tests did not pass - AIRAVATA-1883
http://git-wip-us.apache.org/repos/asf/airavata/blob/52f18ba6/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experiment_model_types.cpp -- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experiment_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experiment_model_types.cpp index 1a756ac..71ad4ea 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experiment_model_types.cpp +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experiment_model_types.cpp @@ -16,7 +16,7 @@ */ /** - * Autogenerated by Thrift Compiler (0.9.3) + * Autogenerated by Thrift Compiler (0.9.2) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -103,9 +103,11 @@ void UserConfigurationDataModel::__set_storageId(const std::string& val) { __isset.storageId = true; } +const char* UserConfigurationDataModel::ascii_fingerprint = "9CA6AB92C690C796BF5375F505933922"; +const uint8_t UserConfigurationDataModel::binary_fingerprint[16] = {0x9C,0xA6,0xAB,0x92,0xC6,0x90,0xC7,0x96,0xBF,0x53,0x75,0xF5,0x05,0x93,0x39,0x22}; + uint32_t UserConfigurationDataModel::read(::apache::thrift::protocol::TProtocol* iprot) { - apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); uint32_t xfer = 0; std::string fname; ::apache::thrift::protocol::TType ftype; @@ -208,7 +210,7 @@ uint32_t UserConfigurationDataModel::read(::apache::thrift::protocol::TProtocol* uint32_t UserConfigurationDataModel::write(::apache::thrift::protocol::TProtocol* oprot) const { uint32_t xfer = 0; - apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); + oprot->incrementRecursionDepth(); xfer += oprot->writeStructBegin("UserConfigurationDataModel"); xfer += oprot->writeFieldBegin("airavataAutoSchedule", ::apache::thrift::protocol::T_BOOL, 1); @@ -251,6 +253,7 @@ uint32_t UserConfigurationDataModel::write(::apache::thrift::protocol::TProtocol } xfer += oprot->writeFieldStop(); xfer += oprot->writeStructEnd(); + oprot->decrementRecursionDepth(); return xfer; } @@ -290,18 +293,19 @@ UserConfigurationDataModel& UserConfigurationDataModel::operator=(const UserConf __isset = other1.__isset; return *this; } -void UserConfigurationDataModel::printTo(std::ostream& out) const { - using ::apache::thrift::to_string; +std::ostream& operator<<(std::ostream& out, const UserConfigurationDataModel& obj) { + using apache::thrift::to_string; out << "UserConfigurationDataModel("; - out << "airavataAutoSchedule=" << to_string(airavataAutoSchedule); - out << ", " << "overrideManualScheduledParams=" << to_string(overrideManualScheduledParams); - out << ", " << "shareExperimentPublicly="; (__isset.shareExperimentPublicly ? (out << to_string(shareExperimentPublicly)) : (out << "")); - out << ", " << "computationalResourceScheduling="; (__isset.computationalResourceScheduling ? (out << to_string(computationalResourceScheduling)) : (out << "")); - out << ", " << "throttleResources="; (__isset.throttleResources ? (out << to_string(throttleResources)) : (out << "")); - out << ", " << "userDN="; (__isset.userDN ? (out << to_string(userDN)) : (out << "")); - out << ", " << "generateCert="; (__isset.generateCert ? (out << to_string(generateCert)) : (out << "")); - out << ", " << "storageId="; (__isset.storageId ? (out << to_string(storageId)) : (out << "")); + out << "airavataAutoSchedule=" << to_string(obj.airavataAutoSchedule); + out << ", " << "overrideManualScheduledParams=" << to_string(obj.overrideManualScheduledParams); + out << ", " << "shareExperimentPublicly="; (obj.__isset.shareExperimentPublicly ? (out << to_string(obj.shareExperimentPublicly)) : (out << "")); + out << ", " << "computationalResourceScheduling="; (obj.__isset.computationalResourceScheduling ? (out << to_string(obj.computationalResourceScheduling)) : (out << "")); + out << ", " << "throttleResources="; (obj.__isset.throttleResources ? (out << to_string(obj.throttleResources)) : (out << "")); + out << ", " << "userDN="; (obj.__isset.userDN ? (out << to_string(obj.userDN)) : (out << "")); + out << ", " << "generateCert="; (obj.__isset.generateCert ? (out << to_string(obj.generateCert)) : (out << "")); + out << ", " << "storageId="; (obj.__isset.storageId ? (out << to_string(obj.storageId)) : (out << "")); out << ")"; + return out; } @@ -393,9 +397,11 @@ void ExperimentModel::__set_processes(const std::vector< ::apache::airavata::mod __isset.processes = true; } +const char* ExperimentModel::ascii_fingerprint = "24797EBC0AAED86B273BC8D2768E5A7B"; +const uint8_t ExperimentModel::binary_fingerprint[16] =
[05/13] airavata git commit: reverting the generated classes to 0.9.2 as the tests did not pass - AIRAVATA-1883
http://git-wip-us.apache.org/repos/asf/airavata/blob/52f18ba6/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 81d711f..ec02e28 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 @@ -1,5 +1,5 @@ # -# Autogenerated by Thrift Compiler (0.9.3) +# Autogenerated by Thrift Compiler (0.9.2) # # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING # @@ -7,7 +7,6 @@ # from thrift.Thrift import TType, TMessageType, TException, TApplicationException -import logging from ttypes import * from thrift.Thrift import TProcessor from thrift.transport import TTransport @@ -2716,7 +2715,7 @@ class Client(Iface): raise result.ase if result.ae is not None: raise result.ae -raise TApplicationException(TApplicationException.MISSING_RESULT, "getAPIVersion failed: unknown result") +raise TApplicationException(TApplicationException.MISSING_RESULT, "getAPIVersion failed: unknown result"); def addGateway(self, authzToken, gateway): """ @@ -2767,7 +2766,7 @@ class Client(Iface): raise result.ase if result.ae is not None: raise result.ae -raise TApplicationException(TApplicationException.MISSING_RESULT, "addGateway failed: unknown result") +raise TApplicationException(TApplicationException.MISSING_RESULT, "addGateway failed: unknown result"); def updateGateway(self, authzToken, gatewayId, updatedGateway): """ @@ -2871,7 +2870,7 @@ class Client(Iface): raise result.ase if result.ae is not None: raise result.ae -raise TApplicationException(TApplicationException.MISSING_RESULT, "getGateway failed: unknown result") +raise TApplicationException(TApplicationException.MISSING_RESULT, "getGateway failed: unknown result"); def deleteGateway(self, authzToken, gatewayId): """ @@ -2922,7 +2921,7 @@ class Client(Iface): raise result.ase if result.ae is not None: raise result.ae -raise TApplicationException(TApplicationException.MISSING_RESULT, "deleteGateway failed: unknown result") +raise TApplicationException(TApplicationException.MISSING_RESULT, "deleteGateway failed: unknown result"); def getAllGateways(self, authzToken): """ @@ -2964,7 +2963,7 @@ class Client(Iface): raise result.ase if result.ae is not None: raise result.ae -raise TApplicationException(TApplicationException.MISSING_RESULT, "getAllGateways failed: unknown result") +raise TApplicationException(TApplicationException.MISSING_RESULT, "getAllGateways failed: unknown result"); def isGatewayExist(self, authzToken, gatewayId): """ @@ -3018,7 +3017,7 @@ class Client(Iface): raise result.ase if result.ae is not None: raise result.ae -raise TApplicationException(TApplicationException.MISSING_RESULT, "isGatewayExist failed: unknown result") +raise TApplicationException(TApplicationException.MISSING_RESULT, "isGatewayExist failed: unknown result"); def generateAndRegisterSSHKeys(self, authzToken, gatewayId, userName): """ @@ -3074,7 +3073,7 @@ class Client(Iface): raise result.ace if result.ase is not None: raise result.ase -raise TApplicationException(TApplicationException.MISSING_RESULT, "generateAndRegisterSSHKeys failed: unknown result") +raise TApplicationException(TApplicationException.MISSING_RESULT, "generateAndRegisterSSHKeys failed: unknown result"); def getSSHPubKey(self, authzToken, airavataCredStoreToken, gatewayId): """ @@ -3127,7 +3126,7 @@ class Client(Iface): raise result.ace if result.ase is not None: raise result.ase -raise TApplicationException(TApplicationException.MISSING_RESULT, "getSSHPubKey failed: unknown result") +raise TApplicationException(TApplicationException.MISSING_RESULT, "getSSHPubKey failed: unknown result"); def getAllUserSSHPubKeys(self, authzToken, userName): """ @@ -3178,7 +3177,7 @@ class Client(Iface): raise result.ace if result.ase is not None: raise result.ase -raise TApplicationException(TApplicationException.MISSING_RESULT, "getAllUserSSHPubKeys failed: unknown result") +raise TApplicationException(TApplicationException.MISSING_RESULT, "getAllUserSSHPubKeys failed: unknown result"); def getAllGatewaySSHPubKeys(self, authzToken, gatewayId): """ @@ -3229,7 +3228,7 @@ class Client(Iface): raise result.ace if
[02/13] airavata git commit: reverting the generated classes to 0.9.2 as the tests did not pass - AIRAVATA-1883
http://git-wip-us.apache.org/repos/asf/airavata/blob/52f18ba6/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 896191c..dfa04ec 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 @@ -16,7 +16,7 @@ */ /** - * Autogenerated by Thrift Compiler (0.9.3) + * Autogenerated by Thrift Compiler (0.9.2) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -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 = "2015-12-16") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-17") public class GridFTPDataMovement implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { 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/52f18ba6/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 7b57218..86c1b37 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 @@ -16,7 +16,7 @@ */ /** - * Autogenerated by Thrift Compiler (0.9.3) + * Autogenerated by Thrift Compiler (0.9.2) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -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 = "2015-12-16") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-17") public class LOCALDataMovement implements org.apache.thrift.TBase , java.io.Serializable, Cloneable, Comparable { 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/52f18ba6/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 d832401..8163262 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 @@ -16,7 +16,7 @@ */ /** - * Autogenerated by Thrift Compiler (0.9.3) + * Autogenerated by Thrift Compiler (0.9.2) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -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 = "2015-12-16") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-12-17") public class SCPDataMovement implements org.apache.thrift.TBase , java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SCPDataMovement"); @@ -365,7 +365,7 @@ public class SCPDataMovement implements org.apache.thrift.TBase
airavata-php-gateway git commit: rolling back to thrift 0.9.2
Repository: airavata-php-gateway Updated Branches: refs/heads/master e5e190efd -> a090e8954 rolling back to thrift 0.9.2 Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/a090e895 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/a090e895 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/a090e895 Branch: refs/heads/master Commit: a090e89549ec01d8be70f4769a216e77b37c624f Parents: e5e190e Author: scnakandalaAuthored: Thu Dec 17 00:52:37 2015 -0500 Committer: scnakandala Committed: Thu Dec 17 00:52:37 2015 -0500 -- app/libraries/Airavata/API/Airavata.php | 2 +- app/libraries/Airavata/API/Error/Types.php| 2 +- app/libraries/Airavata/API/Types.php | 2 +- app/libraries/Airavata/Model/AppCatalog/AppDeployment/Types.php | 2 +- app/libraries/Airavata/Model/AppCatalog/AppInterface/Types.php| 2 +- app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php | 2 +- app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php | 2 +- app/libraries/Airavata/Model/AppCatalog/StorageResource/Types.php | 2 +- app/libraries/Airavata/Model/Application/Io/Types.php | 2 +- app/libraries/Airavata/Model/Commons/Types.php| 2 +- app/libraries/Airavata/Model/Data/Movement/Types.php | 2 +- app/libraries/Airavata/Model/Data/Resource/Types.php | 2 +- app/libraries/Airavata/Model/Experiment/Types.php | 2 +- app/libraries/Airavata/Model/Job/Types.php| 2 +- app/libraries/Airavata/Model/Messaging/Event/Types.php| 2 +- app/libraries/Airavata/Model/Process/Types.php| 2 +- app/libraries/Airavata/Model/Scheduling/Types.php | 2 +- app/libraries/Airavata/Model/Security/Types.php | 2 +- app/libraries/Airavata/Model/Status/Types.php | 2 +- app/libraries/Airavata/Model/Task/Types.php | 2 +- app/libraries/Airavata/Model/Types.php| 2 +- app/libraries/Airavata/Model/Workspace/Types.php | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a090e895/app/libraries/Airavata/API/Airavata.php -- diff --git a/app/libraries/Airavata/API/Airavata.php b/app/libraries/Airavata/API/Airavata.php index 4cc073b..52f2310 100644 --- a/app/libraries/Airavata/API/Airavata.php +++ b/app/libraries/Airavata/API/Airavata.php @@ -1,7 +1,7 @@ http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a090e895/app/libraries/Airavata/API/Error/Types.php -- diff --git a/app/libraries/Airavata/API/Error/Types.php b/app/libraries/Airavata/API/Error/Types.php index edaa6de..d0a1ab6 100644 --- a/app/libraries/Airavata/API/Error/Types.php +++ b/app/libraries/Airavata/API/Error/Types.php @@ -2,7 +2,7 @@ namespace Airavata\API\Error; /** - * Autogenerated by Thrift Compiler (0.9.3) + * Autogenerated by Thrift Compiler (0.9.2) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a090e895/app/libraries/Airavata/API/Types.php -- diff --git a/app/libraries/Airavata/API/Types.php b/app/libraries/Airavata/API/Types.php index 389e1ca..2261a42 100644 --- a/app/libraries/Airavata/API/Types.php +++ b/app/libraries/Airavata/API/Types.php @@ -2,7 +2,7 @@ namespace Airavata\API; /** - * Autogenerated by Thrift Compiler (0.9.3) + * Autogenerated by Thrift Compiler (0.9.2) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a090e895/app/libraries/Airavata/Model/AppCatalog/AppDeployment/Types.php -- diff --git a/app/libraries/Airavata/Model/AppCatalog/AppDeployment/Types.php b/app/libraries/Airavata/Model/AppCatalog/AppDeployment/Types.php index ab599e6..e35f999 100644 --- a/app/libraries/Airavata/Model/AppCatalog/AppDeployment/Types.php +++ b/app/libraries/Airavata/Model/AppCatalog/AppDeployment/Types.php @@ -2,7 +2,7 @@ namespace Airavata\Model\AppCatalog\AppDeployment; /** - * Autogenerated by Thrift Compiler (0.9.3) + * Autogenerated by Thrift Compiler (0.9.2) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
airavata git commit: reverting the server version as well
Repository: airavata Updated Branches: refs/heads/master 52f18ba68 -> f4aafbfe3 reverting the server version as well Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/f4aafbfe Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/f4aafbfe Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/f4aafbfe Branch: refs/heads/master Commit: f4aafbfe32386dfc2360afc9e7a681cf1f38 Parents: 52f18ba Author: smarruAuthored: Thu Dec 17 00:54:43 2015 -0500 Committer: smarru Committed: Thu Dec 17 00:54:43 2015 -0500 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/airavata/blob/f4aafbfe/pom.xml -- diff --git a/pom.xml b/pom.xml index 6eea5e0..0f320b5 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ 1.50 2.1.0 1.0.0 - 0.9.3 + 0.9.2 5.1.34 false 2.3
[10/13] airavata git commit: reverting the generated classes to 0.9.2 as the tests did not pass - AIRAVATA-1883
http://git-wip-us.apache.org/repos/asf/airavata/blob/52f18ba6/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_api_constants.cpp -- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_api_constants.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_api_constants.cpp index 9a13809..6a8bf09 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_api_constants.cpp +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_api_constants.cpp @@ -16,7 +16,7 @@ */ /** - * Autogenerated by Thrift Compiler (0.9.3) + * Autogenerated by Thrift Compiler (0.9.2) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated http://git-wip-us.apache.org/repos/asf/airavata/blob/52f18ba6/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_api_constants.h -- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_api_constants.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_api_constants.h index 7304f11..7de8402 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_api_constants.h +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_api_constants.h @@ -16,7 +16,7 @@ */ /** - * Autogenerated by Thrift Compiler (0.9.3) + * Autogenerated by Thrift Compiler (0.9.2) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated http://git-wip-us.apache.org/repos/asf/airavata/blob/52f18ba6/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_api_types.cpp -- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_api_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_api_types.cpp index 1cbdcaa..67600ea 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_api_types.cpp +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_api_types.cpp @@ -16,7 +16,7 @@ */ /** - * Autogenerated by Thrift Compiler (0.9.3) + * Autogenerated by Thrift Compiler (0.9.2) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated http://git-wip-us.apache.org/repos/asf/airavata/blob/52f18ba6/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_api_types.h -- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_api_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_api_types.h index 5d059c5..692cd5f 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_api_types.h +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_api_types.h @@ -16,7 +16,7 @@ */ /** - * Autogenerated by Thrift Compiler (0.9.3) + * Autogenerated by Thrift Compiler (0.9.2) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated http://git-wip-us.apache.org/repos/asf/airavata/blob/52f18ba6/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_commons_constants.cpp -- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_commons_constants.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_commons_constants.cpp index 989f7eb..c67be12 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_commons_constants.cpp +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_commons_constants.cpp @@ -16,7 +16,7 @@ */ /** - * Autogenerated by Thrift Compiler (0.9.3) + * Autogenerated by Thrift Compiler (0.9.2) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated http://git-wip-us.apache.org/repos/asf/airavata/blob/52f18ba6/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_commons_constants.h -- diff --git
[03/13] airavata git commit: reverting the generated classes to 0.9.2 as the tests did not pass - AIRAVATA-1883
http://git-wip-us.apache.org/repos/asf/airavata/blob/52f18ba6/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/process/ttypes.py -- diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/process/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/process/ttypes.py index 802d6a7..b83a663 100644 --- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/process/ttypes.py +++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/process/ttypes.py @@ -1,5 +1,5 @@ # -# Autogenerated by Thrift Compiler (0.9.3) +# Autogenerated by Thrift Compiler (0.9.2) # # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING # @@ -116,22 +116,22 @@ class ProcessModel: break if fid == 1: if ftype == TType.STRING: - self.processId = iprot.readString() + self.processId = iprot.readString(); else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.experimentId = iprot.readString() + self.experimentId = iprot.readString(); else: iprot.skip(ftype) elif fid == 3: if ftype == TType.I64: - self.creationTime = iprot.readI64() + self.creationTime = iprot.readI64(); else: iprot.skip(ftype) elif fid == 4: if ftype == TType.I64: - self.lastUpdateTime = iprot.readI64() + self.lastUpdateTime = iprot.readI64(); else: iprot.skip(ftype) elif fid == 5: @@ -142,22 +142,22 @@ class ProcessModel: iprot.skip(ftype) elif fid == 6: if ftype == TType.STRING: - self.processDetail = iprot.readString() + self.processDetail = iprot.readString(); else: iprot.skip(ftype) elif fid == 7: if ftype == TType.STRING: - self.applicationInterfaceId = iprot.readString() + self.applicationInterfaceId = iprot.readString(); else: iprot.skip(ftype) elif fid == 8: if ftype == TType.STRING: - self.applicationDeploymentId = iprot.readString() + self.applicationDeploymentId = iprot.readString(); else: iprot.skip(ftype) elif fid == 9: if ftype == TType.STRING: - self.computeResourceId = iprot.readString() + self.computeResourceId = iprot.readString(); else: iprot.skip(ftype) elif fid == 10: @@ -201,7 +201,7 @@ class ProcessModel: iprot.skip(ftype) elif fid == 14: if ftype == TType.STRING: - self.taskDag = iprot.readString() + self.taskDag = iprot.readString(); else: iprot.skip(ftype) elif fid == 15: @@ -212,12 +212,12 @@ class ProcessModel: iprot.skip(ftype) elif fid == 16: if ftype == TType.STRING: - self.gatewayExecutionId = iprot.readString() + self.gatewayExecutionId = iprot.readString(); else: iprot.skip(ftype) elif fid == 17: if ftype == TType.BOOL: - self.enableEmailNotification = iprot.readBool() + self.enableEmailNotification = iprot.readBool(); else: iprot.skip(ftype) elif fid == 18: @@ -225,24 +225,24 @@ class ProcessModel: self.emailAddresses = [] (_etype21, _size18) = iprot.readListBegin() for _i22 in xrange(_size18): -_elem23 = iprot.readString() +_elem23 = iprot.readString(); self.emailAddresses.append(_elem23) iprot.readListEnd() else: iprot.skip(ftype) elif fid == 19: if ftype == TType.STRING: - self.storageResourceId = iprot.readString() + self.storageResourceId = iprot.readString(); else: iprot.skip(ftype) elif fid == 20: if ftype == TType.STRING: - self.userDn = iprot.readString() + self.userDn = iprot.readString(); else: iprot.skip(ftype) elif fid == 21: if ftype == TType.BOOL: - self.generateCert = iprot.readBool() + self.generateCert = iprot.readBool(); else: iprot.skip(ftype) else: http://git-wip-us.apache.org/repos/asf/airavata/blob/52f18ba6/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/scheduling/constants.py -- diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/scheduling/constants.py
[06/13] airavata git commit: reverting the generated classes to 0.9.2 as the tests did not pass - AIRAVATA-1883
http://git-wip-us.apache.org/repos/asf/airavata/blob/52f18ba6/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/task_model_types.cpp -- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/task_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/task_model_types.cpp index dba3511..30ba1e9 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/task_model_types.cpp +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/task_model_types.cpp @@ -16,7 +16,7 @@ */ /** - * Autogenerated by Thrift Compiler (0.9.3) + * Autogenerated by Thrift Compiler (0.9.2) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -107,9 +107,11 @@ void TaskModel::__set_jobs(const std::vector< ::apache::airavata::model::job::Jo __isset.jobs = true; } +const char* TaskModel::ascii_fingerprint = "BA52131C9C867CBF7281F29EDD7DDB6F"; +const uint8_t TaskModel::binary_fingerprint[16] = {0xBA,0x52,0x13,0x1C,0x9C,0x86,0x7C,0xBF,0x72,0x81,0xF2,0x9E,0xDD,0x7D,0xDB,0x6F}; + uint32_t TaskModel::read(::apache::thrift::protocol::TProtocol* iprot) { - apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); uint32_t xfer = 0; std::string fname; ::apache::thrift::protocol::TType ftype; @@ -254,7 +256,7 @@ uint32_t TaskModel::read(::apache::thrift::protocol::TProtocol* iprot) { uint32_t TaskModel::write(::apache::thrift::protocol::TProtocol* oprot) const { uint32_t xfer = 0; - apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); + oprot->incrementRecursionDepth(); xfer += oprot->writeStructBegin("TaskModel"); xfer += oprot->writeFieldBegin("taskId", ::apache::thrift::protocol::T_STRING, 1); @@ -311,6 +313,7 @@ uint32_t TaskModel::write(::apache::thrift::protocol::TProtocol* oprot) const { } xfer += oprot->writeFieldStop(); xfer += oprot->writeStructEnd(); + oprot->decrementRecursionDepth(); return xfer; } @@ -356,20 +359,21 @@ TaskModel& TaskModel::operator=(const TaskModel& other8) { __isset = other8.__isset; return *this; } -void TaskModel::printTo(std::ostream& out) const { - using ::apache::thrift::to_string; +std::ostream& operator<<(std::ostream& out, const TaskModel& obj) { + using apache::thrift::to_string; out << "TaskModel("; - out << "taskId=" << to_string(taskId); - out << ", " << "taskType=" << to_string(taskType); - out << ", " << "parentProcessId=" << to_string(parentProcessId); - out << ", " << "creationTime=" << to_string(creationTime); - out << ", " << "lastUpdateTime=" << to_string(lastUpdateTime); - out << ", " << "taskStatus=" << to_string(taskStatus); - out << ", " << "taskDetail="; (__isset.taskDetail ? (out << to_string(taskDetail)) : (out << "")); - out << ", " << "subTaskModel="; (__isset.subTaskModel ? (out << to_string(subTaskModel)) : (out << "")); - out << ", " << "taskError="; (__isset.taskError ? (out << to_string(taskError)) : (out << "")); - out << ", " << "jobs="; (__isset.jobs ? (out << to_string(jobs)) : (out << "")); + out << "taskId=" << to_string(obj.taskId); + out << ", " << "taskType=" << to_string(obj.taskType); + out << ", " << "parentProcessId=" << to_string(obj.parentProcessId); + out << ", " << "creationTime=" << to_string(obj.creationTime); + out << ", " << "lastUpdateTime=" << to_string(obj.lastUpdateTime); + out << ", " << "taskStatus=" << to_string(obj.taskStatus); + out << ", " << "taskDetail="; (obj.__isset.taskDetail ? (out << to_string(obj.taskDetail)) : (out << "")); + out << ", " << "subTaskModel="; (obj.__isset.subTaskModel ? (out << to_string(obj.subTaskModel)) : (out << "")); + out << ", " << "taskError="; (obj.__isset.taskError ? (out << to_string(obj.taskError)) : (out << "")); + out << ", " << "jobs="; (obj.__isset.jobs ? (out << to_string(obj.jobs)) : (out << "")); out << ")"; + return out; } @@ -414,9 +418,11 @@ void DataStagingTaskModel::__set_processOutput(const ::apache::airavata::model: __isset.processOutput = true; } +const char* DataStagingTaskModel::ascii_fingerprint = "ACF0A091382F299B453E77765150F8C9"; +const uint8_t DataStagingTaskModel::binary_fingerprint[16] = {0xAC,0xF0,0xA0,0x91,0x38,0x2F,0x29,0x9B,0x45,0x3E,0x77,0x76,0x51,0x50,0xF8,0xC9}; + uint32_t DataStagingTaskModel::read(::apache::thrift::protocol::TProtocol* iprot) { - apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); uint32_t xfer = 0; std::string fname; ::apache::thrift::protocol::TType ftype; @@ -524,7 +530,7 @@ uint32_t DataStagingTaskModel::read(::apache::thrift::protocol::TProtocol* iprot uint32_t DataStagingTaskModel::write(::apache::thrift::protocol::TProtocol* oprot) const { uint32_t xfer = 0; -
[11/13] airavata git commit: reverting the generated classes to 0.9.2 as the tests did not pass - AIRAVATA-1883
http://git-wip-us.apache.org/repos/asf/airavata/blob/52f18ba6/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 5a4d1e4..eb4a5a5 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 @@ -16,7 +16,7 @@ */ /** - * Autogenerated by Thrift Compiler (0.9.3) + * Autogenerated by Thrift Compiler (0.9.2) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -25,16 +25,10 @@ #define Airavata_H #include -#include #include "airavata_api_types.h" namespace apache { namespace airavata { namespace api { -#ifdef _WIN32 - #pragma warning( push ) - #pragma warning (disable : 4250 ) //inheriting methods via dominance -#endif - class AiravataIf { public: virtual ~AiravataIf() {} @@ -2773,6 +2767,9 @@ class AiravataNull : virtual public AiravataIf { class Airavata_getAPIVersion_args { public: + static const char* ascii_fingerprint; // = "75A7E945AEBB96C8FA8998CBCEB31C27"; + static const uint8_t binary_fingerprint[16]; // = {0x75,0xA7,0xE9,0x45,0xAE,0xBB,0x96,0xC8,0xFA,0x89,0x98,0xCB,0xCE,0xB3,0x1C,0x27}; + Airavata_getAPIVersion_args(const Airavata_getAPIVersion_args&); Airavata_getAPIVersion_args& operator=(const Airavata_getAPIVersion_args&); Airavata_getAPIVersion_args() { @@ -2798,18 +2795,23 @@ class Airavata_getAPIVersion_args { uint32_t read(::apache::thrift::protocol::TProtocol* iprot); uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; + friend std::ostream& operator<<(std::ostream& out, const Airavata_getAPIVersion_args& obj); }; class Airavata_getAPIVersion_pargs { public: + static const char* ascii_fingerprint; // = "75A7E945AEBB96C8FA8998CBCEB31C27"; + static const uint8_t binary_fingerprint[16]; // = {0x75,0xA7,0xE9,0x45,0xAE,0xBB,0x96,0xC8,0xFA,0x89,0x98,0xCB,0xCE,0xB3,0x1C,0x27}; + virtual ~Airavata_getAPIVersion_pargs() throw(); const ::apache::airavata::model::security::AuthzToken* authzToken; uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; + friend std::ostream& operator<<(std::ostream& out, const Airavata_getAPIVersion_pargs& obj); }; typedef struct _Airavata_getAPIVersion_result__isset { @@ -2824,6 +2826,9 @@ typedef struct _Airavata_getAPIVersion_result__isset { class Airavata_getAPIVersion_result { public: + static const char* ascii_fingerprint; // = "21BF57A9FE5AAA661540804D4FB9F023"; + static const uint8_t binary_fingerprint[16]; // = {0x21,0xBF,0x57,0xA9,0xFE,0x5A,0xAA,0x66,0x15,0x40,0x80,0x4D,0x4F,0xB9,0xF0,0x23}; + Airavata_getAPIVersion_result(const Airavata_getAPIVersion_result&); Airavata_getAPIVersion_result& operator=(const Airavata_getAPIVersion_result&); Airavata_getAPIVersion_result() : success() { @@ -2871,6 +2876,7 @@ class Airavata_getAPIVersion_result { uint32_t read(::apache::thrift::protocol::TProtocol* iprot); uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; + friend std::ostream& operator<<(std::ostream& out, const Airavata_getAPIVersion_result& obj); }; typedef struct _Airavata_getAPIVersion_presult__isset { @@ -2885,6 +2891,9 @@ typedef struct _Airavata_getAPIVersion_presult__isset { class Airavata_getAPIVersion_presult { public: + static const char* ascii_fingerprint; // = "21BF57A9FE5AAA661540804D4FB9F023"; + static const uint8_t binary_fingerprint[16]; // = {0x21,0xBF,0x57,0xA9,0xFE,0x5A,0xAA,0x66,0x15,0x40,0x80,0x4D,0x4F,0xB9,0xF0,0x23}; + virtual ~Airavata_getAPIVersion_presult() throw(); std::string* success; @@ -2897,12 +2906,16 @@ class Airavata_getAPIVersion_presult { uint32_t read(::apache::thrift::protocol::TProtocol* iprot); + friend std::ostream& operator<<(std::ostream& out, const Airavata_getAPIVersion_presult& obj); }; class Airavata_addGateway_args { public: + static const char* ascii_fingerprint; // = "04DA9961C72375F564BB2C724C51FAF2"; + static const uint8_t binary_fingerprint[16]; // = {0x04,0xDA,0x99,0x61,0xC7,0x23,0x75,0xF5,0x64,0xBB,0x2C,0x72,0x4C,0x51,0xFA,0xF2}; + Airavata_addGateway_args(const Airavata_addGateway_args&); Airavata_addGateway_args& operator=(const Airavata_addGateway_args&); Airavata_addGateway_args() { @@ -2933,12 +2946,16 @@ class Airavata_addGateway_args { uint32_t read(::apache::thrift::protocol::TProtocol* iprot); uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; + friend std::ostream& operator<<(std::ostream& out, const Airavata_addGateway_args& obj); }; class
[07/13] airavata git commit: reverting the generated classes to 0.9.2 as the tests did not pass - AIRAVATA-1883
http://git-wip-us.apache.org/repos/asf/airavata/blob/52f18ba6/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/messaging_events_types.h -- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/messaging_events_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/messaging_events_types.h index d5a2411..af34dc9 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/messaging_events_types.h +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/messaging_events_types.h @@ -16,7 +16,7 @@ */ /** - * Autogenerated by Thrift Compiler (0.9.3) + * Autogenerated by Thrift Compiler (0.9.2) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -96,6 +96,9 @@ class Message; class ExperimentStatusChangeEvent { public: + static const char* ascii_fingerprint; // = "38C252E94E93B69D04EB3A6EE2F9EDFB"; + static const uint8_t binary_fingerprint[16]; // = {0x38,0xC2,0x52,0xE9,0x4E,0x93,0xB6,0x9D,0x04,0xEB,0x3A,0x6E,0xE2,0xF9,0xED,0xFB}; + ExperimentStatusChangeEvent(const ExperimentStatusChangeEvent&); ExperimentStatusChangeEvent& operator=(const ExperimentStatusChangeEvent&); ExperimentStatusChangeEvent() : state(( ::apache::airavata::model::status::ExperimentState::type)0), experimentId(), gatewayId() { @@ -131,21 +134,18 @@ class ExperimentStatusChangeEvent { uint32_t read(::apache::thrift::protocol::TProtocol* iprot); uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; - virtual void printTo(std::ostream& out) const; + friend std::ostream& operator<<(std::ostream& out, const ExperimentStatusChangeEvent& obj); }; void swap(ExperimentStatusChangeEvent , ExperimentStatusChangeEvent ); -inline std::ostream& operator<<(std::ostream& out, const ExperimentStatusChangeEvent& obj) -{ - obj.printTo(out); - return out; -} - class ProcessIdentifier { public: + static const char* ascii_fingerprint; // = "AB879940BD15B6B25691265F7384B271"; + static const uint8_t binary_fingerprint[16]; // = {0xAB,0x87,0x99,0x40,0xBD,0x15,0xB6,0xB2,0x56,0x91,0x26,0x5F,0x73,0x84,0xB2,0x71}; + ProcessIdentifier(const ProcessIdentifier&); ProcessIdentifier& operator=(const ProcessIdentifier&); ProcessIdentifier() : processId(), experimentId(), gatewayId() { @@ -181,21 +181,18 @@ class ProcessIdentifier { uint32_t read(::apache::thrift::protocol::TProtocol* iprot); uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; - virtual void printTo(std::ostream& out) const; + friend std::ostream& operator<<(std::ostream& out, const ProcessIdentifier& obj); }; void swap(ProcessIdentifier , ProcessIdentifier ); -inline std::ostream& operator<<(std::ostream& out, const ProcessIdentifier& obj) -{ - obj.printTo(out); - return out; -} - class TaskIdentifier { public: + static const char* ascii_fingerprint; // = "C93D890311F28844166CF6E571EB3AC2"; + static const uint8_t binary_fingerprint[16]; // = {0xC9,0x3D,0x89,0x03,0x11,0xF2,0x88,0x44,0x16,0x6C,0xF6,0xE5,0x71,0xEB,0x3A,0xC2}; + TaskIdentifier(const TaskIdentifier&); TaskIdentifier& operator=(const TaskIdentifier&); TaskIdentifier() : taskId(), processId(), experimentId(), gatewayId() { @@ -236,21 +233,18 @@ class TaskIdentifier { uint32_t read(::apache::thrift::protocol::TProtocol* iprot); uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; - virtual void printTo(std::ostream& out) const; + friend std::ostream& operator<<(std::ostream& out, const TaskIdentifier& obj); }; void swap(TaskIdentifier , TaskIdentifier ); -inline std::ostream& operator<<(std::ostream& out, const TaskIdentifier& obj) -{ - obj.printTo(out); - return out; -} - class TaskStatusChangeEvent { public: + static const char* ascii_fingerprint; // = "8D18A3CD1822DBC67D7BD8CB98E7B4F1"; + static const uint8_t binary_fingerprint[16]; // = {0x8D,0x18,0xA3,0xCD,0x18,0x22,0xDB,0xC6,0x7D,0x7B,0xD8,0xCB,0x98,0xE7,0xB4,0xF1}; + TaskStatusChangeEvent(const TaskStatusChangeEvent&); TaskStatusChangeEvent& operator=(const TaskStatusChangeEvent&); TaskStatusChangeEvent() : state(( ::apache::airavata::model::status::TaskState::type)0) { @@ -281,21 +275,18 @@ class TaskStatusChangeEvent { uint32_t read(::apache::thrift::protocol::TProtocol* iprot); uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; - virtual void printTo(std::ostream& out) const; + friend std::ostream& operator<<(std::ostream& out, const TaskStatusChangeEvent& obj); }; void swap(TaskStatusChangeEvent , TaskStatusChangeEvent ); -inline std::ostream& operator<<(std::ostream& out, const TaskStatusChangeEvent& obj) -{ - obj.printTo(out); - return out; -} - class
[12/13] airavata git commit: reverting the generated classes to 0.9.2 as the tests did not pass - AIRAVATA-1883
http://git-wip-us.apache.org/repos/asf/airavata/blob/52f18ba6/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp -- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp index 5fa7f87..ca7c397 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp @@ -16,7 +16,7 @@ */ /** - * Autogenerated by Thrift Compiler (0.9.3) + * Autogenerated by Thrift Compiler (0.9.2) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -32,7 +32,6 @@ Airavata_getAPIVersion_args::~Airavata_getAPIVersion_args() throw() { uint32_t Airavata_getAPIVersion_args::read(::apache::thrift::protocol::TProtocol* iprot) { - apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); uint32_t xfer = 0; std::string fname; ::apache::thrift::protocol::TType ftype; @@ -76,7 +75,7 @@ uint32_t Airavata_getAPIVersion_args::read(::apache::thrift::protocol::TProtocol uint32_t Airavata_getAPIVersion_args::write(::apache::thrift::protocol::TProtocol* oprot) const { uint32_t xfer = 0; - apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); + oprot->incrementRecursionDepth(); xfer += oprot->writeStructBegin("Airavata_getAPIVersion_args"); xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1); @@ -85,6 +84,7 @@ uint32_t Airavata_getAPIVersion_args::write(::apache::thrift::protocol::TProtoco xfer += oprot->writeFieldStop(); xfer += oprot->writeStructEnd(); + oprot->decrementRecursionDepth(); return xfer; } @@ -95,7 +95,7 @@ Airavata_getAPIVersion_pargs::~Airavata_getAPIVersion_pargs() throw() { uint32_t Airavata_getAPIVersion_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const { uint32_t xfer = 0; - apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); + oprot->incrementRecursionDepth(); xfer += oprot->writeStructBegin("Airavata_getAPIVersion_pargs"); xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1); @@ -104,6 +104,7 @@ uint32_t Airavata_getAPIVersion_pargs::write(::apache::thrift::protocol::TProtoc xfer += oprot->writeFieldStop(); xfer += oprot->writeStructEnd(); + oprot->decrementRecursionDepth(); return xfer; } @@ -114,7 +115,6 @@ Airavata_getAPIVersion_result::~Airavata_getAPIVersion_result() throw() { uint32_t Airavata_getAPIVersion_result::read(::apache::thrift::protocol::TProtocol* iprot) { - apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); uint32_t xfer = 0; std::string fname; ::apache::thrift::protocol::TType ftype; @@ -224,7 +224,6 @@ Airavata_getAPIVersion_presult::~Airavata_getAPIVersion_presult() throw() { uint32_t Airavata_getAPIVersion_presult::read(::apache::thrift::protocol::TProtocol* iprot) { - apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); uint32_t xfer = 0; std::string fname; ::apache::thrift::protocol::TType ftype; @@ -302,7 +301,6 @@ Airavata_addGateway_args::~Airavata_addGateway_args() throw() { uint32_t Airavata_addGateway_args::read(::apache::thrift::protocol::TProtocol* iprot) { - apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); uint32_t xfer = 0; std::string fname; ::apache::thrift::protocol::TType ftype; @@ -357,7 +355,7 @@ uint32_t Airavata_addGateway_args::read(::apache::thrift::protocol::TProtocol* i uint32_t Airavata_addGateway_args::write(::apache::thrift::protocol::TProtocol* oprot) const { uint32_t xfer = 0; - apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); + oprot->incrementRecursionDepth(); xfer += oprot->writeStructBegin("Airavata_addGateway_args"); xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1); @@ -370,6 +368,7 @@ uint32_t Airavata_addGateway_args::write(::apache::thrift::protocol::TProtocol* xfer += oprot->writeFieldStop(); xfer += oprot->writeStructEnd(); + oprot->decrementRecursionDepth(); return xfer; } @@ -380,7 +379,7 @@ Airavata_addGateway_pargs::~Airavata_addGateway_pargs() throw() { uint32_t Airavata_addGateway_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const { uint32_t xfer = 0; - apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); + oprot->incrementRecursionDepth(); xfer += oprot->writeStructBegin("Airavata_addGateway_pargs"); xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1); @@ -393,6 +392,7 @@ uint32_t
airavata git commit: Adding descriptions to thirft API methods
Repository: airavata Updated Branches: refs/heads/master d8987244b -> 648a0cb99 Adding descriptions to thirft API methods Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/648a0cb9 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/648a0cb9 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/648a0cb9 Branch: refs/heads/master Commit: 648a0cb9931e616b9f8616e3879cae3fdfe8d81b Parents: d898724 Author: Eroma AbeysingheAuthored: Wed Dec 16 09:51:52 2015 -0500 Committer: Eroma Abeysinghe Committed: Wed Dec 16 09:51:52 2015 -0500 -- .../airavata-apis/airavata_api.thrift | 101 --- 1 file changed, 64 insertions(+), 37 deletions(-) -- http://git-wip-us.apache.org/repos/asf/airavata/blob/648a0cb9/thrift-interface-descriptions/airavata-apis/airavata_api.thrift -- diff --git a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift index d49cc95..6ee4f99 100644 --- a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift +++ b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift @@ -284,7 +284,7 @@ service Airavata { throws (1: airavata_errors.InvalidRequestException ire, 2: airavata_errors.AiravataClientException ace, 3: airavata_errors.AiravataSystemException ase) - /** + /** * Creates a Project with basic metadata. *A Project is a container of experiments. * @@ -294,7 +294,8 @@ service Airavata { * @param Project *The Project Object described in the workspace_model * - */ + **/ + string createProject (1: required security_model.AuthzToken authzToken, 2: required string gatewayId, 3: required workspace_model.Project project) @@ -303,7 +304,7 @@ service Airavata { 3: airavata_errors.AiravataSystemException ase, 4: airavata_errors.AuthorizationException ae) - /** + /** * Update an Existing Project * * @param projectId @@ -312,7 +313,8 @@ service Airavata { * @return void *Currently this does not return any value. * - */ + **/ + void updateProject (1: required security_model.AuthzToken authzToken, 2: required string projectId, 3: required workspace_model.Project updatedProject) @@ -322,7 +324,7 @@ service Airavata { 4: airavata_errors.ProjectNotFoundException pnfe, 5: airavata_errors.AuthorizationException ae) -/** + /** * Get a Project by ID *This method is to obtain a project by providing a projectId * @@ -332,7 +334,8 @@ service Airavata { * @return project *project data model will be returned * - */ + **/ + workspace_model.Project getProject (1: required security_model.AuthzToken authzToken, 2: required string projectId) throws (1: airavata_errors.InvalidRequestException ire, 2: airavata_errors.AiravataClientException ace, @@ -340,7 +343,7 @@ service Airavata { 4: airavata_errors.ProjectNotFoundException pnfe, 5: airavata_errors.AuthorizationException ae) -/** + /** * Delete a Project *This method is used to delete an existing Project * @@ -350,7 +353,7 @@ service Airavata { * @return boolean *Boolean identifier for the success or failure of the deletion operation. * - */ + **/ bool deleteProject (1: required security_model.AuthzToken authzToken, 2: required string projectId) throws (1: airavata_errors.InvalidRequestException ire, @@ -359,19 +362,24 @@ service Airavata { 4: airavata_errors.ProjectNotFoundException pnfe, 5: airavata_errors.AuthorizationException ae) - /** + /** * Get all Project by user with pagination. Results will be ordered based * on creation time DESC * * @param gatewayId *The identifier for the requested gateway. + * * @param userName *The identifier of the user + * * @param limit *The amount results to be fetched + * * @param offset *The starting point of the results to be fetched - **/ + * + **/ + list getUserProjects(1: required security_model.AuthzToken authzToken, 2: required string gatewayId, 3: required string userName, @@ -382,7 +390,7 @@ service Airavata { 3: airavata_errors.AiravataSystemException ase,
[2/4] airavata git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/9462bd18 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/9462bd18 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/9462bd18 Branch: refs/heads/master Commit: 9462bd184566977462fd701450844ed389be06f6 Parents: 7ea88a2 a513dcd Author: Eroma AbeysingheAuthored: Wed Dec 16 09:36:04 2015 -0500 Committer: Eroma Abeysinghe Committed: Wed Dec 16 09:36:04 2015 -0500 -- .../server/handler/AiravataServerHandler.java | 7 +- .../api/server/handler/utils/DataCatInit.java | 315 + .../java/org/apache/airavata/api/Airavata.java | 279 +- .../airavata/api/airavata_apiConstants.java | 4 +- .../org/apache/airavata/model/Workflow.java | 1062 ++ .../ApplicationDeploymentDescription.java | 1937 +++ .../appdeployment/ApplicationModule.java| 745 + .../ApplicationParallelismType.java |90 + .../appcatalog/appdeployment/CommandObject.java | 525 + .../appcatalog/appdeployment/SetEnvPaths.java | 629 + .../ApplicationInterfaceDescription.java| 1114 ++ .../appcatalog/computeresource/BatchQueue.java | 1029 ++ .../computeresource/CloudJobSubmission.java | 953 ++ .../ComputeResourceDescription.java | 1821 ++ .../appcatalog/computeresource/FileSystems.java |87 + .../computeresource/GlobusJobSubmission.java| 688 + .../computeresource/JobManagerCommand.java | 102 + .../computeresource/JobSubmissionInterface.java | 637 + .../computeresource/JobSubmissionProtocol.java |90 + .../computeresource/LOCALSubmission.java| 643 + .../appcatalog/computeresource/MonitorMode.java |79 + .../computeresource/ProviderName.java |69 + .../computeresource/ResourceJobManager.java | 933 + .../computeresource/ResourceJobManagerType.java |90 + .../computeresource/SSHJobSubmission.java | 1146 ++ .../computeresource/UnicoreJobSubmission.java | 637 + .../ComputeResourcePreference.java | 1329 ++ .../gatewayprofile/GatewayResourceProfile.java | 854 + .../gatewayprofile/StoragePreference.java | 733 + .../StorageResourceDescription.java | 905 + .../airavata/model/application/io/DataType.java |78 + .../application/io/InputDataObjectType.java | 1493 ++ .../application/io/OutputDataObjectType.java| 1393 ++ .../airavata/model/commons/ErrorModel.java | 991 ++ .../model/commons/ValidationResults.java| 562 + .../airavata/model/commons/ValidatorResult.java | 525 + .../commons/airavata_commonsConstants.java |58 + .../airavata/model/data/movement/DMType.java|62 + .../data/movement/DataMovementInterface.java| 637 + .../data/movement/DataMovementProtocol.java |87 + .../data/movement/GridFTPDataMovement.java | 687 + .../model/data/movement/LOCALDataMovement.java | 420 + .../model/data/movement/SCPDataMovement.java| 754 + .../model/data/movement/SecurityProtocol.java |88 + .../data/movement/UnicoreDataMovement.java | 635 + .../data/resource/ReplicaLocationModel.java | 462 + .../model/data/resource/ResourceModel.java | 684 + .../model/error/AiravataClientException.java| 550 + .../airavata/model/error/AiravataErrorType.java |99 + .../model/error/AiravataSystemException.java| 545 + .../model/error/AuthenticationException.java| 413 + .../model/error/AuthorizationException.java | 413 + .../error/ExperimentNotFoundException.java | 415 + .../model/error/InvalidRequestException.java| 414 + .../model/error/LaunchValidationException.java | 524 + .../model/error/ProjectNotFoundException.java | 413 + .../airavata/model/error/TimedOutException.java | 305 + .../airavata/model/error/ValidationResults.java | 562 + .../airavata/model/error/ValidatorResult.java | 518 + .../model/experiment/ExperimentModel.java | 2504 +++ .../experiment/ExperimentSearchFields.java |77 + .../model/experiment/ExperimentStatistics.java | 1855 ++ .../experiment/ExperimentSummaryModel.java | 1448 ++ .../model/experiment/ExperimentType.java|62 + .../experiment/UserConfigurationDataModel.java | 1148 ++ .../org/apache/airavata/model/job/JobModel.java | 1566 ++ .../event/ExperimentStatusChangeEvent.java | 626 + .../model/messaging/event/JobIdentifier.java| 812 + .../messaging/event/JobStatusChangeEvent.java | 530 + .../event/JobStatusChangeRequestEvent.java | 530 + .../airavata/model/messaging/event/Message.java | 870 + .../model/messaging/event/MessageLevel.java |68 +
[3/4] airavata git commit: Adding descriptions to thirft API methods
Adding descriptions to thirft API methods Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/4c8d3967 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/4c8d3967 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/4c8d3967 Branch: refs/heads/master Commit: 4c8d396745b1ed13c3fe7ff17f16aff012cd9ac4 Parents: 9462bd1 Author: Eroma AbeysingheAuthored: Wed Dec 16 09:42:35 2015 -0500 Committer: Eroma Abeysinghe Committed: Wed Dec 16 09:42:35 2015 -0500 -- .../airavata-apis/airavata_api.thrift| 15 ++- 1 file changed, 14 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/airavata/blob/4c8d3967/thrift-interface-descriptions/airavata-apis/airavata_api.thrift -- diff --git a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift index 928af6b..179a842 100644 --- a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift +++ b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift @@ -304,7 +304,13 @@ service Airavata { 4: airavata_errors.AuthorizationException ae) /** - * Update a Project + * Update an Existing Project + * + * @param projectId + *The projectId of the project needed an update. + * + * @return void + *Currently this does not return any value. * */ void updateProject (1: required security_model.AuthzToken authzToken, @@ -318,6 +324,13 @@ service Airavata { /** * Get a Project by ID + *This method is to obtain a project by providing a projectId + * + * @param projectId + *projectId of the project you require + * + * @return project + *project data model will be returned * */ workspace_model.Project getProject (1: required security_model.AuthzToken authzToken, 2: required string projectId)
[1/4] airavata git commit: Adding descriptions to thirft API methods
Repository: airavata Updated Branches: refs/heads/master a513dcdeb -> d8987244b Adding descriptions to thirft API methods Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/7ea88a2b Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7ea88a2b Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7ea88a2b Branch: refs/heads/master Commit: 7ea88a2b91cebb313a6484fdf24674ce79bc552d Parents: a059fbb Author: Eroma AbeysingheAuthored: Wed Dec 16 09:24:00 2015 -0500 Committer: Eroma Abeysinghe Committed: Wed Dec 16 09:24:00 2015 -0500 -- .../airavata-apis/airavata_api.thrift | 27 1 file changed, 27 insertions(+) -- http://git-wip-us.apache.org/repos/asf/airavata/blob/7ea88a2b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift -- diff --git a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift index bd8e14e..928af6b 100644 --- a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift +++ b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift @@ -106,6 +106,8 @@ service Airavata { * @return gateway *Modified gateway obejct. * + * @exception AiravataClientException + * **/ void updateGateway(1: required security_model.AuthzToken authzToken, 2: required string gatewayId, 3: required workspace_model.Gateway updatedGateway) @@ -158,6 +160,20 @@ service Airavata { 3: airavata_errors.AiravataSystemException ase, 4: airavata_errors.AuthorizationException ae) +/** +* Check for the Existance of a Gateway within Airavata +* +* @param gatewayId +* Provide the gatewayId of the gateway you want to check the existancy +* +* @return boolean +* Boolean idetifier for the existance or non-existane of the gatewayId +* +* @return gatewayId +* return the gatewayId of the existing gateway. +* +**/ + bool isGatewayExist(1: required security_model.AuthzToken authzToken, 2: required string gatewayId) throws (1: airavata_errors.InvalidRequestException ire, 2: airavata_errors.AiravataClientException ace, @@ -251,6 +267,17 @@ service Airavata { 2: airavata_errors.AiravataClientException ace, 3: airavata_errors.AiravataSystemException ase) +/** +* Delete a Gateway +* +* @param gatewayId +*The gateway Id of the Gateway to be deleted. +* +* @return boolean +*Boolean identifier for the success or failure of the deletion operation. +* +**/ + bool deleteSSHPubKey (1: required security_model.AuthzToken authzToken, 2: required string airavataCredStoreToken, 3: required string gatewayId)
[4/4] airavata git commit: Adding descriptions to thirft API methods
Adding descriptions to thirft API methods Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d8987244 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d8987244 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d8987244 Branch: refs/heads/master Commit: d8987244b58c030c468d55158a76e9bf52f41250 Parents: 4c8d396 Author: Eroma AbeysingheAuthored: Wed Dec 16 09:44:34 2015 -0500 Committer: Eroma Abeysinghe Committed: Wed Dec 16 09:44:34 2015 -0500 -- .../airavata-apis/airavata_api.thrift | 12 1 file changed, 12 insertions(+) -- http://git-wip-us.apache.org/repos/asf/airavata/blob/d8987244/thrift-interface-descriptions/airavata-apis/airavata_api.thrift -- diff --git a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift index 179a842..d49cc95 100644 --- a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift +++ b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift @@ -340,6 +340,18 @@ service Airavata { 4: airavata_errors.ProjectNotFoundException pnfe, 5: airavata_errors.AuthorizationException ae) +/** + * Delete a Project + *This method is used to delete an existing Project + * + * @param projectId + *projectId of the project you want to delete + * + * @return boolean + *Boolean identifier for the success or failure of the deletion operation. + * + */ + bool deleteProject (1: required security_model.AuthzToken authzToken, 2: required string projectId) throws (1: airavata_errors.InvalidRequestException ire, 2: airavata_errors.AiravataClientException ace,
svn commit: r975704 - /websites/staging/airavata/trunk/content/
Author: buildbot Date: Wed Dec 16 16:25:48 2015 New Revision: 975704 Log: Staging update by buildbot for airavata Modified: websites/staging/airavata/trunk/content/ (props changed) Propchange: websites/staging/airavata/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Wed Dec 16 16:25:48 2015 @@ -1 +1 @@ -1718757 +1720387
svn commit: r1720388 [3/5] - /airavata/site/trunk/content/documentation/api-docs/0.16/
Added: airavata/site/trunk/content/documentation/api-docs/0.16/airavata_commons.html URL: http://svn.apache.org/viewvc/airavata/site/trunk/content/documentation/api-docs/0.16/airavata_commons.html?rev=1720388=auto == --- airavata/site/trunk/content/documentation/api-docs/0.16/airavata_commons.html (added) +++ airavata/site/trunk/content/documentation/api-docs/0.16/airavata_commons.html Wed Dec 16 16:25:38 2015 @@ -0,0 +1,44 @@ +http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd;> +http://www.w3.org/1999/xhtml;> + + + +Thrift module: airavata_commons + +Thrift module: airavata_commons +ModuleServicesData typesConstants + +airavata_commons +ErrorModel +ValidationResults +ValidatorResult + +DEFAULT_ID + + +Constants +ConstantTypeValue +DEFAULT_IDstring"DO_NOT_SET_AT_CLIENTS"Data structures +Struct: ErrorModel +KeyFieldTypeDescriptionRequirednessDefault value +1errorIdstringrequired"DO_NOT_SET_AT_CLIENTS" +2creationTimei64optional +3actualErrorMessagestringoptional +4userFriendlyMessagestringoptional +5transientOrPersistentbooloptionalfalse +6rootCauseErrorIdListliststringoptional +Struct: ValidatorResult +KeyFieldTypeDescriptionRequirednessDefault value +1resultboolrequired +2errorDetailsstringoptional +This data structure can be used to store the validation results +captured during validation step and during the launchExperiment +operation it can be easilly checked to see the errors occured +during the experiment launch operation + +Struct: ValidationResults +KeyFieldTypeDescriptionRequirednessDefault value +1validationStateboolrequired +2validationResultListlistValidatorResultrequired + Added: airavata/site/trunk/content/documentation/api-docs/0.16/airavata_data_models.html URL: http://svn.apache.org/viewvc/airavata/site/trunk/content/documentation/api-docs/0.16/airavata_data_models.html?rev=1720388=auto == --- airavata/site/trunk/content/documentation/api-docs/0.16/airavata_data_models.html (added) +++ airavata/site/trunk/content/documentation/api-docs/0.16/airavata_data_models.html Wed Dec 16 16:25:38 2015 @@ -0,0 +1,16 @@ +http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd;> +http://www.w3.org/1999/xhtml;> + + + +Thrift module: airavata_data_models + +Thrift module: airavata_data_models +ModuleServicesData typesConstants + +airavata_data_models + + + + Added: airavata/site/trunk/content/documentation/api-docs/0.16/airavata_errors.html URL: http://svn.apache.org/viewvc/airavata/site/trunk/content/documentation/api-docs/0.16/airavata_errors.html?rev=1720388=auto == --- airavata/site/trunk/content/documentation/api-docs/0.16/airavata_errors.html (added) +++ airavata/site/trunk/content/documentation/api-docs/0.16/airavata_errors.html Wed Dec 16 16:25:38 2015 @@ -0,0 +1,143 @@ +http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd;> +http://www.w3.org/1999/xhtml;> + + + +Thrift module: airavata_errors + +Thrift module: airavata_errors +ModuleServicesData typesConstants + +airavata_errors +AiravataClientException +AiravataErrorType +AiravataSystemException +AuthenticationException +AuthorizationException +ExperimentNotFoundException +InvalidRequestException +LaunchValidationException +ProjectNotFoundException +TimedOutException +ValidationResults +ValidatorResult + + + +Enumerations +Enumeration: AiravataErrorType +A list of Airavata API Error Message Types + + UNKNOWN: No information available about the error + + PERMISSION_DENIED: Not permitted to perform action + + INTERNAL_ERROR: Unexpected problem with the service + + AUTHENTICATION_FAILURE: The client failed to authenticate. + + INVALID_AUTHORIZATION: Security Token and/or Username and/or password is incorrect + + AUTHORIZATION_EXPIRED: Authentication token expired + + UNKNOWN_GATEWAY_ID: The gateway is not registered with Airavata. + + UNSUPPORTED_OPERATION: Operation denied because it is currently unsupported. + +UNKNOWN0 + +PERMISSION_DENIED1 + +INTERNAL_ERROR2 + +AUTHENTICATION_FAILURE3 + +INVALID_AUTHORIZATION4 + +AUTHORIZATION_EXPIRED5 + +UNKNOWN_GATEWAY_ID6 + +UNSUPPORTED_OPERATION7 + + +Data structures +Exception: ExperimentNotFoundException +KeyFieldTypeDescriptionRequirednessDefault value +1messagestringrequired +This exception is thrown when a client asks to perform an operation on an experiment that does not exist. + +identifier: A description of the experiment that was not found on the server. + +key: The value passed from the client in the identifier, which was not found. +Exception: ProjectNotFoundException +KeyFieldTypeDescriptionRequirednessDefault value +1messagestringrequired +1: optional string identifier, +2: optional string key + +Exception: InvalidRequestException +KeyFieldTypeDescriptionRequirednessDefault value +1messagestringrequired +This exception is thrown for
svn commit: r1720388 [2/5] - /airavata/site/trunk/content/documentation/api-docs/0.16/
Added: airavata/site/trunk/content/documentation/api-docs/0.16/airavata_api.html URL: http://svn.apache.org/viewvc/airavata/site/trunk/content/documentation/api-docs/0.16/airavata_api.html?rev=1720388=auto == --- airavata/site/trunk/content/documentation/api-docs/0.16/airavata_api.html (added) +++ airavata/site/trunk/content/documentation/api-docs/0.16/airavata_api.html Wed Dec 16 16:25:38 2015 @@ -0,0 +1,2156 @@ +http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd;> +http://www.w3.org/1999/xhtml;> + + + +Thrift module: airavata_api + +Thrift module: airavata_api +Application Programming Interface definition for Apache Airavata Services. + this parent thrift file is contains all service interfaces. The data models are + described in respective thrift files. +ModuleServicesData typesConstants + +airavata_apiAiravata + +addCloudJobSubmissionDetails +addGateway +addGatewayComputeResourcePreference +addGatewayStoragePreference +addGridFTPDataMovementDetails +addLocalDataMovementDetails +addLocalSubmissionDetails +addSCPDataMovementDetails +addSSHForkJobSubmissionDetails +addSSHJobSubmissionDetails +addUNICOREJobSubmissionDetails +addUnicoreDataMovementDetails +changeDataMovementPriorities +changeDataMovementPriority +changeJobSubmissionPriorities +changeJobSubmissionPriority +cloneExperiment +createExperiment +createProject +deleteApplicationDeployment +deleteApplicationInterface +deleteApplicationModule +deleteBatchQueue +deleteComputeResource +deleteDataMovementInterface +deleteExperiment +deleteGateway +deleteGatewayComputeResourcePreference +deleteGatewayResourceProfile +deleteGatewayStoragePreference +deleteJobSubmissionInterface +deleteProject +deleteResourceJobManager +deleteSSHPubKey +deleteStorageResource +deleteWorkflow +generateAndRegisterSSHKeys +getAPIVersion +getAllAppModules +getAllApplicationDeployments +getAllApplicationInterfaceNames +getAllApplicationInterfaces +getAllComputeResourceNames +getAllGatewayComputeResourcePreferences +getAllGatewayResourceProfiles +getAllGatewaySSHPubKeys +getAllGatewayStoragePreferences +getAllGateways +getAllStorageResourceNames +getAllUserSSHPubKeys +getAllWorkflows +getAppModuleDeployedResources +getApplicationDeployment +getApplicationInputs +getApplicationInterface +getApplicationModule +getApplicationOutputs +getAvailableAppInterfaceComputeResources +getCloudJobSubmission +getComputeResource +getDataResource +getDetailedExperimentTree +getExperiment +getExperimentOutputs +getExperimentStatistics +getExperimentStatus +getExperimentsInProject +getGateway +getGatewayComputeResourcePreference +getGatewayResourceProfile +getGatewayStoragePreference +getGridFTPDataMovement +getIntermediateOutputs +getJobDetails +getJobStatuses +getLocalDataMovement +getLocalJobSubmission +getProject +getResourceJobManager +getSCPDataMovement +getSSHJobSubmission +getSSHPubKey +getStorageResource +getUnicoreDataMovement +getUnicoreJobSubmission +getUserExperiments +getUserProjects +getWorkflow +getWorkflowTemplateId +isGatewayExist +isWorkflowExistWithName +launchExperiment +registerApplicationDeployment +registerApplicationInterface +registerApplicationModule +registerComputeResource +registerDataResource +registerGatewayResourceProfile +registerResourceJobManager +registerStorageResource +registerWorkflow +removeDataResource +searchExperiments +searchExperimentsByApplication +searchExperimentsByCreationTime +searchExperimentsByDesc +searchExperimentsByName +searchExperimentsByStatus +searchProjectsByProjectDesc +searchProjectsByProjectName +terminateExperiment +updateApplicationDeployment +updateApplicationInterface +updateApplicationModule +updateCloudJobSubmissionDetails +updateComputeResource +updateDataResource +updateExperiment +updateExperimentConfiguration +updateGateway +updateGatewayComputeResourcePreference +updateGatewayResourceProfile +updateGatewayStoragePreference +updateGridFTPDataMovementDetails +updateLocalDataMovementDetails +updateLocalSubmissionDetails +updateProject +updateResourceJobManager +updateResourceScheduleing +updateSCPDataMovementDetails +updateSSHJobSubmissionDetails +updateStorageResource +updateUnicoreDataMovementDetails +updateUnicoreJobSubmissionDetails +updateWorkflow +validateExperiment + + + +AIRAVATA_API_VERSION + + +Constants +ConstantTypeValue +AIRAVATA_API_VERSIONstring"0.16.0"Airavata Interface Versions depend upon this Thrift Interface File. When making changes, please edit the + Version Constants according to Semantic Versioning Specification (SemVer) http://semver.org. + +Note: The Airavata API version may be different from the Airavata software release versions. + +The Airavata API version is composed as a dot delimited string with major, minor, and patch level components. + + - Major: Incremented for backward incompatible changes. An example would be changes to interfaces. + - Minor: Incremented for backward compatible changes. An example
svn commit: r1720388 [5/5] - /airavata/site/trunk/content/documentation/api-docs/0.16/
Added: airavata/site/trunk/content/documentation/api-docs/0.16/workflow_data_model.html URL: http://svn.apache.org/viewvc/airavata/site/trunk/content/documentation/api-docs/0.16/workflow_data_model.html?rev=1720388=auto == --- airavata/site/trunk/content/documentation/api-docs/0.16/workflow_data_model.html (added) +++ airavata/site/trunk/content/documentation/api-docs/0.16/workflow_data_model.html Wed Dec 16 16:25:38 2015 @@ -0,0 +1,26 @@ +http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd;> +http://www.w3.org/1999/xhtml;> + + + +Thrift module: workflow_data_model + +Thrift module: workflow_data_model +ModuleServicesData typesConstants + +workflow_data_model +Workflow + + + +Data structures +Struct: Workflow +KeyFieldTypeDescriptionRequirednessDefault value +1templateIdstringrequired"DO_NOT_SET_AT_CLIENTS" +2namestringrequired +3graphstringoptional +4imagebinaryoptional +5workflowInputslistapplication_io_models.InputDataObjectTypeoptional +6workflowOutputslistapplication_io_models.OutputDataObjectTypeoptional + Added: airavata/site/trunk/content/documentation/api-docs/0.16/workspace_model.html URL: http://svn.apache.org/viewvc/airavata/site/trunk/content/documentation/api-docs/0.16/workspace_model.html?rev=1720388=auto == --- airavata/site/trunk/content/documentation/api-docs/0.16/workspace_model.html (added) +++ airavata/site/trunk/content/documentation/api-docs/0.16/workspace_model.html Wed Dec 16 16:25:38 2015 @@ -0,0 +1,44 @@ +http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd;> +http://www.w3.org/1999/xhtml;> + + + +Thrift module: workspace_model + +Thrift module: workspace_model +ModuleServicesData typesConstants + +workspace_model +Gateway +Group +Project +User + + + +Data structures +Struct: Group +KeyFieldTypeDescriptionRequirednessDefault value +1groupNamestringrequired +2descriptionstringoptional +Struct: Project +KeyFieldTypeDescriptionRequirednessDefault value +1projectIDstringrequired"DO_NOT_SET_AT_CLIENTS" +2ownerstringrequired +3namestringrequired +4descriptionstringoptional +5creationTimei64optional +6sharedUsersliststringoptional +7sharedGroupsliststringoptional +Struct: User +KeyFieldTypeDescriptionRequirednessDefault value +1userNamestringrequired +2groupListlistGroupoptional +Struct: Gateway +KeyFieldTypeDescriptionRequirednessDefault value +1gatewayIdstringrequired +2gatewayNamestringoptional +3domainstringoptional +4emailAddressstringoptional +
airavata git commit: Adding descriptions to app catalog thirft API methods
Repository: airavata Updated Branches: refs/heads/master 389268fad -> efa66f9ba Adding descriptions to app catalog thirft API methods Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/efa66f9b Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/efa66f9b Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/efa66f9b Branch: refs/heads/master Commit: efa66f9baca32c3e3b95c3e8688140b59b6522e1 Parents: 389268f Author: Eroma AbeysingheAuthored: Wed Dec 16 11:18:50 2015 -0500 Committer: Eroma Abeysinghe Committed: Wed Dec 16 11:18:50 2015 -0500 -- .../airavata-apis/airavata_api.thrift | 40 1 file changed, 32 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/airavata/blob/efa66f9b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift -- diff --git a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift index 9c55330..336eb0b 100644 --- a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift +++ b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift @@ -2268,6 +2268,7 @@ service Airavata { * @return GridFTPDataMovement instance * **/ + data_movement_models.GridFTPDataMovement getGridFTPDataMovement(1: required security_model.AuthzToken authzToken, 2: required string dataMovementId) throws (1: airavata_errors.InvalidRequestException ire, 2: airavata_errors.AiravataClientException ace, @@ -2288,6 +2289,7 @@ service Airavata { * Returns a success/failure of the change. * **/ + bool changeJobSubmissionPriority(1: required security_model.AuthzToken authzToken, 2: required string jobSubmissionInterfaceId, 3: required i32 newPriorityOrder) throws (1: airavata_errors.InvalidRequestException ire, @@ -2295,7 +2297,7 @@ service Airavata { 3: airavata_errors.AiravataSystemException ase, 4: airavata_errors.AuthorizationException ae) - /** + /** * Change the priority of a given data movement interface * * @param dataMovementInterfaceId @@ -2307,7 +2309,8 @@ service Airavata { * @return status * Returns a success/failure of the change. * - */ + **/ + bool changeDataMovementPriority(1: required security_model.AuthzToken authzToken, 2: required string dataMovementInterfaceId, 3: required i32 newPriorityOrder) throws (1: airavata_errors.InvalidRequestException ire, @@ -2325,13 +2328,14 @@ service Airavata { * Returns a success/failure of the changes. * */ + bool changeJobSubmissionPriorities(1: required security_model.AuthzToken authzToken, 2: required map jobSubmissionPriorityMap) throws (1: airavata_errors.InvalidRequestException ire, 2: airavata_errors.AiravataClientException ace, 3: airavata_errors.AiravataSystemException ase, 4: airavata_errors.AuthorizationException ae) - /** + /** * Change the priorities of a given set of data movement interfaces * * @param dataMovementPriorityMap @@ -2340,14 +2344,15 @@ service Airavata { * @return status * Returns a success/failure of the changes. * - */ + **/ + bool changeDataMovementPriorities(1: required security_model.AuthzToken authzToken, 2: required map dataMovementPriorityMap) throws (1: airavata_errors.InvalidRequestException ire, 2: airavata_errors.AiravataClientException ace, 3: airavata_errors.AiravataSystemException ase, 4: airavata_errors.AuthorizationException ae) - /** + /** * Delete a given job submisison interface * * @param jobSubmissionInterfaceId @@ -2356,7 +2361,8 @@ service Airavata { * @return status * Returns a success/failure of the deletion. * - */ + **/ + bool deleteJobSubmissionInterface(1: required security_model.AuthzToken authzToken, 2: required string computeResourceId, 3: required string jobSubmissionInterfaceId) throws (1: airavata_errors.InvalidRequestException ire, @@ -2364,7 +2370,7 @@ service Airavata { 3: airavata_errors.AiravataSystemException ase, 4: airavata_errors.AuthorizationException ae) - /** + /** * Delete a given data movement interface * * @param dataMovementInterfaceId @@ -2373,7 +2379,8 @@ service Airavata { * @return status * Returns a success/failure of the deletion. * - */ + **/ + bool deleteDataMovementInterface(1: required
svn commit: r1720388 [1/5] - /airavata/site/trunk/content/documentation/api-docs/0.16/
Author: smarru Date: Wed Dec 16 16:25:38 2015 New Revision: 1720388 URL: http://svn.apache.org/viewvc?rev=1720388=rev Log: adding 0.16 documentation Added: airavata/site/trunk/content/documentation/api-docs/0.16/ airavata/site/trunk/content/documentation/api-docs/0.16/airavata_api.html airavata/site/trunk/content/documentation/api-docs/0.16/airavata_commons.html airavata/site/trunk/content/documentation/api-docs/0.16/airavata_data_models.html airavata/site/trunk/content/documentation/api-docs/0.16/airavata_errors.html airavata/site/trunk/content/documentation/api-docs/0.16/application_deployment_model.html airavata/site/trunk/content/documentation/api-docs/0.16/application_interface_model.html airavata/site/trunk/content/documentation/api-docs/0.16/application_io_models.html airavata/site/trunk/content/documentation/api-docs/0.16/compute_resource_model.html airavata/site/trunk/content/documentation/api-docs/0.16/data_movement_models.html airavata/site/trunk/content/documentation/api-docs/0.16/experiment_model.html airavata/site/trunk/content/documentation/api-docs/0.16/gateway_resource_profile_model.html airavata/site/trunk/content/documentation/api-docs/0.16/index.html airavata/site/trunk/content/documentation/api-docs/0.16/job_model.html airavata/site/trunk/content/documentation/api-docs/0.16/messaging_events.html airavata/site/trunk/content/documentation/api-docs/0.16/process_model.html airavata/site/trunk/content/documentation/api-docs/0.16/replica_catalog_models.html airavata/site/trunk/content/documentation/api-docs/0.16/scheduling_model.html airavata/site/trunk/content/documentation/api-docs/0.16/security_model.html airavata/site/trunk/content/documentation/api-docs/0.16/status_models.html airavata/site/trunk/content/documentation/api-docs/0.16/storage_resource_model.html airavata/site/trunk/content/documentation/api-docs/0.16/style.css airavata/site/trunk/content/documentation/api-docs/0.16/task_model.html airavata/site/trunk/content/documentation/api-docs/0.16/workflow_data_model.html airavata/site/trunk/content/documentation/api-docs/0.16/workspace_model.html
svn commit: r1720388 [4/5] - /airavata/site/trunk/content/documentation/api-docs/0.16/
Added: airavata/site/trunk/content/documentation/api-docs/0.16/index.html URL: http://svn.apache.org/viewvc/airavata/site/trunk/content/documentation/api-docs/0.16/index.html?rev=1720388=auto == --- airavata/site/trunk/content/documentation/api-docs/0.16/index.html (added) +++ airavata/site/trunk/content/documentation/api-docs/0.16/index.html Wed Dec 16 16:25:38 2015 @@ -0,0 +1,340 @@ + + +All Thrift declarations + +All Thrift declarations +ModuleServicesData typesConstants + +airavata_apiAiravata + +addCloudJobSubmissionDetails +addGateway +addGatewayComputeResourcePreference +addGatewayStoragePreference +addGridFTPDataMovementDetails +addLocalDataMovementDetails +addLocalSubmissionDetails +addSCPDataMovementDetails +addSSHForkJobSubmissionDetails +addSSHJobSubmissionDetails +addUNICOREJobSubmissionDetails +addUnicoreDataMovementDetails +changeDataMovementPriorities +changeDataMovementPriority +changeJobSubmissionPriorities +changeJobSubmissionPriority +cloneExperiment +createExperiment +createProject +deleteApplicationDeployment +deleteApplicationInterface +deleteApplicationModule +deleteBatchQueue +deleteComputeResource +deleteDataMovementInterface +deleteExperiment +deleteGateway +deleteGatewayComputeResourcePreference +deleteGatewayResourceProfile +deleteGatewayStoragePreference +deleteJobSubmissionInterface +deleteProject +deleteResourceJobManager +deleteSSHPubKey +deleteStorageResource +deleteWorkflow +generateAndRegisterSSHKeys +getAPIVersion +getAllAppModules +getAllApplicationDeployments +getAllApplicationInterfaceNames +getAllApplicationInterfaces +getAllComputeResourceNames +getAllGatewayComputeResourcePreferences +getAllGatewayResourceProfiles +getAllGatewaySSHPubKeys +getAllGatewayStoragePreferences +getAllGateways +getAllStorageResourceNames +getAllUserSSHPubKeys +getAllWorkflows +getAppModuleDeployedResources +getApplicationDeployment +getApplicationInputs +getApplicationInterface +getApplicationModule +getApplicationOutputs +getAvailableAppInterfaceComputeResources +getCloudJobSubmission +getComputeResource +getDataResource +getDetailedExperimentTree +getExperiment +getExperimentOutputs +getExperimentStatistics +getExperimentStatus +getExperimentsInProject +getGateway +getGatewayComputeResourcePreference +getGatewayResourceProfile +getGatewayStoragePreference +getGridFTPDataMovement +getIntermediateOutputs +getJobDetails +getJobStatuses +getLocalDataMovement +getLocalJobSubmission +getProject +getResourceJobManager +getSCPDataMovement +getSSHJobSubmission +getSSHPubKey +getStorageResource +getUnicoreDataMovement +getUnicoreJobSubmission +getUserExperiments +getUserProjects +getWorkflow +getWorkflowTemplateId +isGatewayExist +isWorkflowExistWithName +launchExperiment +registerApplicationDeployment +registerApplicationInterface +registerApplicationModule +registerComputeResource +registerDataResource +registerGatewayResourceProfile +registerResourceJobManager +registerStorageResource +registerWorkflow +removeDataResource +searchExperiments +searchExperimentsByApplication +searchExperimentsByCreationTime +searchExperimentsByDesc +searchExperimentsByName +searchExperimentsByStatus +searchProjectsByProjectDesc +searchProjectsByProjectName +terminateExperiment +updateApplicationDeployment +updateApplicationInterface +updateApplicationModule +updateCloudJobSubmissionDetails +updateComputeResource +updateDataResource +updateExperiment +updateExperimentConfiguration +updateGateway +updateGatewayComputeResourcePreference +updateGatewayResourceProfile +updateGatewayStoragePreference +updateGridFTPDataMovementDetails +updateLocalDataMovementDetails +updateLocalSubmissionDetails +updateProject +updateResourceJobManager +updateResourceScheduleing +updateSCPDataMovementDetails +updateSSHJobSubmissionDetails +updateStorageResource +updateUnicoreDataMovementDetails +updateUnicoreJobSubmissionDetails +updateWorkflow +validateExperiment + + + +AIRAVATA_API_VERSION + + +airavata_errors +AiravataClientException +AiravataErrorType +AiravataSystemException +AuthenticationException +AuthorizationException +ExperimentNotFoundException +InvalidRequestException +LaunchValidationException +ProjectNotFoundException +TimedOutException +ValidationResults +ValidatorResult + + + +experiment_model +ExperimentModel +ExperimentSearchFields +ExperimentStatistics +ExperimentSummaryModel +ExperimentType +UserConfigurationDataModel + + + +airavata_commons +ErrorModel +ValidationResults +ValidatorResult + +DEFAULT_ID + + +application_io_models +DataType +InputDataObjectType +OutputDataObjectType + + + +compute_resource_model +BatchQueue +CloudJobSubmission +ComputeResourceDescription +DMType +FileSystems +GlobusJobSubmission +JobManagerCommand +JobSubmissionInterface +JobSubmissionProtocol +LOCALSubmission +MonitorMode +ProviderName +ResourceJobManager +ResourceJobManagerType +SSHJobSubmission +UnicoreJobSubmission + + + +data_movement_models +DMType
svn commit: r975706 - /websites/production/airavata/content/
Author: smarru Date: Wed Dec 16 16:27:42 2015 New Revision: 975706 Log: publishing any pending changes Added: websites/production/airavata/content/ - copied from r975705, websites/staging/airavata/trunk/content/
airavata git commit: Tests are failing with new thrift generated code, need to fix. Committing with build wokring without tetss
Repository: airavata Updated Branches: refs/heads/master efa66f9ba -> 80d202785 Tests are failing with new thrift generated code, need to fix. Committing with build wokring without tetss Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/80d20278 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/80d20278 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/80d20278 Branch: refs/heads/master Commit: 80d202785f05f76fee6fa6461c38cfd759444740 Parents: efa66f9 Author: smarruAuthored: Wed Dec 16 11:34:09 2015 -0500 Committer: smarru Committed: Wed Dec 16 11:34:09 2015 -0500 -- .../server/handler/AiravataServerHandler.java | 7 +- .../airavata/data/manager/DataManager.java | 67 .../data/manager/DataManagerException.java | 35 -- .../data/manager/DataManagerFactory.java| 32 -- .../airavata/data/manager/DataManagerImpl.java | 92 -- .../data/manager/DataManagerFactoryTest.java| 36 --- .../data/manager/DataManagerImptTest.java | 141 .../airavata/data/manager/utils/AppCatInit.java | 320 --- .../data/manager/utils/DataCatInit.java | 315 -- .../airavata-api/data_movement_models.thrift| 154 - .../airavata-api/data_resource_models.thrift| 45 --- 11 files changed, 4 insertions(+), 1240 deletions(-) -- http://git-wip-us.apache.org/repos/asf/airavata/blob/80d20278/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 52bfa80..d9121d8 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 @@ -72,9 +72,10 @@ import org.apache.airavata.registry.core.experiment.catalog.ExpCatResourceUtils; import org.apache.airavata.registry.core.experiment.catalog.impl.RegistryFactory; import org.apache.airavata.registry.cpi.*; import org.apache.airavata.registry.cpi.utils.Constants; -import org.apache.airavata.data.catalog.core.DataManagerFactory; -import org.apache.airavata.data.catalog.cpi.DataManager; -import org.apache.airavata.data.catalog.cpi.DataManagerException; + +import org.apache.airavata.replica.catalog.core.DataManagerFactory; +import org.apache.airavata.replica.catalog.cpi.DataManager; +import org.apache.airavata.replica.catalog.cpi.DataManagerException; import org.apache.thrift.TException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/airavata/blob/80d20278/modules/data-manager/src/main/java/org/apache/airavata/data/manager/DataManager.java -- diff --git a/modules/data-manager/src/main/java/org/apache/airavata/data/manager/DataManager.java b/modules/data-manager/src/main/java/org/apache/airavata/data/manager/DataManager.java deleted file mode 100644 index 7b046d5..000 --- a/modules/data-manager/src/main/java/org/apache/airavata/data/manager/DataManager.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -package org.apache.airavata.data.manager; - -import org.apache.airavata.model.data.resource.DataResourceModel; - -public interface DataManager { - -/** - * To create a replica entry for an already existing file(s). This is how the system comes to know about already - * existing resources - * @param resource - * @return - */ -String publishDataResource(DataResourceModel resource) throws DataManagerException; - -